Merge branch 'master' of https://github.com/rwz/jammit

Author: jashkenas

jammit.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'yui-compressor',    ['>= 0.9.3']
   s.add_dependency 'closure-compiler',  ['>= 0.1.0']
+  s.add_dependency 'uglifier',          ['>= 0.4.0']
 
   s.files = Dir['lib/**/*', 'bin/*', 'rails/*', 'jammit.gemspec', 'LICENSE', 'README']
 end

lib/jammit.rb

@@ -22,7 +22,7 @@ module Jammit
 
   DEFAULT_JST_NAMESPACE = "window.JST"
 
-  AVAILABLE_COMPRESSORS = [:yui, :closure]
+  AVAILABLE_COMPRESSORS = [:yui, :closure, :uglifier]
 
   DEFAULT_COMPRESSOR    = :yui
 

lib/jammit/compressor.rb

@@ -42,18 +42,19 @@ class Compressor
     JST_END         = "})();"
 
     COMPRESSORS = {
-      :yui     => YUI::JavaScriptCompressor,
-      :closure => Closure::Compiler
+      :yui      => YUI::JavaScriptCompressor,
+      :closure  => Closure::Compiler,
+      :uglifier => Jammit::Uglifier
     }
 
     DEFAULT_OPTIONS = {
-      :yui     => {:munge => true},
-      :closure => {}
+      :yui      => {:munge => true},
+      :closure  => {},
+      :uglifier => {:copyright => false}
     }
-
-    # Creating a compressor initializes the internal YUI Compressor from
-    # the "yui-compressor" gem, or the internal Closure Compiler from the
-    # "closure-compiler" gem.
+    
+    # The css comressor if always YUI Compressor. Js compression can be provided with
+    # YUI Compressor, Google Closure Compiler or UglifyJS
     def initialize
       @css_compressor = YUI::CssCompressor.new(Jammit.css_compressor_options || {})
       flavor          = Jammit.javascript_compressor || Jammit::DEFAULT_COMPRESSOR

lib/jammit/dependencies.rb

@@ -10,11 +10,13 @@
 # Gem Dependencies:
 require 'yui/compressor'
 require 'closure-compiler'
+require 'uglifier'
 
 # Load initial configuration before the rest of Jammit.
 Jammit.load_configuration(Jammit::DEFAULT_CONFIG_PATH, true) if defined?(Rails)
 
 # Jammit Core:
+require 'jammit/uglifier'
 require 'jammit/compressor'
 require 'jammit/packager'
 

lib/jammit/uglifier.rb

@@ -0,0 +1,3 @@
+class Jammit::Uglifier < ::Uglifier
+  alias :compress :compile
+end

test/config/assets-uglifier.yml

@@ -0,0 +1,12 @@
+javascript_compressor: uglifier
+embed_assets: on
+
+javascripts:
+  js_test:
+    - fixtures/src/*.js
+  jst_test:
+    - fixtures/src/*.jst
+
+stylesheets:
+  css_test:
+    - fixtures/src/*.css

test/fixtures/jammed/js_test-uglifier.js

@@ -2,6 +2,7 @@
 require 'active_support'
 require 'action_pack'
 require 'action_controller'
+require 'active_support/core_ext/module/deprecation'
 require 'action_controller/base'
 require 'action_controller/test_case'
 require 'jammit/controller'

test/unit/test_jammit_controller.rb

@@ -0,0 +1,24 @@
+require 'test_helper'
+
+class UglifierText < Test::Unit::TestCase
+
+  def setup
+    Jammit.load_configuration('test/config/assets-uglifier.yml').reload!
+    @compressor = Compressor.new
+  end
+
+  def teardown
+    Jammit.load_configuration('test/config/assets.yml').reload!
+  end
+
+  def test_javascript_compression
+    packed = @compressor.compress_js(glob('test/fixtures/src/*.js'))
+    assert packed == File.read('test/fixtures/jammed/js_test-uglifier.js')
+  end
+
+  def test_jst_compilation
+    packed = @compressor.compile_jst(glob('test/fixtures/src/*.jst'))
+    assert packed == File.read('test/fixtures/jammed/jst_test.js')
+  end
+
+end