diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-18 04:01:44 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-18 04:01:44 +0000 |
commit | 504ab568f8941b4ecec5026c06743920bcb05c37 (patch) | |
tree | 59d1e709da354d3218ac39cbfc2fe279739c00fb /activesupport/lib | |
parent | 0555fc905c09d4339bfb641428a4ddfcb5f4c0c6 (diff) | |
download | rails-504ab568f8941b4ecec5026c06743920bcb05c37.tar.gz rails-504ab568f8941b4ecec5026c06743920bcb05c37.tar.bz2 rails-504ab568f8941b4ecec5026c06743920bcb05c37.zip |
Fixed HashWithIndifferentAccess#delete to work with both symbols and strings (closes #2176) [Caio Chassot]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3912 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib')
-rw-r--r-- | activesupport/lib/active_support/core_ext/hash/indifferent_access.rb | 50 |
1 files changed, 14 insertions, 36 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 adfba0fbf3..c84c37f87b 100644 --- a/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb +++ b/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb @@ -9,54 +9,32 @@ class HashWithIndifferentAccess < Hash end end - def default(key) - self[key.to_s] if key.is_a?(Symbol) - end + convert_key_and_hashes_and_call_super = lambda { |key, *args| super(convert_key(key), *args.map{|arg| convert_value(arg) }) } + convert_other_hash_and_call_super = lambda { |other_hash| super(convert_hash(other_hash)) } - alias_method :regular_writer, :[]= unless method_defined?(:regular_writer) - alias_method :regular_update, :update unless method_defined?(:regular_update) - - def []=(key, value) - regular_writer(convert_key(key), convert_value(value)) - end - - def update(other_hash) - other_hash.each_pair {|key, value| regular_writer(convert_key(key), convert_value(value))} - self - end - alias_method :merge!, :update - - def key?(key) - super(convert_key(key)) - end - - alias_method :include?, :key? - alias_method :has_key?, :key? - alias_method :member?, :key? + %w( [] []= fetch store delete has_key? include? key? member? ).each{ |method_name| define_method method_name, &convert_key_and_hashes_and_call_super } + %w( == eql? replace initialize_copy merge merge! update ).each{ |method_name| define_method method_name, &convert_other_hash_and_call_super } - def fetch(key, *extras) - super(convert_key(key), *extras) - end - - def values_at(*indices) - indices.collect {|key| self[convert_key(key)]} - end - - def dup - HashWithIndifferentAccess.new(self) + def invert + self.class.new.replace(super) end - def merge(hash) - self.dup.update(hash) + def values_at(*keys) + super *keys.map{ |key| convert_key(key) } end - + protected def convert_key(key) key.kind_of?(Symbol) ? key.to_s : key end + def convert_value(value) value.is_a?(Hash) ? value.with_indifferent_access : value end + + def convert_hash(hash) + hash.is_a?(Hash) ? hash.inject({}){ |h,(k,v)| h[convert_key(k)] = convert_value(v); h } : hash + end end module ActiveSupport #:nodoc: |