Merge pull request rails#50648 from byroot/opt-stringify-keys

Optimize Hash#stringify_keys

Author: byroot

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

@@ -8,13 +8,13 @@ class Hash
   #   hash.stringify_keys
   #   # => {"name"=>"Rob", "age"=>"28"}
   def stringify_keys
-    transform_keys(&:to_s)
+    transform_keys { |k| Symbol === k ? k.name : k.to_s }
   end
 
   # Destructively converts all keys to strings. Same as
   # +stringify_keys+, but modifies +self+.
   def stringify_keys!
-    transform_keys!(&:to_s)
+    transform_keys! { |k| Symbol === k ? k.name : k.to_s }
   end
 
   # Returns a new hash with all keys converted to symbols, as long as
@@ -82,14 +82,14 @@ def deep_transform_keys!(&block)
   #   hash.deep_stringify_keys
   #   # => {"person"=>{"name"=>"Rob", "age"=>"28"}}
   def deep_stringify_keys
-    deep_transform_keys(&:to_s)
+    deep_transform_keys { |k| Symbol === k ? k.name : k.to_s }
   end
 
   # Destructively converts all keys to strings.
   # This includes the keys from the root hash and from all
   # nested hashes and arrays.
   def deep_stringify_keys!
-    deep_transform_keys!(&:to_s)
+    deep_transform_keys! { |k| Symbol === k ? k.name : k.to_s }
   end
 
   # Returns a new hash with all keys converted to symbols, as long as

activesupport/lib/active_support/hash_with_indifferent_access.rb

@@ -393,7 +393,7 @@ def to_proc
 
     private
       def convert_key(key)
-        key.kind_of?(Symbol) ? key.name : key
+        Symbol === key ? key.name : key
       end
 
       def convert_value(value, conversion: nil)

activesupport/lib/active_support/json/encoding.rb

@@ -76,7 +76,13 @@ def jsonify(value)
             when Hash
               result = {}
               value.each do |k, v|
-                k = k.to_s unless String === k
+                unless String === k
+                  k = if Symbol === k
+                    k.name
+                  else
+                    k.to_s
+                  end
+                end
                 result[k] = jsonify(v)
               end
               result