diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-02-13 20:29:32 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-02-13 20:37:02 -0200 |
| commit | 6960e481cb87964bd450ec3fbaa1087f44c3b860 (patch) | |
| tree | a9a9801ad261502379f1d4398766f56b18226bcf /actionpack | |
| parent | 9b9838ec4b29281be7d04a16ccdd2525a826464f (diff) | |
| download | rails-6960e481cb87964bd450ec3fbaa1087f44c3b860.tar.gz rails-6960e481cb87964bd450ec3fbaa1087f44c3b860.tar.bz2 rails-6960e481cb87964bd450ec3fbaa1087f44c3b860.zip | |
Use Hash#fetch instead of testing for #key?
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/sprockets/railtie.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/sprockets/static_compiler.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb index 44ddab0950..2bc482a39d 100644 --- a/actionpack/lib/sprockets/railtie.rb +++ b/actionpack/lib/sprockets/railtie.rb @@ -24,7 +24,7 @@ module Sprockets env.version = ::Rails.env + "-#{config.assets.version}" if config.assets.logger != false - env.logger = config.assets.logger || ::Rails.logger + env.logger = config.assets.logger || ::Rails.logger end if config.assets.cache_store != false diff --git a/actionpack/lib/sprockets/static_compiler.rb b/actionpack/lib/sprockets/static_compiler.rb index 719df0bd51..9bbb464474 100644 --- a/actionpack/lib/sprockets/static_compiler.rb +++ b/actionpack/lib/sprockets/static_compiler.rb @@ -8,8 +8,8 @@ module Sprockets @env = env @target = target @paths = paths - @digest = options.key?(:digest) ? options.delete(:digest) : true - @manifest = options.key?(:manifest) ? options.delete(:manifest) : true + @digest = options.fetch(:digest, true) + @manifest = options.fetch(:manifest, true) @manifest_path = options.delete(:manifest_path) || target @zip_files = options.delete(:zip_files) || /\.(?:css|html|js|svg|txt|xml)$/ end |