psyho_juicer 1.0.0 → 1.0.7

data/test/unit/juicer/merger/stylesheet_merger_test.rb

@@ -1,7 +1,6 @@
 require "test_helper"
 
 class TestStylesheetMerger < Test::Unit::TestCase
-
   def setup
     @file_merger = Juicer::Merger::StylesheetMerger.new
     Juicer::Test::FileSetup.new.create
@@ -15,34 +14,41 @@ class TestStylesheetMerger < Test::Unit::TestCase
     Dir.chdir(@cwd)
   end
 
- def test_init
-   Juicer::Merger::StylesheetMerger.publicize_methods do
-     assert_equal Juicer::CssDependencyResolver, @file_merger.dependency_resolver.class
-   end
- end
+  context "stylesheet merger" do
+    should "keep reference to css dependency resolver" do
+      Juicer::Merger::StylesheetMerger.publicize_methods do
+        resolver = @file_merger.dependency_resolver
 
-  def test_merge
-    Juicer::Merger::StylesheetMerger.publicize_methods do
-      a_content = "\n\n/* Dette er a.css */\n"
-      content = @file_merger.merge(path('a.css'))
-      assert_equal a_content + "\n", content
+        assert_equal Juicer::CssDependencyResolver, resolver.class
+      end
     end
-  end
 
-  def test_constructor
-    file_merger = Juicer::Merger::StylesheetMerger.new(path('a.css'))
-    assert_equal 2, file_merger.files.length
-  end
+    should "merge single file" do
+      Juicer::Merger::StylesheetMerger.publicize_methods do
+        a_content = "\n\n/* Dette er a.css */\n"
+        content = @file_merger.merge(path('a.css'))
+
+        assert_equal a_content + "\n", content
+      end
+    end
 
-  def test_append
-    @file_merger << path('a.css')
-    assert_equal 2, @file_merger.files.length
+    should "recognize all files" do
+      file_merger = Juicer::Merger::StylesheetMerger.new(path('a.css'))
+
+      assert_equal 2, file_merger.files.length
+    end
+
+    should "not append existing file" do
+      @file_merger << path('a.css')
+      assert_equal 2, @file_merger.files.length
+    end
   end
 
-  def test_save
-    a_css = path('a.css')
-    b_css = path('b.css')
-    merged = <<EOF
+  context "saving files" do
+    should "merge files and strip @includes" do
+      a_css = path('a.css')
+      b_css = path('b.css')
+      merged = <<EOF
 /* Dette er b.css */
 
 
@@ -51,130 +57,190 @@ class TestStylesheetMerger < Test::Unit::TestCase
 
 EOF
 
-    @file_merger << a_css
-    ios = StringIO.new
-    @file_merger.save(ios)
-    assert_equal merged, ios.string
+      @file_merger << a_css
+      ios = StringIO.new
+      @file_merger.save(ios)
+      assert_equal merged, ios.string
 
-    output_file = path('test_out.css')
-    @file_merger.save(output_file)
+      output_file = path('test_out.css')
+      @file_merger.save(output_file)
 
-    assert_equal merged, IO.read(output_file)
-  end
+      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
+    should "strip @includes for quoted urls" do
+      css = path('b2.css')
+
+      merged = <<EOF
+h2 {
+    font-size: 10px;
+}
 
-    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)
+html {
+    background: red;
+}
+
+EOF
+
+      @file_merger << css
+      ios = StringIO.new
+      @file_merger.save(ios)
+      assert_equal merged, ios.string
     end
   end
 
-  def test_resolve_path_error_when_relative_missing_document_root
-    merger = Juicer::Merger::StylesheetMerger.new [], :relative_urls => true
+  context "resolving paths" do
+    should "re-reference relative paths" do
+      @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
 
-    Juicer::Merger::StylesheetMerger.publicize_methods do
-      assert_raise ArgumentError do
-        merger.resolve_path("/some/url", nil)
+    should "not touch absolute urls" do
+      merger = Juicer::Merger::StylesheetMerger.new
+      url = "/some/url"
+
+      Juicer::Merger::StylesheetMerger.publicize_methods do
+        assert_equal url, merger.resolve_path(url, nil)
       end
     end
-  end
 
-  def test_resolve_path_should_make_absolute_urls_relative
-    merger = Juicer::Merger::StylesheetMerger.new [], :relative_urls => true, :document_root => "/home/usr"
+    should "raise when mapping absolute to relative path without document root" do
+      merger = Juicer::Merger::StylesheetMerger.new [], :relative_urls => true
 
-    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)
+      Juicer::Merger::StylesheetMerger.publicize_methods do
+        assert_raise ArgumentError do
+          merger.resolve_path("/some/url", nil)
+        end
+      end
     end
-  end
 
-  def test_resolve_path_should_leave_full_urls
-    merger = Juicer::Merger::StylesheetMerger.new []
-    url = "http://test.com"
+    should "make absolute urls relative" do
+      merger = Juicer::Merger::StylesheetMerger.new([],
+                                                    :relative_urls => true,
+                                                    :document_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
+
+    should "should leave full urls" do
+      merger = Juicer::Merger::StylesheetMerger.new []
+      url = "http://test.com"
+
+      Juicer::Merger::StylesheetMerger.publicize_methods do
+        merger.instance_eval { @root = Pathname.new "/home/usr/design" }
 
-    Juicer::Merger::StylesheetMerger.publicize_methods do
-      merger.instance_eval { @root = Pathname.new "/home/usr/design" }
-      assert_equal url, merger.resolve_path(url, nil)
+        assert_equal url, merger.resolve_path(url, nil)
+      end
     end
-  end
 
-  def test_resolve_path_error_when_missing_absolute_document_root
-    merger = Juicer::Merger::StylesheetMerger.new [], :absolute_urls => true
+    should "error when missing document root for absolute urls" do
+      merger = Juicer::Merger::StylesheetMerger.new [], :absolute_urls => true
 
-    Juicer::Merger::StylesheetMerger.publicize_methods do
-      assert_raise ArgumentError do
-        merger.resolve_path("../some/url", nil)
+      Juicer::Merger::StylesheetMerger.publicize_methods do
+        assert_raise ArgumentError do
+          merger.resolve_path("../some/url", nil)
+        end
       end
     end
-  end
 
-  def test_resolve_path_should_make_relative_urls_absolute
-    merger = Juicer::Merger::StylesheetMerger.new [], :absolute_urls => true, :document_root => "/home/usr"
+    should "make relative urls absolute" do
+      merger = Juicer::Merger::StylesheetMerger.new([],
+                                                    :absolute_urls => true,
+                                                    :document_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")
+      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
-  end
 
-  def test_resolve_path_should_redefine_relative_urls
-    merger = Juicer::Merger::StylesheetMerger.new [], :relative_urls => true
+    should "redefine relative urls" do
+      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")
+      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
-  end
 
-  def test_resolve_path_should_redefine_absolute_urls
-    merger = Juicer::Merger::StylesheetMerger.new [], :relative_urls => true, :document_root => "/home/usr"
+    should "redefine absolute urls" do
+      merger = Juicer::Merger::StylesheetMerger.new([],
+                                                    :relative_urls => true,
+                                                    :document_root => "/home/usr")
+
+      Juicer::Merger::StylesheetMerger.publicize_methods do
+        merger.instance_eval { @root = Pathname.new "/home/usr/design2/css" }
+        result = merger.resolve_path("/images/1.png", "/home/usr/design/css")
+
+        assert_equal "../../images/1.png", result
+      end
+    end
+
+    should "cycle asset hosts" do
+      hosts = ["http://assets1", "http://assets2", "http://assets3"]
+      merger = Juicer::Merger::StylesheetMerger.new([], :hosts => hosts)
+
+      Juicer::Merger::StylesheetMerger.publicize_methods do
+        merger.instance_eval do
+          @root = Pathname.new "/home/usr/design2/css"
+        end
 
-    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")
+        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
-  end
 
-  def test_resolve_path_with_hosts_should_cycle_asset_hosts
-    merger = Juicer::Merger::StylesheetMerger.new [], :hosts => ["http://assets1", "http://assets2", "http://assets3"]
+    should "handle relative document roots" do
+      merger = Juicer::Merger::StylesheetMerger.new([],
+                                                    :document_root => "test/data",
+                                                    :relative_urls => true)
+      merger << File.expand_path("css/test2.css")
+
+      Juicer::Merger::StylesheetMerger.publicize_methods do
+        merger.instance_eval do
+          @root = Pathname.new File.expand_path("test/data/css")
+        end
 
-    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)
+        assert_equal "../images/1.png", merger.resolve_path("/images/1.png", nil)
+      end
     end
-  end
 
-  def test_resolve_paths_should_handle_relative_document_roots
-    merger = Juicer::Merger::StylesheetMerger.new [], :document_root => "test/data", :relative_urls => true
-    merger << File.expand_path("css/test2.css")
+    should "cycle hosts for relative urls" do
+      merger = Juicer::Merger::StylesheetMerger.new([],
+                                                    :document_root => "test/data",
+                                                    :hosts => ["http://assets1/"])
+      merger << File.expand_path("path_test2.css")
+
+      Juicer::Merger::StylesheetMerger.publicize_methods do
+        merger.instance_eval do
+          @root = Pathname.new(File.expand_path("test/data/css"))
+        end
 
-    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)
+        expected = "http://assets1/images/1.png"
+        assert_equal expected, merger.resolve_path("../images/1.png", "test/data/css")
+      end
     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 }
+    should "use same host for same url when cycling asset hosts" do
+      @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("::")
+      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
 end

data/test/unit/juicer/minifyer/closure_compressor_test.rb

@@ -13,18 +13,18 @@ class ClosureCompilerTest < Test::Unit::TestCase
 
   context "#save" do
     should "overwrite existing file" do
-      @closure.expects(:execute).with(%Q{#@cmd -js_output_file "#@output" -js "#@output"})
+      @closure.expects(:execute).with(%Q{#@cmd --js_output_file "#@output" --js "#@output"})
       @closure.save(@output, @output)
     end
 
     should "write compressed input to output" do
-      @closure.expects(:execute).with(%Q{#@cmd -js_output_file "#@output" -js "#@input"})
+      @closure.expects(:execute).with(%Q{#@cmd --js_output_file "#@output" --js "#@input"})
       @closure.save(@input, @output)
     end
 
     should "create non-existant path" do
       output = "some/nested/directory"
-      @closure.expects(:execute).with(%Q{#@cmd -js_output_file "#{output}/file.css" -js "#@input"})
+      @closure.expects(:execute).with(%Q{#@cmd --js_output_file "#{output}/file.css" --js "#@input"})
       FileUtils.expects(:mkdir_p).with(output)
       @closure.save(@input, "#{output}/file.css")
     end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: psyho_juicer
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Christian Johansen
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 +01:00
+date: 2010-08-23 00:00:00 +02:00
 default_executable: juicer
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 35
         segments: 
         - 2
         - 10
@@ -35,9 +38,11 @@ dependencies:
   name: mocha
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 43
         segments: 
         - 0
         - 9
@@ -49,9 +54,11 @@ dependencies:
   name: fakefs
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 0
         - 2
@@ -63,9 +70,11 @@ dependencies:
   name: jeweler
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 0
         - 2
@@ -77,9 +86,11 @@ dependencies:
   name: redgreen
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 2
@@ -91,9 +102,11 @@ dependencies:
   name: cmdparse
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -103,9 +116,11 @@ dependencies:
   name: nokogiri
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -115,9 +130,11 @@ dependencies:
   name: rubyzip
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -132,6 +149,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- Gemfile
 - History.txt
 - Manifest.txt
 - Rakefile
@@ -171,6 +189,7 @@ files:
 - lib/juicer/minifyer/closure_compiler.rb
 - lib/juicer/minifyer/java_base.rb
 - lib/juicer/minifyer/yui_compressor.rb
+- lib/psyho_juicer.rb
 - test/bin/jslint-1.0.js
 - test/bin/jslint.js
 - test/bin/rhino1_7R1.zip
@@ -180,6 +199,30 @@ files:
 - test/bin/yuicompressor-2.3.5.zip
 - test/bin/yuicompressor-2.4.2.jar
 - test/bin/yuicompressor-2.4.2.zip
+- test/data/Changelog.txt
+- test/data/a.css
+- test/data/a.js
+- test/data/a1.css
+- test/data/b.css
+- test/data/b.js
+- test/data/b1.css
+- test/data/b2.css
+- test/data/c1.css
+- test/data/css/2.gif
+- test/data/css/test.css
+- test/data/css/test2.css
+- test/data/css/test3.css
+- test/data/d1.css
+- test/data/images/1.png
+- test/data/my_app.js
+- test/data/not-ok.js
+- test/data/ok.js
+- test/data/path_test.css
+- test/data/path_test2.css
+- test/data/pkg/module/moda.js
+- test/data/pkg/module/modb.js
+- test/data/pkg/pkg.js
+- test/fixtures/git-tracked-file.txt
 - test/fixtures/yui-download.html
 - test/test_helper.rb
 - test/unit/juicer/asset/path_resolver_test.rb
@@ -227,52 +270,56 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: juicer
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Command line tool for CSS and JavaScript developers
 test_files: 
 - test/unit/juicer_test.rb
-- test/unit/juicer/command/install_test.rb
-- test/unit/juicer/command/merge_test.rb
-- test/unit/juicer/command/verify_test.rb
-- test/unit/juicer/command/list_test.rb
-- test/unit/juicer/command/util_test.rb
-- test/unit/juicer/ext/string_test.rb
-- test/unit/juicer/ext/symbol_test.rb
-- test/unit/juicer/image_embed_test.rb
-- test/unit/juicer/chainable_test.rb
-- test/unit/juicer/dependency_resolver/css_dependency_resolver_test.rb
+- test/unit/juicer/cache_buster_test.rb
 - test/unit/juicer/dependency_resolver/javascript_dependency_resolver_test.rb
-- test/unit/juicer/install/rhino_installer_test.rb
+- test/unit/juicer/dependency_resolver/css_dependency_resolver_test.rb
+- test/unit/juicer/jslint_test.rb
 - test/unit/juicer/install/installer_base_test.rb
 - test/unit/juicer/install/jslint_installer_test.rb
 - test/unit/juicer/install/yui_compressor_test.rb
+- test/unit/juicer/install/rhino_installer_test.rb
+- test/unit/juicer/asset/path_test.rb
+- test/unit/juicer/asset/path_resolver_test.rb
 - test/unit/juicer/datafy_test.rb
-- test/unit/juicer/jslint_test.rb
-- test/unit/juicer/cache_buster_test.rb
-- test/unit/juicer/merger/stylesheet_merger_test.rb
 - test/unit/juicer/merger/base_test.rb
 - test/unit/juicer/merger/javascript_merger_test.rb
-- test/unit/juicer/minifyer/yui_compressor_test.rb
+- test/unit/juicer/merger/stylesheet_merger_test.rb
+- test/unit/juicer/chainable_test.rb
+- test/unit/juicer/image_embed_test.rb
+- test/unit/juicer/ext/symbol_test.rb
+- test/unit/juicer/ext/string_test.rb
 - test/unit/juicer/minifyer/closure_compressor_test.rb
-- test/unit/juicer/asset/path_test.rb
-- test/unit/juicer/asset/path_resolver_test.rb
+- test/unit/juicer/minifyer/yui_compressor_test.rb
+- test/unit/juicer/command/merge_test.rb
+- test/unit/juicer/command/verify_test.rb
+- test/unit/juicer/command/util_test.rb
+- test/unit/juicer/command/list_test.rb
+- test/unit/juicer/command/install_test.rb
 - test/unit/juicer/css_cache_buster_test.rb
 - test/test_helper.rb