Skip to content

Commit

Permalink
Move references to Rails.application.config out of Sprockets AssetPaths
Browse files Browse the repository at this point in the history
  • Loading branch information
spohlenz committed Sep 1, 2011
1 parent 3ce3b5b commit d5165e5
Showing 1 changed file with 14 additions and 5 deletions.
19 changes: 14 additions & 5 deletions actionpack/lib/sprockets/helpers/rails_helper.rb
Expand Up @@ -15,6 +15,8 @@ def asset_paths
paths.asset_environment = asset_environment
paths.asset_prefix = asset_prefix
paths.asset_digests = asset_digests
paths.compile_assets = compile_assets?
paths.digest_assets = digest_assets?
paths
end
end
Expand Down Expand Up @@ -60,8 +62,7 @@ def asset_path(source, default_ext = nil, body = false, protocol = nil)
private
def debug_assets?
begin
config = Rails.application.config.assets
config.compile && (config.debug || params[:debug_assets])
compile_assets? && (Rails.application.config.assets.debug || params[:debug_assets])
rescue NoMethodError
false
end
Expand All @@ -81,6 +82,14 @@ def asset_digests
Rails.application.config.assets.digests
end

def compile_assets?
Rails.application.config.assets.compile
end

def digest_assets?
Rails.application.config.assets.digest
end

# Override to specify an alternative asset environment for asset
# path generation. The environment should already have been mounted
# at the prefix returned by +asset_prefix+.
Expand All @@ -89,7 +98,7 @@ def asset_environment
end

class AssetPaths < ::ActionView::AssetPaths #:nodoc:
attr_accessor :asset_environment, :asset_prefix, :asset_digests
attr_accessor :asset_environment, :asset_prefix, :asset_digests, :compile_assets, :digest_assets

class AssetNotPrecompiledError < StandardError; end

Expand All @@ -114,7 +123,7 @@ def digest_for(logical_path)
return digest
end

if Rails.application.config.assets.compile
if compile_assets
if asset = asset_environment[logical_path]
return asset.digest_path
end
Expand All @@ -128,7 +137,7 @@ def rewrite_asset_path(source, dir)
if source[0] == ?/
source
else
source = digest_for(source) if Rails.application.config.assets.digest
source = digest_for(source) if digest_assets
source = File.join(dir, source)
source = "/#{source}" unless source =~ /^\//
source
Expand Down

0 comments on commit d5165e5

Please sign in to comment.