Permalink
Browse files

Merge pull request #7971 from dgraham/hash-replace

Implement HashWithIndifferentAccess#replace so key? works correctly.
  • Loading branch information...
rafaelfranca committed Oct 26, 2012
2 parents 6ac33f9 + f38e752 commit f078f913b06f601427192d52a83b1c6a401f5166
@@ -1,5 +1,7 @@
## Rails 4.0.0 (unreleased) ##
+* Implement HashWithIndifferentAccess#replace so key? works correctly. *David Graham*
+
* Hash#extract! returns only those keys that present in the receiver.
{:a => 1, :b => 2}.extract!(:a, :x) # => {:a => 1}
@@ -204,6 +204,14 @@ def reverse_merge!(other_hash)
replace(reverse_merge( other_hash ))
end
+ # Replaces the contents of this hash with other_hash.
+ #
+ # h = { "a" => 100, "b" => 200 }
+ # h.replace({ "c" => 300, "d" => 400 }) #=> {"c"=>300, "d"=>400}
+ def replace(other_hash)
+ super(self.class.new_from_hash_copying_default(other_hash))
+ end
+
# Removes the specified key from the hash.
def delete(key)
super(convert_key(key))
@@ -428,6 +428,18 @@ def test_indifferent_merging
assert_equal 2, hash['b']
end
+ def test_indifferent_replace
+ hash = HashWithIndifferentAccess.new
+ hash[:a] = 42
+
+ replaced = hash.replace(b: 12)
+
+ assert hash.key?('b')
+ assert !hash.key?(:a)
+ assert_equal 12, hash[:b]
+ assert_same hash, replaced
+ end
+
def test_indifferent_merging_with_block
hash = HashWithIndifferentAccess.new
hash[:a] = 1

0 comments on commit f078f91

Please sign in to comment.