Correctly merge default headers with request provided headers - fixes #255

lib/httparty.rb

@@ -494,10 +494,17 @@ module HTTParty
 
       def perform_request(http_method, path, options, &block) #:nodoc:
         options = default_options.merge(options)
+        process_headers(options)
         process_cookies(options)
         Request.new(http_method, path, options).perform(&block)
       end
 
+      def process_headers(options)
+        if options[:headers] && headers.any?
+          options[:headers] = headers.merge(options[:headers])
+        end
+      end
+
       def process_cookies(options) #:nodoc:
         return unless options[:cookies] || default_cookies.any?
         options[:headers] ||= headers.dup

spec/httparty_spec.rb

@@ -160,12 +160,18 @@ describe HTTParty do
       @klass.get('')
     end
 
-    it "overwrites class headers when passing in headers" do
-      expect_headers(:baz => 'spax')
+    it "merges class headers with request headers" do
+      expect_headers(:baz => 'spax', :foo => 'bar')
       @klass.headers(:foo => 'bar')
       @klass.get('', :headers => {:baz => 'spax'})
     end
 
+    it 'overrides class headers with request headers' do
+      expect_headers(:baz => 'spax', :foo => 'baz')
+      @klass.headers(:foo => 'bar')
+      @klass.get('', :headers => {:baz => 'spax', :foo => 'baz'})
+    end
+
     context "with cookies" do
       it 'utilizes the class-level cookies' do
         expect_headers(:foo => 'bar', 'cookie' => 'type=snickerdoodle')

spec/spec_helper.rb

@@ -1,4 +1,5 @@
 $:.push File.expand_path("../lib", __FILE__)
+
 require "httparty"
 
 require 'spec/autorun'