updated compute_public_path, added check for images

kennon · Nov 28, 2006 · f356aa8 · f356aa8
1 parent 9be39fd
commit f356aa8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/lib/synthesis/asset_package_helper.rb b/lib/synthesis/asset_package_helper.rb
@@ -38,11 +38,14 @@ def stylesheet_link_merged(*sources)
       # rewrite compute_public_path to allow us to not include the query string timestamp
       # used by ActionView::Helpers::AssetTagHelper
       def compute_public_path(source, dir, ext, add_asset_id=true)
-        source  = "/#{dir}/#{source}" unless source.first == "/" || source.include?(":")
-        source << ".#{ext}" unless source.split("/").last =~ /\.(js|css)$/
-        source << '?' + rails_asset_id(source) if defined?(RAILS_ROOT) && %r{^[-a-z]+://} !~ source && add_asset_id
-        source  = "#{@controller.request.relative_url_root}#{source}" unless %r{^[-a-z]+://} =~ source
-        source = ActionController::Base.asset_host + source unless source.include?(":")
+        source = source.dup
+        source << ".#{ext}" if File.extname(source).blank?
+        unless source =~ %r{^[-a-z]+://}
+          source = "/#{dir}/#{source}" unless source[0] == ?/
+          asset_id = rails_asset_id(source)
+          source << '?' + asset_id if defined?(RAILS_ROOT) and add_asset_id and not asset_id.blank?
+          source = "#{ActionController::Base.asset_host}#{@controller.request.relative_url_root}#{source}"
+        end
         source
       end
 

diff --git a/test/asset_package_helper_production_test.rb b/test/asset_package_helper_production_test.rb
@@ -128,4 +128,9 @@ def test_css_multiple_package_names
       stylesheet_link_merged(:base, :secondary)
   end
 
+  def test_image_tag
+    timestamp = rails_asset_id("images/rails.png")
+    assert_dom_equal %(<img alt="Rails" src="/images/rails.png?#{timestamp}" />), image_tag("rails")
+  end
+
 end