Fix the lame config.action_controller.present? check scattered throughout assets_path.

Conflicts:

	actionpack/test/template/sprockets_helper_test.rb

7 files changed, 32 insertions, 30 deletions

diff --git a/actionpack/lib/action_view/asset_paths.rb b/actionpack/lib/action_view/asset_paths.rb
index 3321b4181d..1d16e34df6 100644
--- a/actionpack/lib/action_view/asset_paths.rb
+++ b/actionpack/lib/action_view/asset_paths.rb
@@ -86,9 +86,7 @@ module ActionView
     end
 
     def default_protocol
-      protocol = @config.action_controller.default_asset_host_protocol if @config.action_controller.present?
-      protocol ||= @config.default_asset_host_protocol
-      protocol || (has_request? ? :request : :relative)
+      @config.default_asset_host_protocol || (has_request? ? :request : :relative)
     end
 
     def invalid_asset_host!(help_message)
@@ -117,19 +115,11 @@ module ActionView
     end
 
     def relative_url_root
-      if config.action_controller.present?
-        config.action_controller.relative_url_root
-      else
-        config.relative_url_root
-      end
+      config.relative_url_root
     end
 
     def asset_host_config
-      if config.action_controller.present?
-        config.action_controller.asset_host
-      else
-        config.asset_host
-      end
+      config.asset_host
     end
 
     # Returns the current request if one exists.
diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake
index a801050084..80c3d4d0b8 100644
--- a/actionpack/lib/sprockets/assets.rake
+++ b/actionpack/lib/sprockets/assets.rake
@@ -39,12 +39,13 @@ namespace :assets do
       config = Rails.application.config
       config.assets.compile = true
       config.assets.digest  = digest unless digest.nil?
-
       config.assets.digests = {}
 
-      env    = Rails.application.assets
+      env = Rails.application.assets
+      env.context_class.send :include, ::Sprockets::Helpers::PrecompileHelper
+
       target = File.join(Rails.public_path, config.assets.prefix)
-      compiler = Sprockets::StaticCompiler.new(env, 
+      compiler = Sprockets::StaticCompiler.new(env,
                                                target,
                                                config.assets.precompile,
                                                :manifest_path => config.assets.manifest,
diff --git a/actionpack/lib/sprockets/helpers.rb b/actionpack/lib/sprockets/helpers.rb
index a952a55c5e..cd9c8f62e6 100644
--- a/actionpack/lib/sprockets/helpers.rb
+++ b/actionpack/lib/sprockets/helpers.rb
@@ -1,5 +1,6 @@
 module Sprockets
   module Helpers
-    autoload :RailsHelper, "sprockets/helpers/rails_helper"
+    autoload :RailsHelper,      "sprockets/helpers/rails_helper"
+    autoload :PrecompileHelper, "sprockets/helpers/precompile_helper"
   end
 end
diff --git a/actionpack/lib/sprockets/helpers/precompile_helper.rb b/actionpack/lib/sprockets/helpers/precompile_helper.rb
new file mode 100644
index 0000000000..ca7927f6fb
--- /dev/null
+++ b/actionpack/lib/sprockets/helpers/precompile_helper.rb
@@ -0,0 +1,13 @@
+module Sprockets
+  module Helpers
+    module PrecompileHelper
+      def controller
+        nil
+      end
+
+      def config
+        Rails.application.config.action_controller
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index e1d8fccf04..f866bc626e 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -8,9 +8,6 @@ module Sprockets
 
       def asset_paths
         @asset_paths ||= begin
-          config     = self.config if respond_to?(:config)
-          config   ||= Rails.application.config
-          controller = self.controller if respond_to?(:controller)
           paths = RailsHelper::AssetPaths.new(config, controller)
           paths.asset_environment = asset_environment
           paths.asset_digests     = asset_digests
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb
index 2cf54b7777..e29612d320 100644
--- a/actionpack/lib/sprockets/railtie.rb
+++ b/actionpack/lib/sprockets/railtie.rb
@@ -43,10 +43,7 @@ module Sprockets
 
       ActiveSupport.on_load(:action_view) do
         include ::Sprockets::Helpers::RailsHelper
-
-        app.assets.context_class.instance_eval do
-          include ::Sprockets::Helpers::RailsHelper
-        end
+        app.assets.context_class.send :include, ::Sprockets::Helpers::RailsHelper
       end
     end
 
diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb
index f0fb783a93..08b66fec8b 100644
--- a/actionpack/test/template/sprockets_helper_test.rb
+++ b/actionpack/test/template/sprockets_helper_test.rb
@@ -28,7 +28,6 @@ class SprocketsHelperTest < ActionView::TestCase
     application = Struct.new(:config, :assets).new(config, @assets)
     Rails.stubs(:application).returns(application)
     @config = config
-    @config.action_controller ||= ActiveSupport::InheritableOptions.new
     @config.perform_caching = true
     @config.assets.digest = true
     @config.assets.compile = true
@@ -38,6 +37,10 @@ class SprocketsHelperTest < ActionView::TestCase
     "http://www.example.com"
   end
 
+  def config
+    @controller ? @controller.config : @config
+  end
+
   test "asset_path" do
     assert_match %r{/assets/logo-[0-9a-f]+.png},
       asset_path("logo.png")
@@ -116,7 +119,7 @@ class SprocketsHelperTest < ActionView::TestCase
 
   test "stylesheets served without a controller in scope cannot access the request" do
     @controller = nil
-    @config.action_controller.asset_host = Proc.new do |asset, request|
+    @config.asset_host = Proc.new do |asset, request|
       fail "This should not have been called."
     end
     assert_raises ActionController::RoutingError do
@@ -154,9 +157,9 @@ class SprocketsHelperTest < ActionView::TestCase
 
   test "stylesheets served without a controller in do not use asset hosts when the default protocol is :request" do
     @controller = nil
-    @config.action_controller.asset_host = "assets-%d.example.com"
-    @config.action_controller.default_asset_host_protocol = :request
-    @config.action_controller.perform_caching = true
+    @config.asset_host = "assets-%d.example.com"
+    @config.default_asset_host_protocol = :request
+    @config.perform_caching = true
 
     assert_match %r{/assets/logo-[0-9a-f]+.png},
       asset_path("logo.png")
@@ -170,7 +173,7 @@ class SprocketsHelperTest < ActionView::TestCase
 
   test "asset path with relative url root when controller isn't present but relative_url_root is" do
     @controller = nil
-    @config.action_controller.relative_url_root = "/collaboration/hieraki"
+    @config.relative_url_root = "/collaboration/hieraki"
     assert_equal "/collaboration/hieraki/images/logo.gif",
      asset_path("/images/logo.gif")
   end