jammit 0.3.1 → 0.3.2

data/jammit.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name      = 'jammit'
-  s.version   = '0.3.1'         # Keep version in sync with jammit.rb
-  s.date      = '2009-11-29'
+  s.version   = '0.3.2'         # Keep version in sync with jammit.rb
+  s.date      = '2009-12-03'
 
   s.homepage    = "http://documentcloud.github.com/jammit/"
   s.summary     = "Industrial Strength Asset Packaging for Rails"

data/lib/jammit.rb

@@ -4,7 +4,7 @@ $LOAD_PATH.push File.expand_path(File.dirname(__FILE__))
 # to all of the configuration options.
 module Jammit
 
-  VERSION               = "0.3.1"
+  VERSION               = "0.3.2"
 
   ROOT                  = File.expand_path(File.dirname(__FILE__) + '/..')
 
@@ -32,10 +32,6 @@ module Jammit
   # configuration of an assets.yml file that doesn't exist.
   class ConfigurationNotFound < NameError; end
 
-  # Jammit raises a JavaNotFound exception if Java is not installed, or it's
-  # not a recent enough version to run the JavaScript compressor.
-  class JavaNotFound < StandardError; end
-
   # Jammit raises an OutputNotWritable exception if the output directory for
   # cached packages is locked.
   class OutputNotWritable < StandardError; end
@@ -118,10 +114,18 @@ module Jammit
   # The YUI Compressor requires Java > 1.4, and Closure requires Java > 1.6.
   def self.check_java_version
     java = @compressor_options[:java] || 'java'
-    version = (`#{java} -version 2>&1`).match(/\d+\.\d+/)[0] rescue false
-    raise JavaNotFound, "the \"#{java}\" command could not be found" unless version
-    raise JavaNotFound, "the closure compiler requires Java 6 (1.6) or greater" if @javascript_compressor == :closure && version < '1.6'
-    raise JavaNotFound, "the YUI compressor requires Java 1.4 or greater" if @javascript_compressor == :yui && version < '1.4'
+    version = (`#{java} -version 2>&1`)[/\d+\.\d+/]
+    disable_compression if !version ||
+      (@javascript_compressor == :closure && version < '1.6') ||
+      (@javascript_compressor == :yui && version < '1.4')
+  end
+
+  # If we don't have a working Java VM, then disable asset compression and
+  # complain loudly.
+  def self.disable_compression
+    @compressor_options[:disabled] = true
+    complaint = "Warning: Jammit asset compression disabled -- Java unavailable."
+    defined?(Rails) ? Rails.logger.warn(complaint) : STDERR.puts(complaint)
   end
 
 end

data/lib/jammit/compressor.rb

@@ -31,6 +31,11 @@ module Jammit
     JST_START       = "(function(){window.JST = window.JST || {};"
     JST_END         = "})();"
 
+    COMPRESSORS = {
+      :yui     => YUI::JavaScriptCompressor,
+      :closure => Closure::Compiler
+    }
+
     DEFAULT_OPTIONS = {
       :yui     => {:munge => true},
       :closure => {}
@@ -41,28 +46,28 @@ module Jammit
     # "closure-compiler" gem.
     def initialize
       @css_compressor = YUI::CssCompressor.new
-      flavor = Jammit.javascript_compressor
-      js_options = DEFAULT_OPTIONS[flavor].merge(Jammit.compressor_options)
-      @js_compressor  = flavor == :closure ?
-                        Closure::Compiler.new(js_options) :
-                        YUI::JavaScriptCompressor.new(js_options)
+      flavor          = Jammit.javascript_compressor
+      @options        = DEFAULT_OPTIONS[flavor].merge(Jammit.compressor_options)
+      @js_compressor  = COMPRESSORS[flavor].new(@options)
     end
 
     # Concatenate together a list of JavaScript paths, and pass them through the
     # YUI Compressor (with munging enabled).
     def compress_js(paths)
-      @js_compressor.compress(concatenate(paths))
+      js = concatenate(paths)
+      @options[:disabled] ? js : @js_compressor.compress(js)
     end
 
     # Concatenate and compress a list of CSS stylesheets. When compressing a
     # :datauri or :mhtml variant, post-processes the result to embed
     # referenced images.
     def compress_css(paths, variant=nil, asset_url=nil)
-      compressed_css = @css_compressor.compress(concatenate_and_tag_images(paths, variant))
+      css = concatenate_and_tag_images(paths, variant)
+      css = @css_compressor.compress(css) unless @options[:disabled]
       case variant
-      when nil      then return compressed_css
-      when :datauri then return with_data_uris(compressed_css)
-      when :mhtml   then return with_mhtml(compressed_css, asset_url)
+      when nil      then return css
+      when :datauri then return with_data_uris(css)
+      when :mhtml   then return with_mhtml(css, asset_url)
       else raise PackageNotFound, "\"#{variant}\" is not a valid stylesheet variant"
       end
     end

data/lib/jammit/helper.rb

@@ -15,9 +15,10 @@ module Jammit
     # versions of the stylesheet package, otherwise the package is regular
     # compressed CSS, and in development the stylesheet URLs are passed verbatim.
     def include_stylesheets(*packages)
-      return individual_stylesheets(packages) unless Jammit.package_assets
-      return embedded_image_stylesheets(packages) if Jammit.embed_images
-      return packaged_stylesheets(packages)
+      options = packages.extract_options!
+      return individual_stylesheets(packages, options) unless Jammit.package_assets
+      return packaged_stylesheets(packages, options) if options.delete(:embed_images) == false || !Jammit.embed_images
+      return embedded_image_stylesheets(packages, options)
     end
 
     # Writes out the URL to the bundled and compressed javascript package,
@@ -39,30 +40,29 @@ module Jammit
     private
 
     # HTML tags, in order, for all of the individual stylesheets.
-    def individual_stylesheets(packages)
-      tags_with_options(packages) {|p| Jammit.packager.individual_urls(p.to_sym, :css) }
+    def individual_stylesheets(packages, options)
+      tags_with_options(packages, options) {|p| Jammit.packager.individual_urls(p.to_sym, :css) }
     end
 
     # HTML tags for the stylesheet packages.
-    def packaged_stylesheets(packages)
-      tags_with_options(packages) {|p| Jammit.asset_url(p, :css) }
+    def packaged_stylesheets(packages, options)
+      tags_with_options(packages, options) {|p| Jammit.asset_url(p, :css) }
     end
 
     # HTML tags for the 'datauri', and 'mhtml' versions of the packaged
     # stylesheets, using conditional comments to load the correct variant.
-    def embedded_image_stylesheets(packages)
-      datauri_tags = tags_with_options(packages) {|p| Jammit.asset_url(p, :css, :datauri) }
+    def embedded_image_stylesheets(packages, options)
+      datauri_tags = tags_with_options(packages, options) {|p| Jammit.asset_url(p, :css, :datauri) }
       ie_tags = Jammit.mhtml_enabled ?
-                tags_with_options(packages) {|p| Jammit.asset_url(p, :css, :mhtml) } :
-                packaged_stylesheets(packages)
+                tags_with_options(packages, options) {|p| Jammit.asset_url(p, :css, :mhtml) } :
+                packaged_stylesheets(packages, options)
       [DATA_URI_START, datauri_tags, DATA_URI_END, MHTML_START, ie_tags, MHTML_END].join("\n")
     end
 
     # Generate the stylesheet tags for a batch of packages, with options, by
     # yielding each package to a block.
-    def tags_with_options(packages)
+    def tags_with_options(packages, options)
       packages = packages.dup
-      options = packages.extract_options!
       packages.map! {|package| yield package }.flatten!
       packages.push(options) unless options.empty?
       stylesheet_link_tag(*packages)

data/lib/jammit/packager.rb

@@ -99,7 +99,7 @@ module Jammit
     # Absolute globs are absolute -- relative globs are relative to ASSET_ROOT.
     def glob_files(glob)
       absolute = Pathname.new(glob).absolute?
-      Dir[absolute ? glob : File.join(ASSET_ROOT, glob)]
+      Dir[absolute ? glob : File.join(ASSET_ROOT, glob)].sort
     end
 
     # Return a list of all of the packages that should be cached. If "force" is

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jammit
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Jeremy Ashkenas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-29 00:00:00 -05:00
+date: 2009-12-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency