juicer 1.0.4 → 1.0.5

data/History.txt

@@ -1,5 +1,12 @@
+== 1.0.5 / 2010-06-06
+* No more Regexp warnings on Ruby 1.9.1
+* Cycle hosts for relative paths
+* Allow hostnames with no protocol (i.e. //myassets)
+
 == 1.0.4 / 2010-05-26
-* Brought to you by Elliott Wood, two-fish.com
+* Fix issue (GH-22) where Closure Compiler would not work due to wrong
+  command line arguments passed by Juicer
+* Brought to you by Elliott Wood, two-fish.com:
 * Added "rails" cache-buster type for cache-buster stamps that are identical
   to those generated by Rails'
 * --all-hosts-local is no longer dependent upon command-line positioning.

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/juicer.rb

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

data/lib/juicer/asset/path.rb

@@ -63,7 +63,7 @@ module Juicer
       # Directory served as root through a web server, see Juicer::Asset::Path#initialize
       attr_reader :document_root
 
-      @@scheme_pattern = %r{^[a-zA-Z]{3,5}://}
+      @@scheme_pattern = %r{^([a-zA-Z]{3,5}:)?//}
 
       #
       # Initialize asset at <tt>path</tt>. Accepts an optional hash of options:

data/lib/juicer/command/merge.rb

@@ -94,7 +94,7 @@ the compressor the path should be the path to where the jar file is found.
           @log.fatal "Please provide atleast one input file"
           raise SystemExit.new("Please provide atleast one input file")
         end
-        
+
         # Copy hosts to local_hosts if --all-hosts-local was specified
         @local_hosts = @hosts if @all_hosts_local
 

data/lib/juicer/dependency_resolver/css_dependency_resolver.rb

@@ -8,7 +8,7 @@ module Juicer
   class CssDependencyResolver < DependencyResolver
     # Regexp borrowed from similar project:
     # http://github.com/cgriego/front-end-blender/tree/master/lib/front_end_architect/blender.rb
-    @@import_pattern = /^\s*@import(?:\surl\(|\s)(['"]?)([^\?'"\)\s]+)(\?(?:[^'"\)]+)?)?\1\)?(?:[^?;]+)?;?/im
+    @@import_pattern = /^\s*@import(?:\surl\(|\s)(['"]?)([^\?'"\)\s]+)(\?(?:[^'"\)]*))?\1\)?(?:[^?;]*);?/im
 
     private
     def parse(line, imported_file = nil)

data/lib/juicer/merger/stylesheet_merger.rb

@@ -53,7 +53,7 @@ module Juicer
       # for all absolute URLs regardless of absolute/relative URL strategy.
       #
       def merge(file)
-        content = super.gsub(/^\s*@import(?:\surl\(|\s)(['"]?)([^\?'"\)\s]+)(\?(?:[^'"\)]+)?)?\1\)?(?:[^?;]+)?;?/i, "")
+        content = super.gsub(/^\s*@import(?:\surl\(|\s)(['"]?)([^\?'"\)\s]+)(\?(?:[^'"\)]*))?\1\)?(?:[^?;]*);?/i, "")
         dir = File.expand_path(File.dirname(file))
 
         content.scan(/url\([\s"']*([^\)"'\s]*)[\s"']*\)/m).uniq.collect do |url|
@@ -79,7 +79,7 @@ module Juicer
 
         # All URLs that don't start with a protocol
         if url !~ %r{^/} && url !~ %r{^[a-z]+://}
-          if @use_absolute
+          if @use_absolute || @hosts.length > 0
             raise ArgumentError.new("Unable to handle absolute URLs without :document_root option") if !@document_root
             path = File.expand_path(File.join(dir, url)).sub(@document_root, "")         # Make absolute
           else
@@ -88,8 +88,8 @@ module Juicer
         end
 
         # Cycle hosts, if any
-        if url =~ %r{^/} && @hosts.length > 0
-          path = File.join(@hosts[@host_num % @hosts.length], url)
+        if path =~ %r{^/} && @hosts.length > 0
+          path = File.join(@hosts[@host_num % @hosts.length], path)
           @host_num += 1
         end
 

data/test/unit/juicer/asset/path_test.rb

@@ -55,6 +55,12 @@ class AssetPathTest < Test::Unit::TestCase
 
       assert_equal ["http://localhost", "http://dev.server", "http://some.server"], asset.hosts
     end
+
+    should "accept protocol-less hosts" do
+      asset = Juicer::Asset::Path.new "../images/logo.png", :hosts => ["localhost/", "//dev.server", "some.server/"]
+
+      assert_equal ["http://localhost", "//dev.server", "http://some.server"], asset.hosts
+    end
   end
 
   context "asset absolute path" do

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,28 +14,34 @@ 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
+  context "stylesheet merger" do
+    should "keep reference to css dependency resolver" do
+      Juicer::Merger::StylesheetMerger.publicize_methods do
+        resolver = @file_merger.dependency_resolver
+
+        assert_equal Juicer::CssDependencyResolver, resolver.class
+      end
     end
-  end
 
-  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
+    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
-  end
 
-  def test_constructor
-    file_merger = Juicer::Merger::StylesheetMerger.new(path('a.css'))
-    assert_equal 2, file_merger.files.length
-  end
+    should "recognize all files" do
+      file_merger = Juicer::Merger::StylesheetMerger.new(path('a.css'))
 
-  def test_append
-    @file_merger << path('a.css')
-    assert_equal 2, @file_merger.files.length
+      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
 
   context "saving files" do
@@ -95,112 +100,147 @@ EOF
 
       assert_equal "a1.css::css/2.gif::images/1.png", files.join("::")
     end
-  end
 
-  def test_resolve_path_should_leave_absolute_urls
-    merger = Juicer::Merger::StylesheetMerger.new
-    url = "/some/url"
+    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)
+      Juicer::Merger::StylesheetMerger.publicize_methods do
+        assert_equal url, merger.resolve_path(url, nil)
+      end
     end
-  end
 
-  def test_resolve_path_error_when_relative_missing_document_root
-    merger = Juicer::Merger::StylesheetMerger.new [], :relative_urls => true
+    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
-      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_absolute_urls_relative
-    merger = Juicer::Merger::StylesheetMerger.new [], :relative_urls => true, :document_root => "/home/usr"
+    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" }
 
-    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)
+        assert_equal "../some/url", merger.resolve_path("/some/url", nil)
+      end
     end
-  end
 
-  def test_resolve_path_should_leave_full_urls
-    merger = Juicer::Merger::StylesheetMerger.new []
-    url = "http://test.com"
+    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")
 
-    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 "../../images/1.png", result
+      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 "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 "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 "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_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 "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 File.expand_path("test/data/css") }
-      assert_equal "../images/1.png", merger.resolve_path("/images/1.png", nil)
+        assert_equal "../images/1.png", merger.resolve_path("/images/1.png", nil)
+      end
+    end
+
+    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
+
+        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

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Christian Johansen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-31 00:00:00 +02:00
+date: 2010-06-06 00:00:00 +02:00
 default_executable: juicer
 dependencies: 
 - !ruby/object:Gem::Dependency