define the middleware as a Faraday::Builder

sferik · Jun 12, 2012 · 2bd5010 · 2bd5010 · sferik · Jun 13, 2012
1 parent b1c4dab
commit 2bd5010
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/lib/twitter/config.rb b/lib/twitter/config.rb
@@ -31,15 +31,15 @@ module Config
     DEFAULT_MEDIA_ENDPOINT = 'https://upload.twitter.com'
 
     # The middleware stack if none is set
-    DEFAULT_MIDDLEWARE = Proc.new do |builder|
+    DEFAULT_MIDDLEWARE = Faraday::Builder.new(&Proc.new { |builder|
       builder.use Twitter::Request::MultipartWithFile
       builder.use Faraday::Request::Multipart
       builder.use Faraday::Request::UrlEncoded
       builder.use Twitter::Response::RaiseClientError
       builder.use Twitter::Response::ParseJson
       builder.use Twitter::Response::RaiseServerError
       builder.adapter Faraday.default_adapter
-    end
+    })
 
     # The oauth token if none is set
     DEFAULT_OAUTH_TOKEN = ENV['TWITTER_OAUTH_TOKEN']

diff --git a/lib/twitter/requestable.rb b/lib/twitter/requestable.rb
@@ -41,7 +41,7 @@ def connection
 
       options = default_options.deep_merge(connection_options)
 
-      @connection = Faraday.new(endpoint, options, &middleware)
+      @connection = Faraday.new(endpoint, options.merge(:builder => middleware))
     end
 
     # Perform an HTTP request

diff --git a/spec/twitter_spec.rb b/spec/twitter_spec.rb
@@ -64,6 +64,12 @@
     end
   end
 
+  describe '.middleware' do
+    it "should return a Faraday::Builder" do
+      Twitter.middleware.should be_kind_of(Faraday::Builder)
+    end
+  end
+
   describe ".configure" do
     Twitter::Config::VALID_OPTIONS_KEYS.each do |key|
       it "should set the #{key}" do