diff options
author | Francesco Rodriguez <lrodriguezsanc@gmail.com> | 2012-05-15 10:00:09 -0500 |
---|---|---|
committer | Francesco Rodriguez <lrodriguezsanc@gmail.com> | 2012-05-15 10:00:09 -0500 |
commit | b2f73c40b8a995ed685fc76f2df724b15ead16b6 (patch) | |
tree | 3893c441594d0d59a5ee4046f6b8c69d09bf8a9d /activesupport/lib/active_support/core_ext/hash/deep_merge.rb | |
parent | e9051e20aeb2c666db06b6217954737665878db7 (diff) | |
download | rails-b2f73c40b8a995ed685fc76f2df724b15ead16b6.tar.gz rails-b2f73c40b8a995ed685fc76f2df724b15ead16b6.tar.bz2 rails-b2f73c40b8a995ed685fc76f2df724b15ead16b6.zip |
Backporting some docs on core_ext/hash
Diffstat (limited to 'activesupport/lib/active_support/core_ext/hash/deep_merge.rb')
-rw-r--r-- | activesupport/lib/active_support/core_ext/hash/deep_merge.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/hash/deep_merge.rb b/activesupport/lib/active_support/core_ext/hash/deep_merge.rb index af771c86ff..4f61c38eb1 100644 --- a/activesupport/lib/active_support/core_ext/hash/deep_merge.rb +++ b/activesupport/lib/active_support/core_ext/hash/deep_merge.rb @@ -1,11 +1,16 @@ class Hash # Returns a new hash with +self+ and +other_hash+ merged recursively. + # + # h1 = {:x => {:y => [4,5,6]}, :z => [7,8,9]} + # h2 = {:x => {:y => [7,8,9]}, :z => "xyz"} + # + # h1.deep_merge(h2) #=> { :x => {:y => [7, 8, 9]}, :z => "xyz" } + # h2.deep_merge(h1) #=> { :x => {:y => [4, 5, 6]}, :z => [7, 8, 9] } def deep_merge(other_hash) dup.deep_merge!(other_hash) end - # Returns a new hash with +self+ and +other_hash+ merged recursively. - # Modifies the receiver in place. + # Same as +deep_merge+, but modifies +self+. def deep_merge!(other_hash) other_hash.each_pair do |k,v| tv = self[k] |