request.rb in faraday-0.9.0.rc1

- old
+ new

@@ -8,30 +8,21 @@
   #     req['b']         = '2' # also Header
   #     req.body = 'abc'
   #   end
   #
   class Request < Struct.new(:method, :path, :params, :headers, :body, :options)
-    extend AutoloadHelper
     extend MiddlewareRegistry
 
-    autoload_all 'faraday/request',
-      :UrlEncoded => 'url_encoded',
-      :Multipart => 'multipart',
-      :Retry => 'retry',
-      :Timeout => 'timeout',
-      :Authorization => 'authorization',
-      :BasicAuthentication => 'basic_authentication',
-      :TokenAuthentication => 'token_authentication'
+    register_middleware File.expand_path('../request', __FILE__),
+      :url_encoded => [:UrlEncoded, 'url_encoded'],
+      :multipart => [:Multipart, 'multipart'],
+      :retry => [:Retry, 'retry'],
+      :authorization => [:Authorization, 'authorization'],
+      :basic_auth => [:BasicAuthentication, 'basic_authentication'],
+      :token_auth => [:TokenAuthentication, 'token_authentication'],
+      :instrumentation => [:Instrumentation, 'instrumentation']
 
-    register_middleware \
-      :url_encoded => :UrlEncoded,
-      :multipart => :Multipart,
-      :retry => :Retry,
-      :authorization => :Authorization,
-      :basic_auth => :BasicAuthentication,
-      :token_auth => :TokenAuthentication
-
     def self.create(request_method)
       new(request_method).tap do |request|
         yield request if block_given?
       end
     end
@@ -58,11 +49,11 @@
         end
       else
         path, query = path.split('?', 2)
       end
       self.path = path
-      self.params.merge_query query
+      self.params.merge_query query, options.params_encoder
       self.params.update(params) if params
     end
 
     def [](key)
       headers[key]
@@ -87,15 +78,11 @@
     #     :uri        - Proxy Server URI
     #     :user       - Proxy server username
     #     :password   - Proxy server password
     # :ssl - Hash of options for configuring SSL requests.
     def to_env(connection)
-      { :method           => method,
-        :body             => body,
-        :url              => connection.build_exclusive_url(path, params),
-        :request_headers  => headers,
-        :parallel_manager => connection.parallel_manager,
-        :request          => options,
-        :ssl              => connection.ssl}
+      Env.new(method, body, connection.build_exclusive_url(path, params),
+        options, headers, connection.ssl, connection.parallel_manager)
     end
   end
 end
+