Merge pull request #1870 from chriseppstein/asset_urls_master

Asset urls master

1 files changed, 67 insertions, 4 deletions

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",