Hash#symbolize_keys behaves well with integer keys. Closes #9890.

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

activesupport/CHANGELOG

@@ -1,5 +1,7 @@
 *SVN*
 
+* Hash#symbolize_keys behaves well with integer keys.  #9890 [PotatoSalad]
+
 * Multibyte: String#slice supports regexp argument.  #9646 [yob]
 
 * object.duplicable? returns true if object.dup is safe. False for nil, true, false, symbols, and numbers; true otherwise.  #9333 [sur]

activesupport/lib/active_support/core_ext/hash/keys.rb

@@ -24,7 +24,7 @@ module ActiveSupport #:nodoc:
         # Return a new hash with all keys converted to symbols.
         def symbolize_keys
           inject({}) do |options, (key, value)|
-            options[key.to_sym] = value
+            options[key.to_sym || key] = value
             options
           end
         end
@@ -32,8 +32,8 @@ module ActiveSupport #:nodoc:
         # Destructively convert all keys to symbols.
         def symbolize_keys!
           keys.each do |key|
-            unless key.is_a?(Symbol)
-              self[key.to_sym] = self[key]
+            unless key.is_a?(Symbol) || (new_key = key.to_sym).nil?
+              self[new_key] = self[key]
               delete(key)
             end
           end

activesupport/test/core_ext/hash_ext_test.rb

@@ -5,6 +5,7 @@ class HashExtTest < Test::Unit::TestCase
     @strings = { 'a' => 1, 'b' => 2 }
     @symbols = { :a  => 1, :b  => 2 }
     @mixed   = { :a  => 1, 'b' => 2 }
+    @fixnums = {  0  => 1,  1  => 2 }
   end
 
   def test_methods
@@ -33,6 +34,11 @@ class HashExtTest < Test::Unit::TestCase
     assert_raises(NoMethodError) { { [] => 1 }.symbolize_keys }
   end
 
+  def test_symbolize_keys_preserves_fixnum_keys
+    assert_equal @fixnums, @fixnums.symbolize_keys
+    assert_equal @fixnums, @fixnums.dup.symbolize_keys!
+  end
+
   def test_stringify_keys
     assert_equal @strings, @symbols.stringify_keys
     assert_equal @strings, @strings.stringify_keys