diff options
author | Mark J. Titorenko <mark@titorenko.net> | 2011-10-04 23:05:01 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-10-05 01:24:58 +0200 |
commit | b41bd968c6734737d14c542c514b8deef30a3ffe (patch) | |
tree | 66e99259db1b284f85e9f4f43b21c7f5a69f56c8 /actionpack/lib/sprockets/assets.rake | |
parent | dc85fc546fb9c40a610d3f3d029ccb3692aefc02 (diff) | |
download | rails-b41bd968c6734737d14c542c514b8deef30a3ffe.tar.gz rails-b41bd968c6734737d14c542c514b8deef30a3ffe.tar.bz2 rails-b41bd968c6734737d14c542c514b8deef30a3ffe.zip |
assets compilation task refactoring
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionpack/lib/sprockets/assets.rake')
-rw-r--r-- | actionpack/lib/sprockets/assets.rake | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake index 7ab079c626..8f993b0abb 100644 --- a/actionpack/lib/sprockets/assets.rake +++ b/actionpack/lib/sprockets/assets.rake @@ -28,12 +28,18 @@ namespace :assets do config = Rails.application.config config.assets.compile = true config.assets.digest = digest unless digest.nil? + config.assets.digests = {} env = Rails.application.assets target = File.join(Rails.public_path, config.assets.prefix) - static_compiler = Sprockets::StaticCompiler.new(env, target, :digest => config.assets.digest) - static_compiler.precompile(config.assets.precompile) + compiler = Sprockets::StaticCompiler.new(env, + target, + config.assets.precompile, + :manifest_path => config.assets.manifest, + :digest => config.assets.digest, + :manifest => digest.nil?) + compiler.compile end task :all do @@ -42,14 +48,7 @@ namespace :assets do end task :digest => ["assets:environment", "tmp:cache:clear"] do - manifest = internal_precompile - config = Rails.application.config - manifest_path = config.assets.manifest || File.join(Rails.public_path, config.assets.prefix) - FileUtils.mkdir_p(manifest_path) - - File.open("#{manifest_path}/manifest.yml", 'wb') do |f| - YAML.dump(manifest, f) - end + internal_precompile end task :nondigest => ["assets:environment", "tmp:cache:clear"] do |