jammit 0.3.2 → 0.3.3

data/README

@@ -11,7 +11,7 @@
   template support, and optional Data-URI / MHTML image embedding.
   
   Installation:
-  gem install jammit --source http://gemcutter.org
+  gem install jammit
   
   For documentation, usage, and examples, see:
   http://documentcloud.github.com/jammit/

data/jammit.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name      = 'jammit'
-  s.version   = '0.3.2'         # Keep version in sync with jammit.rb
-  s.date      = '2009-12-03'
+  s.version   = '0.3.3'         # Keep version in sync with jammit.rb
+  s.date      = '2009-1-5'
 
   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.2"
+  VERSION               = "0.3.3"
 
   ROOT                  = File.expand_path(File.dirname(__FILE__) + '/..')
 
@@ -38,8 +38,8 @@ module Jammit
 
   class << self
     attr_reader :configuration, :template_function, :embed_images, :package_path,
-                :package_assets, :mhtml_enabled, :include_jst_script,
-                :javascript_compressor, :compressor_options
+                :package_assets, :compress_assets, :mhtml_enabled, :include_jst_script,
+                :javascript_compressor, :compressor_options, :css_compressor_options
   end
 
   # The minimal required configuration.
@@ -54,8 +54,10 @@ module Jammit
     @configuration          = conf = conf.symbolize_keys
     @package_path           = conf[:package_path] || DEFAULT_PACKAGE_PATH
     @embed_images           = conf[:embed_images]
+    @compress_assets        = !(conf[:compress_assets] == false)
     @mhtml_enabled          = @embed_images && @embed_images != "datauri"
     @compressor_options     = (conf[:compressor_options] || {}).symbolize_keys
+    @css_compressor_options = (conf[:css_compressor_options] || {}).symbolize_keys
     set_javascript_compressor(conf[:javascript_compressor])
     set_package_assets(conf[:package_assets])
     set_template_function(conf[:template_function])
@@ -114,6 +116,7 @@ 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'
+    @css_compressor_options[:java] ||= java if @compressor_options[:java]
     version = (`#{java} -version 2>&1`)[/\d+\.\d+/]
     disable_compression if !version ||
       (@javascript_compressor == :closure && version < '1.6') ||
@@ -123,7 +126,7 @@ module Jammit
   # If we don't have a working Java VM, then disable asset compression and
   # complain loudly.
   def self.disable_compression
-    @compressor_options[:disabled] = true
+    @compress_assets = false
     complaint = "Warning: Jammit asset compression disabled -- Java unavailable."
     defined?(Rails) ? Rails.logger.warn(complaint) : STDERR.puts(complaint)
   end

data/lib/jammit/compressor.rb

@@ -45,7 +45,7 @@ module Jammit
     # the "yui-compressor" gem, or the internal Closure Compiler from the
     # "closure-compiler" gem.
     def initialize
-      @css_compressor = YUI::CssCompressor.new
+      @css_compressor = YUI::CssCompressor.new(Jammit.css_compressor_options)
       flavor          = Jammit.javascript_compressor
       @options        = DEFAULT_OPTIONS[flavor].merge(Jammit.compressor_options)
       @js_compressor  = COMPRESSORS[flavor].new(@options)
@@ -55,7 +55,7 @@ module Jammit
     # YUI Compressor (with munging enabled).
     def compress_js(paths)
       js = concatenate(paths)
-      @options[:disabled] ? js : @js_compressor.compress(js)
+      Jammit.compress_assets ? @js_compressor.compress(js) : js
     end
 
     # Concatenate and compress a list of CSS stylesheets. When compressing a
@@ -63,7 +63,7 @@ module Jammit
     # referenced images.
     def compress_css(paths, variant=nil, asset_url=nil)
       css = concatenate_and_tag_images(paths, variant)
-      css = @css_compressor.compress(css) unless @options[:disabled]
+      css = @css_compressor.compress(css) if Jammit.compress_assets
       case variant
       when nil      then return css
       when :datauri then return with_data_uris(css)

data/lib/jammit/packager.rb

@@ -7,7 +7,7 @@ module Jammit
   class Packager
 
     # In Rails, the difference between a path and an asset URL is "public".
-    PATH_TO_URL = /\A#{ASSET_ROOT}(\/public)?/
+    PATH_TO_URL = /\A#{Regexp.escape(ASSET_ROOT)}(\/public)?/
 
     # Set force to false to allow packages to only be rebuilt when their source
     # files have changed since the last time their package was built.

metadata

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