Merge pull request #7494 from route/actionview_decoupling_issue

ActionView decoupling and sprockets-rails tests fail

actionpack/lib/action_controller.rb

@@ -12,7 +12,6 @@ module ActionController
   autoload :Middleware
 
   autoload_under "metal" do
-    autoload :AssetPaths
     autoload :Compatibility
     autoload :ConditionalGet
     autoload :Cookies

actionpack/lib/action_controller/base.rb

@@ -183,8 +183,8 @@ def self.without_modules(*modules)
     MODULES = [
       AbstractController::Layouts,
       AbstractController::Translation,
+      AbstractController::AssetPaths,
 
-      AssetPaths,
       Helpers,
       HideActions,
       UrlFor,

actionpack/lib/action_controller/metal/asset_paths.rb

@@ -1,13 +0,0 @@
-require 'action_controller/metal/exceptions'
-
-module ActionController
-  module AssetPaths
-    extend ActiveSupport::Concern
-
-    include AbstractController::AssetPaths
-
-    def invalid_asset_host!(help_message)
-      raise ActionController::RoutingError, "This asset host cannot be computed without a request in scope. #{help_message}"
-    end
-  end
-end

actionpack/lib/action_view.rb

@@ -71,6 +71,7 @@ module ActionView
       autoload :MissingTemplate
       autoload :ActionViewError
       autoload :EncodingError
+      autoload :MissingRequestError
       autoload :TemplateError
       autoload :WrongEncodingError
     end

actionpack/lib/action_view/asset_paths.rb

@@ -1,6 +1,6 @@
 require 'zlib'
 require 'active_support/core_ext/file'
-require 'active_support/core_ext/module/delegation'
+require 'action_controller/metal/exceptions'
 
 module ActionView
   class AssetPaths #:nodoc:
@@ -8,8 +8,6 @@ class AssetPaths #:nodoc:
 
     attr_reader :config, :controller
 
-    delegate :invalid_asset_host!, :to => :controller, :prefix => false
-
     def initialize(config, controller = nil)
       @config = config
       @controller = controller
@@ -99,6 +97,10 @@ def default_protocol
       @config.default_asset_host_protocol || (has_request? ? :request : :relative)
     end
 
+    def invalid_asset_host!(help_message)
+      raise ActionView::MissingRequestError, "This asset host cannot be computed without a request in scope. #{help_message}"
+    end
+
     # Pick an asset host for this source. Returns +nil+ if no host is set,
     # the host if no wildcard is set, the host interpolated with the
     # numbers 0-3 if it contains <tt>%d</tt> (the number is the source hash mod 4),

actionpack/lib/action_view/template/error.rb

@@ -8,6 +8,9 @@ class ActionViewError < StandardError #:nodoc:
   class EncodingError < StandardError #:nodoc:
   end
 
+  class MissingRequestError < StandardError #:nodoc:
+  end
+
   class WrongEncodingError < EncodingError #:nodoc:
     def initialize(string, encoding)
       @string, @encoding = string, encoding