Merge branch 'deep_merge_without_include' of github.com:defsprite/hashie

3 files changed, 22 insertions, 11 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 762658e..a5c13bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 * [#110](https://github.com/intridea/hashie/pull/110): Correctly use Hash#default from Mash#method_missing - [@ryansouza](https://github.com/ryansouza).
 * [#120](https://github.com/intridea/hashie/pull/120): Pass options to recursive to_hash calls - [@pwillett](https://github.com/pwillett).
 * [#113](https://github.com/intridea/hashie/issues/113): Fixed Hash#merge with Hashie::Dash - [@spencer1248](https://github.com/spencer1248).
+* [#99](https://github.com/intridea/hashie/issues/99): Hash#deep_merge raises errors when it encounters integers - [@defsprite](https://github.com/defsprite).
 
 ## 2.0.5
 
diff --git a/lib/hashie/extensions/deep_merge.rb b/lib/hashie/extensions/deep_merge.rb
index ce821de..aa3b478 100644
--- a/lib/hashie/extensions/deep_merge.rb
+++ b/lib/hashie/extensions/deep_merge.rb
@@ -3,19 +3,28 @@ module Hashie
     module DeepMerge
       # Returns a new hash with +self+ and +other_hash+ merged recursively.
       def deep_merge(other_hash)
-        (class << (h = dup); self; end).send :include, Hashie::Extensions::DeepMerge
-        h.deep_merge!(other_hash)
+        self.dup.deep_merge!(other_hash)
       end
 
       # Returns a new hash with +self+ and +other_hash+ merged recursively.
       # Modifies the receiver in place.
       def deep_merge!(other_hash)
-        other_hash.each do |k,v|
-          (class << (tv = self[k]); self; end).send :include, Hashie::Extensions::DeepMerge
-          self[k] = tv.is_a?(::Hash) && v.is_a?(::Hash) ? tv.deep_merge(v) : v
-        end
+        _recursive_merge(self, other_hash)
         self
       end
+
+      private
+
+      def _recursive_merge(hash, other_hash)
+        if other_hash.is_a?(::Hash) && hash.is_a?(::Hash)
+          other_hash.each do |k, v|
+            hash[k] = hash.has_key?(k) ? _recursive_merge(hash[k], v) : v
+          end
+          hash
+        else
+          other_hash
+        end
+      end
     end
   end
 end
diff --git a/spec/hashie/extensions/deep_merge_spec.rb b/spec/hashie/extensions/deep_merge_spec.rb
index d835381..ea88ee6 100644
--- a/spec/hashie/extensions/deep_merge_spec.rb
+++ b/spec/hashie/extensions/deep_merge_spec.rb
@@ -5,16 +5,17 @@ describe Hashie::Extensions::DeepMerge do
 
   subject{ DeepMergeHash }
 
-  let(:h1) { subject.new.merge(:a => "a", :b => "b", :c => { :c1 => "c1", :c2 => "c2", :c3 => { :d1 => "d1" } }) }
-  let(:h2) { { :a => 1, :c => { :c1 => 2, :c3 => { :d2 => "d2" } } } }
-  let(:expected_hash) { { :a => 1, :b => "b", :c => { :c1 => 2, :c2 => "c2", :c3 => { :d1 => "d1", :d2 => "d2" } } } }
+  let(:h1) { subject.new.merge(:a => "a", :a1 => 42, :b => "b", :c => { :c1 => "c1", :c2 => {:a => "b"}, :c3 => { :d1 => "d1" } }) }
+  let(:h2) { { :a => 1, :a1 => 1, :c => { :c1 => 2, :c2 => "c2", :c3 => { :d2 => "d2" } } } }
+  let(:expected_hash) { { :a => 1, :a1 => 1, :b => "b", :c => { :c1 => 2, :c2 => "c2", :c3 => { :d1 => "d1", :d2 => "d2" } } } }
 
-  it 'should deep merge two hashes' do
+  it 'deep merges two hashes' do
     h1.deep_merge(h2).should == expected_hash
   end
 
-  it 'should deep merge two hashes with bang method' do
+  it 'deep merges another hash in place via bang method' do
     h1.deep_merge!(h2)
     h1.should == expected_hash
   end
+
 end