diff options
author | Hubert Łępicki <hubert.lepicki@amberbit.com> | 2014-05-08 08:05:45 +0200 |
---|---|---|
committer | Hubert Łępicki <hubert.lepicki@amberbit.com> | 2014-05-08 08:10:00 +0200 |
commit | 5371106d530e64cfb221492714fb7cef32fa45c3 (patch) | |
tree | 41d1fb3e1fabb6e502db5dddbbf9b0ead1a2e5d6 /actionview | |
parent | d2061a224d4e99cbc0f859c50f0c35277773369e (diff) | |
download | rails-5371106d530e64cfb221492714fb7cef32fa45c3.tar.gz rails-5371106d530e64cfb221492714fb7cef32fa45c3.tar.bz2 rails-5371106d530e64cfb221492714fb7cef32fa45c3.zip |
Allow custom asset host to be passed in asset_url
Diffstat (limited to 'actionview')
-rw-r--r-- | actionview/lib/action_view/helpers/asset_url_helper.rb | 3 | ||||
-rw-r--r-- | actionview/test/template/asset_tag_helper_test.rb | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/actionview/lib/action_view/helpers/asset_url_helper.rb b/actionview/lib/action_view/helpers/asset_url_helper.rb index 41997a85b3..86a84c1356 100644 --- a/actionview/lib/action_view/helpers/asset_url_helper.rb +++ b/actionview/lib/action_view/helpers/asset_url_helper.rb @@ -191,7 +191,8 @@ module ActionView # (proc or otherwise). def compute_asset_host(source = "", options = {}) request = self.request if respond_to?(:request) - host = config.asset_host if defined? config.asset_host + host = options[:host] + host ||= config.asset_host if defined? config.asset_host host ||= request.base_url if request && options[:protocol] == :request if host.respond_to?(:call) diff --git a/actionview/test/template/asset_tag_helper_test.rb b/actionview/test/template/asset_tag_helper_test.rb index 18e4277d7a..343681b5a9 100644 --- a/actionview/test/template/asset_tag_helper_test.rb +++ b/actionview/test/template/asset_tag_helper_test.rb @@ -596,6 +596,10 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase assert_equal "gopher://www.example.com", compute_asset_host("foo", :protocol => :request) end + def test_should_return_custom_host_if_passed_in_options + assert_equal "http://custom.example.com", compute_asset_host("foo", :host => "http://custom.example.com") + end + def test_should_ignore_relative_root_path_on_complete_url assert_dom_equal(%(http://www.example.com/images/xml.png), image_path("http://www.example.com/images/xml.png")) end @@ -759,4 +763,15 @@ class AssetUrlHelperEmptyModuleTest < ActionView::TestCase assert @module.config.asset_host assert_equal "http://www.example.com/foo", @module.asset_url("foo") end + + def test_asset_url_with_custom_asset_host + @module.instance_eval do + def config + Struct.new(:asset_host).new("http://www.example.com") + end + end + + assert @module.config.asset_host + assert_equal "http://custom.example.com/foo", @module.asset_url("foo", :host => "http://custom.example.com") + end end |