Fix issue with setting connection options based on custom request headers.

piotrmurach · piotrmurach · commit 3e3b9fcb1ace · 2016-06-27T09:12:48.000+02:00
diff --git a/lib/github_api/connection.rb b/lib/github_api/connection.rb
@@ -14,32 +14,34 @@ module Connection
       :ssl
     ].freeze
 
+    # Default requets header information
+    #
+    # @return [Hash[String]]
+    #
+    # @api private
+    def default_headers
+      {
+        ACCEPT         => 'application/vnd.github.v3+json,' \
+                          'application/vnd.github.beta+json;q=0.5,' \
+                          'application/json;q=0.1',
+        ACCEPT_CHARSET => 'utf-8'
+      }
+    end
+
+    # Create default connection options
+    #
+    # @return [Hash[Symbol]]
+    #   the default options
+    #
+    # @api private
     def default_options(options = {})
-      accept = options[:headers] && options[:headers][:accept]
+      headers = default_headers.merge(options[:headers] || {})
+      headers.merge!({USER_AGENT => options[:user_agent]})
       {
-        headers: {
-          ACCEPT         =>  accept || 'application/vnd.github.v3+json,' \
-                            'application/vnd.github.beta+json;q=0.5,' \
-                            'application/json;q=0.1',
-          ACCEPT_CHARSET => 'utf-8',
-          USER_AGENT     => options[:user_agent]
-        },
+        headers: headers,
         ssl: options[:ssl],
         url: options[:endpoint]
-      }.tap do |h|
-        if type = options[:headers] && options[:headers][CONTENT_TYPE]
-          h[:headers][CONTENT_TYPE] = type
-        end
-        h
-      end
-    end
-
-    def clear_cache
-      @connection = nil
-    end
-
-    def caching?
-      !@connection.nil?
+      }
     end
 
     # Exposes middleware builder to facilitate custom stacks and easy
@@ -48,7 +50,11 @@ def caching?
     # @api public
     def stack(options = {})
       @stack ||= begin
-        builder_class = defined?(Faraday::RackBuilder) ? Faraday::RackBuilder : Faraday::Builder
+        builder_class = if defined?(Faraday::RackBuilder)
+                          Faraday::RackBuilder
+                        else
+                          Faraday::Builder
+                        end
         builder_class.new(&Github.default_middleware(options))
       end
     end
@@ -58,14 +64,15 @@ def stack(options = {})
     # Returns a Fraday::Connection object
     def connection(api, options = {})
       connection_options = default_options(options)
-      clear_cache unless options.empty?
       connection_options.merge!(builder: stack(options.merge!(api: api)))
-      connection_options.deep_merge!(options[:connection_options]) if options[:connection_options]
+      if options[:connection_options]
+        connection_options.deep_merge!(options[:connection_options])
+      end
       if ENV['DEBUG']
         p "Connection options : \n"
         pp connection_options
       end
-      @connection ||= Faraday.new(connection_options)
+      Faraday.new(connection_options)
     end
   end # Connection
 end # Github
