Merge pull request #1870 from chriseppstein/asset_urls_master

Asset urls master

2 files changed, 87 insertions, 14 deletions

diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 38ab5815a4..df61901b44 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -862,7 +862,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_stylesheet_link_tag_when_caching_on
     ENV["RAILS_ASSET_ID"] = ""
-    @controller.config.asset_host = 'http://a0.example.com'
+    @controller.config.asset_host = 'a0.example.com'
     config.perform_caching = true
 
     assert_dom_equal(
@@ -972,7 +972,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_stylesheet_link_tag_when_caching_on_with_proc_asset_host
     ENV["RAILS_ASSET_ID"] = ""
-    @controller.config.asset_host = Proc.new { |source| "http://a#{source.length}.example.com" }
+    @controller.config.asset_host = Proc.new { |source| "a#{source.length}.example.com" }
     config.perform_caching = true
 
     assert_equal '/stylesheets/styles.css'.length, 23
@@ -1099,13 +1099,23 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase
   end
 
   def test_should_compute_proper_path_with_asset_host
-    @controller.config.asset_host = "http://assets.example.com"
+    @controller.config.asset_host = "assets.example.com"
     assert_dom_equal(%(<link href="http://www.example.com/collaboration/hieraki" rel="alternate" title="RSS" type="application/rss+xml" />), auto_discovery_link_tag)
-    assert_dom_equal(%(http://assets.example.com/collaboration/hieraki/javascripts/xmlhr.js), javascript_path("xmlhr"))
-    assert_dom_equal(%(http://assets.example.com/collaboration/hieraki/stylesheets/style.css), stylesheet_path("style"))
-    assert_dom_equal(%(http://assets.example.com/collaboration/hieraki/images/xml.png), image_path("xml.png"))
-    assert_dom_equal(%(<img alt="Mouse" onmouseover="this.src='http://assets.example.com/collaboration/hieraki/images/mouse_over.png'" onmouseout="this.src='http://assets.example.com/collaboration/hieraki/images/mouse.png'" src="http://assets.example.com/collaboration/hieraki/images/mouse.png" />), image_tag("mouse.png", :mouseover => "/images/mouse_over.png"))
-    assert_dom_equal(%(<img alt="Mouse2" onmouseover="this.src='http://assets.example.com/collaboration/hieraki/images/mouse_over2.png'" onmouseout="this.src='http://assets.example.com/collaboration/hieraki/images/mouse2.png'" src="http://assets.example.com/collaboration/hieraki/images/mouse2.png" />), image_tag("mouse2.png", :mouseover => image_path("mouse_over2.png")))
+    assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/javascripts/xmlhr.js), javascript_path("xmlhr"))
+    assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/stylesheets/style.css), stylesheet_path("style"))
+    assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/images/xml.png), image_path("xml.png"))
+    assert_dom_equal(%(<img alt="Mouse" onmouseover="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse_over.png'" onmouseout="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse.png'" src="gopher://assets.example.com/collaboration/hieraki/images/mouse.png" />), image_tag("mouse.png", :mouseover => "/images/mouse_over.png"))
+    assert_dom_equal(%(<img alt="Mouse2" onmouseover="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse_over2.png'" onmouseout="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse2.png'" src="gopher://assets.example.com/collaboration/hieraki/images/mouse2.png" />), image_tag("mouse2.png", :mouseover => image_path("mouse_over2.png")))
+  end
+
+  def test_should_compute_proper_path_with_asset_host_and_default_protocol
+    @controller.config.asset_host = "assets.example.com"
+    @controller.config.default_asset_host_protocol = :request
+    assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/javascripts/xmlhr.js), javascript_path("xmlhr"))
+    assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/stylesheets/style.css), stylesheet_path("style"))
+    assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/images/xml.png), image_path("xml.png"))
+    assert_dom_equal(%(<img alt="Mouse" onmouseover="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse_over.png'" onmouseout="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse.png'" src="gopher://assets.example.com/collaboration/hieraki/images/mouse.png" />), image_tag("mouse.png", :mouseover => "/images/mouse_over.png"))
+    assert_dom_equal(%(<img alt="Mouse2" onmouseover="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse_over2.png'" onmouseout="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse2.png'" src="gopher://assets.example.com/collaboration/hieraki/images/mouse2.png" />), image_tag("mouse2.png", :mouseover => image_path("mouse_over2.png")))
   end
 
   def test_should_ignore_asset_host_on_complete_url
@@ -1123,12 +1133,12 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase
     assert_match(%r(http://a[0123].example.com/collaboration/hieraki/images/xml.png), image_path('xml.png'))
   end
 
-  def test_asset_host_without_protocol_should_use_request_protocol
+  def test_asset_host_without_protocol_should_be_protocol_relative
     @controller.config.asset_host = 'a.example.com'
     assert_equal 'gopher://a.example.com/collaboration/hieraki/images/xml.png', image_path('xml.png')
   end
 
-  def test_asset_host_without_protocol_should_use_request_protocol_even_if_path_present
+  def test_asset_host_without_protocol_should_be_protocol_relative_even_if_path_present
     @controller.config.asset_host = 'a.example.com/files/go/here'
     assert_equal 'gopher://a.example.com/files/go/here/collaboration/hieraki/images/xml.png', image_path('xml.png')
   end
diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb
index b1317d0a35..6dc9a2a743 100644
--- a/actionpack/test/template/sprockets_helper_test.rb
+++ b/actionpack/test/template/sprockets_helper_test.rb
@@ -31,18 +31,21 @@ class SprocketsHelperTest < ActionView::TestCase
     Rails.stubs(:application).returns(application)
     application.stubs(:config).returns(config)
     application.stubs(:assets).returns(@assets)
-
-    config.perform_caching = true
+    @config = config
+    @config.action_controller ||= ActiveSupport::InheritableOptions.new
+    @config.perform_caching = true
   end
 
   def url_for(*args)
     "http://www.example.com"
   end
 
-  test "asset path" do
+  test "asset_path" do
     assert_equal "/assets/logo-9c0a079bdd7701d7e729bd956823d153.png",
       asset_path("logo.png")
+  end
 
+  test "asset_path with root relative assets" do
     assert_equal "/images/logo",
       asset_path("/images/logo")
     assert_equal "/images/logo.gif",
@@ -50,13 +53,73 @@ class SprocketsHelperTest < ActionView::TestCase
 
     assert_equal "/dir/audio",
       asset_path("/dir/audio")
-
+  end
+  
+  test "asset_path with absolute urls" do
     assert_equal "http://www.example.com/video/play",
       asset_path("http://www.example.com/video/play")
     assert_equal "http://www.example.com/video/play.mp4",
       asset_path("http://www.example.com/video/play.mp4")
   end
 
+  test "with a simple asset host the url should default to protocol relative" do
+    @controller.config.asset_host = "assets-%d.example.com"
+    assert_match %r{//assets-\d.example.com/assets/logo-[0-9a-f]+.png},
+      asset_path("logo.png")
+  end
+
+  test "with a simple asset host the url can be changed to use the request protocol" do
+    @controller.config.asset_host = "assets-%d.example.com"
+    @controller.config.default_asset_host_protocol = :request
+    assert_match %r{http://assets-\d.example.com/assets/logo-[0-9a-f]+.png},
+      asset_path("logo.png")
+  end
+  
+  test "With a proc asset host that returns no protocol the url should be protocol relative" do
+    @controller.config.asset_host = Proc.new do |asset|
+      "assets-999.example.com"
+    end
+    assert_match %r{//assets-999.example.com/assets/logo-[0-9a-f]+.png},
+      asset_path("logo.png")
+  end
+
+  test "with a proc asset host that returns a protocol the url use it" do
+    @controller.config.asset_host = Proc.new do |asset|
+      "http://assets-999.example.com"
+    end
+    assert_match %r{http://assets-999.example.com/assets/logo-[0-9a-f]+.png},
+      asset_path("logo.png")
+  end
+
+  test "stylesheets served with a controller in scope can access the request" do
+    config.asset_host = Proc.new do |asset, request|
+      assert_not_nil request
+      "http://assets-666.example.com"
+    end
+    assert_match %r{http://assets-666.example.com/assets/logo-[0-9a-f]+.png},
+      asset_path("logo.png")
+  end
+
+  test "stylesheets served without a controller in scope cannot access the request" do
+    remove_instance_variable("@controller")
+    @config.action_controller.asset_host = Proc.new do |asset, request|
+      fail "This should not have been called."
+    end
+    assert_raises ActionController::RoutingError do
+      asset_path("logo.png")
+    end
+  end
+
+  test "stylesheets served without a controller in do not use asset hosts when the default protocol is :request" do
+    remove_instance_variable("@controller")
+    @config.action_controller.asset_host = "assets-%d.example.com"
+    @config.action_controller.default_asset_host_protocol = :request
+    @config.action_controller.perform_caching = true
+
+    assert_equal "/assets/logo-9c0a079bdd7701d7e729bd956823d153.png",
+      asset_path("logo.png")
+  end
+
   test "asset path with relative url root" do
     @controller.config.relative_url_root = "/collaboration/hieraki"
     assert_equal "/collaboration/hieraki/images/logo.gif",