HashWithIndifferentAccess#to_hash converts to a Hash with String keys and the same default value. Fix Hash#reverse_update to be an alias for reverse_merge./script/console More thoroughly test the reverse_* methods.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5725 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 8 insertions, 3 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 9a3b02e5d5..6c7e6d76ac 100644
--- a/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb
+++ b/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb
@@ -1,4 +1,4 @@
-# this class has dubious semantics and we only have it so that
+# This class has dubious semantics and we only have it so that
 # people can write params[:key] instead of params['key']
 
 class HashWithIndifferentAccess < Hash
@@ -64,6 +64,11 @@ class HashWithIndifferentAccess < Hash
   def stringify_keys!; self end
   def symbolize_keys!; self end
 
+  # Convert to a Hash with String keys.
+  def to_hash
+    Hash.new(default).merge(self)
+  end
+
   protected
     def convert_key(key)
       key.kind_of?(Symbol) ? key.to_s : key
diff --git a/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb b/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
index 46c53871d8..3c4908ac9e 100644
--- a/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
+++ b/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
@@ -18,8 +18,8 @@ module ActiveSupport #:nodoc:
           replace(reverse_merge(other_hash))
         end
 
-        alias_method :reverse_update, :reverse_merge
+        alias_method :reverse_update, :reverse_merge!
       end
     end
   end
-end
\ No newline at end of file
+end