Changeset 3468

Timestamp:

01/23/06 05:38:02 (4 years ago)

Author:

david

Message:

Fix merge and dup for hashes with indifferent access (closes #3404) [kenneth.miller@bitfield.net]

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb (modified) (1 diff)
• trunk/activesupport/test/core_ext/hash_ext_test.rb (modified) (1 diff)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fix merge and dup for hashes with indifferent access #3404 [kenneth.miller@bitfield.net]
-
-* Fix the requires in option_merger_test to unbreak AS tests. [Sam Stephenson]

trunk/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb

@@ -42 +42 @@
-  end
-
+  def dup
+    HashWithIndifferentAccess.new(self)
+  end
+  
+  def merge(hash)
+    self.dup.update(hash)
+  end
+  
-  protected
-    def convert_key(key)

trunk/activesupport/test/core_ext/hash_ext_test.rb

@@ -117 +117 @@
-  end
-
+  def test_indifferent_merging
+    hash = HashWithIndifferentAccess.new
+    hash[:a] = 'failure'
+    hash['b'] = 'failure'
+   
+    other = { 'a' => 1, :b => 2 }
+  
+    merged = hash.merge(other)
+  
+    assert_equal HashWithIndifferentAccess, merged.class
+    assert_equal 1, merged[:a]
+    assert_equal 2, merged['b']
+  
+    hash.update(other)
+  
+    assert_equal 1, hash[:a]
+    assert_equal 2, hash['b']
+  end
+  
-  def test_assert_valid_keys
-    assert_nothing_raised do