activesupport 3.0.9.rc1 → 3.0.9.rc3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/lib/active_support/core_ext/string/output_safety.rb +2 -1
  2. data/lib/active_support/version.rb +1 -1
  3. metadata +4 -4
data/lib/active_support/core_ext/string/output_safety.rb CHANGED
@@ -50,7 +50,8 @@ class ERB
50
50
  # <%=j @person.to_json %>
51
51
  #
52
52
  def json_escape(s)
53
- s.to_s.gsub(/[&"><]/) { |special| JSON_ESCAPE[special] }
53
+ result = s.to_s.gsub(/[&"><]/) { |special| JSON_ESCAPE[special] }
54
+ s.html_safe? ? result.html_safe : result
54
55
  end
55
56
 
56
57
  alias j json_escape
data/lib/active_support/version.rb CHANGED
@@ -3,7 +3,7 @@ module ActiveSupport
3
3
  MAJOR = 3
4
4
  MINOR = 0
5
5
  TINY = 9
6
- PRE = "rc1"
6
+ PRE = "rc3"
7
7
 
8
8
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
9
9
  end
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: activesupport
3
3
  version: !ruby/object:Gem::Version
4
- hash: 15424063
4
+ hash: 15424059
5
5
  prerelease: 6
6
6
  segments:
7
7
  - 3
8
8
  - 0
9
9
  - 9
10
10
  - rc
11
- - 1
12
- version: 3.0.9.rc1
11
+ - 3
12
+ version: 3.0.9.rc3
13
13
  platform: ruby
14
14
  authors:
15
15
  - David Heinemeier Hansson
@@ -17,7 +17,7 @@ autorequire:
17
17
  bindir: bin
18
18
  cert_chain: []
19
19
 
20
- date: 2011-06-08 00:00:00 Z
20
+ date: 2011-06-09 00:00:00 Z
21
21
  dependencies: []
22
22
 
23
23
  description: A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.