From 6bc6978e2ad90e6546f18452a8423116c4935a88 Mon Sep 17 00:00:00 2001
From: Sam Pohlenz <sam@sampohlenz.com>
Date: Thu, 1 Sep 2011 14:59:16 +0930
Subject: [PATCH] Move references to Rails.application.config out of Sprockets
 AssetPaths

---
 .../lib/sprockets/helpers/rails_helper.rb      | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index 33b10194df71..838feec03dc7 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -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
@@ -60,7 +62,7 @@ def asset_path(source, default_ext = nil, body = false, protocol = nil)
     private
       def debug_assets?
         begin
-          Rails.application.config.assets.compile &&
+          compile_assets? &&
             (Rails.application.config.assets.debug ||
              params[:debug_assets] == '1' ||
              params[:debug_assets] == 'true')
@@ -83,6 +85,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+.
@@ -91,7 +101,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
 
@@ -116,7 +126,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
@@ -130,7 +140,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