Let's use inheritance here, shall we?

4 files changed, 12 insertions, 12 deletions

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
index 52eb43a1cd..e4662a2919 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
@@ -8,9 +8,11 @@ module ActionView
     module AssetTagHelper
 
       class AssetIncludeTag
-        attr_reader :config, :asset_paths
+        include TagHelper
 
+        attr_reader :config, :asset_paths
         class_attribute :expansions
+
         def self.inherited(base)
           base.expansions = { }
         end
@@ -56,7 +58,6 @@ module ActionView
           end
         end
 
-
         private
 
           def path_to_asset(source, include_host = true)
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
index 1e00fd996b..955634bb19 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
@@ -26,15 +26,18 @@ module ActionView
         # roots. Rewrite the asset path for cache-busting asset ids. Include
         # asset host, if configured, with the correct request protocol.
         def compute_public_path(source, dir, ext = nil, include_host = true)
+          source = source.to_s
           return source if is_uri?(source)
 
           source = rewrite_extension(source, dir, ext) if ext
           source = "/#{dir}/#{source}" unless source[0] == ?/
-          source = rewrite_asset_path(source, config.asset_path)
+          source = rewrite_asset_path(source, dir)
 
-          has_request = controller.respond_to?(:request)
-          source = rewrite_relative_url_root(source, controller.config.relative_url_root) if has_request && include_host
-          source = rewrite_host_and_protocol(source, has_request) if include_host
+          if controller && include_host
+            has_request = controller.respond_to?(:request)
+            source = rewrite_relative_url_root(source, controller.config.relative_url_root) if has_request
+            source = rewrite_host_and_protocol(source, has_request)
+          end
 
           source
         end
@@ -70,6 +73,8 @@ module ActionView
           # Break out the asset path rewrite in case plugins wish to put the asset id
           # someplace other than the query string.
           def rewrite_asset_path(source, path = nil)
+            path = config.asset_path
+
             if path && path.respond_to?(:call)
               return path.call(source)
             elsif path && path.is_a?(String)
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
index a0f6fb5692..07ff49659a 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
@@ -1,6 +1,5 @@
 require 'active_support/concern'
 require 'active_support/core_ext/file'
-require 'action_view/helpers/tag_helper'
 require 'action_view/helpers/asset_tag_helpers/asset_include_tag'
 
 module ActionView
@@ -8,8 +7,6 @@ module ActionView
     module AssetTagHelper
 
       class JavascriptIncludeTag < AssetIncludeTag
-        include TagHelper
-
         def asset_name
           'javascript'
         end
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
index 309762ee05..c3dcd410bb 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
@@ -1,6 +1,5 @@
 require 'active_support/concern'
 require 'active_support/core_ext/file'
-require 'action_view/helpers/tag_helper'
 require 'action_view/helpers/asset_tag_helpers/asset_include_tag'
 
 module ActionView
@@ -8,8 +7,6 @@ module ActionView
     module AssetTagHelper
 
       class StylesheetIncludeTag < AssetIncludeTag
-        include TagHelper
-
         def asset_name
           'stylesheet'
         end