lib/active_support/json/encoders/string.rb in activesupport-2.0.5 vs lib/active_support/json/encoders/string.rb in activesupport-2.1.0

@@ -1,8 +1,10 @@
 module ActiveSupport
   module JSON
     module Encoding
+      mattr_accessor :escape_regex
+
       ESCAPED_CHARS = {
         "\010" =>  '\b',
         "\f"   =>  '\f',
         "\n"   =>  '\n',
         "\r"   =>  '\r',
@@ -15,14 +17,18 @@
       }
     end
   end
 end
 
+ActiveSupport.escape_html_entities_in_json = true
+
 class String
   def to_json(options = nil) #:nodoc:
-    '"' + gsub(/[\010\f\n\r\t"\\><&]/) { |s|
+    json = '"' + gsub(ActiveSupport::JSON::Encoding.escape_regex) { |s|
       ActiveSupport::JSON::Encoding::ESCAPED_CHARS[s]
-    }.gsub(/([\xC0-\xDF][\x80-\xBF]|
+    }
+    json.force_encoding('ascii-8bit') if respond_to?(:force_encoding)
+    json.gsub(/([\xC0-\xDF][\x80-\xBF]|
              [\xE0-\xEF][\x80-\xBF]{2}|
              [\xF0-\xF7][\x80-\xBF]{3})+/nx) { |s|
       s.unpack("U*").pack("n*").unpack("H*")[0].gsub(/.{4}/, '\\\\u\&')
     } + '"'
   end