diff options
| author | Peter Wagenet <peter.wagenet@gmail.com> | 2012-09-17 10:36:15 -0700 |
|---|---|---|
| committer | Peter Wagenet <peter.wagenet@gmail.com> | 2012-09-17 15:32:31 -0700 |
| commit | 1ac19c11792a745cd654f02dfaed8e93f95b3c70 (patch) | |
| tree | 68f8dacd5fe1cb44ba2db4561148ad8fc4eef827 /actionpack | |
| parent | 24a77743b69b2a3452848f7d78afd2692b209a03 (diff) | |
| download | rails-1ac19c11792a745cd654f02dfaed8e93f95b3c70.tar.gz rails-1ac19c11792a745cd654f02dfaed8e93f95b3c70.tar.bz2 rails-1ac19c11792a745cd654f02dfaed8e93f95b3c70.zip | |
Respect `config.digest = false` for `asset_path`
Previously, the `asset_path` internals only respected the `:digest`
option, but ignored the global config setting. This meant that
`config.digest = false` could not be used in conjunction with
`config.compile = false` this corrects the behavior.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG.md | 9 | ||||
| -rw-r--r-- | actionpack/lib/sprockets/helpers/rails_helper.rb | 4 | ||||
| -rw-r--r-- | actionpack/test/template/sprockets_helper_test.rb | 8 |
3 files changed, 20 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index bfb561a154..c52241a9c0 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,14 @@ ## Rails 3.2.9 (unreleased) ## +* Respect `config.digest = false` for `asset_path` + + Previously, the `asset_path` internals only respected the `:digest` + option, but ignored the global config setting. This meant that + `config.digest = false` could not be used in conjunction with + `config.compile = false` this corrects the behavior. + + *Peter Wagenet* + * Fix #7646, the log now displays the correct status code when an exception is raised. *Yves Senn* diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb index 8f0e0f8ee1..690c71b472 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -147,7 +147,9 @@ module Sprockets if source[0] == ?/ source else - source = digest_for(source) unless options[:digest] == false + if digest_assets && options[:digest] != false + source = digest_for(source) + end source = File.join(dir, source) source = "/#{source}" unless source =~ /^\// source diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb index b908b6777c..72d03e43e9 100644 --- a/actionpack/test/template/sprockets_helper_test.rb +++ b/actionpack/test/template/sprockets_helper_test.rb @@ -360,4 +360,12 @@ class SprocketsHelperTest < ActionView::TestCase assert_equal '/assets/logo.png', asset_path("logo.png") end + + test "`config.digest = false` works with `config.compile = false`" do + @config.assets.digest = false + @config.assets.compile = false + + assert_equal '/assets/logo.png', + asset_path("logo.png") + end end |