Merge pull request rails#55727 from etiennebarrie/json-main

Update JSONGemCoderEncoder to handle non-String hash keys

Author: byroot

Gemfile.lock

@@ -311,7 +311,7 @@ GEM
     jmespath (1.6.2)
     jsbundling-rails (1.3.1)
       railties (>= 6.0.0)
-    json (2.14.0)
+    json (2.15.0)
     jwt (2.10.1)
       base64
     kamal (2.4.0)

activesupport/lib/active_support/json/encoding.rb

@@ -140,20 +140,17 @@ def stringify(jsonified)
           end
       end
 
-      if defined?(::JSON::Coder)
+      # ruby/json 2.14.x yields non-String keys but doesn't let us know it's a key
+      if defined?(::JSON::Coder) && !::JSON::VERSION.start_with?("2.14.")
         class JSONGemCoderEncoder # :nodoc:
           JSON_NATIVE_TYPES = [Hash, Array, Float, String, Symbol, Integer, NilClass, TrueClass, FalseClass, ::JSON::Fragment].freeze
-          CODER = ::JSON::Coder.new do |value|
+          CODER = ::JSON::Coder.new do |value, is_key|
             json_value = value.as_json
+            # Keep compatibility by calling to_s on non-String keys
+            next json_value.to_s if is_key
             # Handle objects returning self from as_json
             if json_value.equal?(value)
-              if JSON_NATIVE_TYPES.include?(json_value.class)
-                # If the callback is invoked for a native type,
-                # it means it is hash keys, e.g. { 1 => true }
-                next json_value.to_s
-              else
-                next ::JSON::Fragment.new(::JSON.generate(json_value))
-              end
+              next ::JSON::Fragment.new(::JSON.generate(json_value))
             end
             # Handle objects not returning JSON-native types from as_json
             count = 5
@@ -222,7 +219,7 @@ def encode_without_options(value) # :nodoc:
       self.use_standard_json_time_format = true
       self.escape_html_entities_in_json  = true
       self.json_encoder =
-        if defined?(::JSON::Coder)
+        if defined?(JSONGemCoderEncoder)
           JSONGemCoderEncoder
         else
           JSONGemEncoder