juicer 0.2.1 → 0.2.3

data/History.txt

@@ -1,9 +1,13 @@
-== 0.2.0 / 2009-xx-xx
+== 0.2.3 / 2009-03-03
 
-* Refactored the minifyers execute method from compress to save
-* Refactored Juicer::Merger::FileMerger -> Juicer::Merger::Base
-* Refactored the mergers and minifyers to be chainable commands.
-* Added Chainable module
+* Cache busters in CSS files should only be appended once to each URL
+* Output to merge target should accept directories as well as files (in case of
+  directories, file name is generated)
+* Tests should not ship with 3rd party libraries
+
+== 0.2.0 / 2009-02-25
+
+* First usable release; merge, verify, install targets
 
 == 0.1.0 / 2008-12-17
 

data/Rakefile

@@ -4,10 +4,13 @@
 
 begin
   require 'bones'
-  load 'tasks/test/setup.rake'
   Bones.setup
 rescue LoadError
-  load 'tasks/setup.rb'
+  begin
+    load 'tasks/setup.rb'
+  rescue LoadError
+    raise RuntimeError, '### please install the "bones" gem ###'
+  end
 end
 
 ensure_in_path 'lib'

data/Readme.rdoc

@@ -106,6 +106,7 @@ installed and the java executable available on your path.
 
   $ gem install juicer
   $ juicer install yui_compressor
+  $ juicer install jslint
 
 You need Java installed and available on your PATH. During gem installation,
 Juicer will download and install YUI Compressor, JsLint and Rhino for you.

data/lib/juicer.rb

@@ -3,7 +3,7 @@ require "logger"
 module Juicer
 
   # :stopdoc:
-  VERSION = '0.2.1'
+  VERSION = '0.2.3'
   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

@@ -16,19 +16,19 @@ module Juicer
         super('merge', false, true)
         @types = { :js => Juicer::Merger::JavaScriptMerger,
                    :css => Juicer::Merger::StylesheetMerger }
-        @output = nil                # File to write to
-        @force = false               # Overwrite existing file if true
-        @type = nil                  # "css" or "js" - for minifyer
-        @minifyer = "yui_compressor" # Which minifyer to use
-        @opts = {}                   # Path to minifyer binary
-        @arguments = nil             # Minifyer arguments
-        @ignore = false              # Ignore syntax problems if true
-        @cache_buster = :soft        # What kind of cache buster to use, :soft or :hard
-        @hosts = nil                 # Hosts to use when replacing URLs in stylesheets
-        @web_root = nil              # Used to understand absolute paths
-        @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
+        @output = nil                   # File to write to
+        @force = false                  # Overwrite existing file if true
+        @type = nil                     # "css" or "js" - for minifyer
+        @minifyer = "yui_compressor"    # Which minifyer to use
+        @opts = {}                      # Path to minifyer binary
+        @arguments = nil                # Minifyer arguments
+        @ignore = false                 # Ignore syntax problems if true
+        @cache_buster = :soft           # What kind of cache buster to use, :soft or :hard
+        @hosts = nil                    # Hosts to use when replacing URLs in stylesheets
+        @web_root = nil                 # Used to understand absolute paths
+        @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
 
         @log = log || Logger.new(STDOUT)
 
@@ -178,7 +178,9 @@ the YUI Compressor the path should be the path to where the jar file is found.
       # name on. It will prepend the original suffix with ".min"
       #
       def output(file = "#{Time.now.to_i}.tmp")
-        @output || file.sub(/\.([^\.]+)$/, '.min.\1')
+        @output = File.dirname(file) if @output.nil?
+        @output = File.join(@output, File.basename(file).sub(/\.([^\.]+)$/, '.min.\1')) if File.directory?(@output)
+        @output = File.expand_path(@output)
       end
     end
   end

data/lib/juicer/css_cache_buster.rb

@@ -36,11 +36,14 @@ module Juicer
     #
     def save(file, output = nil)
       @contents = File.read(file)
+      used = []
 
       urls(file).each do |url|
         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))
         end

data/test/juicer/command/test_merge.rb

@@ -55,7 +55,7 @@ class TestMergeCommand < Test::Unit::TestCase
 
   def test_output_name_from_file_should_have_suffix_prepended_with_min
     Juicer::Command::Merge.publicize_methods do
-      assert_equal "test.min.js", @merge.output("test.js")
+      assert_equal File.expand_path("test.min.js"), @merge.output("test.js")
     end
   end
 
@@ -68,8 +68,15 @@ class TestMergeCommand < Test::Unit::TestCase
   def test_output_name_instance_value
     Juicer::Command::Merge.publicize_methods do
       @merge.instance_eval { @output = "output.css" }
-      assert_equal "output.css", @merge.output
-      assert_equal "output.css", @merge.output("bleh.css")
+      assert_equal File.expand_path("output.css"), @merge.output
+      assert_equal File.expand_path("output.css"), @merge.output("bleh.css")
+    end
+  end
+
+  def test_output_name_should_be_generated_when_output_is_directory
+    Juicer::Command::Merge.publicize_methods do
+      @merge.instance_eval { @output = path("css") }
+      assert_equal File.join(path("css"), "file.min.css"), @merge.output("file.css")
     end
   end
 
@@ -115,10 +122,10 @@ class TestMergeCommand < Test::Unit::TestCase
   end
 
   def test_update_output_when_force
-   assert_nothing_raised do
-     @merge.instance_eval { @force = true }
-     @merge.execute(path("a.css"))
-   end
+    assert_nothing_raised do
+      @merge.instance_eval { @force = true }
+      @merge.execute(path("a.css"))
+    end
   end
 
   def test_merge_successful
@@ -150,6 +157,4 @@ class TestMergeCommand < Test::Unit::TestCase
       assert_match(/Ignoring detected problems/, @io.string)
     end
   end
-
-
 end

data/test/juicer/test_css_cache_buster.rb

@@ -69,4 +69,14 @@ class TestCssCacheBuster < Test::Unit::TestCase
       assert_match(/[^\?]*\?jcb=\d+/, path.first)
     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 :web_root => path("")
+    buster.save file, output
+
+    buster.urls(output).each { |url| assert url !~ /(jcb=\d+).*(jcb=\d+)/, url }
+  end
 end

metadata

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