juicer 1.0.13 → 1.0.14

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify gem dependencies in juicer.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,33 @@
+PATH
+  remote: .
+  specs:
+    juicer (1.0.9)
+      cmdparse
+      nokogiri
+      rubyzip
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    cmdparse (2.0.3)
+    fakefs (0.3.2)
+    git (1.2.5)
+    jeweler (1.6.0)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    mocha (0.9.12)
+    nokogiri (1.4.4.1-x86-mingw32)
+    rake (0.9.0)
+    rubyzip (0.9.4)
+    shoulda (2.11.3)
+
+PLATFORMS
+  x86-mingw32
+
+DEPENDENCIES
+  fakefs (>= 0.2.1)
+  jeweler (>= 0.2.1)
+  juicer!
+  mocha (>= 0.9.8)
+  shoulda (>= 2.10.2)

data/History.txt

@@ -1,3 +1,6 @@
+== 1.0.14 / 2012-04-13
+* Minor fix for closure compiler installation
+
 == 1.0.13 / 2011-08-30
 * Update YUI Compressor installer (new download page)
 

data/Rakefile

@@ -0,0 +1,96 @@
+require 'rubygems'
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "juicer"
+    gem.summary = "Command line tool for CSS and JavaScript developers"
+    gem.description = "Resolve dependencies, merge and minify CSS and JavaScript files with Juicer - the command line tool for frontend engineers"
+    gem.email = "christian@cjohansen.no"
+    gem.homepage = "http://github.com/cjohansen/juicer"
+    gem.authors = ["Christian Johansen"]
+    gem.rubyforge_project = "juicer"
+    gem.add_development_dependency "shoulda", ">= 2.10.2"
+    gem.add_development_dependency "mocha", ">= 0.9.8"
+    gem.add_development_dependency "fakefs", ">= 0.2.1"
+    gem.add_development_dependency "jeweler", ">= 0.2.1"
+    gem.add_development_dependency "redgreen", ">= 1.2.2" if RUBY_VERSION < "1.9"
+    gem.add_dependency "cmdparse"
+    gem.add_dependency "nokogiri", ">= 1.5.0"
+    gem.add_dependency "rubyzip"
+    gem.executables = ["juicer"]
+    gem.post_install_message = <<-MSG
+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!
+    MSG
+    gem.files = FileList["[A-Z]*", "{bin,generators,lib,test}/**/*"]
+  end
+
+  Jeweler::GemcutterTasks.new
+  Jeweler::RubyforgeTasks.new do |rubyforge|
+    rubyforge.doc_task = "rdoc"
+  end
+rescue LoadError => err
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+  puts err.message
+end
+
+Rake::TestTask.new("test:units") do |test|
+  test.libs << 'test'
+  test.pattern = 'test/unit/**/*_test.rb'
+  test.verbose = true
+end
+
+Rake::TestTask.new("test:integration") do |test|
+  test.libs << 'test'
+  test.pattern = 'test/integration/**/*_test.rb'
+  test.verbose = true
+end
+
+task :test => ["check_dependencies:development", "test:units", "test:integration"]
+
+task :default => "test:units"
+
+# lib/tasks/cruise.rake
+desc 'Continuous build target'
+task :cruise do
+  out = ENV['CC_BUILD_ARTIFACTS']
+  mkdir_p out unless File.directory? out if out
+
+  Rake::Task["rcov"].invoke
+  mv 'coverage/', "#{out}/" if out
+end
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/*_test.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
+end
+
+Rake::RDocTask.new do |rdoc|
+  if File.exist?('VERSION')
+    version = File.read('VERSION')
+  else
+    version = ""
+  end
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "jstdutil #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -1 +1 @@
-1.0.13
+1.0.14

data/lib/juicer.rb

@@ -3,7 +3,7 @@ require "logger"
 module Juicer
 
   # :stopdoc:
-  VERSION = '1.0.13'
+  VERSION = '1.0.14'
   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

@@ -16,35 +16,35 @@ module Juicer
     #
     #   Dir.pwd
     #   #=> "/home/christian/projects/mysite/design/css"
-    #   
+    #
     #   asset = Juicer::Asset::Path.new "../images/logo.png"
     #   asset.path
     #   #=> "../images/logo.png"
-    #   
+    #
     #   asset.rebase("~/projects/mysite/design").path
     #   #=> "images/logo.png"
-    #   
+    #
     #   asset.filename
     #   #=> "/home/christian/projects/mysite/design/images/logo.png"
-    #   
+    #
     #   asset.path(:cache_buster_type => :soft)
     #   #=> "../images/logo.png?jcb=1234567890"
-    #   
+    #
     #   asset.path(:cache_buster_type => :soft, :cache_buster => nil)
     #   #=> "../images/logo.png?1234567890"
-    #   
+    #
     #   asset.path(:cache_buster => "bustIT")
     #   #=> "../images/logo.png?bustIT=1234567890"
-    #   
+    #
     #   asset = Juicer::Asset::Path.new "../images/logo.png", :document_root
     #   #=> "/home/christian/projects/mysite"
-    #   
+    #
     #   asset.absolute_path(:cache_buster_type => :hard)
     #   #=> "/images/logo-jcb1234567890.png"
-    #   
+    #
     #   asset.absolute_path(:host => "http://localhost")
     #   #=> "http://localhost/images/logo.png"
-    #   
+    #
     #   asset.absolute_path(:host => "http://localhost", :cache_buster_type => :hard)
     #   #=> "http://localhost/images/logo-jcb1234567890.png"
     #

data/lib/juicer/asset/path_resolver.rb

@@ -16,10 +16,10 @@ module Juicer
     #   asset = path_resolver.resolve("../images/logo.png")
     #   asset.document_root
     #   #=> "/var/www"
-    #   
+    #
     #   asset.absolute_path(path_resolver.cycle_hosts)
     #   #=> "http://assets1.mysite.com/images/logo.png"
-    #   
+    #
     #   asset = path_resolver.resolve("/favicon.ico")
     #   asset.absolute_path(path_resolver.cycle_hosts)
     #   #=> "http://assets2.mysite.com/favicon.ico"

data/lib/juicer/binary.rb

@@ -129,7 +129,7 @@ module Juicer
     #
     def locate(bin_glob, env = nil)
       path << ENV[env] if env && ENV.key?(env) && File.exist?(ENV[env])
-      
+
       (path << Dir.pwd).each do |path|
         files = Dir.glob(File.expand_path(File.join(path, bin_glob)))
         return files unless files.empty?

data/lib/juicer/cache_buster.rb

@@ -127,7 +127,7 @@ module Juicer
     def self.rails(file)
       self.path(file, :rails)
     end
-    
+
     #
     # Remove cache buster from a URL for a given parameter name. Parameter name is
     # "cb" by default.

data/lib/juicer/command/merge.rb

@@ -30,7 +30,8 @@ module Juicer
         @absolute_urls = false          # Make the merger use absolute URLs
         @local_hosts = []               # Host names that are served from :document_root
         @verify = true                  # Verify js files with JsLint
-				@image_embed_type = :none       # Embed images in css files, options are :none, :data_uri
+        @image_embed_type = :none       # Embed images in css files, options are :none, :data_uri
+        @force_image_embed = false
 
         @log = log || Logger.new(STDOUT)
 
@@ -75,7 +76,7 @@ the compressor the path should be the path to where the jar file is found.
                            (" " * 37) + "Works with cycled asset hosts. Only valid for CSS files") { |t| @absolute_urls = true }
           opt.on("-d", "--document-root dir", "Path to resolve absolute URLs relative to") { |path| @document_root = path }
           opt.on("-c", "--cache-buster type", "none, soft, rails, or hard. Default is soft, which adds timestamps to\n" +
-                           (" " * 37) + "reference URLs as query parameters. None leaves URLs untouched, rails adds\n" + 
+                           (" " * 37) + "reference URLs as query parameters. None leaves URLs untouched, rails adds\n" +
                            (" " * 37) + "timestamps in the same format as Rails' image_tag helper, and hard alters\n" +
                            (" " * 37) + "file names") do |type|
             @cache_buster = [:soft, :hard, :rails].include?(type.to_sym) ? type.to_sym : nil
@@ -84,6 +85,7 @@ the compressor the path should be the path to where the jar file is found.
                            (" " * 37) + "None leaves URLs untouched. Candiate images must be flagged with '?embed=true to be considered") do |embed|
             @image_embed_type = [:none, :data_uri].include?(embed.to_sym) ? embed.to_sym : nil
           end
+          opt.on("", "--force-image-embed", "Will force all images to embed without having to tag with embed parameter") { @force_image_embed = true }
         end
       end
 
@@ -188,13 +190,13 @@ the compressor the path should be the path to where the jar file is found.
         Juicer::CssCacheBuster.new(:document_root => @document_root, :type => @cache_buster, :hosts => @local_hosts)
       end
 
-			#
-			# Load image embed, only available for CSS files
-			# 
-			def image_embed(file)
+      #
+      # Load image embed, only available for CSS files
+      #
+      def image_embed(file)
         return nil if !file || file !~ /\.css$/ || @image_embed_type.nil?
-        Juicer::ImageEmbed.new(:document_root => @document_root, :type => @image_embed_type )
-			end
+        Juicer::ImageEmbed.new(:document_root => @document_root, :type => @image_embed_type, :force => @force_image_embed )
+      end
 
       #
       # Generate output file name. Optional argument is a filename to base the new

data/lib/juicer/datafy/datafy.rb

@@ -16,5 +16,5 @@ module Datafy
     end
     outuri += ",#{content}"
   end
-  
-end
+
+end

data/lib/juicer/dependency_resolver/css_dependency_resolver.rb

@@ -1,29 +1,29 @@
-require "juicer/dependency_resolver/dependency_resolver"
-
-module Juicer
-
-  # Resolves @import statements in CSS files and builds a list of all
-  # files, in order.
-  #
-  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
-
-    private
-    def parse(line, imported_file = nil)
-      return $2 if line =~ @@import_pattern
-
-      # At first sight of actual CSS rules we abort (TODO: This does not take
-      # into account the fact that rules may be commented out and that more
-      # imports may follow)
-      throw :done if imported_file && line =~ %r{/*}
-      throw :done if line =~ /^[\.\#a-zA-Z\:]/
-    end
-
-    def extension
-      ".css"
-    end
-  end
-
-end
+require "juicer/dependency_resolver/dependency_resolver"
+
+module Juicer
+
+  # Resolves @import statements in CSS files and builds a list of all
+  # files, in order.
+  #
+  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
+
+    private
+    def parse(line, imported_file = nil)
+      return $2 if line =~ @@import_pattern
+
+      # At first sight of actual CSS rules we abort (TODO: This does not take
+      # into account the fact that rules may be commented out and that more
+      # imports may follow)
+      throw :done if imported_file && line =~ %r{/*}
+      throw :done if line =~ /^[\.\#a-zA-Z\:]/
+    end
+
+    def extension
+      ".css"
+    end
+  end
+
+end

data/lib/juicer/dependency_resolver/javascript_dependency_resolver.rb

@@ -1,23 +1,23 @@
-require "juicer/dependency_resolver/dependency_resolver"
-
-module Juicer
-  # Resolves @depends and @depend statements in comments in JavaScript files.
-  # Only the first comment in a JavaScript file is parsed
-  #
-  class JavaScriptDependencyResolver < DependencyResolver
-    @@depends_pattern = /\@depends?\s+([^\s\'\"\;]+)/
-
-    private
-    def parse(line, imported_file = nil)
-      return $1 if line =~ @@depends_pattern
-
-      # If we have already skimmed through some @depend/@depends or a
-      # closing comment we're done.
-      throw :done unless imported_file.nil? || !(line =~ /\*\//)
-    end
-
-    def extension
-      ".js"
-    end
-  end
-end
+require "juicer/dependency_resolver/dependency_resolver"
+
+module Juicer
+  # Resolves @depends and @depend statements in comments in JavaScript files.
+  # Only the first comment in a JavaScript file is parsed
+  #
+  class JavaScriptDependencyResolver < DependencyResolver
+    @@depends_pattern = /\@depends?\s+([^\s\'\"\;]+)/
+
+    private
+    def parse(line, imported_file = nil)
+      return $1 if line =~ @@depends_pattern
+
+      # If we have already skimmed through some @depend/@depends or a
+      # closing comment we're done.
+      throw :done unless imported_file.nil? || !(line =~ /\*\//)
+    end
+
+    def extension
+      ".js"
+    end
+  end
+end

data/lib/juicer/image_embed.rb

@@ -6,18 +6,18 @@ module Juicer
   #
   # The ImageEmbed is a tool that can parse a CSS file and substitute all
   # referenced URLs by a data uri
-  # 
+  #
   # - data uri (http://en.wikipedia.org/wiki/Data_URI_scheme)
-  # 
+  #
   # Only local resources will be processed this way, external resources referenced
   # by absolute urls will be left alone
-  # 
+  #
   class ImageEmbed
     include Juicer::Chainable
 
     # The maximum supported limit for modern browsers, See the Readme.rdoc for details
     SIZE_LIMIT = 32768
-    
+
     #
     # Returns the size limit
     #
@@ -33,6 +33,7 @@ module Juicer
       @hosts = options[:hosts]
       @path_resolver = Juicer::Asset::PathResolver.new(:document_root => options[:document_root],
                                                        :hosts => options[:hosts])
+      @force = options[:force]
     end
 
     #
@@ -55,22 +56,22 @@ module Juicer
       duplicates = duplicate_urls(assets)
 
       if duplicates.length > 0
-        Juicer::LOGGER.warn("Duplicate image urls detected, these images will not be embedded: #{duplicates.collect { |v| v.gsub('?embed=true', '') }.inspect}") 
+        Juicer::LOGGER.warn("Duplicate image urls detected, these images will not be embedded: #{duplicates.collect { |v| v.gsub('?embed=true', '') }.inspect}")
       end
 
       assets.each do |asset|
         begin
           next if used.include?(asset) || duplicates.include?(asset.path)
           used << asset
-          
+
           # make sure we do not exceed SIZE_LIMIT
           new_path = embed_data_uri(asset.filename)
 
           if new_path.length < SIZE_LIMIT
             # replace the url in the css file with the data uri
-            @contents.gsub!(asset.path, embed_data_uri(asset.filename)) if asset.filename.match( /\?embed=true$/ )
+            @contents.gsub!(asset.path, embed_data_uri(asset.filename)) if @force || asset.filename.match( /\?embed=true$/ )
           else
-            Juicer::LOGGER.warn("The final data uri for the image located at #{asset.path.gsub('?embed=true', '')} exceeds #{SIZE_LIMIT} and will not be embedded to maintain compatability.") 
+            Juicer::LOGGER.warn("The final data uri for the image located at #{asset.path.gsub('?embed=true', '')} exceeds #{SIZE_LIMIT} and will not be embedded to maintain compatability.")
           end
         rescue Errno::ENOENT
           puts "Unable to locate file #{asset.path}, skipping image embedding"
@@ -82,23 +83,28 @@ module Juicer
     end
 
     chain_method :save
-            
+
     def embed_data_uri( path )
       new_path = path
-      
-      supported_file_matches = path.match( /(?:\.)(png|gif|jpg|jpeg)(?:\?embed=true)$/i )
+
+      if @force
+        supported_file_matches = path.match( /(?:\.)(png|gif|jpg|jpeg)$/i )
+      else
+        supported_file_matches = path.match( /(?:\.)(png|gif|jpg|jpeg)(?:\?embed=true)$/i )
+      end
+
       filetype = supported_file_matches[1] if supported_file_matches
-      
-      if ( filetype )        
-        filename = path.gsub('?embed=true','')      
-        
+
+      if ( filetype )
+        filename = path.gsub('?embed=true','')
+
         # check if file exists, throw an error if it doesn't exist
         if File.exist?( filename )
-          
-          # read contents of file into memory              
+
+          # read contents of file into memory
           content = File.read( filename )
           content_type = "image/#{filetype}"
-          
+
           # encode the url
           new_path = Datafy::make_data_uri( content, content_type )
         else