Merge pull request piotrmurach#264 from zacksiri/master

piotrmurach · piotrmurach · commit 7642d22a6a34 · 2016-05-21T20:58:13.000+01:00
Can add custom stack to middleware fixes piotrmurach#227
diff --git a/README.md b/README.md
@@ -384,7 +384,7 @@ You can now configure cache parameters as follows
 
 ```ruby
 Github.configure do |config|
-  config.stack do |builder|
+  config.stack = proc do |builder|
     builder.use Faraday::HttpCache, store: Rails.cache
   end
 end
diff --git a/lib/github_api/connection.rb b/lib/github_api/connection.rb
@@ -59,8 +59,7 @@ def stack(options = {})
     def connection(api, options = {})
       connection_options = default_options(options)
       clear_cache unless options.empty?
-      builder = api.stack ? api.stack : stack(options.merge!(api: api))
-      connection_options.merge!(builder: builder)
+      connection_options.merge!(builder: stack(options.merge!(api: api)))
       connection_options.deep_merge!(options[:connection_options]) if options[:connection_options]
       if ENV['DEBUG']
         p "Connection options : \n"
diff --git a/lib/github_api/middleware.rb b/lib/github_api/middleware.rb
@@ -24,6 +24,9 @@ def self.default(options = {})
           builder.use Github::Response::Jsonize
           builder.use Github::Response::AtomParser
         end
+        if api.stack
+          api.stack.call(builder)
+        end
         builder.use Github::Response::RaiseError
         builder.adapter options[:adapter]
       end
