From 36fc181a575d2c300742a41abd45d7b1a7207288 Mon Sep 17 00:00:00 2001 From: Marcel Molina Date: Sun, 8 Jan 2006 21:29:47 +0000 Subject: Make HashWithIndifferentAccess#update behave like Hash#update by returning the hash. Closes #3419, #3425 git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3388 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../lib/active_support/core_ext/hash/indifferent_access.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'activesupport/lib/active_support/core_ext/hash/indifferent_access.rb') 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 d818d86a09..458f8961a3 100644 --- a/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb +++ b/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb @@ -18,9 +18,12 @@ class HashWithIndifferentAccess < Hash def []=(key, value) regular_writer(convert_key(key), convert_value(value)) end - def update(hash) - hash.each {|key, value| self[key] = value} + + def update(other_hash) + other_hash.each {|key, value| self[key] = value} + self end + alias_method :merge!, :update def key?(key) super(convert_key(key)) -- cgit v1.2.3