jammit 0.2.2 → 0.2.3

data/jammit.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name      = 'jammit'
-  s.version   = '0.2.2'         # Keep version in sync with jammit.rb
+  s.version   = '0.2.3'         # Keep version in sync with jammit.rb
   s.date      = '2009-11-18'
 
   s.homepage    = "http://documentcloud.github.com/jammit/"

data/lib/jammit.rb

@@ -4,19 +4,21 @@ $LOAD_PATH.push File.expand_path(File.dirname(__FILE__))
 # to all of the configuration options.
 module Jammit
 
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 
   ROOT = File.expand_path(File.dirname(__FILE__) + '/..')
 
-  DEFAULT_CONFIG_PATH  = "config/assets.yml"
+  DEFAULT_CONFIG_PATH   = "config/assets.yml"
 
-  DEFAULT_PACKAGE_PATH = "assets"
+  DEFAULT_PACKAGE_PATH  = "assets"
 
-  DEFAULT_JST_SCRIPT   = "#{ROOT}/lib/jammit/jst.js"
+  DEFAULT_JST_SCRIPT    = "#{ROOT}/lib/jammit/jst.js"
 
-  DEFAULT_JST_COMPILER = "template"
+  DEFAULT_JST_COMPILER  = "template"
 
-  DEFAULT_COMPRESSOR   = :yui
+  AVAILABLE_COMPRESSORS = [:yui, :closure]
+
+  DEFAULT_COMPRESSOR    = :yui
 
   # Jammit raises a @PackageNotFound@ exception when a non-existent package is
   # requested by a browser -- rendering a 404.
@@ -40,8 +42,8 @@ module Jammit
     @package_path           = conf[:package_path] || DEFAULT_PACKAGE_PATH
     @embed_images           = conf[:embed_images]
     @mhtml_enabled          = @embed_images && @embed_images != "datauri"
-    @javascript_compressor  = (conf[:javascript_compressor] || DEFAULT_COMPRESSOR).to_sym
     @compressor_options     = conf[:compressor_options] || {}
+    set_javascript_compressor(conf[:javascript_compressor])
     set_package_assets(conf[:package_assets])
     set_template_function(conf[:template_function])
     self
@@ -75,6 +77,11 @@ module Jammit
 
   private
 
+  def self.set_javascript_compressor(value)
+    value = value && value.to_sym
+    @javascript_compressor = AVAILABLE_COMPRESSORS.include?(value) ? value : DEFAULT_COMPRESSOR
+  end
+
   def self.set_package_assets(value)
     package_env     = !defined?(RAILS_ENV) || RAILS_ENV != 'development'
     @package_assets = case value

data/lib/jammit/compressor.rb

@@ -41,7 +41,7 @@ module Jammit
     def initialize
       @css_compressor = YUI::CssCompressor.new
       flavor = Jammit.javascript_compressor
-      js_options = (DEFAULT_OPTIONS[flavor] || {}).merge(Jammit.compressor_options)
+      js_options = DEFAULT_OPTIONS[flavor].merge(Jammit.compressor_options)
       @js_compressor  = flavor == :closure ?
                         Closure::Compiler.new(js_options) :
                         YUI::JavaScriptCompressor.new(js_options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jammit
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Jeremy Ashkenas