faraday 0.9.0.rc2 → 0.9.0.rc3

data/lib/faraday.rb

@@ -14,7 +14,7 @@ require 'forwardable'
 #   conn.get '/'
 #
 module Faraday
-  VERSION = "0.9.0.rc2"
+  VERSION = "0.9.0.rc3"
 
   class << self
     # Public: Gets or sets the root path that Faraday is being loaded from.

data/lib/faraday/adapter/test.rb

@@ -144,10 +144,11 @@ module Faraday
       def call(env)
         super
         normalized_path = Faraday::Utils.normalize_path(env[:url])
+        params_encoder = env.request.params_encoder || Faraday::Utils.default_params_encoder
 
         if stub = stubs.match(env[:method], normalized_path, env.request_headers, env[:body])
           env[:params] = (query = env[:url].query) ?
-            Faraday::Utils.parse_nested_query(query)  :
+            params_encoder.decode(query)  :
             {}
           status, headers, body = stub.block.call(env)
           save_response(env, status, body, headers)

data/lib/faraday/connection.rb

@@ -186,8 +186,7 @@ module Faraday
     #
     # Returns nothing.
     def basic_auth(login, pass)
-      headers[Faraday::Request::Authorization::KEY] =
-        Faraday::Request::BasicAuthentication.header(login, pass)
+      set_authorization_header(:basic_auth, login, pass)
     end
 
     # Public: Sets up the Authorization header with the given token.
@@ -204,8 +203,7 @@ module Faraday
     #
     # Returns nothing.
     def token_auth(token, options = nil)
-      headers[Faraday::Request::Authorization::KEY] =
-        Faraday::Request::TokenAuthentication.header(token, options)
+      set_authorization_header(:token_auth, token, options)
     end
 
     # Public: Sets up a custom Authorization header.
@@ -227,8 +225,7 @@ module Faraday
     #
     # Returns nothing.
     def authorization(type, token)
-      headers[Faraday::Request::Authorization::KEY] =
-        Faraday::Request::Authorization.header(type, token)
+      set_authorization_header(:authorization, type, token)
     end
 
     # Internal: Traverse the middleware stack in search of a
@@ -395,6 +392,12 @@ module Faraday
         yield Utils.unescape(uri.user), Utils.unescape(uri.password)
       end
     end
+
+    def set_authorization_header(header_type, *args)
+      header = Faraday::Request.lookup_middleware(header_type).
+        header(*args)
+      headers[Faraday::Request::Authorization::KEY] = header
+    end
   end
 end
 

data/test/adapters/test_middleware_test.rb

@@ -69,6 +69,35 @@ module Adapters
       assert_equal 'a', @conn.get('http://foo.com/hello?a=1').body
     end
 
+    def test_parses_params_with_default_encoder
+      @stubs.get '/hello' do |env|
+        assert_equal '1', env[:params]['a']['b']
+        [200, {}, 'a']
+      end
+
+      assert_equal 'a', @conn.get('http://foo.com/hello?a[b]=1').body
+    end
+
+    def test_parses_params_with_nested_encoder
+      @stubs.get '/hello' do |env|
+        assert_equal '1', env[:params]['a']['b']
+        [200, {}, 'a']
+      end
+
+      @conn.options.params_encoder = Faraday::NestedParamsEncoder
+      assert_equal 'a', @conn.get('http://foo.com/hello?a[b]=1').body
+    end
+
+    def test_parses_params_with_flat_encoder
+      @stubs.get '/hello' do |env|
+        assert_equal '1', env[:params]['a[b]']
+        [200, {}, 'a']
+      end
+
+      @conn.options.params_encoder = Faraday::FlatParamsEncoder
+      assert_equal 'a', @conn.get('http://foo.com/hello?a[b]=1').body
+    end
+
     def test_raises_an_error_if_no_stub_is_found_for_request
       assert_raises Stubs::NotFound do
         @conn.get('/invalid'){ [200, {}, []] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faraday
 version: !ruby/object:Gem::Version
-  version: 0.9.0.rc2
+  version: 0.9.0.rc3
   prerelease: 6
 platform: ruby
 authors: