diff options
Diffstat (limited to 'lib/hashie/extensions/deep_merge.rb')
| -rw-r--r-- | lib/hashie/extensions/deep_merge.rb | 21 |
1 files changed, 15 insertions, 6 deletions
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 |