jammit 0.2.8 → 0.2.9

data/jammit.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name      = 'jammit'
-  s.version   = '0.2.8'         # Keep version in sync with jammit.rb
-  s.date      = '2009-11-23'
+  s.version   = '0.2.9'         # Keep version in sync with jammit.rb
+  s.date      = '2009-11-24'
 
   s.homepage    = "http://documentcloud.github.com/jammit/"
   s.summary     = "Industrial Strength Asset Packaging for Rails"

data/lib/jammit.rb

@@ -4,7 +4,7 @@ $LOAD_PATH.push File.expand_path(File.dirname(__FILE__))
 # to all of the configuration options.
 module Jammit
 
-  VERSION               = "0.2.8"
+  VERSION               = "0.2.9"
 
   ROOT                  = File.expand_path(File.dirname(__FILE__) + '/..')
 

data/lib/jammit/compressor.rb

@@ -92,8 +92,9 @@ module Jammit
     def concatenate_and_tag_images(paths, variant=nil)
       stylesheets = [paths].flatten.map do |css_path|
         File.read(css_path).gsub(IMAGE_DETECTOR) do |url|
-          new_path = rewrite_image_path(Pathname.new($1), Pathname.new(File.expand_path(css_path)), !!variant)
-          "url(#{new_path})"
+          ipath, cpath = Pathname.new($1), Pathname.new(File.expand_path(css_path))
+          is_url = URI.parse($1).absolute?
+          is_url ? url : "url(#{rewrite_image_path(ipath, cpath, !!variant)})"
         end
       end
       stylesheets.join("\n")
@@ -129,7 +130,7 @@ module Jammit
     def rewrite_image_path(image_path, css_path, embed=false)
       public_path = absolute_path(image_path, css_path)
       return "__EMBED__#{public_path}" if embed && embeddable?(public_path)
-      image_path.relative? ? relative_path(public_path) : image_path.to_s
+      image_path.absolute? ? image_path.to_s : relative_path(public_path)
     end
 
     # Get the site-absolute public path for an image file path that may or may

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jammit
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors: 
 - Jeremy Ashkenas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 -05:00
+date: 2009-11-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency