jammit 0.1.3 → 0.2.0

data/jammit.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name      = 'jammit'
-  s.version   = '0.1.3'         # Keep version in sync with jammit.rb
-  s.date      = '2009-11-17'
+  s.version   = '0.2.0'         # Keep version in sync with jammit.rb
+  s.date      = '2009-11-18'
 
   s.homepage    = "http://documentcloud.github.com/jammit/"
   s.summary     = "Industrial Strength Asset Packaging for Rails"
@@ -26,22 +26,9 @@ Gem::Specification.new do |s|
                          '--main'     << 'README' <<
                          '--all'
 
-  s.add_dependency 'rails', ['>= 2.0.0']
-  s.add_dependency 'yui-compressor', ['>= 0.9.1']
+  s.add_dependency 'rails',             ['>= 2.0.0']
+  s.add_dependency 'yui-compressor',    ['>= 0.9.1']
+  s.add_dependency 'closure-compiler',  ['>= 0.1.0']
 
-  s.files = %w(
-bin/jammit
-jammit.gemspec
-lib/jammit.rb
-lib/jammit/command_line.rb
-lib/jammit/compressor.rb
-lib/jammit/controller.rb
-lib/jammit/helper.rb
-lib/jammit/jst.js
-lib/jammit/packager.rb
-lib/jammit/routes.rb
-LICENSE
-Rakefile
-README
-)
+  s.files = Dir['lib/**/*', 'bin/*', 'jammit.gemspec', 'LICENSE', 'README']
 end

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.1.3"
+  VERSION = "0.2.0"
 
   ROOT = File.expand_path(File.dirname(__FILE__) + '/..')
 
@@ -16,13 +16,16 @@ module Jammit
 
   DEFAULT_JST_COMPILER = "template"
 
+  DEFAULT_COMPRESSOR   = :yui
+
   # Jammit raises a @PackageNotFound@ exception when a non-existent package is
   # requested by a browser -- rendering a 404.
   class PackageNotFound < NameError; end
 
   class << self
     attr_reader :configuration, :template_function, :embed_images, :package_path,
-                :package_assets, :mhtml_enabled, :include_jst_script
+                :package_assets, :mhtml_enabled, :include_jst_script,
+                :javascript_compressor, :compressor_options
   end
 
   # The minimal required configuration.
@@ -32,11 +35,13 @@ module Jammit
   # Load the complete asset configuration from the specified @config_path@.
   def self.load_configuration(config_path)
     return unless config_path && File.exists?(config_path)
-    @config_path        = config_path
-    @configuration      = conf = YAML.load_file(@config_path).symbolize_keys
-    @package_path       = conf[:package_path] || DEFAULT_PACKAGE_PATH
-    @embed_images       = conf[:embed_images]
-    @mhtml_enabled      = @embed_images && @embed_images != "datauri"
+    @config_path            = config_path
+    @configuration          = conf = YAML.load_file(@config_path).symbolize_keys
+    @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_package_assets(conf[:package_assets])
     set_template_function(conf[:template_function])
     self
@@ -101,6 +106,7 @@ require 'fileutils'
 # Gem Dependencies:
 require 'rubygems'
 require 'yui/compressor'
+require 'closure-compiler'
 require 'activesupport'
 
 # Load initial configuration before the rest of Jammit.

data/lib/jammit/compressor.rb

@@ -1,7 +1,8 @@
 module Jammit
 
-  # Uses the YUI Compressor to compress JavaScript and CSS. (Which means that
-  # Java must be installed.) Also knows how to create a concatenated JST file.
+  # Uses the YUI Compressor or Closure Compiler to compress JavaScript.
+  # Always uses YUI to compress CSS (Which means that Java must be installed.)
+  # Also knows how to create a concatenated JST file.
   # If "embed_images" is turned on, creates "mhtml" and "datauri" versions of
   # all stylesheets, with all enabled images inlined into the css.
   class Compressor
@@ -29,25 +30,35 @@ module Jammit
     JST_START       = "(function(){window.JST = window.JST || {};"
     JST_END         = "})();"
 
+    DEFAULT_OPTIONS = {
+      :yui     => {:munge => true},
+      :closure => {}
+    }
+
     # Creating a compressor initializes the internal YUI Compressor from
-    # the "yui-compressor" gem.
+    # the "yui-compressor" gem, or the internal Closure Compiler from the
+    # "closure-compiler" gem.
     def initialize
-      @yui_js  = YUI::JavaScriptCompressor.new(:munge => true)
-      @yui_css = YUI::CssCompressor.new
+      @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)
     end
 
     # Concatenate together a list of JavaScript paths, and pass them through the
     # YUI Compressor (with munging enabled).
     def compress_js(paths)
-      @yui_js.compress(concatenate(paths))
+      @js_compressor.compress(concatenate(paths))
     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)
-      return @yui_css.compress(concatenate(paths)) if variant.nil?
-      compressed_css = @yui_css.compress(concatenate_and_tag_images(paths))
+      return @css_compressor.compress(concatenate(paths)) if variant.nil?
+      compressed_css = @css_compressor.compress(concatenate_and_tag_images(paths))
       return with_data_uris(compressed_css) if variant == :datauri
       return with_mhtml(compressed_css, asset_url) if variant == :mhtml
       raise PackageNotFound, "\"#{variant}\" is not a valid stylesheet variant"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jammit
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jeremy Ashkenas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-17 00:00:00 -05:00
+date: 2009-11-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: closure-compiler
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.0
+    version: 
 description: "    Jammit is an industrial strength asset packaging library for Rails,\n    providing both the CSS and JavaScript concatenation and compression\n    that you'd expect, as well as ahead-of-time gzipping, built-in JavaScript\n    template support, and optional Data-URI / MHTML image embedding.\n"
 email: jeremy@documentcloud.org
 executables: 
@@ -41,9 +51,6 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- bin/jammit
-- jammit.gemspec
-- lib/jammit.rb
 - lib/jammit/command_line.rb
 - lib/jammit/compressor.rb
 - lib/jammit/controller.rb
@@ -51,8 +58,10 @@ files:
 - lib/jammit/jst.js
 - lib/jammit/packager.rb
 - lib/jammit/routes.rb
+- lib/jammit.rb
+- bin/jammit
+- jammit.gemspec
 - LICENSE
-- Rakefile
 - README
 has_rdoc: true
 homepage: http://documentcloud.github.com/jammit/

data/Rakefile

@@ -1,40 +0,0 @@
-require 'rake/testtask'
-
-desc 'Run all tests'
-task :test do
-  $LOAD_PATH.unshift(File.expand_path('test'))
-  require 'redgreen' if Gem.available?('redgreen')
-  require 'test/unit'
-  Dir.chdir('test')
-  Dir['./**/test_*.rb'].each {|test| require test }
-end
-
-desc 'Generate YARD Documentation'
-task :doc do
-  sh "mv README TEMPME"
-  sh "rm -rf doc"
-  sh "yardoc"
-  sh "mv TEMPME README"
-end
-
-desc "Deploy the Github Page"
-task :deploy do
-  sh "git co gh-pages && git merge master && git push github gh-pages && git co master"
-end
-
-namespace :gem do
-
-  desc 'Build and install the jammit gem'
-  task :install do
-    sh "gem build jammit.gemspec"
-    sh "sudo gem install #{Dir['*.gem'].join(' ')} --local --no-ri --no-rdoc"
-  end
-
-  desc 'Uninstall the jammit gem'
-  task :uninstall do
-    sh "sudo gem uninstall -x jammit"
-  end
-
-end
-
-task :default => :test