actionpack 3.1.0.rc3 → 3.1.0.rc4

data/CHANGELOG

@@ -1,5 +1,7 @@
 *Rails 3.1.0 (unreleased)*
 
+* Make sure escape_js returns SafeBuffer string if it receives SafeBuffer string [Prem Sichanugrist]
+
 * Fix escape_js to work correctly with the new SafeBuffer restriction [Paul Gallagher]
 
 * Brought back alternative convention for namespaced models in i18n [thoefer]

data/lib/action_pack/version.rb

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

data/lib/action_view/helpers/javascript_helper.rb

@@ -18,7 +18,8 @@ module ActionView
       #   $('some_element').replaceWith('<%=j render 'some/element_template' %>');
       def escape_javascript(javascript)
         if javascript
-          javascript.gsub(/(\\|<\/|\r\n|[\n\r"'])/) {|match| JS_ESCAPE_MAP[match] }
+          result = javascript.gsub(/(\\|<\/|\r\n|[\n\r"'])/) {|match| JS_ESCAPE_MAP[match] }
+          javascript.html_safe? ? result.html_safe : result
         else
           ''
         end

data/lib/sprockets/railtie.rb

@@ -46,43 +46,48 @@ module Sprockets
     end
 
     protected
+      def asset_environment(app)
+        require "sprockets"
 
-    def asset_environment(app)
-      require "sprockets"
-      assets = app.config.assets
-      env = Sprockets::Environment.new(app.root.to_s)
-      env.static_root = File.join(app.root.join("public"), assets.prefix)
-      env.paths.concat assets.paths
-      env.logger = Rails.logger
-      env.js_compressor = expand_js_compressor(assets.js_compressor) if assets.compress
-      env.css_compressor = expand_css_compressor(assets.css_compressor) if assets.compress
-      env
-    end
+        assets = app.config.assets
+
+        env = Sprockets::Environment.new(app.root.to_s)
+
+        env.static_root = File.join(app.root.join("public"), assets.prefix)
+        env.paths.concat assets.paths
+
+        env.logger = Rails.logger
+
+        env.js_compressor  = expand_js_compressor(assets.js_compressor)
+        env.css_compressor = expand_css_compressor(assets.css_compressor)
 
-    def expand_js_compressor(sym)
-      case sym
-      when :closure
-        require 'closure-compiler'
-        Closure::Compiler.new
-      when :uglifier
-        require 'uglifier'
-        Uglifier.new
-      when :yui
-        require 'yui/compressor'
-        YUI::JavaScriptCompressor.new
-      else
-        sym
+        env
       end
-    end
 
-    def expand_css_compressor(sym)
-      case sym
-      when :yui
-        require 'yui/compressor'
-        YUI::CssCompressor.new
-      else
-        sym
+      def expand_js_compressor(sym)
+        case sym
+        when :closure
+          require 'closure-compiler'
+          Closure::Compiler.new
+        when :uglifier
+          require 'uglifier'
+          Uglifier.new
+        when :yui
+          require 'yui/compressor'
+          YUI::JavaScriptCompressor.new
+        else
+          sym
+        end
+      end
+
+      def expand_css_compressor(sym)
+        case sym
+        when :yui
+          require 'yui/compressor'
+          YUI::CssCompressor.new
+        else
+          sym
+        end
       end
-    end
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: actionpack
 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: activesupport
@@ -27,14 +27,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15424099
+        hash: 15424109
         segments: 
         - 3
         - 1
         - 0
         - rc
-        - 3
-        version: 3.1.0.rc3
+        - 4
+        version: 3.1.0.rc4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -45,14 +45,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15424099
+        hash: 15424109
         segments: 
         - 3
         - 1
         - 0
         - rc
-        - 3
-        version: 3.1.0.rc3
+        - 4
+        version: 3.1.0.rc4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency