Fixed HashWithIndifferentAccess#default (closes #5586) [chris@seagul.co.uk]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4539 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
f384622a20
commit
760bcc6ea9
|
@ -1,5 +1,7 @@
|
||||||
*SVN*
|
*SVN*
|
||||||
|
|
||||||
|
* Fixed HashWithIndifferentAccess#default #5586 [chris@seagul.co.uk]
|
||||||
|
|
||||||
* More compatible Hash.create_from_xml. #5523 [nunemaker@gmail.com]
|
* More compatible Hash.create_from_xml. #5523 [nunemaker@gmail.com]
|
||||||
|
|
||||||
* Added Enumerable#sum for calculating a sum from the elements [DHH, jonathan@daikini.com]. Examples:
|
* Added Enumerable#sum for calculating a sum from the elements [DHH, jonathan@daikini.com]. Examples:
|
||||||
|
|
|
@ -11,9 +11,10 @@ class HashWithIndifferentAccess < Hash
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def default(key)
|
def default(key = nil)
|
||||||
self[key.to_s] if key.is_a?(Symbol)
|
value = self[key.to_s] if key.is_a?(Symbol)
|
||||||
end
|
value ? value : super
|
||||||
|
end
|
||||||
|
|
||||||
alias_method :regular_writer, :[]= unless method_defined?(:regular_writer)
|
alias_method :regular_writer, :[]= unless method_defined?(:regular_writer)
|
||||||
alias_method :regular_update, :update unless method_defined?(:regular_update)
|
alias_method :regular_update, :update unless method_defined?(:regular_update)
|
||||||
|
@ -74,7 +75,9 @@ module ActiveSupport #:nodoc:
|
||||||
module Hash #:nodoc:
|
module Hash #:nodoc:
|
||||||
module IndifferentAccess #:nodoc:
|
module IndifferentAccess #:nodoc:
|
||||||
def with_indifferent_access
|
def with_indifferent_access
|
||||||
HashWithIndifferentAccess.new(self)
|
hash = HashWithIndifferentAccess.new(self)
|
||||||
|
hash.default = self.default
|
||||||
|
hash
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -380,4 +380,26 @@ class HashToXmlTest < Test::Unit::TestCase
|
||||||
|
|
||||||
assert_equal expected_topic_hash, Hash.create_from_xml(topic_xml)["rsp"]["photos"]["photo"]
|
assert_equal expected_topic_hash, Hash.create_from_xml(topic_xml)["rsp"]["photos"]["photo"]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_should_use_default_value_for_unknown_key
|
||||||
|
hash_wia = HashWithIndifferentAccess.new(3)
|
||||||
|
assert_equal 3, hash_wia[:new_key]
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_should_use_default_value_if_no_key_is_supplied
|
||||||
|
hash_wia = HashWithIndifferentAccess.new(3)
|
||||||
|
assert_equal 3, hash_wia.default
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_should_nil_if_no_default_value_is_supplied
|
||||||
|
hash_wia = HashWithIndifferentAccess.new
|
||||||
|
assert_nil hash_wia.default
|
||||||
|
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
|
||||||
|
assert_equal 3, hash_wia.default
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
Loading…
Reference in New Issue