cjohansen-juicer 0.2.0 → 0.2.4

data/lib/juicer/minifyer/yui_compressor.rb

@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
 require 'tempfile'
-require File.expand_path(File.join(File.dirname(__FILE__), 'compressor')) unless defined?(Juicer::Minifyer::Compressor)
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'binary')) unless defined?(Juicer::Shell::Binary)
 
 module Juicer
   module Minifyer
 
     # Provides an interface to the YUI compressor library using
-    # Juicer::Minify::Compressor. The YUI compressor library is implemented
+    # Juicer::Shell::Binary. The YUI compressor library is implemented
     # using Java, and as such Java is required when running this code. Also, the
     # YUI jar file has to be provided.
     #
@@ -28,14 +28,23 @@ module Juicer
     # License::   MIT
     #
     # = Usage example =
-    # yuic = Juicer::Minifyer::YuiCompressor.new({ :bin_path => '/home/user/java/yui/' })
-    # yuic.compress('lib.js', 'lib.compressed.js')
+    # yuic = Juicer::Minifyer::YuiCompressor.new
+    # yuic.java = "/usr/local/bin/java" # If 'java' is not on path
+    # yuic.path << "/home/user/java/yui_compressor/"
+    # yuic.save("", "")
     #
-    class YuiCompressor < Compressor
+    #
+    class YuiCompressor
+      include Juicer::Binary
+      include Juicer::Chainable
+
       def initialize(options = {})
-        super
+        bin = options.delete(:java) || "java"
+        bin_path = options.delete(:bin_path) || nil
         @jar = nil
-        @command = nil
+
+        super(bin, options)
+        path << bin_path if bin_path
       end
 
       # Compresses a file using the YUI Compressor. Note that the :bin_path
@@ -50,16 +59,13 @@ module Juicer
       #        is guessed from the suffix on the input file name
       def save(file, output = nil, type = nil)
         type = type.nil? ? file.split('.')[-1].to_sym : type
-        cmd = @command = @command.nil? || @opt_set || type != @type ? command(type) : @command
 
         output ||= file
         use_tmp = !output.is_a?(String)
         output = File.join(Dir::tmpdir, File.basename(file) + '.min.tmp.' + type.to_s) if use_tmp
         FileUtils.mkdir_p(File.dirname(output))
 
-        cmd += ' -o "' + output + '" "' + file + '"'
-        compressor = IO.popen(cmd, 'r')
-        result = compressor.gets
+        result = execute(%Q{-jar "#{locate_jar}" -o "#{output}" "#{file}"})
 
         if use_tmp                            # If no output file is provided, YUI compressor will
           output.puts IO.read(output)         # compress to a temp file. This file should be cleared
@@ -70,22 +76,6 @@ module Juicer
       chain_method :save
 
      private
-      # Constructs the command to use
-      def command(type)
-        @opt_set = false
-        @type = type
-        @jar = locate_jar unless @jar
-        raise 'Unable to locate YUI Compressor Jar' if @jar.nil?
-        cmd = "#{@options[:java]} -jar #{@jar} --type #{@type}"
-
-        @options.each do |k, v|
-          v = '' if v == true
-          v = " #{v}" unless v == '' || v.nil?
-          cmd += " --#{k.to_s.gsub('_', '-')}#{v}" unless v.nil? || [:bin_path, :java].include?(k)
-        end
-
-        return cmd
-      end
 
       # Returns a map of options accepted by YUI Compressor, currently:
       #
@@ -100,8 +90,7 @@ module Juicer
       # :java     (Java command, defaults to 'java')
       def default_options
         { :charset => nil, :line_break => nil, :no_munge => nil,
-          :preserve_semi => nil, :preserve_strings => nil,
-          :bin_path => nil, :java => 'java' }
+          :preserve_semi => nil, :preserve_strings => nil }
       end
 
       # Locates the Jar file by searching directories.
@@ -117,20 +106,8 @@ module Juicer
       # This means that higher version numbers will be preferred with the default
       # naming for the YUI Compressor Jars
       def locate_jar
-        paths = @options[:bin_path].nil? ? [] : [@options[:bin_path]]
-        jar = nil
-
-        if ENV.key?('YUIC_HOME') && File.exist?(ENV['YUIC_HOME'])
-          paths << ENV['YUIC_HOME']
-        end
-
-        (paths << Dir.pwd).each do |path|
-          files = Dir.glob(File.join(path, 'yuicompressor*.jar'))
-          jar = files.sort.last unless files.empty?
-          break unless jar.nil?
-        end
-
-        jar.nil? ? nil : File.expand_path(jar)
+        files = locate("yuicompressor*.jar", "YUIC_HOME")
+        !files || files.empty? ? nil : files.sort.last
       end
     end
 

data/tasks/test/setup.rake

@@ -0,0 +1,35 @@
+require 'fileutils'
+require 'open-uri'
+
+namespace :test do
+  desc "Download third party libraries needed to successfully run tests"
+  task :setup do
+    root = File.join(File.dirname(__FILE__), "../../test/bin")
+    yui242 = File.join(root, "yuicompressor-2.4.2.zip")
+    jslint = File.join(root, "jslint.js")
+    rhino = File.join(root, "rhino1_7R2-RC1.zip")
+
+    download("http://www.julienlecomte.net/yuicompressor/yuicompressor-2.4.2.zip")
+    FileUtils.cp(File.join(root, "yuicompressor-2.4.2.zip"), File.join(root, "yuicompressor-2.3.5.zip"))
+    download("http://www.jslint.com/rhino/jslint.js")
+    download("ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R1.zip")
+    download("ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R2-RC1.zip")
+    download("http://www.julienlecomte.net/yuicompressor/")
+  end
+end
+
+def download(url)
+  filename = File.expand_path(File.join(File.dirname(__FILE__), "../../test/bin", File.basename(url)))
+  return filename if File.exists?(filename)
+
+  puts "Downloading #{url} to #{filename}"
+  FileUtils.mkdir_p(File.dirname(filename))
+
+  File.open(filename, "wb") do |file|
+    webpage = open(url)
+    file.write(webpage.read)
+    webpage.close
+  end
+
+  filename
+end

data/test/juicer/command/test_install.rb

@@ -0,0 +1,53 @@
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. test_helper])) unless defined?(Juicer)
+
+class TestInstallCommand < Test::Unit::TestCase
+
+  def setup
+    @io = StringIO.new
+    @command = Juicer::Command::Install.new(Logger.new(@io))
+    FileUtils.rm_rf(path(".juicer/lib")) if File.exists?(path(".juicer/lib"))
+  end
+
+  def test_default_version_should_bring_up_latest_from_installer
+    assert_equal "1.0", @command.version(Juicer::Install::JSLintInstaller.new)
+  end
+
+  def test_explicit_version_should_not_be_overridden
+    @command.instance_eval { @version = "1.0.1" }
+    assert_equal "1.0.1", @command.version(Juicer::Install::JSLintInstaller.new)
+  end
+
+  def test_execute_should_require_atleast_one_argument
+    assert_raise ArgumentError do
+      @command.execute
+    end
+  end
+
+  def test_install_single_lib
+    installer = Juicer::Install::JSLintInstaller.new(path(".juicer"))
+    assert !installer.installed?
+
+    @command.instance_eval { @path = path(".juicer") }
+    @command.execute("jslint")
+    assert installer.installed?
+  end
+
+  def test_install_already_installed_lib
+    installer = Juicer::Install::JSLintInstaller.new(path(".juicer"))
+    installer.install
+    assert installer.installed?
+
+    @command.execute("jslint")
+    assert_match(/is already installed in/, @io.string)
+  end
+
+  def test_install_specific_version
+    installer = Juicer::Install::JSLintInstaller.new(path(".juicer"))
+    assert !installer.installed?("0.9")
+
+    @command.instance_eval { @path = path(".juicer") }
+    @command.instance_eval { @version = "0.9" }
+    @command.execute("jslint")
+    assert installer.installed?("0.9")
+  end
+end

data/test/juicer/command/test_list.rb

@@ -0,0 +1,69 @@
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. test_helper])) unless defined?(Juicer)
+
+class TestListCommand < Test::Unit::TestCase
+
+  def setup
+    @io = StringIO.new
+    @command = Juicer::Command::List.new(@io)
+    Juicer::Test::FileSetup.new.create
+  end
+
+  def test_list_nothing
+    assert_raise ArgumentError do
+      @command.execute
+    end
+
+    assert_raise ArgumentError do
+      @command.execute []
+    end
+  end
+
+  def test_list_css_file
+    @command.execute "test/data/a.css"
+
+    msg = <<-STDOUT
+Dependency chain for test/data/a.css:
+  test/data/b.css
+  test/data/a.css
+
+    STDOUT
+
+    assert_equal msg, @io.string
+  end
+
+  def test_list_js_file
+    @command.execute "test/data/a.js"
+
+    msg = <<-STDOUT
+Dependency chain for test/data/a.js:
+  test/data/b.js
+  test/data/a.js
+
+    STDOUT
+
+    assert_equal msg, @io.string
+  end
+
+  def test_list_several_files
+    @command.execute ["test/data/a.js", "test/data/b.js"]
+
+    msg = <<-STDOUT
+Dependency chain for test/data/a.js:
+  test/data/b.js
+  test/data/a.js
+
+Dependency chain for test/data/b.js:
+  test/data/a.js
+  test/data/b.js
+
+    STDOUT
+
+    assert_equal msg, @io.string
+  end
+
+  def test_list_files_unable_to_guess_type
+    assert_raise FileNotFoundError do
+      @command.execute("test/data/*.txt")
+    end
+  end
+end

data/test/juicer/command/test_merge.rb

@@ -0,0 +1,160 @@
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. test_helper])) unless defined?(Juicer)
+
+class TestMergeCommand < Test::Unit::TestCase
+
+  def setup
+    @io = StringIO.new
+    @merge = Juicer::Command::Merge.new(Logger.new(@io))
+
+    Juicer::Test::FileSetup.new.create
+
+    ["a.min.css", "not-ok.min.js"].each { |f| File.delete(path(f)) if File.exists?(path(f)) }
+
+    Juicer.home = path(".juicer")
+    installer = Juicer::Install::YuiCompressorInstaller.new(Juicer.home)
+    installer.install("2.4.2") unless installer.installed?("2.4.2")
+
+    installer = Juicer::Install::JSLintInstaller.new(Juicer.home)
+    installer.install unless installer.installed?
+  end
+
+  def test_get_minifier_from_nil_minifyer
+    @merge.instance_eval { @minifyer = nil }
+
+    Juicer::Command::Merge.publicize_methods do
+      assert_nil @merge.minifyer
+    end
+  end
+
+  def test_get_minifier_from_empty_minifyer
+    @merge.instance_eval { @minifyer = "" }
+
+    Juicer::Command::Merge.publicize_methods do
+      assert_nil @merge.minifyer
+    end
+  end
+
+  def test_get_minifier_from_none_minifyer
+    Juicer::Command::Merge.publicize_methods do
+      @merge.instance_eval { @minifyer = "none" }
+      assert_nil @merge.minifyer
+
+      @merge.instance_eval { @minifyer = "None" }
+      assert_nil @merge.minifyer
+
+      @merge.instance_eval { @minifyer = "NONE" }
+      assert_nil @merge.minifyer
+    end
+  end
+
+  def test_get_minifyer
+    Juicer::Command::Merge.publicize_methods do
+      assert @merge.minifyer.class == Juicer::Minifyer::YuiCompressor
+    end
+  end
+
+  def test_output_name_from_file_should_have_suffix_prepended_with_min
+    Juicer::Command::Merge.publicize_methods do
+      assert_equal File.expand_path("test.min.js"), @merge.output("test.js")
+    end
+  end
+
+  def test_output_name_from_nothing_should_be_timestamp
+    Juicer::Command::Merge.publicize_methods do
+      assert_match(/\d{10}\.min\.tmp/, @merge.output)
+    end
+  end
+
+  def test_output_name_instance_value
+    Juicer::Command::Merge.publicize_methods do
+      @merge.instance_eval { @output = "output.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
+
+  def test_merger_from_valid_type
+    Juicer::Command::Merge.publicize_methods do
+      assert_equal Juicer::Merger::JavaScriptMerger, @merge.merger("bleh.js")
+    end
+  end
+
+  def test_merger_from_invalid_type
+    Juicer::Command::Merge.publicize_methods do
+      assert_equal Juicer::Merger::JavaScriptMerger, @merge.merger("bleh.txt")
+      assert_match(/Unknown type 'txt', defaulting to 'js'/, @io.string)
+    end
+  end
+
+  def test_merger_from_preset_type
+    Juicer::Command::Merge.publicize_methods do
+      @merge.instance_eval { @type = "css" }
+      assert_equal Juicer::Merger::StylesheetMerger, @merge.merger
+      assert_equal Juicer::Merger::StylesheetMerger, @merge.merger("bleh.txt")
+    end
+  end
+
+  def test_merge_without_input
+    assert_raise SystemExit do
+      @merge.execute([])
+    end
+  end
+
+  def test_merge_with_bogus_input
+    assert_raise SystemExit do
+      @merge.execute(["*.css", "bleh/*.js"])
+    end
+  end
+
+  def test_unable_to_merge_on_existing_file
+    assert_raise SystemExit do
+      @merge.instance_eval { @output = path("a.css") }
+      @merge.execute(path("a.css"))
+      assert_match(/Run again with --force to overwrite/, @io.string)
+    end
+  end
+
+  def test_update_output_when_force
+    assert_nothing_raised do
+      @merge.instance_eval { @force = true }
+      @merge.execute(path("a.css"))
+    end
+  end
+
+  def test_merge_successful
+    begin
+      @merge.instance_eval { @output = path("a.min.css") }
+      assert @merge.execute(path("a1.css"))
+      assert_equal "h2{font-size:10px;}html{background:red;}h1{font-size:12px;}body{width:800px;}", IO.read(path("a.min.css"))
+    rescue Test::Unit::AssertionFailedError => err
+      raise err
+    rescue Exception => err
+      puts err.message
+    end
+  end
+
+  def test_fail_when_syntax_no_good
+    assert_raise SystemExit do
+      @merge.execute(path("not-ok.js"))
+      assert_match(/Problems were detected during verification/, @io.string)
+      assert_no_match(/Ignoring detected problems/, @io.string)
+    end
+  end
+
+  def test_ignore_problems
+    @merge.instance_eval { @ignore = true }
+
+    assert_nothing_raised do
+      @merge.execute(path("not-ok.js"))
+      assert_match(/Problems were detected during verification/, @io.string)
+      assert_match(/Ignoring detected problems/, @io.string)
+    end
+  end
+end

data/test/juicer/command/test_util.rb

@@ -0,0 +1,54 @@
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. test_helper])) unless defined?(Juicer)
+
+class Dummy
+  include Juicer::Command::Util
+end
+
+class TestCommandUtil < Test::Unit::TestCase
+
+  def setup
+    @impl = Dummy.new
+    Juicer::Test::FileSetup.new.create
+    Dir.glob("test/data/*.min.css").each { |file| File.delete(file) }
+  end
+
+  def test_files_from_single_file
+    files = @impl.files("test/data/a.css")
+    assert files.is_a?(Array)
+    assert_equal "test/data/a.css", files.sort.join
+  end
+
+  def test_files_from_single_glob_pattern
+    files = @impl.files("test/data/*.css")
+    assert files.is_a?(Array)
+    assert_equal %w{a.css a1.css b.css b1.css c1.css d1.css path_test.css path_test2.css}.collect { |f| "test/data/#{f}" }.join, files.sort.join
+  end
+
+  def test_files_from_mixed_arguments
+    files = @impl.files("test/data/*.css", "test/data/a.js")
+    assert files.is_a?(Array)
+    assert_equal %w{a.css a.js a1.css b.css b1.css c1.css d1.css path_test.css path_test2.css}.collect { |f| "test/data/#{f}" }.join, files.sort.join
+  end
+
+  def test_files_from_array
+    files = @impl.files(["test/data/*.css", "test/data/a.js"])
+    assert files.is_a?(Array)
+    assert_equal %w{a.css a.js a1.css b.css b1.css c1.css d1.css path_test.css path_test2.css}.collect { |f| "test/data/#{f}" }.join, files.sort.join
+  end
+
+  def test_relative_path_single_file
+    assert_equal "test/data/a.css", @impl.relative("test/data/a.css")
+  end
+
+  def test_relative_path_many_files
+    files = @impl.relative(Dir.glob("test/data/*.css"))
+    assert files.is_a?(Array)
+    assert_equal %w{a.css a1.css b.css b1.css c1.css d1.css path_test.css path_test2.css}.collect { |f| "test/data/#{f}" }.join, files.sort.join
+  end
+
+  def test_relative_path_many_files_explicit_reference
+    files = @impl.relative(Dir.glob("test/data/*.css"), "lib")
+    assert files.is_a?(Array)
+    assert_equal %w{a.css a1.css b.css b1.css c1.css d1.css path_test.css path_test2.css}.collect { |f| "../test/data/#{f}" }.join, files.sort.join
+  end
+end