diff options
author | Bradford Folkens <bfolkens@gmail.com> | 2009-03-12 15:03:01 +0000 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2009-03-12 15:03:01 +0000 |
commit | aa57e66fec3a131f5d246b8950a2c3286f858b78 (patch) | |
tree | 2a697e042513154e149133f34b0a0ef13337aab1 /activesupport/lib | |
parent | 8a17fd1a65ab8e2fa6b36d79603fde0e6ffd083f (diff) | |
download | rails-aa57e66fec3a131f5d246b8950a2c3286f858b78.tar.gz rails-aa57e66fec3a131f5d246b8950a2c3286f858b78.tar.bz2 rails-aa57e66fec3a131f5d246b8950a2c3286f858b78.zip |
Ensure HWIA#reverse_merge! retrurns HWIA [#421 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Diffstat (limited to 'activesupport/lib')
-rw-r--r-- | activesupport/lib/active_support/core_ext/hash/indifferent_access.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb b/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb index c96c5160b3..34ba8a005d 100644 --- a/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb +++ b/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb @@ -91,6 +91,12 @@ class HashWithIndifferentAccess < Hash self.dup.update(hash) end + # Performs the opposite of merge, with the keys and values from the first hash taking precedence over the second. + # This overloaded definition prevents returning a regular hash, if reverse_merge is called on a HashWithDifferentAccess. + def reverse_merge(other_hash) + super other_hash.with_indifferent_access + end + # Removes a specified key from the hash. def delete(key) super(convert_key(key)) |