aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/lib/active_support/core_ext/hash/reverse_merge.rb')
-rw-r--r--activesupport/lib/active_support/core_ext/hash/reverse_merge.rb57
1 files changed, 25 insertions, 32 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 546e261cc9..ebfdcb2cf0 100644
--- a/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
+++ b/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
@@ -1,35 +1,28 @@
-module ActiveSupport #:nodoc:
- module CoreExtensions #:nodoc:
- module Hash #:nodoc:
- # 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:
- #
- # def setup(options = {})
- # options.reverse_merge! :size => 25, :velocity => 10
- # end
- #
- # Using <tt>merge</tt>, the above example would look as follows:
- #
- # def setup(options = {})
- # { :size => 25, :velocity => 10 }.merge(options)
- # end
- #
- # 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.
- module ReverseMerge
- # Performs the opposite of <tt>merge</tt>, with the keys and values from the first hash taking precedence over the second.
- 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.
- def reverse_merge!(other_hash)
- replace(reverse_merge(other_hash))
- end
+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:
+ #
+ # def setup(options = {})
+ # options.reverse_merge! :size => 25, :velocity => 10
+ # end
+ #
+ # Using <tt>merge</tt>, the above example would look as follows:
+ #
+ # def setup(options = {})
+ # { :size => 25, :velocity => 10 }.merge(options)
+ # end
+ #
+ # 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.
+ def reverse_merge(other_hash)
+ other_hash.merge(self)
+ end
- alias_method :reverse_update, :reverse_merge!
- end
- 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.
+ def reverse_merge!(other_hash)
+ replace(reverse_merge(other_hash))
end
+
+ alias_method :reverse_update, :reverse_merge!
end