aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-03-05 11:54:06 +0100
committerXavier Noria <fxn@hashref.com>2011-03-05 11:57:32 +0100
commit20768176292cbcb883ab152b4aa9ed8c664771cd (patch)
treeabd05cd3535a4cf31320207b85300c1d3d9b7789 /activesupport/lib
parentf6a5449d431e5d9096edbf4cb52eb2d82f467925 (diff)
downloadrails-20768176292cbcb883ab152b4aa9ed8c664771cd.tar.gz
rails-20768176292cbcb883ab152b4aa9ed8c664771cd.tar.bz2
rails-20768176292cbcb883ab152b4aa9ed8c664771cd.zip
revises the RDoc of Hash#reverse_merge
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/core_ext/hash/reverse_merge.rb20
1 files changed, 7 insertions, 13 deletions
diff --git a/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb b/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
index 87a7bebd7b..01863a162b 100644
--- a/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
+++ b/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
@@ -1,25 +1,19 @@
class Hash
- # Allows for reverse merging two hashes where the keys in the calling hash take precedence over those
- # in the <tt>other_hash</tt>. This is particularly useful for initializing an option hash with default values:
+ # Merges the caller into +other_hash+. For example,
#
- # def setup(options = {})
- # options.reverse_merge! :size => 25, :velocity => 10
- # end
+ # options = options.reverse_merge(:size => 25, :velocity => 10)
#
- # The default <tt>:size</tt> and <tt>:velocity</tt> are only set if the +options+ hash passed in doesn't already
- # have the respective key.
+ # is equivalent to
#
- # As contrast, using Ruby's built in <tt>merge</tt> would require writing the following:
+ # options = {:size => 25, :velocity => 10}.merge(options)
#
- # def setup(options = {})
- # options = { :size => 25, :velocity => 10 }.merge(options)
- # end
+ # This is particularly useful for initializing an options hash
+ # with default values.
def reverse_merge(other_hash)
other_hash.merge(self)
end
- # Performs the opposite of <tt>merge</tt>, with the keys and values from the first hash taking precedence over the second.
- # Modifies the receiver in place.
+ # Destructive +reverse_merge+.
def reverse_merge!(other_hash)
# right wins if there is no left
merge!( other_hash ){|key,left,right| left }