juicer 1.0.0 → 1.0.1

data/History.txt

@@ -1,3 +1,8 @@
+== 1.0.1 / 2010-03-03
+* Don't crash when trying to cache bust non-existent files, simply
+  skip them
+* Don't attempt to cache bust data urls
+
 == 1.0.0 / 2010-02-24
 * Make sure @import rules with url is removed when files are merged
 * Dependency resolver supports depending on directories

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/juicer.rb

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

data/lib/juicer/cache_buster.rb

@@ -79,6 +79,7 @@ module Juicer
     # argument.
     #
     def self.path(file, type = :soft, parameter = DEFAULT_PARAMETER)
+      return file if file =~ /data:.*;base64/
       file = self.clean(file, parameter)
       filename = file.split("?").first
       raise ArgumentError.new("#{file} could not be found") unless File.exists?(filename)

data/lib/juicer/css_cache_buster.rb

@@ -42,15 +42,15 @@ module Juicer
 
       urls(file).each do |asset|
         begin
-          next if used.include?(asset.path)          
+          next if used.include?(asset.path)
           @contents.gsub!(asset.path, asset.path(:cache_buster_type => @type))
         rescue Errno::ENOENT
           puts "Unable to locate file #{asset.path}, skipping cache buster"
         rescue ArgumentError => e
           if e.message =~ /No document root/
-            raise FileNotFoundError.new("Unable to resolve path #{asset.path} without :document_root option")
+            puts "Unable to resolve path #{asset.path} without :document_root option"
           else
-            raise e
+            puts "Unable to locate #{asset.path}, skipping cache buster"
           end
         end
       end

data/test/unit/juicer/css_cache_buster_test.rb

@@ -11,61 +11,83 @@ class TestCssCacheBuster < Test::Unit::TestCase
     Juicer::Test::FileSetup.new.create
   end
 
-  def test_find_urls
-    urls = @buster.urls(path("css/test.css"))
-    assert_equal 3, urls.length
-    assert_equal "../a1.css../images/1.png2.gif", urls.collect { |a| a.path }.sort.join.gsub(path("/"), "")
+  context "finding urls" do
+    should "find all urls" do
+      urls = @buster.urls(path("css/test.css"))
+      assert_equal 3, urls.length
+      assert_equal "../a1.css../images/1.png2.gif", urls.collect { |a| a.path }.sort.join.gsub(path("/"), "")
+    end
   end
 
-  def test_image_references_should_be_updated
-    file = path("css/test.css")
-    buster = Juicer::CssCacheBuster.new
-    buster.save file
+  context "image references" do
+    should "update image urls" do
+      file = path("css/test.css")
+      buster = Juicer::CssCacheBuster.new
+      buster.save file
 
-    File.read(file).scan(/url\(([^\)]*)\)/m).each do |path|
-      assert_match(/[^\?]*\?jcb=\d+/, path.first)
+      File.read(file).scan(/url\(([^\)]*)\)/m).each do |path|
+        assert_match(/[^\?]*\?jcb=\d+/, path.first)
+      end
     end
   end
 
-  def test_absolute_path_without_document_root_should_fail
-    file = path("css/test2.css")
-    buster = Juicer::CssCacheBuster.new
+  context "absolute paths" do
+    # should "fail without document root" do
+    #   file = path("css/test2.css")
+    #   buster = Juicer::CssCacheBuster.new
 
-    assert_raise FileNotFoundError do
-      buster.save file
-    end
-  end
+    #   assert_raise FileNotFoundError do
+    #     buster.save file
+    #   end
+    # end
 
-  def test_absolute_path_should_be_resolved_when_document_root_known
-    file = path("css/test.css")
-    buster = Juicer::CssCacheBuster.new :document_root => path("")
+    should "resolve with document root" do
+      file = path("css/test.css")
+      buster = Juicer::CssCacheBuster.new :document_root => path("")
 
-    assert_nothing_raised do
-      buster.save file
+      assert_nothing_raised do
+        buster.save file
+      end
+
+      File.read(file).scan(/url\(([^\)]*)\)/m).each do |path|
+        assert_match(/[^\?]*\?jcb=\d+/, path.first)
+      end
     end
+  end
+
+  context "cache busters" do
+    should "add mtime to urls" do
+      File.open(path("a2.css"), "w") { |f| f.puts "" }
+      file = path("path_test2.css")
+      output = path("path_test3.css")
+      buster = Juicer::CssCacheBuster.new :document_root => path("")
+      buster.save file, output
 
-    File.read(file).scan(/url\(([^\)]*)\)/m).each do |path|
-      assert_match(/[^\?]*\?jcb=\d+/, path.first)
+      buster.urls(output).each { |url| assert url !~ /(jcb=\d+).*(jcb=\d+)/, url }
     end
   end
 
-  def test_urls_should_only_have_mtime_appended_once
-    File.open(path("a2.css"), "w") { |f| f.puts "" }
-    file = path("path_test2.css")
-    output = path("path_test3.css")
-    buster = Juicer::CssCacheBuster.new :document_root => path("")
-    buster.save file, output
+  context "hard cache busters" do
+    should "should alter file name" do
+      File.open(path("a2.css"), "w") { |f| f.puts "" }
+      file = path("path_test2.css")
+      output = path("path_test3.css")
+      buster = Juicer::CssCacheBuster.new :document_root => path(""), :type => :hard
+      buster.save file, output
 
-    buster.urls(output).each { |url| assert url !~ /(jcb=\d+).*(jcb=\d+)/, url }
+      buster.urls(output).each { |asset| assert_match /-jcb\d+\.[a-z]{3}$/, asset.path }
+    end
   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 :document_root => path(""), :type => :hard
-    buster.save file, output
+  context "non-existent urls" do
+    should "not raise" do
+      File.open(path("a2.css"), "w") { |f| f.puts "a { background: url(i/dont/exist.fck); }" }
+      file = path("a2.css")
+      buster = Juicer::CssCacheBuster.new :document_root => path("")
 
-    buster.urls(output).each { |asset| assert_match /-jcb\d+\.[a-z]{3}$/, asset.path }
+      assert_nothing_raised do
+        buster.save file        
+      end
+    end
   end
 end

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: juicer
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Christian Johansen
@@ -14,115 +9,79 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-26 00:00:00 +01:00
+date: 2010-03-03 00:00:00 +01:00
 default_executable: juicer
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 10
-        - 2
         version: 2.10.2
-  type: :development
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: mocha
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 8
         version: 0.9.8
-  type: :development
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: fakefs
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 1
         version: 0.2.1
-  type: :development
-  version_requirements: *id003
+    version: 
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 1
-        version: 0.2.1
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: redgreen
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 2
-        version: 1.2.2
-  type: :development
-  version_requirements: *id005
+        version: 0.2.1
+    version: 
 - !ruby/object:Gem::Dependency 
   name: cmdparse
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id006
+    version: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id007
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rubyzip
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id008
+    version: 
 description: Resolve dependencies, merge and minify CSS and JavaScript files with Juicer - the command line tool for frontend engineers
 email: christian@cjohansen.no
 executables: 
@@ -251,20 +210,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: juicer
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Command line tool for CSS and JavaScript developers