Deep copy in the superclass merging to ensure no sharing of nested ha…

…shes. Fixes #83
jnunemaker · Apr 21, 2012 · 682af8f · 682af8f · Sutto · May 16, 2012
1 parent 939d1d2
commit 682af8f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/httparty/module_inheritable_attributes.rb b/lib/httparty/module_inheritable_attributes.rb
@@ -22,7 +22,7 @@ def inherited(subclass)
           if instance_variable_get(ivar).respond_to?(:merge)
             method = <<-EOM
               def self.#{inheritable_attribute}
-                #{ivar} = superclass.#{inheritable_attribute}.merge #{ivar}
+                #{ivar} = superclass.#{inheritable_attribute}.merge Marshal.load(Marshal.dump(#{ivar}))
               end
             EOM
             subclass.class_eval method

diff --git a/spec/httparty_spec.rb b/spec/httparty_spec.rb
@@ -526,6 +526,14 @@ def self.name
       @parent.default_options.should == {:basic_auth => {:username => 'user', :password => 'password'}}
     end
 
+    it "doesn't modify hashes in the parent's default options" do
+      @parent.headers 'Accept' => 'application/json'
+      @child1.headers 'Accept' => 'application/xml'
+
+      @parent.default_options[:headers].should == {'Accept' => 'application/json'}
+      @child1.default_options[:headers].should == {'Accept' => 'application/xml'}
+    end
+
     it "inherits default_cookies from the parent class" do
       @parent.cookies 'type' => 'chocolate_chip'
       @child1.default_cookies.should == {"type" => "chocolate_chip"}