diff options
Diffstat (limited to 'actionpack/lib/sprockets/railtie.rb')
| -rw-r--r-- | actionpack/lib/sprockets/railtie.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb index d1e97c594e..c28bdc3061 100644 --- a/actionpack/lib/sprockets/railtie.rb +++ b/actionpack/lib/sprockets/railtie.rb @@ -1,8 +1,12 @@ module Sprockets autoload :Helpers, "sprockets/helpers" + autoload :LazyCompressor, "sprockets/compressors" + autoload :NullCompressor, "sprockets/compressors" # TODO: Get rid of config.assets.enabled class Railtie < ::Rails::Railtie + config.default_asset_host_protocol = :relative + rake_tasks do load "sprockets/assets.rake" end @@ -60,14 +64,14 @@ module Sprockets env.logger = Rails.logger if env.respond_to?(:cache) - env.cache = Rails.cache + env.cache = assets.cache_store || Rails.cache end if assets.compress # temporarily hardcode default JS compressor to uglify. Soon, it will work # the same as SCSS, where a default plugin sets the default. - env.js_compressor = expand_js_compressor(assets.js_compressor || :uglifier) - env.css_compressor = expand_css_compressor(assets.css_compressor) + env.js_compressor = LazyCompressor.new { expand_js_compressor(assets.js_compressor || :uglifier) } + env.css_compressor = LazyCompressor.new { expand_css_compressor(assets.css_compressor) } end env |