juicer 0.2.3 → 0.2.4

data/History.txt

@@ -1,3 +1,11 @@
+== 0.2.4 / 2009-04-29
+
+* More robust pattern checking for url() references in CSS files
+* Allow skipping verification
+* Bug fix: Skip cache buster if type=none
+* Bug fix: Quote JsLint command parts to allow for spaces in jar file paths
+* Bug fix: cache buster type wasn't carried all the way (ie had no effect)
+
 == 0.2.3 / 2009-03-03
 
 * Cache busters in CSS files should only be appended once to each URL

data/Rakefile

@@ -15,6 +15,7 @@ end
 
 ensure_in_path 'lib'
 require 'juicer'
+load 'tasks/test/setup.rake'
 
 task :default => 'test:run'
 

data/lib/juicer.rb

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

data/lib/juicer/command/merge.rb

@@ -29,6 +29,7 @@ module Juicer
         @relative_urls = false          # Make the merger use relative URLs
         @absolute_urls = false          # Make the merger use absolute URLs
         @local_hosts = []               # Host names that are served from :web_root
+        @verify = true                  # Verify js files with JsLint
 
         @log = log || Logger.new(STDOUT)
 
@@ -57,6 +58,7 @@ the YUI Compressor the path should be the path to where the jar file is found.
           opt.on("-f", "--force", "Force overwrite of target file") { @force = true }
           opt.on("-a", "--arguments arguments", "Arguments to minifyer, escape with quotes") { |arguments| @arguments = arguments }
           opt.on("-i", "--ignore-problems", "Merge and minify even if verifyer finds problems") { @ignore = true }
+          opt.on("-s", "--skip-verification", "Skip JsLint verification (js files only). Not recomended!") { @verify = false }
           opt.on("-t", "--type type", "Juicer can only guess type when files have .css or .js extensions. Specify js or\n" +
                            (" " * 37) + "css with this option in cases where files have other extensions.") { |type| @type = type.to_sym }
           opt.on("-h", "--hosts hosts", "Cycle asset hosts for referenced urls. Comma separated") { |hosts| @hosts = hosts.split(",") }
@@ -103,7 +105,7 @@ the YUI Compressor the path should be the path to where the jar file is found.
                                            :hosts => @hosts)
 
         # Fail if syntax trouble (js only)
-        if !Juicer::Command::Verify.check_all(merger.files.reject { |f| f =~ /\.css$/ }, @log)
+        if @verify && !Juicer::Command::Verify.check_all(merger.files.reject { |f| f =~ /\.css$/ }, @log)
           @log.error "Problems were detected during verification"
           raise SystemExit.new("Input files contain problems") unless @ignore
           @log.warn "Ignoring detected problems"
@@ -169,7 +171,7 @@ the YUI Compressor the path should be the path to where the jar file is found.
       # Load cache buster, only available for CSS files
       #
       def cache_buster(file)
-        return nil if !file || file !~ /\.css$/
+        return nil if !file || file !~ /\.css$/ || @cache_buster.nil?
         Juicer::CssCacheBuster.new(:web_root => @web_root, :type => @cache_buster, :hosts => @local_hosts)
       end
 

data/lib/juicer/core.rb

@@ -31,8 +31,10 @@ class String
   #
   # Turn a camelcase string into underscore string
   #
-  def underscore
-    self.split(/([A-Z][^A-Z]*)/).find_all { |str| str != "" }.join("_").downcase
+  unless String.method_defined?(:underscore)
+    def underscore
+      self.split(/([A-Z][^A-Z]*)/).find_all { |str| str != "" }.join("_").downcase
+    end
   end
 end
 

data/lib/juicer/css_cache_buster.rb

@@ -39,13 +39,17 @@ module Juicer
       used = []
 
       urls(file).each do |url|
-        path = resolve(url, file)
-        next if used.include?(path)
+        begin
+          path = resolve(url, file)
+          next if used.include?(path)
 
-        if path != url
-          used << path
-          basename = File.basename(Juicer::CacheBuster.path(path))
-          @contents.sub!(url, File.join(File.dirname(url), basename))
+          if path != url
+            used << path
+            basename = File.basename(Juicer::CacheBuster.path(path, @type))
+            @contents.gsub!(url, File.join(File.dirname(url), basename))
+          end
+        rescue Errno::ENOENT
+          puts "Unable to locate file #{path || url}, skipping"
         end
       end
 
@@ -62,7 +66,7 @@ module Juicer
     def urls(file)
       @contents = File.read(file) unless @contents
 
-      @contents.scan(/url\(([^\)]*)\)/m).collect do |match|
+      @contents.scan(/url\([\s"']*([^\)"'\s]*)[\s"']*\)/m).collect do |match|
         match.first
       end
     end

data/lib/juicer/jslint.rb

@@ -32,7 +32,7 @@ module Juicer
       raise FileNotFoundError.new("Unable to locate JsLint '#{js_file}'") if !js_file || !File.exists?(js_file)
       raise FileNotFoundError.new("Unable to locate input file '#{file}'") unless File.exists?(file)
 
-      lines = execute(%Q{-jar #{rhino} #{locate_lib} "#{file}"}).split("\n")
+      lines = execute(%Q{-jar "#{rhino}" "#{locate_lib}" "#{file}"}).split("\n")
       return Report.new if lines.length == 1 && lines[0] =~ /jslint: No problems/
 
       report = Report.new

data/test/juicer/test_css_cache_buster.rb

@@ -79,4 +79,13 @@ class TestCssCacheBuster < Test::Unit::TestCase
 
     buster.urls(output).each { |url| assert url !~ /(jcb=\d+).*(jcb=\d+)/, url }
   end
+
+  def test_type_hard_should_produce_hard_buster_urls
+    File.open(path("a2.css"), "w") { |f| f.puts "" }
+    file = path("path_test2.css")
+    output = path("path_test3.css")
+    buster = Juicer::CssCacheBuster.new :web_root => path(""), :type => :hard
+    buster.save file, output
+    buster.urls(output).each { |url| assert url =~ /-\d+\.[a-z]{3}/, url }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: juicer
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Christian Johansen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-01 00:00:00 +01:00
+date: 2009-05-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency