juicer 1.0.6 → 1.0.7

data/History.txt

@@ -1,3 +1,7 @@
+== 1.0.7 / 2010-08-23
+* Fix bug where embedded images where re-mapped as though they where
+  URLs (Elliot Wood)
+
 == 1.0.6 / 2010-06-29
 * Fix bug where image embedding could not see the document root,
   resulting in missing images (Jakub Pawlowicz)

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.0.7

data/lib/juicer.rb

@@ -3,7 +3,7 @@ require "logger"
 module Juicer
 
   # :stopdoc:
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   LOGGER = Logger.new(STDOUT)

data/lib/juicer/merger/stylesheet_merger.rb

@@ -69,6 +69,7 @@ module Juicer
       # Resolves a path relative to a directory
       #
       def resolve_path(url, dir)
+        return url if url =~ /^data:/
         path = url
 
         # Absolute URLs

data/test/unit/juicer/merger/stylesheet_merger_test.rb

@@ -216,6 +216,22 @@ EOF
         assert_equal "../images/1.png", merger.resolve_path("/images/1.png", nil)
       end
     end
+    
+    should "leave data URLs untouched" do
+      merger = Juicer::Merger::StylesheetMerger.new([],
+                                                    :document_root => "test/data",
+                                                    :hosts => ["http://assets1/"])
+      merger << File.expand_path("path_test2.css")
+
+      Juicer::Merger::StylesheetMerger.publicize_methods do
+        merger.instance_eval do
+          @root = Pathname.new(File.expand_path("test/data/css"))
+        end
+
+        expected = "data:image/png;base64,ERJW"
+        assert_equal expected, merger.resolve_path("data:image/png;base64,ERJW", "test/data/css")
+      end
+    end
 
     should "cycle hosts for relative urls" do
       merger = Juicer::Merger::StylesheetMerger.new([],

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Christian Johansen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-29 00:00:00 +02:00
+date: 2010-08-23 00:00:00 +02:00
 default_executable: juicer
 dependencies: 
 - !ruby/object:Gem::Dependency