Merge branch 'master' of https://github.com/documentcloud/jammit into bin_root

* 'master' of https://github.com/documentcloud/jammit:
  Fixes a typo.
  Fixed SASS test, it actually cares about single vs double quotes.
  Actually sets :jsmin as DEFAULT_JAVASCRIPT_COMPRESSOR AND :cssmin as DEFAULT_CSS_COMPRESSOR. They both are loaded inside `lib/jammit/dependencies.rb`
  cssmin and jsmin is the new minimum requirements of jammit. YUI is now optional.
  Added sass, cssmin, and jsmin to Gemfile as part of development+test requirements.
  Removed unecessary abstraction of YUI compressors.
  Refactor of Jammit.
  Late instantiation of Jammit::Compressor
  Added test for no-rewrite-relative-paths.
  Replace invalid font/* MIME types with valid ones, to suppress WebKit warnings
  Bad merge.
  Added rewrite_relative_paths.
  Erase has_rdoc
  Edit s.date = to current date time with proper format
  Fix for undefined RAILS_ENV (when running under Rake there's no Rails.env).

Author: samuelclay

Gemfile

@@ -0,0 +1,18 @@
+source 'http://rubygems.org'
+
+gemspec
+
+group :development, :test do
+  gem "rake", "0.9.2.2"
+  gem "rails", "2.3.14"
+  gem "cssmin", "1.0.2"
+  gem "jsmin", "1.0.1"
+  gem "yui-compressor", "0.9.6"
+  gem "closure-compiler", "1.1.6"
+  gem "uglifier", "1.2.4"
+  gem "sass", "3.1.7"
+end
+
+group :development do
+  gem "RedCloth", "4.2.9"
+end

doc/Jammit/Compressor.html

@@ -234,7 +234,7 @@ <h2>Constant Summary</h2>
 <span class='rbrace token'>}</span>
 </pre></dd>
 
-        <dt id="DEFAULT_OPTIONS-constant" class="">DEFAULT_OPTIONS =
+        <dt id="JAVASCRIPT_DEFAULT_OPTIONS-constant" class="">JAVASCRIPT_DEFAULT_OPTIONS =
 
         </dt>
         <dd><pre class="code"><span class='lbrace token'>{</span>

index.html

@@ -164,7 +164,7 @@ <h2 id="installation">Installation</h2>
       <a href="http://github.com/sstephenson/ruby-yui-compressor">ruby-yui-compressor</a>,
       <a href="http://github.com/documentcloud/closure-compiler">closure-compiler</a> or
       <a href="https://github.com/lautis/uglifier">uglifier</a>
-      gems installed, downloading make take a minute &mdash; the jar files together
+      gems installed, downloading may take a minute &mdash; the jar files together
       weigh in at 5 megabytes.</i>
     </p>
 
@@ -236,6 +236,13 @@ <h2 id="configuration">Configuration</h2>
           if you're packaging assets in development.
         </td>
       </tr>
+      <tr>
+        <td><b>rewrite_relative_paths</b></td>
+        <td><tt>on&nbsp;|&nbsp;off</tt></td>
+        <td class="definition">
+          Defaults to <b>on</b>. When <b>off</b>, relative paths with CSS will be left unchanged.
+        </td>
+      </tr>
       <tr>
         <td><b>gzip_assets</b></td>
         <td><tt>on&nbsp;|&nbsp;off</tt></td>

jammit.gemspec

@@ -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.2']
+  s.add_dependency 'jsmin',  ['>= 1.0.1']
 
   s.files = Dir['lib/**/*', 'bin/*', 'rails/*', 'jammit.gemspec', 'LICENSE', 'README']
 end

lib/jammit.rb

@@ -4,27 +4,31 @@
 # to all of the configuration options.
 module Jammit
 
-  VERSION               = "0.6.5"
+  VERSION                       = "0.6.5"
 
-  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 @@ class << self
     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,20 +78,22 @@ def self.load_configuration(config_path, soft=false)
     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
     @configuration          = symbolize_keys(conf)
     @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 @@ def self.set_public_root(public_root=nil)
   # 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.

lib/jammit/compressor.rb

@@ -15,9 +15,9 @@ class Compressor
       '.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 @@ class Compressor
     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 @@ def with_mhtml(css, asset_url)
     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
 

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

lib/jammit/dependencies.rb

@@ -7,28 +7,45 @@
 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'
 

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

lib/jammit/packager.rb

@@ -14,7 +14,6 @@ class Packager
     # 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 @@ def individual_urls(package, extension)
       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 @@ def glob_files(glob)
     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]