diff options
| -rw-r--r-- | actionpack/lib/sprockets/assets.rake | 1 | ||||
| -rw-r--r-- | railties/CHANGELOG | 3 | ||||
| -rw-r--r-- | railties/test/application/assets_test.rb | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake index 0531b1509b..ee8ca1b3dd 100644 --- a/actionpack/lib/sprockets/assets.rake +++ b/actionpack/lib/sprockets/assets.rake @@ -43,6 +43,7 @@ namespace :assets do mkdir_p filename.dirname asset.write_to(filename) asset.write_to("#{filename}.gz") if filename.to_s =~ /\.(css|js)$/ + asset.write_to(target.join(logical_path)) end end end diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 6ed76974b4..9ba93d6130 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -12,6 +12,9 @@ *Rails 3.1.0 (unreleased)* +* Provide a way to access to assets without using the digest, useful for +static files and emails. [Santiago Pastorino] + * The default database schema file is written as UTF-8. [Aaron Patterson] * Generated apps with --dev or --edge flags depend on git versions of diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb index 0901c6df3d..9245532e17 100644 --- a/railties/test/application/assets_test.rb +++ b/railties/test/application/assets_test.rb @@ -58,7 +58,9 @@ module ApplicationTests Dir.chdir(app_path){ `bundle exec rake assets:precompile` } end files = Dir["#{app_path}/public/assets/application-*.js"] + files << Dir["#{app_path}/public/assets/application.js"].first files << Dir["#{app_path}/public/assets/foo/application-*.js"].first + files << Dir["#{app_path}/public/assets/foo/application.js"].first files.each do |file| assert_not_nil file, "Expected application.js asset to be generated, but none found" assert_equal "alert()", File.read(file) |