cjohansen-juicer 0.2.0 → 0.2.4

data/test/juicer/merger/test_javascript_dependency_resolver.rb

@@ -4,8 +4,7 @@ class TestJavaScriptDependencyResolver < Test::Unit::TestCase
 
   def setup
     @resolver = Juicer::Merger::JavaScriptDependencyResolver.new
-    @file_setup = Juicer::Test::FileSetup.new($DATA_DIR)
-    @file_setup.create!
+    Juicer::Test::FileSetup.new.create
   end
 
   def test_init
@@ -13,24 +12,24 @@ class TestJavaScriptDependencyResolver < Test::Unit::TestCase
   end
 
   def test_resolve
-    b_file = File.expand_path(path('b.js'))
-    a_file = File.expand_path(path('a.js'))
+    b_file = path('b.js')
+    a_file = path('a.js')
 
-    files = @resolver.resolve(path('a.js')) do |file|
+    files = @resolver.resolve(a_file) do |file|
       assert b_file == file || a_file == file, file
       b_file != file
     end
 
     assert_equal [a_file], files
 
-    files = @resolver.resolve(path('a.js')) do |file|
+    files = @resolver.resolve(a_file) do |file|
       assert b_file == file || a_file == file
       true
     end
 
     assert_equal [a_file, b_file], files.sort
 
-    files = @resolver.resolve(path('b.js')) do |file|
+    files = @resolver.resolve(b_file) do |file|
       assert b_file == file || a_file == file
       true
     end

data/test/juicer/merger/test_javascript_merger.rb

@@ -4,8 +4,7 @@ class TestJavaScriptMerger < Test::Unit::TestCase
 
   def setup
     @file_merger = Juicer::Merger::JavaScriptMerger.new
-    @file_setup = Juicer::Test::FileSetup.new($DATA_DIR)
-    @file_setup.create!
+    Juicer::Test::FileSetup.new.create
   end
 
   def teardown

data/test/juicer/merger/test_stylesheet_merger.rb

@@ -4,8 +4,8 @@ class TestStylesheetMerger < Test::Unit::TestCase
 
   def setup
     @file_merger = Juicer::Merger::StylesheetMerger.new
-    @file_setup = Juicer::Test::FileSetup.new($DATA_DIR)
-    @file_setup.create!
+    Juicer::Test::FileSetup.new.create
+    Dir.chdir path("")
   end
 
   def teardown
@@ -59,4 +59,120 @@ EOF
 
     assert_equal merged, IO.read(output_file)
   end
+
+  def test_included_files_should_have_referenced_relative_urls_rereferenced
+    @file_merger << path("path_test.css")
+    ios = StringIO.new
+    @file_merger.save(ios)
+    files = ios.string.scan(/url\(([^\)]*)\)/).collect { |f| f.first }.uniq.sort
+
+    assert_equal "a1.css::css/2.gif::images/1.png", files.join("::")
+  end
+
+  def test_resolve_path_should_leave_absolute_urls
+    merger = Juicer::Merger::StylesheetMerger.new
+    url = "/some/url"
+
+    Juicer::Merger::StylesheetMerger.publicize_methods do
+      assert_equal url, merger.resolve_path(url, nil)
+    end
+  end
+
+  def test_resolve_path_error_when_relative_missing_web_root
+    merger = Juicer::Merger::StylesheetMerger.new [], :relative_urls => true
+
+    Juicer::Merger::StylesheetMerger.publicize_methods do
+      assert_raise ArgumentError do
+        merger.resolve_path("/some/url", nil)
+      end
+    end
+  end
+
+  def test_resolve_path_should_make_absolute_urls_relative
+    merger = Juicer::Merger::StylesheetMerger.new [], :relative_urls => true, :web_root => "/home/usr"
+
+    Juicer::Merger::StylesheetMerger.publicize_methods do
+      merger.instance_eval { @root = Pathname.new "/home/usr/design" }
+      assert_equal "../some/url", merger.resolve_path("/some/url", nil)
+    end
+  end
+
+  def test_resolve_path_should_leave_full_urls
+    merger = Juicer::Merger::StylesheetMerger.new []
+    url = "http://test.com"
+
+    Juicer::Merger::StylesheetMerger.publicize_methods do
+      merger.instance_eval { @root = Pathname.new "/home/usr/design" }
+      assert_equal url, merger.resolve_path(url, nil)
+    end
+  end
+
+  def test_resolve_path_error_when_missing_absolute_web_root
+    merger = Juicer::Merger::StylesheetMerger.new [], :absolute_urls => true
+
+    Juicer::Merger::StylesheetMerger.publicize_methods do
+      assert_raise ArgumentError do
+        merger.resolve_path("../some/url", nil)
+      end
+    end
+  end
+
+  def test_resolve_path_should_make_relative_urls_absolute
+    merger = Juicer::Merger::StylesheetMerger.new [], :absolute_urls => true, :web_root => "/home/usr"
+
+    Juicer::Merger::StylesheetMerger.publicize_methods do
+      merger.instance_eval { @root = Pathname.new "/home/usr/design" }
+      assert_equal "/design/images/1.png", merger.resolve_path("../images/1.png", "/home/usr/design/css")
+    end
+  end
+
+  def test_resolve_path_should_redefine_relative_urls
+    merger = Juicer::Merger::StylesheetMerger.new [], :relative_urls => true
+
+    Juicer::Merger::StylesheetMerger.publicize_methods do
+      merger.instance_eval { @root = Pathname.new "/home/usr/design2/css" }
+      assert_equal "../../design/images/1.png", merger.resolve_path("../images/1.png", "/home/usr/design/css")
+    end
+  end
+
+  def test_resolve_path_should_redefine_absolute_urls
+    merger = Juicer::Merger::StylesheetMerger.new [], :relative_urls => true, :web_root => "/home/usr"
+
+    Juicer::Merger::StylesheetMerger.publicize_methods do
+      merger.instance_eval { @root = Pathname.new "/home/usr/design2/css" }
+      assert_equal "../../images/1.png", merger.resolve_path("/images/1.png", "/home/usr/design/css")
+    end
+  end
+
+  def test_resolve_path_with_hosts_should_cycle_asset_hosts
+    merger = Juicer::Merger::StylesheetMerger.new [], :hosts => ["http://assets1", "http://assets2", "http://assets3"]
+
+    Juicer::Merger::StylesheetMerger.publicize_methods do
+      merger.instance_eval { @root = Pathname.new "/home/usr/design2/css" }
+      assert_equal "http://assets1/images/1.png", merger.resolve_path("/images/1.png", nil)
+      assert_equal "http://assets2/images/1.png", merger.resolve_path("/images/1.png", nil)
+      assert_equal "http://assets3/images/1.png", merger.resolve_path("/images/1.png", nil)
+      assert_equal "http://assets1/images/1.png", merger.resolve_path("/images/1.png", nil)
+    end
+  end
+
+  def test_resolve_paths_should_handle_relative_web_roots
+    merger = Juicer::Merger::StylesheetMerger.new [], :web_root => "test/data", :relative_urls => true
+    merger << File.expand_path("css/test2.css")
+
+    Juicer::Merger::StylesheetMerger.publicize_methods do
+      merger.instance_eval { @root = Pathname.new File.expand_path("test/data/css") }
+      assert_equal "../images/1.png", merger.resolve_path("/images/1.png", nil)
+    end
+  end
+
+  def test_cycle_asset_hosts_should_use_same_host_for_same_url
+    @file_merger = Juicer::Merger::StylesheetMerger.new nil, :hosts => ["http://assets1", "http://assets2", "http://assets3"]
+    @file_merger << path("path_test2.css")
+    ios = StringIO.new
+    @file_merger.save(ios)
+    files = ios.string.scan(/url\(([^\)]*)\)/).collect { |f| f.first }
+
+    assert_equal "1/images/1.png::2/css/2.gif::3/a1.css::2/css/2.gif::1/a2.css".gsub(/(\d\/)/, 'http://assets\1'), files.join("::")
+  end
 end

data/test/juicer/minifyer/test_yui_compressor.rb

@@ -4,75 +4,155 @@ class TestYuiCompressor < Test::Unit::TestCase
 
   def setup
     @path = ENV.key?('YUI_HOME') ? ENV['YUI_HOME'] : File.expand_path('~/sources/yuicompressor-2.3.5/build')
-    # @path = File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. ..]))
+
     @yui_compressor = Juicer::Minifyer::YuiCompressor.new({ :bin_path => @path })
-    @file_setup = Juicer::Test::FileSetup.new($DATA_DIR)
-    @file_setup.create!
+    Juicer::Test::FileSetup.new.create
     @file = path('out.min.css')
   end
 
   def teardown
-    File.delete(@file) if File.exists?(@file)
+   File.delete(@file) if @file && File.exists?(@file)
   end
 
-  def test_save
+  def test_save_overwrite
     FileUtils.cp(path('a.css'), path('a-1.css'))
     @yui_compressor.save(path('a-1.css'))
     assert_equal "@import 'b.css';", IO.read(path('a-1.css'))
+  end
 
-    filename = path('a-minified.css')
-    @yui_compressor.save(path('a.css'), filename)
-    assert_equal "@import 'b.css';", IO.read(filename)
+  def test_save_with_symbol_type
+    @yui_compressor.save(path('a.css'), path('a-1.css'), :css)
+    assert_equal "@import 'b.css';", IO.read(path('a-1.css'))
+    File.delete(path('a-1.css'))
+  end
 
-    File.delete(filename)
+  def test_save_with_string_type
+    @yui_compressor.save(path('a.css'), path('a-1.css'), "css")
+    assert_equal "@import 'b.css';", IO.read(path('a-1.css'))
     File.delete(path('a-1.css'))
   end
 
-  def test_command
+  def test_save_other_file
+    @yui_compressor.save(path('a.css'), path('a-1.css'))
+    assert_equal "@import 'b.css';", IO.read(path('a-1.css'))
+    assert_not_equal IO.read(path('a-1.css')), IO.read(path('a.css'))
+    File.delete(path('a-1.css'))
+  end
+
+  def test_save_should_create_non_existant_path
+    @yui_compressor.save(path('a.css'), path('bleh/blah/a-1.css'))
+    assert File.exists? path('bleh/blah/a-1.css')
+    FileUtils.rm_rf(path('bleh'))
+  end
+
+#  def test_command
+#    Juicer::Minifyer::YuiCompressor.publicize_methods do
+#      cmd = /java -jar #{@path.sub('2.3.5', '\d\.\d\.\d')}\/yuicompressor-\d\.\d\.\d\.jar --type css/
+#      assert_match cmd, @yui_compressor.command('css')
+
+#      @yui_compressor.no_munge = true
+#      cmd = /#{cmd} --no-munge/
+#      assert_match cmd, @yui_compressor.command('css')
+#    end
+#  end
+
+  def test_locate_jar_no_existing_jar
     Juicer::Minifyer::YuiCompressor.publicize_methods do
-      cmd = /java -jar #{@path.sub('2.3.5', '\d\.\d\.\d')}\/yuicompressor-\d\.\d\.\d\.jar --type css/
-      assert_match cmd, @yui_compressor.command('css')
+      # Avoid developer env settings
+      yuic_home = ENV['YUIC_HOME']
+      ENV.delete('YUIC_HOME')
+
+      assert_nil @yui_compressor.locate_jar
 
-      @yui_compressor.no_munge = true
-      cmd = /#{cmd} --no-munge/
-      assert_match cmd, @yui_compressor.command('css')
+      # Reset developer env settings
+      ENV['YUIC_HOME'] = yuic_home
     end
   end
 
-  def test_locate_jar
+  def test_locate_jar_one_file_in_cwd
     Juicer::Minifyer::YuiCompressor.publicize_methods do
-      # No env, no option, and no file in cwd
+      # Avoid developer env settings
       yuic_home = ENV['YUIC_HOME']
       ENV.delete('YUIC_HOME')
-      @yui_compressor = Juicer::Minifyer::YuiCompressor.new
-      assert_nil @yui_compressor.locate_jar
 
-      # One file in cwd
       File.open('yuicompressor-2.3.4.jar', 'w') { |f| f.puts '' }
       assert_equal File.expand_path('yuicompressor-2.3.4.jar'), @yui_compressor.locate_jar
 
-      # Two files in cwd
+      # Cleanup
+      File.delete('yuicompressor-2.3.4.jar')
+
+      # Reset developer env settings
+      ENV['YUIC_HOME'] = yuic_home
+    end
+  end
+
+  def test_locate_jar_two_files_in_cwd
+    Juicer::Minifyer::YuiCompressor.publicize_methods do
+      # Avoid developer env settings
+      yuic_home = ENV['YUIC_HOME']
+      ENV.delete('YUIC_HOME')
+
+      # Create files
+      File.open('yuicompressor-2.3.4.jar', 'w') { |f| f.puts '' }
       File.open('yuicompressor-2.3.5.jar', 'w') { |f| f.puts '' }
+
+      # Test
       assert_equal File.expand_path('yuicompressor-2.3.5.jar'), @yui_compressor.locate_jar
 
-      # Three files in cwd
+      # Cleanup
+      File.delete('yuicompressor-2.3.4.jar')
+      File.delete('yuicompressor-2.3.5.jar')
+
+      # Reset developer env settings
+      ENV['YUIC_HOME'] = yuic_home
+    end
+  end
+
+  def test_locate_jar_three_files_in_cwd
+    Juicer::Minifyer::YuiCompressor.publicize_methods do
+      # Avoid developer env settings
+      yuic_home = ENV['YUIC_HOME']
+      ENV.delete('YUIC_HOME')
+
+      # Create files
+      File.open('yuicompressor-2.3.4.jar', 'w') { |f| f.puts '' }
+      File.open('yuicompressor-2.3.5.jar', 'w') { |f| f.puts '' }
       File.open('yuicompressor.jar', 'w') { |f| f.puts '' }
+
+      # Test
       assert_equal File.expand_path('yuicompressor.jar'), @yui_compressor.locate_jar
 
-      # Specify another directory
+      # Cleanup
+      File.delete('yuicompressor-2.3.4.jar')
+      File.delete('yuicompressor-2.3.5.jar')
+      File.delete('yuicompressor.jar')
+
+      # Reset developer env settings
+      ENV['YUIC_HOME'] = yuic_home
+    end
+  end
+
+  def test_locate_jar_custom_directory
+    Juicer::Minifyer::YuiCompressor.publicize_methods do
+      # Avoid developer env settings
+      yuic_home = ENV['YUIC_HOME']
+      ENV.delete('YUIC_HOME')
+
+      # Prepare
       Dir.mkdir('another')
       Dir.chdir('another')
       File.open('yuicompressor-2.3.4.jar', 'w')
       Dir.chdir('..')
-      assert_equal File.expand_path('yuicompressor.jar'), @yui_compressor.locate_jar
+
+      # Test
+      assert_nil @yui_compressor.locate_jar
       @yui_compressor = Juicer::Minifyer::YuiCompressor.new({ :bin_path => 'another' })
       assert_equal File.expand_path('another/yuicompressor-2.3.4.jar'), @yui_compressor.locate_jar
 
-      # Cleanup
-      FileUtils.rm('yuicompressor-2.3.4.jar')
-      FileUtils.rm('yuicompressor-2.3.5.jar')
-      FileUtils.rm('yuicompressor.jar')
-      FileUtils.rm_rf('another')
+      # Clean up
+      FileUtils.rm_rf("another")
+
+      # Reset developer env settings
       ENV['YUIC_HOME'] = yuic_home
     end
   end

data/test/juicer/test_cache_buster.rb

@@ -0,0 +1,58 @@
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. test_helper])) unless defined?(Juicer)
+
+class TestCacheBuster < Test::Unit::TestCase
+  def setup
+    Juicer::Test::FileSetup.new.create
+  end
+
+  def test_default_type_and_param_name
+    file = path("a.js")
+    mtime = File.new(file).mtime.to_i
+    assert_equal "#{file}?jcb=#{mtime}", Juicer::CacheBuster.path(file)
+  end
+
+  def test_soft_path_default_param_name
+    file = path("a.js")
+    mtime = File.new(file).mtime.to_i
+    assert_equal "#{file}?jcb=#{mtime}", Juicer::CacheBuster.path(file, :soft)
+  end
+
+  def test_soft_path
+    file = path("a.js")
+    mtime = File.new(file).mtime.to_i
+    assert_equal "#{file}?mtime=#{mtime}", Juicer::CacheBuster.path(file, :soft, "mtime")
+    assert_equal "#{file}?mtime=#{mtime}", Juicer::CacheBuster.path(file, :soft, :mtime)
+  end
+
+  def test_soft_path_with_empty_param_name
+    file = path("a.js")
+    mtime = File.new(file).mtime.to_i
+    assert_equal "#{file}?#{mtime}", Juicer::CacheBuster.path(file, :soft, nil)
+    assert_equal "#{file}?#{mtime}", Juicer::CacheBuster.path(file, :soft, "")
+  end
+
+  def test_hard_path_default_param_name
+    file = path("a.js")
+    mtime = File.new(file).mtime.to_i
+    assert_equal "#{File.dirname(file)}/a-#{mtime}.js", Juicer::CacheBuster.path(file, :hard)
+  end
+
+  def test_hard_path_with_empty_param_name
+    file = path("a.js")
+    mtime = File.new(file).mtime.to_i
+    assert_equal "#{File.dirname(file)}/a-#{mtime}.js", Juicer::CacheBuster.path(file, :hard, "")
+    assert_equal "#{File.dirname(file)}/a-#{mtime}.js", Juicer::CacheBuster.path(file, :hard, nil)
+  end
+
+  def test_hard_path
+    file = path("a.js")
+    mtime = File.new(file).mtime.to_i
+    assert_equal "#{File.dirname(file)}/a-cb#{mtime}.js", Juicer::CacheBuster.path(file, :hard, "cb")
+  end
+
+  def test_cached_path_should_be_updated_soft
+    file = path("a.js")
+    mtime = File.new(file).mtime.to_i
+    assert_equal "#{File.dirname(file)}/a.js?cb=#{mtime}", Juicer::CacheBuster.path("#{file}?cb=1234", :soft, "cb")
+  end
+end

data/test/juicer/test_chainable.rb

@@ -55,6 +55,13 @@ class TestChainable < Test::Unit::TestCase
     assert_equal host2, host.next_in_chain
   end
 
+  def test_set_next_return_self_if_next_nil
+    host = Host.new
+
+    assert_not_nil host.set_next(nil)
+    assert_equal host, host.set_next(nil)
+  end
+
   def test_simple_chain
     host = Host.new("a")
     host2 = host.next_in_chain = Host.new("b")

data/test/juicer/test_core.rb

@@ -0,0 +1,47 @@
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. test_helper])) unless defined?(Juicer)
+
+class TestStringExtensions < Test::Unit::TestCase
+  def test_camel_case
+    assert_equal "CamelCase", "camel_case".camel_case
+    assert_equal "Camel case", "camel case".camel_case
+    assert_equal "CamelCase", "CAMEL_CASE".camel_case
+    assert_equal "CamelCase", "Camel_Case".camel_case
+  end
+
+  def test_to_class
+    assert_equal String, "String".to_class
+
+    assert_raise RuntimeError do
+      "String".to_class(Array)
+    end
+
+    assert_equal String, "String".to_class(Object)
+    assert_equal Juicer::Merger, "Juicer::Merger".to_class
+    assert_equal Juicer::Merger, "Merger".to_class(Juicer)
+    assert_equal Juicer::Merger::StylesheetMerger, "Juicer::Merger::StylesheetMerger".to_class
+    assert_equal Juicer::Merger::StylesheetMerger, "StylesheetMerger".to_class(Juicer::Merger)
+  end
+
+  def test_classify
+    assert_equal Juicer::Merger, "merger".classify(Juicer)
+    assert_equal FileUtils, "file_utils".classify
+  end
+
+  def test_underscore
+    assert_equal "stylesheet_merger", "StylesheetMerger".underscore
+  end
+end
+
+class TestSymbolExtensions < Test::Unit::TestCase
+  def test_camel_case
+    assert_equal "CamelCase", :camel_case.camel_case
+    assert_equal "CamelCase", :camel_case.camel_case
+    assert_equal "CamelCase", :CAMEL_CASE.camel_case
+    assert_equal "CamelCase", :Camel_Case.camel_case
+  end
+
+  def test_classify
+    assert_equal Juicer::Merger, :merger.classify(Juicer)
+    assert_equal FileUtils, :file_utils.classify
+  end
+end