@@ -120,6 +120,13 @@ module ActiveSupport dup.merge!(other_hash) end + # When replacing with another hash, the initial order of our keys must come from the other hash -ordered or not. + def replace(other) + super + @keys = other.keys + self + end + def inspect "#<OrderedHash #{super}>" end activesupport/lib/active_support/ordered_hash.rb @@ -191,4 +191,11 @@ class OrderedHashTest < Test::Unit::TestCase assert_equal "odd number of arguments for Hash", $!.message end end + + def test_replace_updates_keys + @other_ordered_hash = ActiveSupport::OrderedHash[:black, '000000', :white, '000000'] + original = @ordered_hash.replace(@other_ordered_hash) + assert_same original, @ordered_hash + assert_equal @other_ordered_hash.keys, @ordered_hash.keys + end end activesupport/test/ordered_hash_test.rb a8ed10546d844fc15d87f5c8f168a18d0cdab5f0 Chris Hapgood cch1@hapgoods.com http://github.com/Fingertips/rails/commit/6c59e5a558922b8f4084533071c3d93e151858ac 6c59e5a558922b8f4084533071c3d93e151858ac 2009-11-05T00:17:13-08:00 2009-11-04T07:13:59-08:00 Fix OrderedHash#replace Signed-off-by: Michael Koziarski <michael@koziarski.com> 21827e48685039c4e34fd13a2bdef967983ba416 Michael Koziarski michael@koziarski.com