@@ -34,7 +34,7 @@ class AssetHostingWithMinimumSsl def javascript_file?(source) - source =~ /\.js$/ + source =~ /\.js(\?.*)?$/ end def image_file?(source) @@ -49,4 +49,4 @@ class AssetHostingWithMinimumSsl def firefox?(request) request.headers["USER_AGENT"] =~ /Firefox/ end -end \ No newline at end of file +end lib/asset_hosting_with_minimum_ssl.rb @@ -19,6 +19,12 @@ class AssetHostingWithMinimumSslTest < Test::Unit::TestCase end end + def test_ssl_requests_for_javascript_files_with_a_querystring_should_stay_ssl_regardless_of_the_browser + %(Safari Firefox IE).each do |browser| + assert_equal ssl_host, @asset_host.call("/javascripts/prototype.js?123456789", ssl_request_from(browser)) + end + end + def test_ssl_requests_for_anything_but_js_files_should_go_non_ssl_on_safari assert_match \ non_ssl_host, @@ -61,4 +67,4 @@ class AssetHostingWithMinimumSslTest < Test::Unit::TestCase def ssl_request_from(user_agent) stub(:headers => { "USER_AGENT" => user_agent }, :ssl? => true) end -end \ No newline at end of file +end test/asset_hosting_with_minimum_ssl_test.rb a9d2d26c4be1b341a63cc8c932057969912cc4ec Rob Ares rob.ares@gmail.com http://github.com/rares/asset-hosting-with-minimum-ssl/commit/03940de2fa55940ef6c8567200e91a3fdadac39d 03940de2fa55940ef6c8567200e91a3fdadac39d 2009-11-04T11:45:05-08:00 2009-11-04T11:45:05-08:00 changing regex to allow js files to have querystrings 021eebb9230f0e80e255a73883b3f577dee5d62f Rob Ares rob.ares@gmail.com