diff options
| author | David Lee <davidomundo@gmail.com> | 2011-05-17 03:01:31 -0700 |
|---|---|---|
| committer | David Lee <davidomundo@gmail.com> | 2011-05-17 03:01:31 -0700 |
| commit | 94617d7da1e76daeae3a05c61b42321163f93d62 (patch) | |
| tree | 7da2c0aab714b2a04489ff13bb3755a0a8f20931 | |
| parent | b0385fe1b2a147d982eadbeb716dd1c7598a93e0 (diff) | |
| download | rails-94617d7da1e76daeae3a05c61b42321163f93d62.tar.gz rails-94617d7da1e76daeae3a05c61b42321163f93d62.tar.bz2 rails-94617d7da1e76daeae3a05c61b42321163f93d62.zip | |
Optimize parts of HashWithIndifferentAccess
| -rw-r--r-- | activesupport/lib/active_support/hash_with_indifferent_access.rb | 12 | ||||
| -rw-r--r-- | activesupport/test/core_ext/hash_ext_test.rb | 5 |
2 files changed, 15 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/hash_with_indifferent_access.rb b/activesupport/lib/active_support/hash_with_indifferent_access.rb index 8ec4f6e09a..39ebc1ec82 100644 --- a/activesupport/lib/active_support/hash_with_indifferent_access.rb +++ b/activesupport/lib/active_support/hash_with_indifferent_access.rb @@ -10,6 +10,10 @@ module ActiveSupport true end + def with_indifferent_access + self + end + def initialize(constructor = {}) if constructor.is_a?(Hash) super() @@ -58,8 +62,12 @@ module ActiveSupport # hash_1.update(hash_2) # => {"key"=>"New Value!"} # def update(other_hash) - other_hash.each_pair { |key, value| regular_writer(convert_key(key), convert_value(value)) } - self + if other_hash.is_a? HashWithIndifferentAccess + super(other_hash) + else + other_hash.each_pair { |key, value| regular_writer(convert_key(key), convert_value(value)) } + self + end end alias_method :merge!, :update diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb index 4557a10688..b2c85f15cb 100644 --- a/activesupport/test/core_ext/hash_ext_test.rb +++ b/activesupport/test/core_ext/hash_ext_test.rb @@ -971,6 +971,11 @@ class HashToXmlTest < Test::Unit::TestCase assert_nil hash_wia.default end + def test_should_return_self_for_with_indifferent_access + hash_wia = HashWithIndifferentAccess.new + assert_equal hash_wia, hash_wia.with_indifferent_access + end + def test_should_copy_the_default_value_when_converting_to_hash_with_indifferent_access hash = Hash.new(3) hash_wia = hash.with_indifferent_access |