aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext/hash
diff options
context:
space:
mode:
authorFrancesco Rodriguez <lrodriguezsanc@gmail.com>2012-05-13 12:22:43 -0500
committerFrancesco Rodriguez <lrodriguezsanc@gmail.com>2012-05-13 12:22:43 -0500
commit873ac28660b6cec15064a4d321e121f68e54ee06 (patch)
tree95fae06de32df613c802c7fdefcd9f04431c6f0a /activesupport/lib/active_support/core_ext/hash
parent88fc7495b9aa0facd3363ace4871118a0905d6c2 (diff)
downloadrails-873ac28660b6cec15064a4d321e121f68e54ee06.tar.gz
rails-873ac28660b6cec15064a4d321e121f68e54ee06.tar.bz2
rails-873ac28660b6cec15064a4d321e121f68e54ee06.zip
adding examples to Hash#deep_merge method
Diffstat (limited to 'activesupport/lib/active_support/core_ext/hash')
-rw-r--r--activesupport/lib/active_support/core_ext/hash/deep_merge.rb9
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..2fa397bcd0 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]