cjohansen-juicer 0.2.0 → 0.2.4

data/test/juicer/test_css_cache_buster.rb

@@ -0,0 +1,91 @@
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. test_helper])) unless defined?(Juicer)
+
+class TestCssCacheBuster < Test::Unit::TestCase
+  def setup
+    Juicer::Test::FileSetup.new.create
+    @buster = Juicer::CssCacheBuster.new
+  end
+
+  def teardown
+    Juicer::Test::FileSetup.new.delete
+  end
+
+  def test_resolve_full_url
+    assert_equal "http://localhost/images/1.png", @buster.resolve("http://localhost/images/1.png", "")
+  end
+
+  def test_resolve_relative_url
+    file = path("images/1.png")
+    assert_equal(file, @buster.resolve("../images/1.png", path("css/test.css")))
+  end
+
+  def test_resolve_absolute_url_without_web_root_should_fail
+    file = path("images/1.png")
+    assert_raise FileNotFoundError do
+      @buster.resolve("/images/1.png", path("css/test.css"))
+    end
+  end
+
+  def test_resolve_absolute_url_with_web_root
+    buster = Juicer::CssCacheBuster.new :web_root => path("")
+    file = path("images/1.png")
+    assert_equal(file, buster.resolve("/images/1.png", path("css/test.css")))
+  end
+
+  def test_find_urls
+    urls = @buster.urls(path("css/test.css"))
+    assert_equal 3, urls.length
+    assert_equal "../a1.css../images/1.png2.gif", urls.sort.join.gsub(path("/"), "")
+  end
+
+  def test_image_references_should_be_updated
+    file = path("css/test.css")
+    buster = Juicer::CssCacheBuster.new
+    buster.save file
+
+    File.read(file).scan(/url\(([^\)]*)\)/m).each do |path|
+      assert_match(/[^\?]*\?jcb=\d+/, path.first)
+    end
+  end
+
+  def test_absolute_path_without_web_root_should_fail
+    file = path("css/test2.css")
+    buster = Juicer::CssCacheBuster.new
+
+    assert_raise FileNotFoundError do
+      buster.save file
+    end
+  end
+
+  def test_absolute_path_should_be_resolved_when_web_root_known
+    file = path("css/test.css")
+    buster = Juicer::CssCacheBuster.new :web_root => path("")
+
+    assert_nothing_raised do
+      buster.save file
+    end
+
+    File.read(file).scan(/url\(([^\)]*)\)/m).each do |path|
+      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
+
+  def test_type_hard_should_produce_hard_buster_urls
+    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(""), :type => :hard
+    buster.save file, output
+    buster.urls(output).each { |url| assert url =~ /-\d+\.[a-z]{3}/, url }
+  end
+end

data/test/juicer/test_jslint.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. test_helper])) unless defined?(Juicer)
+
+class TestJsLint < Test::Unit::TestCase
+  def setup
+    Juicer::Test::FileSetup.new.create
+    installer = Juicer::Install::JSLintInstaller.new path(".juicer")
+    installer.install unless installer.installed?
+
+    @jslint = Juicer::JsLint.new(:bin_path => path(".juicer"))
+  end
+
+  def test_check_valid_file
+    assert @jslint.check(path("ok.js")).ok?
+  end
+
+  def test_invalid_file
+    assert !@jslint.check(path("not-ok.js")).ok?
+  end
+
+  def test_check_return_type
+    assert_equal Juicer::JsLint::Report, @jslint.check(path("ok.js")).class
+    assert_equal Juicer::JsLint::Report, @jslint.check(path("not-ok.js")).class
+  end
+
+  def test_error_list
+    assert_equal 2, @jslint.check(path("not-ok.js")).errors.length
+  end
+
+  def test_errors
+    error = @jslint.check(path("not-ok.js")).errors.first
+    assert_equal Juicer::JsLint::Error, error.class
+  end
+end

data/test/test_helper.rb

@@ -2,15 +2,12 @@ require 'fileutils'
 require 'test/unit'
 require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib juicer])) unless defined?(Juicer)
 
-# Test directory
-$TEST_DIR = File.expand_path(File.dirname(__FILE__))
-
-# Directory containing test data
-$DATA_DIR = File.join($TEST_DIR, 'data')
+$data_dir = File.join(File.expand_path(File.dirname(__FILE__)), "data")
+Juicer::LOGGER = Logger.new StringIO.new
 
 # Prefixes paths with the data dir
 def path(path)
-  File.join($DATA_DIR, path)
+  File.join($data_dir, path)
 end
 
 # Allow for testing of private methods inside a block:
@@ -27,6 +24,30 @@ class Class
   end
 end
 
+#
+# Intercept calls to open, and return local files
+#
+module Kernel
+ private
+  alias juicer_original_open open # :nodoc:
+
+  def open(name, *rest, &block)
+    if name =~ /http.+yuicompressor-(\d\.\d\.\d)\.zip$/
+      name = File.join($data_dir, "..", "bin", "yuicompressor-#{$1}.zip")
+    elsif name =~ /http.+yuicompressor/
+      name = File.join($data_dir, "..", "bin", "yuicompressor")
+    elsif name =~ /http.+jslint/
+      name = File.join($data_dir, "..", "bin", "jslint.js")
+    elsif name =~ /ftp.+rhino(.+)\.zip/
+      name = File.join($data_dir, "..", "bin", "rhino#{$1}.zip")
+    end
+
+    juicer_original_open(File.expand_path(name), *rest, &block)
+  end
+
+  module_function :open
+end
+
 module Juicer
   module Test
 
@@ -35,201 +56,77 @@ module Juicer
     class FileSetup
       attr_reader :file_count
 
-      def initialize(dir = $DATA_DIR)
+      def initialize(dir = $data_dir)
         @dir = dir
         @file_count = 0
       end
 
       # Recursively deletes the data directory
-      def delete!
-        res = FileUtils.remove_dir(@dir) if File.exist?(@dir)
+      def delete
+        res = FileUtils.rm_rf(@dir) if File.exist?(@dir)
       end
 
       # Set up files for unit tests
-      def create!(force = false)
+      def create(force = false)
         return if File.exist?(@dir) && !force
 
-        delete! if File.exist?(@dir)
+        delete if File.exist?(@dir)
         mkdir @dir
-
-        # mappe/
-        mappe = mkdir(File.join(@dir, 'mappe'))
-        #mkfile(mappe, 'a.css', "@import 'b.css';\n\n/* Dette er a.css */")
-        mkfile(mappe, 'a.css', "/**\n * Test with comment\n */\n@import 'b.css';\n\n/* Dette er a.css */\n")
-
-        mkfile(mappe, 'c.css', "/* Dette er b.css */")
-
-        # mappe/enda_en_mappe/
-        enda_en_mappe = mkdir(File.join(@dir, 'mappe', 'enda_en_mappe'))
-        mkfile(enda_en_mappe, 'a.css', "@import 'b.css';\n\n/* Dette er a.css */\n")
-        mksvndir(enda_en_mappe)
-
-        # Filer
         mkfile(@dir, 'a.css', "@import 'b.css';\n\n/* Dette er a.css */")
         mkfile(@dir, 'a.js', "/**\n * @depend b.js\n */\n\n/* Dette er a.js */")
         mkfile(@dir, 'b.css', "/* Dette er b.css */")
         mkfile(@dir, 'b.js', "/**\n * @depends a.js\n */\n\n/* Dette er b.css */")
-        mkfile(@dir, 'Changelog.txt', "2008.02.09 | stb-base 1.29\n\nFEATURE: Core  | Bla bla bla bla bla\nFEATURE: UI: | Bla bla bla bla bla\n\n\n2008.02.09 | stb-base 1.29\n\nFEATURE: Core  | Bla bla bla bla bla\nFEATURE: UI: | Bla bla bla bla bla\n")
-
-        mkfile(@dir, 'version2.txt', "branch: 1.0\nversion: 5\nbuild: 879\nrevision: 79867\ndate: 2008-01-17 16:05:33\n")
-        mkfile(@dir, 'version.txt', "")
-        mkfile(@dir, 'version-test.txt', "branch: 1.5\nversion: 2\nbuild: 65\nrevision: 64\ndate: 2008-01-02 22:03:10\n")
-
-        mksvndir(mappe)
-        mksvndir(@dir)
-      end
-
-      def create_design!(force = false, root = 'design')
-        return if File.exist?(@dir) && !force
-
-        delete! if File.exist?(@dir)
-        mkdir @dir
-
-        mkdesign(root)
-      end
-
-      def mkdesign(root, force = false)
-        design = mkdir(File.join(@dir, root))
+        mkfile(@dir, 'a1.css', "@import 'b1.css';\n@import 'c1.css';\nbody {\n    width: 800px;\n}\n")
+        mkfile(@dir, 'b1.css', "@import 'd1.css';\n\nhtml {\n    background: red;\n}\n")
+        mkfile(@dir, 'c1.css', "h1 {\n    font-size: 12px;\n}\n")
+        mkfile(@dir, 'd1.css', "h2 {\n    font-size: 10px;\n}\n")
+        mkfile(@dir, 'ok.js', "function hey() {\n    alert(\"Hey\");\n}\n")
+        mkfile(@dir, 'not-ok.js', "var a = 34\nb = 78;\n")
 
-        # JavaScripts
-        js = mkdir(File.join(design, 'js'))
+        images = mkdir File.join(@dir, "images")
+        mkfile(images, '1.png', "")
 
-        lib_content = <<-EOF
-/**
- * Javascript library
- */
-var ns = {
-  fn: function() {
-    alert(''Hey there!);
-  }
-};
+        css_dir = mkdir File.join(@dir, "css")
+        mkfile(css_dir, '2.gif', "")
 
-/**
- * A really smart function
- */
-function rlySmrt() {
-  return 'I am so smart, S-M-R-T';
-}
-        EOF
-        lib = mkfile(js, 'lib.js', lib_content)
-
-        dom_content = <<-EOF
-function tis() {
-  var just = 'another';
-  return just + 'function';
-}
-        EOF
-        dom = mkfile(js, 'dom.js', dom_content)
-
-        yet_content = <<-EOF
-/**
- * @depends 'lib.js'
- */
-var another = 'file';
-
-function good(stuff, is) {
-  var happening = 'now';
-}
-        EOF
-        yet = mkfile(js, 'yet.js', yet_content)
-
-        another_content = <<-EOF
-/**
- * This file definately is really nice
- */
-var someClass = Base.extend({
-  couple: 'of',
-  them: false,
-  ole: 'properties',
-
-  andThen: function(a, freakin) {
-    this.methodMan(a + 3, freakin - 6);
-  }
-
-  mehtodMan: function(some, params) {
-    return 'ALOHA!';
-  }
-});
-        EOF
-        another = mkfile(js, 'another.js', another_content)
-
-        dom_min_content = <<-EOF
-/**
- * Simply includes other files to make a monolithic minified file. Du-da, du-da
- * @depends dom.js
- * @depends yet.js
- */
-        EOF
-        dom_min = mkfile(js, 'dom.min.js', dom_min_content)
-
-        # CSS files
-        css = mkdir(File.join(design, 'css'))
-
-        defaults_content = <<-EOF
-/**
- * This is a set of defaults for all browsers
- */
-* {
-  margin: 0;
-  padding: 0;
-  border: none;
+        css = <<-CSS
+body {
+    background: url(../images/1.png);
 }
 
-h1, h2, h3, h4, h5, h6, p, ol, ul, dl {
-  margin: 0 0 1em;
-  test-decoration: none;
+h1 {
+    background: url(../a1.css) 0 0 no-repeat;
 }
-        EOF
-        defaults = mkfile(css, 'defaults.css', defaults_content)
 
-        layout_content = <<-EOF
-#main_content {
-  margin: 0 12px 16px;
-  width: 900px;
-  border: 3px solid #344;
+h2 {
+   background: url(2.gif) no-repeat;
 }
+        CSS
 
-#nav {
-  float: left;
-  width: 400px;
-}
-        EOF
-        layout = mkfile(css, 'layout.css', layout_content)
+        mkfile(css_dir, 'test.css', css)
+        mkfile(css_dir, 'test2.css', "body { background: url(/images/1.png); }")
+        mkfile(@dir, 'path_test.css', "@import 'css/test.css';\n\nbody {\n    background: url(css/2.gif) no-repeat;\n}\n")
 
-        fonts_content = <<-EOF
+        css = <<-CSS
 body {
-  font-family: arial, sans-serif;
-  font-size: 76%;
+    background: url(/images/1.png);
 }
 
-table {
-  font-style: normal;
+h1 {
+    background: url(/css/2.gif);
+    background: url(/a1.css) 0 0 no-repeat;
 }
-        EOF
-        fonts = mkfile(css, 'fonts.css', fonts_content)
-
-        fancy_font_content = <<-EOF
-/**
- * Fancy fonts
- */
-@import 'fonts.css';
 
-body {
-  font-family: tahoma, verdana;
+h2 {
+   background: url(/css/2.gif) no-repeat;
 }
-        EOF
-        fancy_font = mkfile(css, 'fancy_font.css', fancy_font_content)
 
-        layout_min_content = <<-EOF
-@import 'defaults.css';
-@import 'layout.css';
-        EOF
-        layout_min = mkfile(css, 'layout.min.css', layout_min_content)
+p { background: url(/a2.css); }
+        CSS
+
+        mkfile(@dir, 'path_test2.css', css)
 
-        images = mkdir(File.join(design, 'images'))
-        icons = mkdir(File.join(images, 'icons'))
-        10.times { |i| mkfile(icons, "icon#{i}.png", "#{i}") }
-        15.times { |i| mkfile(images, "img#{i}.gif", "#{i}") }
+        mkfile(@dir, 'Changelog.txt', "2008.02.09 | stb-base 1.29\n\nFEATURE: Core  | Bla bla bla bla bla\nFEATURE: UI: | Bla bla bla bla bla\n\n\n2008.02.09 | stb-base 1.29\n\nFEATURE: Core  | Bla bla bla bla bla\nFEATURE: UI: | Bla bla bla bla bla\n")
       end
 
      private
@@ -244,34 +141,6 @@ body {
         @file_count += 1
         dir
       end
-
-      def mksvndir(dir)
-        svn_dir = mkdir(File.join(dir, '.svn'))
-        mkdir(File.join(svn_dir, 'prop-base'))
-        mkdir(File.join(svn_dir, 'props'))
-        text_base = mkdir(File.join(svn_dir, 'text-base'))
-        tmp = mkdir(File.join(svn_dir, 'tmp'))
-        mkdir(File.join(tmp, 'prop-base'))
-        mkdir(File.join(tmp, 'props'))
-        mkdir(File.join(tmp, 'text-base'))
-        mkfile(svn_dir, 'all-wcprops', '')
-        mkfile(svn_dir, 'entries', '')
-        mkfile(svn_dir, 'format', '')
-
-        Dir.new(dir).each do |f|
-          if File.file?(File.join(dir, f)) && !(f =~ /^\.\.?/)
-            mkfile(text_base, File.basename(f) + '.svn-base', '')
-          end
-        end
-      end
     end
   end
 end
-
-def noout
-  std = $stdout
-  $stdout = StringIO.new
-  res = yield
-  $stdout = std
-  return res
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cjohansen-juicer
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.4
 platform: ruby
 authors: 
 - Christian Johansen
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-04 00:00:00 -08:00
+date: 2009-04-29 00:00:00 -07:00
 default_executable: juicer
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cmdparse
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -21,16 +22,37 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: hpricot
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.6.164
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rubyzip
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.1
+    version: 
 - !ruby/object:Gem::Dependency 
   name: bones
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.2.0
+        version: 2.4.0
     version: 
-description: Juicer is a command line tool aimed at easing JavaScript and CSS development. Currently it only provides a wrapper to YUI Compressor along with a module that can dynamically link together files, but there are plans for more functionality.
+description: Juicer is a command line tool that helps you ship frontend code for production.  High level overview; Juicer can  * figure out which files depend on each other and merge them together, reducing the number of http requests per page view, thus improving performance * use YUI Compressor to compress code, thus improving performance * verify that your JavaScript is safe to minify/compress by running JsLint on it * cycle asset hosts in CSS files * add "cache busters" to URLs in CSS files * recalculate relative URLs in CSS files, as well as convert them to absolute (or convert absolute URLs to relative URLs)
 email: christian@cjohansen.no
 executables: 
 - juicer
@@ -38,56 +60,73 @@ extensions: []
 
 extra_rdoc_files: 
 - History.txt
+- Manifest.txt
 - Readme.rdoc
 - bin/juicer
-- test/data/Changelog.txt
-- test/data/version-test.txt
-- test/data/version.txt
-- test/data/version2.txt
 files: 
-- .gitignore
 - History.txt
 - Manifest.txt
 - Rakefile
 - Readme.rdoc
 - bin/juicer
-- juicer.gemspec
 - lib/juicer.rb
+- lib/juicer/binary.rb
+- lib/juicer/cache_buster.rb
 - lib/juicer/chainable.rb
 - lib/juicer/cli.rb
+- lib/juicer/command/install.rb
+- lib/juicer/command/list.rb
 - lib/juicer/command/merge.rb
+- lib/juicer/command/util.rb
+- lib/juicer/command/verify.rb
+- lib/juicer/core.rb
+- lib/juicer/css_cache_buster.rb
+- lib/juicer/install/base.rb
+- lib/juicer/install/jslint_installer.rb
+- lib/juicer/install/rhino_installer.rb
+- lib/juicer/install/yui_compressor_installer.rb
+- lib/juicer/jslint.rb
 - lib/juicer/merger/base.rb
 - lib/juicer/merger/css_dependency_resolver.rb
 - lib/juicer/merger/dependency_resolver.rb
 - lib/juicer/merger/javascript_dependency_resolver.rb
 - lib/juicer/merger/javascript_merger.rb
 - lib/juicer/merger/stylesheet_merger.rb
-- lib/juicer/minifyer/compressor.rb
 - lib/juicer/minifyer/yui_compressor.rb
-- test/data/Changelog.txt
-- test/data/a.css
-- test/data/a.js
-- test/data/b.css
-- test/data/b.js
-- test/data/mappe/a.css
-- test/data/mappe/c.css
-- test/data/mappe/enda_en_mappe/a.css
-- test/data/version-test.txt
-- test/data/version.txt
-- test/data/version2.txt
+- tasks/test/setup.rake
+- test/juicer/command/test_install.rb
+- test/juicer/command/test_list.rb
+- test/juicer/command/test_merge.rb
+- test/juicer/command/test_util.rb
+- test/juicer/command/test_verify.rb
+- test/juicer/install/test_installer_base.rb
+- test/juicer/install/test_jslint_installer.rb
+- test/juicer/install/test_rhino_installer.rb
+- test/juicer/install/test_yui_compressor_installer.rb
 - test/juicer/merger/test_base.rb
 - test/juicer/merger/test_css_dependency_resolver.rb
 - test/juicer/merger/test_javascript_dependency_resolver.rb
 - test/juicer/merger/test_javascript_merger.rb
 - test/juicer/merger/test_stylesheet_merger.rb
-- test/juicer/minifyer/test_compressor.rb
 - test/juicer/minifyer/test_yui_compressor.rb
+- test/juicer/test_cache_buster.rb
 - test/juicer/test_chainable.rb
+- test/juicer/test_core.rb
+- test/juicer/test_css_cache_buster.rb
+- test/juicer/test_jslint.rb
 - test/test_helper.rb
 - test/test_juicer.rb
 has_rdoc: true
 homepage: http://www.cjohansen.no/en/projects/juicer
-post_install_message: 
+post_install_message: |
+  Juicer does not ship with third party libraries. You probably want to install
+  Yui Compressor and JsLint now:
+  
+  juicer install yui_compressor
+  juicer install jslint
+  
+  Happy juicing!
+
 rdoc_options: 
 - --main
 - Readme.rdoc
@@ -111,15 +150,27 @@ rubyforge_project: juicer
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Juicer is a command line tool aimed at easing JavaScript and CSS development
+summary: Juicer is a command line tool that helps you ship frontend code for production
 test_files: 
 - test/test_helper.rb
+- test/juicer/test_cache_buster.rb
 - test/juicer/test_chainable.rb
+- test/juicer/test_jslint.rb
+- test/juicer/install/test_installer_base.rb
+- test/juicer/install/test_jslint_installer.rb
+- test/juicer/install/test_yui_compressor_installer.rb
+- test/juicer/install/test_rhino_installer.rb
+- test/juicer/test_css_cache_buster.rb
 - test/juicer/merger/test_javascript_dependency_resolver.rb
 - test/juicer/merger/test_css_dependency_resolver.rb
 - test/juicer/merger/test_base.rb
 - test/juicer/merger/test_javascript_merger.rb
 - test/juicer/merger/test_stylesheet_merger.rb
-- test/juicer/minifyer/test_compressor.rb
+- test/juicer/command/test_verify.rb
+- test/juicer/command/test_util.rb
+- test/juicer/command/test_install.rb
+- test/juicer/command/test_merge.rb
+- test/juicer/command/test_list.rb
+- test/juicer/test_core.rb
 - test/juicer/minifyer/test_yui_compressor.rb
 - test/test_juicer.rb