From 379df76118f47a9e617dc66765f113fc48baf177 Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Mon, 14 May 2012 15:58:41 -0700
Subject: [PATCH] Update to faraday-middleware, as faraday stack has been
 deprecated.

Hopefully this will make REE happy in Travis
---
 Gemfile                        | 2 +-
 Gemfile.lock                   | 6 +++---
 config/initializers/faraday.rb | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index d4bcf4e4c..2b2adb59e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -134,7 +134,7 @@ gem 'jquery-rails'
 # web
 
 gem 'faraday'
-gem 'faraday-stack'
+gem 'faraday_middleware'
 gem 'em-synchrony', '1.0.0', :platforms => :ruby_19
 
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 98f4cce8a..489b46dbb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -172,8 +172,8 @@ GEM
       addressable (~> 2.2)
       multipart-post (~> 1.1)
       rack (~> 1.1)
-    faraday-stack (0.1.5)
-      faraday (>= 0.6, < 0.8)
+    faraday_middleware (0.8.7)
+      faraday (>= 0.7.4, < 0.9)
     fastercsv (1.5.4)
     fastthread (1.0.7)
     ffi (1.0.11)
@@ -518,7 +518,7 @@ DEPENDENCIES
   em-synchrony (= 1.0.0)
   factory_girl_rails (= 1.7.0)
   faraday
-  faraday-stack
+  faraday_middleware
   fastercsv (= 1.5.4)
   fixture_builder (= 0.3.3)
   fog
diff --git a/config/initializers/faraday.rb b/config/initializers/faraday.rb
index 9a2683507..6c3756d5b 100644
--- a/config/initializers/faraday.rb
+++ b/config/initializers/faraday.rb
@@ -5,6 +5,6 @@ options = {:timeout => 25}
 
 options[:ssl] = {:ca_file => EnviromentConfiguration.ca_cert_file_location}
 Faraday.default_connection = Faraday::Connection.new(options) do |b|
-  b.use FaradayStack::FollowRedirects
+  b.use FaradayMiddleware::FollowRedirects
   b.adapter Faraday.default_adapter
 end