juicer 1.0.1 → 1.0.2

data/History.txt

@@ -1,7 +1,11 @@
+== 1.0.2 / 2010-03-19
+* Don't add multiple cache busters
+
 == 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
+* Don't attempt to cache bust data urls (contributed by
+  http://github.com/psyho/juicer)
 
 == 1.0.0 / 2010-02-24
 * Make sure @import rules with url is removed when files are merged

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/juicer.rb

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

data/lib/juicer/css_cache_buster.rb

@@ -44,6 +44,7 @@ module Juicer
         begin
           next if used.include?(asset.path)
           @contents.gsub!(asset.path, asset.path(:cache_buster_type => @type))
+          used.push(asset.path)
         rescue Errno::ENOENT
           puts "Unable to locate file #{asset.path}, skipping cache buster"
         rescue ArgumentError => e

data/test/data/css/test.css

@@ -9,3 +9,7 @@ h1 {
 h2 {
    background: url(2.gif) no-repeat;
 }
+
+p {
+   background: url(2.gif) no-repeat;
+}

data/test/test_helper.rb

@@ -117,6 +117,10 @@ h1 {
 h2 {
    background: url(2.gif) no-repeat;
 }
+
+p {
+   background: url(2.gif) no-repeat;
+}
         CSS
 
         mkfile(css_dir, 'test.css', css)

data/test/unit/juicer/css_cache_buster_test.rb

@@ -14,8 +14,8 @@ class TestCssCacheBuster < Test::Unit::TestCase
   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("/"), "")
+      assert_equal 4, urls.length
+      assert_equal "../a1.css../images/1.png2.gif2.gif", urls.collect { |a| a.path }.sort.join.gsub(path("/"), "")
     end
   end
 
@@ -29,6 +29,14 @@ class TestCssCacheBuster < Test::Unit::TestCase
         assert_match(/[^\?]*\?jcb=\d+/, path.first)
       end
     end
+
+    should "not add multiple cache busters" do
+      file = path("css/test.css")
+      buster = Juicer::CssCacheBuster.new
+      buster.save file
+
+      assert_no_match /2\.gif\?jcb=\d+\?jcb=/, File.read(file)
+    end
   end
 
   context "absolute paths" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: juicer
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Christian Johansen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 +01:00
+date: 2010-03-19 00:00:00 +01:00
 default_executable: juicer
 dependencies: 
 - !ruby/object:Gem::Dependency