Merge pull request #1372 from jacott/master

Fix for relative_url_root when used with sprockets

3 files changed, 13 insertions, 11 deletions

diff --git a/actionpack/lib/action_view/helpers/asset_paths.rb b/actionpack/lib/action_view/helpers/asset_paths.rb
index 1bc5c9e003..9a99c3cf52 100644
--- a/actionpack/lib/action_view/helpers/asset_paths.rb
+++ b/actionpack/lib/action_view/helpers/asset_paths.rb
@@ -44,7 +44,12 @@ module ActionView
         raise NotImplementedError
       end
 
+      def rewrite_relative_url_root(source, relative_url_root)
+        relative_url_root && !source.starts_with?("#{relative_url_root}/") ? "#{relative_url_root}#{source}" : source
+      end
+
       def rewrite_host_and_protocol(source, has_request)
+        source = rewrite_relative_url_root(source, controller.config.relative_url_root) if has_request
         host = compute_asset_host(source)
         if has_request && host && !is_uri?(host)
           host = "#{controller.request.protocol}#{host}"
@@ -75,4 +80,4 @@ module ActionView
     end
 
   end
-end
\ No newline at end of file
+end
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 cd0f8c8878..2d49823412 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
@@ -85,17 +85,8 @@ module ActionView
             end
           end
         end
-
-        def rewrite_relative_url_root(source, relative_url_root)
-          relative_url_root && !source.starts_with?("#{relative_url_root}/") ? "#{relative_url_root}#{source}" : source
-        end
-
-        def rewrite_host_and_protocol(source, has_request)
-          source = rewrite_relative_url_root(source, controller.config.relative_url_root) if has_request
-          super(source, has_request)
-        end
       end
 
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb
index b26315083c..c2ee7f9582 100644
--- a/actionpack/test/template/sprockets_helper_test.rb
+++ b/actionpack/test/template/sprockets_helper_test.rb
@@ -57,6 +57,12 @@ class SprocketsHelperTest < ActionView::TestCase
       asset_path("http://www.example.com/video/play.mp4")
   end
 
+  test "asset path with relavtive url root" do
+    @controller.config.relative_url_root = "/collaboration/hieraki"
+    assert_equal "/collaboration/hieraki/images/logo.gif",
+     asset_path("/images/logo.gif")
+  end
+
   test "javascript path" do
     assert_equal "/assets/application-d41d8cd98f00b204e9800998ecf8427e.js",
       asset_path(:application, "js")