Permalink
Browse files

fixed asset_paths when called from sprockets for relative_url_root

  • Loading branch information...
1 parent 18a2dfb commit db05478d92218d78aca0be22f97257fab10a90ca @jacott jacott committed with josevalim May 28, 2011
@@ -44,7 +44,12 @@ def rewrite_asset_path(source, path = nil)
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 @@ def compute_asset_host(source)
end
end
-end
+end
@@ -85,17 +85,8 @@ def rails_asset_id(source)
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
+end
@@ -58,6 +58,12 @@ def url_for(*args)
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")

0 comments on commit db05478

Please sign in to comment.