activesupport 3.1.0.rc3 → 3.1.0.rc4

data/lib/active_support/core_ext/string/output_safety.rb

@@ -51,7 +51,8 @@ class ERB
     #   <%=j @person.to_json %>
     #
     def json_escape(s)
-      s.to_s.gsub(/[&"><]/) { |special| JSON_ESCAPE[special] }
+      result = s.to_s.gsub(/[&"><]/) { |special| JSON_ESCAPE[special] }
+      s.html_safe? ? result.html_safe : result
     end
 
     alias j json_escape

data/lib/active_support/version.rb

@@ -3,7 +3,7 @@ module ActiveSupport
     MAJOR = 3
     MINOR = 1
     TINY  = 0
-    PRE   = "rc3"
+    PRE   = "rc4"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: activesupport
 version: !ruby/object:Gem::Version 
-  hash: 15424099
+  hash: 15424109
   prerelease: 6
   segments: 
   - 3
   - 1
   - 0
   - rc
-  - 3
-  version: 3.1.0.rc3
+  - 4
+  version: 3.1.0.rc4
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-08 00:00:00 Z
+date: 2011-06-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multi_json