From 8de29bc28d97d8413db1bbc65222771ddf6ed07d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 21:08:56 +0200
Subject: [PATCH] bump faraday and faraday_middleware. closes #4950

---
 Gemfile                        |  4 ++--
 Gemfile.lock                   | 14 +++++++-------
 config/initializers/faraday.rb |  4 +++-
 lib/diaspora/fetcher/public.rb |  4 ++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index fc754c94a..5ff8b8908 100644
--- a/Gemfile
+++ b/Gemfile
@@ -116,8 +116,8 @@ gem 'acts-as-taggable-on', '3.3.0'
 # URIs and HTTP
 
 gem 'addressable',        '2.3.6', :require => 'addressable/uri'
-gem 'faraday',            '0.8.9'
-gem 'faraday_middleware', '0.9.0'
+gem 'faraday',            '0.9.0'
+gem 'faraday_middleware', '0.9.1'
 gem 'typhoeus',           '0.6.9'
 
 # Views
diff --git a/Gemfile.lock b/Gemfile.lock
index a28e6f2d7..e039c78f0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -141,10 +141,10 @@ GEM
     factory_girl_rails (4.4.1)
       factory_girl (~> 4.4.0)
       railties (>= 3.0.0)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
-    faraday_middleware (0.9.0)
-      faraday (>= 0.7.4, < 0.9)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.9.1)
+      faraday (>= 0.7.4, < 0.10)
     ffi (1.9.3)
     fixture_builder (0.3.6)
       activerecord (>= 2)
@@ -267,7 +267,7 @@ GEM
     multi_json (1.10.1)
     multi_test (0.1.1)
     multi_xml (0.5.5)
-    multipart-post (1.2.0)
+    multipart-post (2.0.0)
     mysql2 (0.3.16)
     nested_form (0.3.2)
     net-scp (1.2.1)
@@ -509,8 +509,8 @@ DEPENDENCIES
   devise_lastseenable (= 0.0.4)
   entypo-rails (= 2.2.2)
   factory_girl_rails (= 4.4.1)
-  faraday (= 0.8.9)
-  faraday_middleware (= 0.9.0)
+  faraday (= 0.9.0)
+  faraday_middleware (= 0.9.1)
   fixture_builder (= 0.3.6)
   fog (= 1.23.0)
   foreigner (= 1.6.1)
diff --git a/config/initializers/faraday.rb b/config/initializers/faraday.rb
index 274a998b5..ad1384f6d 100644
--- a/config/initializers/faraday.rb
+++ b/config/initializers/faraday.rb
@@ -2,7 +2,9 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 options = {
-  timeout: 25,
+  request: {
+    timeout: 25
+  },
   ssl: {
     ca_file: AppConfig.environment.certificate_authorities.get
   }
diff --git a/lib/diaspora/fetcher/public.rb b/lib/diaspora/fetcher/public.rb
index a849a9071..241928246 100644
--- a/lib/diaspora/fetcher/public.rb
+++ b/lib/diaspora/fetcher/public.rb
@@ -76,8 +76,8 @@ module Diaspora; module Fetcher; class Public
       FEDERATION_LOGGER.info "fetching public posts for #{@person.diaspora_handle}"
 
       resp = Faraday.get("#{@person.url}people/#{@person.guid}") do |req|
-        req.headers[:accept] = 'application/json'
-        req.headers[:user_agent] = 'diaspora-fetcher'
+        req.headers['Accept'] = 'application/json'
+        req.headers['User-Agent'] = 'diaspora-fetcher'
       end
 
       FEDERATION_LOGGER.debug resp.body.to_s[0..250]