Change default middleware.

piotrmurach · piotrmurach · commit afcd7a3d3909 · 2014-07-30T22:48:15.000+01:00
diff --git a/lib/github_api.rb b/lib/github_api.rb
@@ -1,5 +1,6 @@
 # encoding: utf-8
 
+require 'faraday'
 require 'github_api/version'
 require 'github_api/configuration'
 require 'github_api/constants'
@@ -8,6 +9,7 @@
 require 'github_api/deprecation'
 require 'github_api/core_ext/ordered_hash'
 require 'github_api/ext/faraday'
+require 'github_api/middleware'
 
 module Github
   LIBNAME = 'github_api'
@@ -31,6 +33,16 @@ def new(options = {}, &block)
       Client.new(options, &block)
     end
 
+    # Default middleware stack that uses default adapter as specified
+    # by configuration setup
+    #
+    # @return [Proc]
+    #
+    # @api private
+    def default_middleware(options = {})
+      Middleware.default(options)
+    end
+
     # Delegate to Github::Client
     #
     # @api private
diff --git a/lib/github_api/connection.rb b/lib/github_api/connection.rb
@@ -1,12 +1,5 @@
 # encoding: utf-8
 
-require 'faraday'
-require 'github_api/response'
-require 'github_api/response/mashify'
-require 'github_api/response/jsonize'
-require 'github_api/response/raise_error'
-require 'github_api/response/header'
-
 module Github
   # Specifies Http connection options
   module Connection
@@ -36,32 +29,6 @@ def default_options(options = {})
       }
     end
 
-    # Default middleware stack that uses default adapter as specified at
-    # configuration stage.
-    #
-    def default_middleware(options = {})
-      api = options[:api]
-      proc do |builder|
-        builder.use Github::Request::Jsonize
-        builder.use Faraday::Request::Multipart
-        builder.use Faraday::Request::UrlEncoded
-        builder.use Github::Request::OAuth2, api.oauth_token if api.oauth_token?
-        builder.use Github::Request::BasicAuth, api.authentication if api.basic_authed?
-
-        builder.use Faraday::Response::Logger if ENV['DEBUG']
-        unless options[:raw]
-          builder.use Github::Response::Mashify
-          builder.use Github::Response::Jsonize
-        end
-        builder.use Github::Response::RaiseError
-        builder.adapter options[:adapter]
-      end
-    end
-
-    @connection = nil
-
-    @stack = nil
-
     def clear_cache
       @connection = nil
     end
@@ -80,7 +47,7 @@ def stack(options = {}, &block)
         if block_given?
           builder_class.new(&block)
         else
-          builder_class.new(&default_middleware(options))
+          builder_class.new(&Github.default_middleware(options))
         end
       end
     end
