Merge pull request rails#54503 from etiennebarrie/json-coder-fragment-native

Allow JSON::Fragment as a return value for as_json

Author: byroot

activesupport/lib/active_support/json/encoding.rb

@@ -85,6 +85,7 @@ def encode(value)
           # to +object.as_json+, not any of this method's recursive +#as_json+
           # calls.
           def jsonify(value)
+            return value if value.class.name == "JSON::Fragment"
             case value
             when String, Integer, Symbol, nil, true, false
               value
@@ -112,7 +113,7 @@ def stringify(jsonified)
 
       if defined?(::JSON::Coder)
         class JSONGemCoderEncoder # :nodoc:
-          JSON_NATIVE_TYPES = [Hash, Array, Float, String, Symbol, Integer, NilClass, TrueClass, FalseClass].freeze
+          JSON_NATIVE_TYPES = [Hash, Array, Float, String, Symbol, Integer, NilClass, TrueClass, FalseClass, ::JSON::Fragment].freeze
           CODER = ::JSON::Coder.new do |value|
             json_value = value.as_json
             # Handle objects returning self from as_json

activesupport/test/json/encoding_test_cases.rb

@@ -56,6 +56,16 @@ def to_json(options = nil)
     end
   end
 
+  class CustomNumericFixed < Numeric
+    def initialize(str)
+      @str = str
+    end
+
+    def as_json
+      ::JSON::Fragment.new(@str)
+    end
+  end
+
   module EncodingTestCases
     TrueTests     = [[ true,  %(true)  ]]
     FalseTests    = [[ false, %(false) ]]
@@ -68,7 +78,8 @@ module EncodingTestCases
                      [ BigDecimal("0.0") / BigDecimal("0.0"),  %(null) ],
                      [ BigDecimal("2.5"), %("#{BigDecimal('2.5')}") ],
                      [ RomanNumeral.new("MCCCXXXVII"), %("MCCCXXXVII") ],
-                     [ [CustomNumeric.new("123")], %([123]) ]
+                     [ [CustomNumeric.new("123")], %([123]) ],
+                     [ [CustomNumericFixed.new("123")], %([123]) ],
     ]
 
     StringTests   = [[ "this is the <string>",     %("this is the \\u003cstring\\u003e")],