actionpack 3.0.9.rc1 → 3.0.9.rc3

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.

This version of actionpack might be problematic. Click here for more details.

Files changed (4) hide show
  1. data/CHANGELOG +2 -0
  2. data/lib/action_pack/version.rb +1 -1
  3. data/lib/action_view/helpers/javascript_helper.rb +2 -1
  4. metadata +10 -10
data/CHANGELOG CHANGED
@@ -1,5 +1,7 @@
1
1
  *Rails 3.0.9 (unreleased)*
2
2
 
3
+ * Make sure escape_js returns SafeBuffer string if it receives SafeBuffer string [Prem Sichanugrist]
4
+
3
5
  * Fix text helpers to work correctly with the new SafeBuffer restriction [Paul Gallagher, Arun Agrawal, Prem Sichanugrist]
4
6
 
5
7
 
data/lib/action_pack/version.rb CHANGED
@@ -3,7 +3,7 @@ module ActionPack
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
data/lib/action_view/helpers/javascript_helper.rb CHANGED
@@ -49,7 +49,8 @@ module ActionView
49
49
  # Escape carrier returns and single and double quotes for JavaScript segments.
50
50
  def escape_javascript(javascript)
51
51
  if javascript
52
- javascript.gsub(/(\\|<\/|\r\n|[\n\r"'])/) {|match| JS_ESCAPE_MAP[match] }
52
+ result = javascript.gsub(/(\\|<\/|\r\n|[\n\r"'])/) {|match| JS_ESCAPE_MAP[match] }
53
+ javascript.html_safe? ? result.html_safe : result
53
54
  else
54
55
  ''
55
56
  end
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: actionpack
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
  - !ruby/object:Gem::Dependency
23
23
  name: activesupport
@@ -27,14 +27,14 @@ dependencies:
27
27
  requirements:
28
28
  - - "="
29
29
  - !ruby/object:Gem::Version
30
- hash: 15424063
30
+ hash: 15424059
31
31
  segments:
32
32
  - 3
33
33
  - 0
34
34
  - 9
35
35
  - rc
36
- - 1
37
- version: 3.0.9.rc1
36
+ - 3
37
+ version: 3.0.9.rc3
38
38
  type: :runtime
39
39
  version_requirements: *id001
40
40
  - !ruby/object:Gem::Dependency
@@ -45,14 +45,14 @@ dependencies:
45
45
  requirements:
46
46
  - - "="
47
47
  - !ruby/object:Gem::Version
48
- hash: 15424063
48
+ hash: 15424059
49
49
  segments:
50
50
  - 3
51
51
  - 0
52
52
  - 9
53
53
  - rc
54
- - 1
55
- version: 3.0.9.rc1
54
+ - 3
55
+ version: 3.0.9.rc3
56
56
  type: :runtime
57
57
  version_requirements: *id002
58
58
  - !ruby/object:Gem::Dependency