juicer 1.0.5 → 1.0.6

data/History.txt

@@ -1,3 +1,7 @@
+== 1.0.6 / 2010-06-29
+* Fix bug where image embedding could not see the document root,
+  resulting in missing images (Jakub Pawlowicz)
+
 == 1.0.5 / 2010-06-06
 * No more Regexp warnings on Ruby 1.9.1
 * Cycle hosts for relative paths

data/Readme.rdoc

@@ -9,6 +9,7 @@ Christian Johansen (http://www.cjohansen.no) and contributors:
 * Daniel Stockman (http://evocateur.org/)
 * Aaron Suggs (http://ktheory.com)
 * Olle Jonsson (http://ollehost.dk/blog/)
+* Jakub Pawlowicz (http://blog.jakubpawlowicz.com)
 
 == DESCRIPTION:
 
@@ -295,6 +296,8 @@ Will tell you about other dependencies that might be missing on your system.
 * Elliott Wood (http://two-fish.com)
   Added "rails" cache buster type
   Fixed issues with asset host cycling
+* Jakub Pawlowicz (http://blog.jakubpawlowicz.com)
+  Fixed issue with embedding images that weren't found
 
 == LICENSE:
 

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

data/lib/juicer/command/merge.rb

@@ -193,7 +193,7 @@ the compressor the path should be the path to where the jar file is found.
 			# 
 			def image_embed(file)
         return nil if !file || file !~ /\.css$/ || @image_embed_type.nil?
-        Juicer::ImageEmbed.new( :type => @image_embed_type )
+        Juicer::ImageEmbed.new(:document_root => @document_root, :type => @image_embed_type )
 			end
 
       #

data/lib/juicer/image_embed.rb

@@ -62,13 +62,13 @@ module Juicer
         begin
           next if used.include?(asset) || duplicates.include?(asset.path)
           used << asset
-
+          
           # make sure we do not exceed SIZE_LIMIT
           new_path = embed_data_uri(asset.filename)
 
           if new_path.length < SIZE_LIMIT
             # replace the url in the css file with the data uri
-            @contents.gsub!(asset.path, embed_data_uri(asset.path))
+            @contents.gsub!(asset.path, embed_data_uri(asset.filename)) if asset.filename.match( /\?embed=true$/ )
           else
             Juicer::LOGGER.warn("The final data uri for the image located at #{asset.path.gsub('?embed=true', '')} exceeds #{SIZE_LIMIT} and will not be embedded to maintain compatability.") 
           end
@@ -86,25 +86,23 @@ module Juicer
     def embed_data_uri( path )
       new_path = path
       
-      if path.match( /\?embed=true$/ )
-        supported_file_matches = path.match( /(?:\.)(png|gif|jpg|jpeg)(?:\?embed=true)$/i )
-        filetype = supported_file_matches[1] if supported_file_matches
+      supported_file_matches = path.match( /(?:\.)(png|gif|jpg|jpeg)(?:\?embed=true)$/i )
+      filetype = supported_file_matches[1] if supported_file_matches
+      
+      if ( filetype )        
+        filename = path.gsub('?embed=true','')      
         
-        if ( filetype )        
-          filename = path.gsub('?embed=true','')      
-
-          # check if file exists, throw an error if it doesn't exist
-          if File.exist?( filename )
-            
-            # read contents of file into memory              
-            content = File.read( filename )
-            content_type = "image/#{filetype}"
-            
-            # encode the url
-            new_path = Datafy::make_data_uri( content, content_type )
-          else
-            puts "Unable to locate file #{filename} on local file system, skipping image embedding"
-          end
+        # check if file exists, throw an error if it doesn't exist
+        if File.exist?( filename )
+          
+          # read contents of file into memory              
+          content = File.read( filename )
+          content_type = "image/#{filetype}"
+          
+          # encode the url
+          new_path = Datafy::make_data_uri( content, content_type )
+        else
+          puts "Unable to locate file #{filename} on local file system, skipping image embedding"
         end
       end
       return new_path

data/lib/juicer.rb

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

data/test/unit/juicer/image_embed_test.rb

@@ -73,6 +73,41 @@ class TestImageEmbed < Test::Unit::TestCase
         end
       end
 
+      context "non empty document root" do
+        setup do
+          @document_root = '/path/to/public/dir'
+          @another_embedder = Juicer::ImageEmbed.new(:type => :data_uri, :document_root => @document_root)
+          @files = [{ :path => "#{@document_root}/images/custom-file.png", :filename => '/images/custom-file.png', :content => "hello png!" }]
+          create_files(@files)
+        end
+        
+        should "embed urls with embedder" do
+          stylesheets = [{ :path => "#{@document_root}/stylesheets/test_absolute_path.css", :content => "body: { background: url(#{@files.first[:filename]}?embed=true); }" }]
+          create_files(stylesheets)
+          
+          @another_embedder.save stylesheets.first[:path]
+          css_contents = File.read(stylesheets.first[:path])
+
+          # encode the image
+          image_contents = File.read(@files.first[:path])
+          data_uri = Datafy::make_data_uri(image_contents, 'image/png')
+
+          # make sure the encoded data_uri is present in the stylesheet
+          assert css_contents.include?(data_uri)
+        end
+        
+        should "not embed urls with embedder" do
+          stylesheets = [{ :path => "#{@document_root}/stylesheets/test_absolute_path.css", :content => "body: { background: url(#{@files.first[:filename]}?embed=false); }" }]
+          create_files(stylesheets)
+          
+          @another_embedder.save stylesheets.first[:path]
+          css_contents = File.read(stylesheets.first[:path])
+
+          # encode the image
+          assert css_contents.include?(@files.first[:filename])
+        end
+      end
+
       context "with duplicated urls" do
         setup do
           @stylesheets = [{

metadata

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