jammit 0.6.5 → 0.6.6

data/bin/jammit

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby -rrubygems
+require 'pathname'
 
-require "#{File.dirname(__FILE__)}/../lib/jammit/command_line.rb"
+APP_ROOT = File.dirname(Pathname.new(__FILE__).realpath)
+require File.join(APP_ROOT, '../lib/jammit/command_line.rb')
 
 Jammit::CommandLine.new

data/jammit.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name      = 'jammit'
-  s.version   = '0.6.5'         # Keep version in sync with jammit.rb
-  s.date      = '2011-11-30'
+  s.version   = '0.6.6'         # Keep version in sync with jammit.rb
+  s.date      = '2013-03-20'
 
   s.homepage    = "http://documentcloud.github.com/jammit/"
   s.summary     = "Industrial Strength Asset Packaging for Rails"
@@ -26,7 +26,8 @@ Gem::Specification.new do |s|
                          '--main'     << 'README' <<
                          '--all'
 
-  s.add_dependency 'yui-compressor',    ['>= 0.9.3']
+  s.add_dependency 'cssmin', ['>= 1.0.3']
+  s.add_dependency 'jsmin',  ['>= 1.0.1']
 
   s.files = Dir['lib/**/*', 'bin/*', 'rails/*', 'jammit.gemspec', 'LICENSE', 'README']
 end

data/lib/jammit.rb

@@ -4,27 +4,31 @@ $LOAD_PATH.push File.expand_path(File.dirname(__FILE__))
 # to all of the configuration options.
 module Jammit
 
-  VERSION               = "0.6.5"
+  VERSION                       = "0.6.6"
 
-  ROOT                  = File.expand_path(File.dirname(__FILE__) + '/..')
+  ROOT                          = File.expand_path(File.dirname(__FILE__) + '/..')
 
-  ASSET_ROOT            = File.expand_path((defined?(Rails) && Rails.root.to_s.length > 0) ? Rails.root : ENV['RAILS_ROOT'] || ".") unless defined?(ASSET_ROOT)
+  ASSET_ROOT                    = File.expand_path((defined?(Rails) && Rails.root.to_s.length > 0) ? Rails.root : ENV['RAILS_ROOT'] || ".") unless defined?(ASSET_ROOT)
 
-  DEFAULT_PUBLIC_ROOT   = (defined?(Rails) && Rails.public_path.to_s.length > 0) ? Rails.public_path : File.join(ASSET_ROOT, 'public') unless defined?(PUBLIC_ROOT)
+  DEFAULT_PUBLIC_ROOT           = (defined?(Rails) && Rails.public_path.to_s.length > 0) ? Rails.public_path : File.join(ASSET_ROOT, 'public') unless defined?(PUBLIC_ROOT)
 
-  DEFAULT_CONFIG_PATH   = File.join(ASSET_ROOT, 'config', 'assets.yml')
+  DEFAULT_CONFIG_PATH           = File.join(ASSET_ROOT, 'config', 'assets.yml')
 
-  DEFAULT_PACKAGE_PATH  = "assets"
+  DEFAULT_PACKAGE_PATH          = "assets"
 
-  DEFAULT_JST_SCRIPT    = File.join(ROOT, 'lib/jammit/jst.js')
+  DEFAULT_JST_SCRIPT            = File.join(ROOT, 'lib/jammit/jst.js')
 
-  DEFAULT_JST_COMPILER  = "template"
+  DEFAULT_JST_COMPILER          = "template"
 
-  DEFAULT_JST_NAMESPACE = "window.JST"
+  DEFAULT_JST_NAMESPACE         = "window.JST"
 
-  COMPRESSORS           = [:yui, :closure, :uglifier]
+  JAVASCRIPT_COMPRESSORS        = [:jsmin, :yui, :closure, :uglifier]
 
-  DEFAULT_COMPRESSOR    = :yui
+  DEFAULT_JAVASCRIPT_COMPRESSOR = :jsmin
+
+  CSS_COMPRESSORS               = [:cssmin, :yui, :sass]
+
+  DEFAULT_CSS_COMPRESSOR        = :cssmin
 
   # Extension matchers for JavaScript and JST, which need to be disambiguated.
   JS_EXTENSION          = /\.js\Z/
@@ -35,7 +39,7 @@ module Jammit
   class PackageNotFound < NameError; end
 
   # Jammit raises a MissingConfiguration exception when you try to load the
-  # configuration of an assets.yml file that doesn't exist, or are missing 
+  # configuration of an assets.yml file that doesn't exist, or are missing
   # a piece of required configuration.
   class MissingConfiguration < NameError; end
 
@@ -50,17 +54,20 @@ module Jammit
     attr_reader   :configuration, :template_function, :template_namespace,
                   :embed_assets, :package_assets, :compress_assets, :gzip_assets,
                   :package_path, :mhtml_enabled, :include_jst_script, :config_path,
-                  :javascript_compressor, :compressor_options, :css_compressor_options,
-                  :template_extension, :template_extension_matcher, :allow_debugging,
-                  :public_root
-    attr_accessor :compressors
+                  :javascript_compressor, :compressor_options, :css_compressor,
+                  :css_compressor_options, :template_extension,
+                  :template_extension_matcher, :allow_debugging,
+                  :rewrite_relative_paths, :public_root
+    attr_accessor :javascript_compressors, :css_compressors
   end
 
   # The minimal required configuration.
   @configuration  = {}
   @public_root    = DEFAULT_PUBLIC_ROOT
   @package_path   = DEFAULT_PACKAGE_PATH
-  @compressors    = COMPRESSORS
+
+  @javascript_compressors = JAVASCRIPT_COMPRESSORS
+  @css_compressors        = CSS_COMPRESSORS
 
   # Load the complete asset configuration from the specified @config_path@.
   # If we're loading softly, don't let missing configuration error out.
@@ -71,7 +78,7 @@ module Jammit
     conf = YAML.load(ERB.new(File.read(config_path)).result)
 
     # Optionally overwrite configuration based on the environment.
-    rails_env = defined?(Rails) ? Rails.env : ENV['RAILS_ENV']
+    rails_env = (defined?(Rails) ? ::Rails.env : ENV['RAILS_ENV'] || "development")
     conf.merge! conf.delete rails_env if conf.has_key? rails_env
 
     @config_path            = config_path
@@ -79,12 +86,14 @@ module Jammit
     @package_path           = conf[:package_path] || DEFAULT_PACKAGE_PATH
     @embed_assets           = conf[:embed_assets] || conf[:embed_images]
     @compress_assets        = !(conf[:compress_assets] == false)
+    @rewrite_relative_paths = !(conf[:rewrite_relative_paths] == false)
     @gzip_assets            = !(conf[:gzip_assets] == false)
     @allow_debugging        = !(conf[:allow_debugging] == false)
     @mhtml_enabled          = @embed_assets && @embed_assets != "datauri"
     @compressor_options     = symbolize_keys(conf[:compressor_options] || {})
     @css_compressor_options = symbolize_keys(conf[:css_compressor_options] || {})
     set_javascript_compressor(conf[:javascript_compressor])
+    set_css_compressor(conf[:css_compressor])
     set_package_assets(conf[:package_assets])
     set_template_function(conf[:template_function])
     set_template_namespace(conf[:template_namespace])
@@ -148,7 +157,13 @@ module Jammit
   # Ensure that the JavaScript compressor is a valid choice.
   def self.set_javascript_compressor(value)
     value = value && value.to_sym
-    @javascript_compressor = compressors.include?(value) ? value : DEFAULT_COMPRESSOR
+    @javascript_compressor = javascript_compressors.include?(value) ? value : DEFAULT_JAVASCRIPT_COMPRESSOR
+  end
+
+  # Ensure that the CSS compressor is a valid choice.
+  def self.set_css_compressor(value)
+    value = value && value.to_sym
+    @css_compressor = css_compressors.include?(value) ? value : DEFAULT_CSS_COMPRESSOR
   end
 
   # Turn asset packaging on or off, depending on configuration and environment.

data/lib/jammit/compressor.rb

@@ -15,9 +15,9 @@ module Jammit
       '.gif'  => 'image/gif',
       '.tif'  => 'image/tiff',
       '.tiff' => 'image/tiff',
-      '.ttf'  => 'font/truetype',
+      '.ttf'  => 'application/x-font-ttf',
       '.otf'  => 'font/opentype',
-      '.woff' => 'font/woff'
+      '.woff' => 'application/x-font-woff'
     }
 
     # Font extensions for which we allow embedding:
@@ -41,26 +41,39 @@ module Jammit
     JST_START       = "(function(){"
     JST_END         = "})();"
 
-    COMPRESSORS = {
-      :yui      => YUI::JavaScriptCompressor,
-      :closure  => Jammit.compressors.include?(:closure)  ? Closure::Compiler : nil,
-      :uglifier => Jammit.compressors.include?(:uglifier) ? Jammit::Uglifier  : nil
+    JAVASCRIPT_COMPRESSORS = {
+      :jsmin    => Jammit.javascript_compressors.include?(:jsmin)  ? Jammit::JsminCompressor : nil,
+      :yui      => Jammit.javascript_compressors.include?(:yui)  ? YUI::JavaScriptCompressor : nil,
+      :closure  => Jammit.javascript_compressors.include?(:closure)  ? Closure::Compiler : nil,
+      :uglifier => Jammit.javascript_compressors.include?(:uglifier) ? Jammit::Uglifier  : nil
     }
 
-    DEFAULT_OPTIONS = {
+    CSS_COMPRESSORS = {
+      :cssmin   => Jammit.css_compressors.include?(:cssmin) ? Jammit::CssminCompressor : nil,
+      :yui      => Jammit.css_compressors.include?(:yui) ? YUI::CssCompressor : nil,
+      :sass     => Jammit.css_compressors.include?(:sass) ? Jammit::SassCompressor : nil
+     }
+
+    JAVASCRIPT_DEFAULT_OPTIONS = {
+      :jsmin    => {},
       :yui      => {:munge => true},
       :closure  => {},
       :uglifier => {:copyright => false}
     }
 
-    # The css compressor is always the YUI Compressor. JS compression can be
-    # provided with YUI Compressor, Google Closure Compiler or UglifyJS.
+    # CSS compression can be provided with YUI Compressor or sass. JS
+    # compression can be provided with YUI Compressor, Google Closure
+    # Compiler or UglifyJS.
     def initialize
-      Jammit.check_java_version
-      @css_compressor = YUI::CssCompressor.new(Jammit.css_compressor_options || {})
-      flavor          = Jammit.javascript_compressor || Jammit::DEFAULT_COMPRESSOR
-      @options        = DEFAULT_OPTIONS[flavor].merge(Jammit.compressor_options || {})
-      @js_compressor  = COMPRESSORS[flavor].new(@options)
+      if Jammit.javascript_compressors.include?(:yui) || Jammit.javascript_compressors.include?(:closure) || Jammit.css_compressors.include?(:yui)
+        Jammit.check_java_version
+      end
+
+      css_flavor      = Jammit.css_compressor || Jammit::DEFAULT_CSS_COMPRESSOR
+      @css_compressor = CSS_COMPRESSORS[css_flavor].new(Jammit.css_compressor_options || {})
+      js_flavor       = Jammit.javascript_compressor || Jammit::DEFAULT_JAVASCRIPT_COMPRESSOR
+      @options        = JAVASCRIPT_DEFAULT_OPTIONS[js_flavor].merge(Jammit.compressor_options || {})
+      @js_compressor  = JAVASCRIPT_COMPRESSORS[js_flavor].new(@options)
     end
 
     # Concatenate together a list of JavaScript paths, and pass them through the
@@ -179,7 +192,7 @@ module Jammit
     def construct_asset_path(asset_path, css_path, variant)
       public_path = absolute_path(asset_path, css_path)
       return "__EMBED__#{public_path}" if embeddable?(public_path, variant)
-      source = asset_path.absolute? ? asset_path.to_s : relative_path(public_path)
+      source = asset_path.absolute? || ! Jammit.rewrite_relative_paths ? asset_path.to_s : relative_path(public_path)
       rewrite_asset_path(source, public_path)
     end
 

data/lib/jammit/cssmin_compressor.rb

@@ -0,0 +1,10 @@
+# Wraps CSSMin compressor to use the same API as the rest of
+# Jammit's compressors.
+class Jammit::CssminCompressor
+  def initialize(options = {})
+  end
+
+  def compress(css)
+    CSSMin.minify(css)
+  end
+end

data/lib/jammit/dependencies.rb

@@ -7,28 +7,45 @@ require 'base64'
 require 'pathname'
 require 'fileutils'
 
-# Include YUI as the default
-require 'yui/compressor'
+# Try Uglifier.
+begin
+  require 'uglifier'
+  require 'jammit/uglifier'
+rescue LoadError
+  Jammit.javascript_compressors.delete :uglifier
+end
+
+# Try YUI
+begin
+  require 'yui/compressor'
+rescue LoadError
+  Jammit.javascript_compressors.delete :yui
+  Jammit.css_compressors.delete :yui
+end
 
 # Try Closure.
 begin
   require 'closure-compiler'
 rescue LoadError
-  Jammit.compressors.delete :closure
+  Jammit.javascript_compressors.delete :closure
 end
 
-# Try Uglifier.
+# Try Sass
 begin
-  require 'uglifier'
+  require 'sass'
+  require 'jammit/sass_compressor'
 rescue LoadError
-  Jammit.compressors.delete :uglifier
+  Jammit.css_compressors.delete :sass
 end
 
 # Load initial configuration before the rest of Jammit.
 Jammit.load_configuration(Jammit::DEFAULT_CONFIG_PATH, true) if defined?(Rails)
 
 # Jammit Core:
-require 'jammit/uglifier' if Jammit.compressors.include? :uglifier
+require 'jsmin'
+require 'cssmin'
+require 'jammit/jsmin_compressor'
+require 'jammit/cssmin_compressor'
 require 'jammit/compressor'
 require 'jammit/packager'
 

data/lib/jammit/jsmin_compressor.rb

@@ -0,0 +1,10 @@
+# Wraps JSMin compressor to use the same API as the rest of
+# Jammit's compressors.
+class Jammit::JsminCompressor
+  def initialize(options = {})
+  end
+
+  def compress(js)
+    JSMin.minify(js)
+  end
+end

data/lib/jammit/packager.rb

@@ -14,7 +14,6 @@ module Jammit
     # Jammit.configuration. When assets.yml is being changed on the fly,
     # create a new Packager.
     def initialize
-      @compressor     = Compressor.new
       @force          = false
       @package_names  = nil
       @config = {
@@ -71,21 +70,25 @@ module Jammit
       package_for(package, extension)[:urls]
     end
 
+    def compressor
+      @compressor ||= Compressor.new
+    end
+
     # Return the compressed contents of a stylesheet package.
     def pack_stylesheets(package, variant=nil, asset_url=nil)
-      @compressor.compress_css(package_for(package, :css)[:paths], variant, asset_url)
+      compressor.compress_css(package_for(package, :css)[:paths], variant, asset_url)
     end
 
     # Return the compressed contents of a javascript package.
     def pack_javascripts(package)
-      @compressor.compress_js(package_for(package, :js)[:paths])
+      compressor.compress_js(package_for(package, :js)[:paths])
     end
 
     # Return the compiled contents of a JST package.
     def pack_templates(package)
-      @compressor.compile_jst(package_for(package, :js)[:paths])
+      compressor.compile_jst(package_for(package, :js)[:paths])
     end
-  
+
 
     private
 
@@ -109,7 +112,7 @@ module Jammit
     def path_to_url
       @path_to_url ||= /\A#{Regexp.escape(ASSET_ROOT)}(\/?#{Regexp.escape(Jammit.public_root.sub(ASSET_ROOT, ''))})?/
     end
-    
+
     # Get the latest mtime of a list of files (plus the config path).
     def latest_mtime(paths)
       paths += [Jammit.config_path]

data/lib/jammit/sass_compressor.rb

@@ -0,0 +1,17 @@
+# Wraps sass' css compressor to use the same API as the rest of
+# Jammit's compressors.
+class Jammit::SassCompressor
+  # Creates a new sass compressor. Jammit::SassCompressor doesn't use
+  # any options, the +options+ parameter is there for API
+  # compatibility.
+  def initialize(options = {})
+  end
+
+  # Compresses +css+ using sass' CSS parser, and returns the
+  # compressed css.
+  def compress(css)
+    root_node = ::Sass::SCSS::CssParser.new(css, 'jammit-combined-input').parse
+    root_node.options = {:style => :compressed}
+    root_node.render.strip
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jammit
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - Jeremy Ashkenas
@@ -15,24 +15,40 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-30 00:00:00 Z
+date: 2013-03-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: yui-compressor
+  name: cssmin
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 61
+        hash: 17
         segments: 
+        - 1
         - 0
-        - 9
         - 3
-        version: 0.9.3
+        version: 1.0.3
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: jsmin
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
+  type: :runtime
+  version_requirements: *id002
 description: "    Jammit is an industrial strength asset packaging library for Rails,\n    providing both the CSS and JavaScript concatenation and compression that\n    you'd expect, as well as YUI Compressor and Closure Compiler compatibility,\n    ahead-of-time gzipping, built-in JavaScript template support, and optional\n    Data-URI / MHTML image embedding.\n"
 email: jeremy@documentcloud.org
 executables: 
@@ -45,12 +61,15 @@ files:
 - lib/jammit/command_line.rb
 - lib/jammit/compressor.rb
 - lib/jammit/controller.rb
+- lib/jammit/cssmin_compressor.rb
 - lib/jammit/dependencies.rb
 - lib/jammit/helper.rb
+- lib/jammit/jsmin_compressor.rb
 - lib/jammit/jst.js
 - lib/jammit/packager.rb
 - lib/jammit/railtie.rb
 - lib/jammit/routes.rb
+- lib/jammit/sass_compressor.rb
 - lib/jammit/uglifier.rb
 - lib/jammit.rb
 - bin/jammit
@@ -93,9 +112,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jammit
-rubygems_version: 1.7.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Industrial Strength Asset Packaging for Rails
 test_files: []
 
+has_rdoc: