JSON: encode objects that don't have a native JSON representation using to_hash, if available, instead of instance_values (the old fallback) or to_s (other encoders' default). Encode BigDecimal and Regexp encode as strings to conform with other encoders. Try to transcode non-UTF-8 strings.

1 files changed, 19 insertions, 5 deletions

diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb
index 8ba45f7ea2..0f38fd0e89 100644
--- a/activesupport/lib/active_support/json/encoding.rb
+++ b/activesupport/lib/active_support/json/encoding.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'bigdecimal'
 require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/hash/slice'
@@ -102,7 +103,9 @@ module ActiveSupport
         end
 
         def escape(string)
-          string = string.dup.force_encoding(::Encoding::BINARY) if string.respond_to?(:force_encoding)
+          if string.respond_to?(:force_encoding)
+            string = string.encode(::Encoding::UTF_8, undef: :replace).force_encoding(::Encoding::BINARY)
+          end
           json = string.
             gsub(escape_regex) { |s| ESCAPED_CHARS[s] }.
             gsub(/([\xC0-\xDF][\x80-\xBF]|
@@ -110,7 +113,9 @@ module ActiveSupport
                    [\xF0-\xF7][\x80-\xBF]{3})+/nx) { |s|
             s.unpack("U*").pack("n*").unpack("H*")[0].gsub(/.{4}/n, '\\\\u\&')
           }
-          %("#{json}")
+          json = %("#{json}")
+          json.force_encoding(::Encoding::UTF_8) if json.respond_to?(:force_encoding)
+          json
         end
       end
 
@@ -128,7 +133,13 @@ class Object
     ActiveSupport::JSON.encode(self, options)
   end
 
-  def as_json(options = nil) instance_values end #:nodoc:
+  def as_json(options = nil) #:nodoc:
+    if respond_to?(:to_hash)
+      to_hash
+    else
+      instance_values
+    end
+  end
 end
 
 # A string that returns itself as its JSON-encoded form.
@@ -166,9 +177,12 @@ class Numeric
   def encode_json(encoder) to_s end #:nodoc:
 end
 
+class BigDecimal
+  def as_json(options = nil) to_s end #:nodoc:
+end
+
 class Regexp
-  def as_json(options = nil) self end #:nodoc:
-  def encode_json(encoder) inspect end #:nodoc:
+  def as_json(options = nil) to_s end #:nodoc:
 end
 
 module Enumerable