From b24ebbb030d342af70137c643aa65adeb97d1101 Mon Sep 17 00:00:00 2001 From: Daniel Pereira Date: Mon, 5 Dec 2016 21:12:23 -0200 Subject: [PATCH 1/2] Fix compatibility with Rails 3 --- lib/requirejs/rails/engine.rb | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/requirejs/rails/engine.rb b/lib/requirejs/rails/engine.rb index 7608877a..f39d2b1d 100644 --- a/lib/requirejs/rails/engine.rb +++ b/lib/requirejs/rails/engine.rb @@ -54,16 +54,14 @@ class Engine < ::Rails::Engine # values. if defined?(Rake) && Rake.application.top_level_tasks.include?("requirejs:precompile:all") initializer "requirejs.modify_environment_config", after: "load_environment_config", group: :all do |app| - app.configure do - # If we don't set this to true, sprockets-rails will assign `Rails.application.assets` to `nil`. - config.assets.compile = true + # If we don't set this to true, sprockets-rails will assign `Rails.application.assets` to `nil`. + app.config.assets.compile = true - # Don't compress JavaScripts fed into the r.js optimizer. - config.assets.js_compressor = false + # Don't compress JavaScripts fed into the r.js optimizer. + app.config.assets.js_compressor = false - # Don't use any cache to retrieve assets. - config.assets.cache = nil - end + # Don't use any cache to retrieve assets. + app.config.assets.cache = nil end end From 1e94ca374700d60c8b7974e1d67a6eff70a8018f Mon Sep 17 00:00:00 2001 From: Daniel Pereira Date: Thu, 8 Dec 2016 12:31:51 -0200 Subject: [PATCH 2/2] Fix test suite on Rails 3 --- lib/requirejs/rails/engine.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/requirejs/rails/engine.rb b/lib/requirejs/rails/engine.rb index f39d2b1d..abe90950 100644 --- a/lib/requirejs/rails/engine.rb +++ b/lib/requirejs/rails/engine.rb @@ -52,7 +52,7 @@ class Engine < ::Rails::Engine # Are we running in the precompilation Rake task? If so, we need to adjust certain environmental configuration # values. - if defined?(Rake) && Rake.application.top_level_tasks.include?("requirejs:precompile:all") + if defined?(Rake) && defined?(Rake.application) && Rake.application.top_level_tasks.include?("requirejs:precompile:all") initializer "requirejs.modify_environment_config", after: "load_environment_config", group: :all do |app| # If we don't set this to true, sprockets-rails will assign `Rails.application.assets` to `nil`. app.config.assets.compile = true