Changeset 9238

Timestamp:

04/08/08 03:45:26 (8 months ago)

Author:

rick

Message:

Add config.active_support.escape_html_entities_in_json to allow disabling of html entity escaping. [rick]

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/json.rb (modified) (2 diffs)
• trunk/activesupport/lib/active_support/json/encoders/string.rb (modified) (2 diffs)
• trunk/activesupport/lib/active_support/json/encoding.rb (modified) (1 diff)
• trunk/activesupport/test/json/encoding_test.rb (modified) (2 diffs)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Add config.active_support.escape_html_entities_in_json to allow disabling of html entity escaping.  [rick]
-
-* Improve documentation. [Xavier Noria]

trunk/activesupport/lib/active_support/json.rb

@@ -1 @@
-
-
+
-
-module ActiveSupport
+  # If true, use ISO 8601 format for dates and times.  Otherwise, fall back to the ActiveSupport legacy format.
-  mattr_accessor :use_standard_json_time_format
+
+  class << self
+    def escape_html_entities_in_json
+      @escape_html_entities_in_json
+    end
+
+    def escape_html_entities_in_json=(value)
+      ActiveSupport::JSON::Encoding.escape_regex = \
+        if value
+          /[\010\f\n\r\t"\\><&]/
+        else
+          /[\010\f\n\r\t"\\]/
+        end
+      @escape_html_entities_in_json = value
+    end
+  end
-
-  module JSON
@@ -32 +48 @@
-  end
-end
+
+require 'active_support/json/encoding'
+require 'active_support/json/decoding'

trunk/activesupport/lib/active_support/json/encoders/string.rb

@@ -2 +2 @@
-  module JSON
-    module Encoding
+      mattr_accessor :escape_regex
+
-      ESCAPED_CHARS = {
-        "\010" =>  '\b',
@@ -18 +20 @@
-end
-
+ActiveSupport.escape_html_entities_in_json = true
+
-class String
-  def to_json(options = nil) #:nodoc:
-/[\010\f\n\r\t"\\><&]/
+ActiveSupport::JSON::Encoding.escape_regex
-      ActiveSupport::JSON::Encoding::ESCAPED_CHARS[s]
-    }

trunk/activesupport/lib/active_support/json/encoding.rb

@@ -1 +1 @@
-require 'active_support/json/variable'
-
-require 'active_support/json/encoders/object' # Require explicitly for rdoc.
-Dir["#{File.dirname(__FILE__)}/encoders/**/*.rb"].each do |file|

trunk/activesupport/test/json/encoding_test.rb

@@ -39 +39 @@
-  StandardTimeTests     = [[ Time.utc(2005,2,1,15,15,10), %("2005-02-01T15:15:10Z") ]]
-  StandardDateTimeTests = [[ DateTime.civil(2005,2,1,15,15,10), %("2005-02-01T15:15:10+00:00") ]]
+  StandardStringTests   = [[ 'this is the <string>', %("this is the <string>")]]
-
-  constants.grep(/Tests$/).each do |class_tests|
-    define_method("test_#{class_tests[0..-6].underscore}") do
-      begin
+        ActiveSupport.escape_html_entities_in_json  = class_tests !~ /^Standard/
-        ActiveSupport.use_standard_json_time_format = class_tests =~ /^Standard/
-        self.class.const_get(class_tests).each do |pair|
@@ -48 +50 @@
-        end
-      ensure
+        ActiveSupport.escape_html_entities_in_json  = false
-        ActiveSupport.use_standard_json_time_format = false
-      end