sinatra-assetpack 0.0.9 → 0.0.10

data/HISTORY.md

@@ -1,3 +1,17 @@
+v0.0.10 - Sep 18, 2011
+----------------------
+
+### Added:
+  * Support for 'prebuild' to build on startup.
+  * Add UglifyJS support via `js_compression :uglify`. (#18)
+  * Ignore '.*' and '_*' files. (#17)
+  * Allow specifying of files to be ignored. (#17)
+
+### Changed:
+  * Built files from 'rake assetpack:build' now match the mtimes of their
+    sources. (#12)
+  * Refactor Compressor into separate engine classes.
+
 v0.0.9 - Sep 18, 2011
 ---------------------
 
@@ -6,8 +20,8 @@ v0.0.9 - Sep 18, 2011
   * Fix the Rake task when the main App class is in a module. (#11)
 
 ### Changed:
-  * Use Sinatra's `template_cache`. This makes AssetPack honor Sinatra's 
-`reload_templates` setting. (#15)
+  * Use Sinatra's `template_cache`. This makes AssetPack honor Sinatra's
+    `reload_templates` setting. (#15)
 
 ### Added:
   * Added .htc (IE behavior files) to the list of file formats to be served.
@@ -17,16 +31,16 @@ v0.0.8 - Sep 06, 2011
 ---------------------
 
 ### Fixed:
-  * Fixed the CSS preprocessing bug that gives invalid 'url()' properties to 
-  non-existing images. Closes #1.
+  * Fixed the CSS preprocessing bug that gives invalid 'url()' properties to
+    non-existing images. (#1)
 
 ### Added:
-  * Allow adding CSS/JS files that don't exist. Closes #8.
-  * Support any Tilt-compatible CSS or JS engine. Related to #5.
+  * Allow adding CSS/JS files that don't exist. (#8)
+  * Support any Tilt-compatible CSS or JS engine. (#5)
 
 ### Changed:
-  * Default to '/assets/x.js' then using assets.css without a path. Inspiration 
-  from Jammit.
+  * Default to '/assets/x.js' then using assets.css without a path. Inspiration
+    from Jammit.
   * Ask browsers to cache assets for 1 month.
 
 ### Misc:

data/README.md

@@ -136,7 +136,7 @@ compressors in the `assets` block:
 
 ``` ruby
 assets {
-  js_compression  :jsmin    # :jsmin | :yui | :closure
+  js_compression  :jsmin    # :jsmin | :yui | :closure | :uglify
   css_compression :simple   # :simple | :sass | :yui | :sqwish
 }
 ```
@@ -155,10 +155,19 @@ assets {
 }
 ```
 
+__Note:__ This depends on the `yui-compressor` gem. You will need to install it.
+(`gem install yui-compressor`) If you use Bundler, you will need to add it to 
+your Gemfile as well.
+
+``` ruby
+# Gemfile
+gem 'yui-compressor', :require => 'yui/compressor'
+```
+
 ### SASS compression
 
 For SASS compression, you need the Sass gem (`gem install sass`). This treats 
-the CSS files as Scss files and uses Sass's `output: :compressed`.
+the CSS files as Scss files and uses Sass's `:output => :compressed`.
 
 ``` ruby
 assets {
@@ -166,6 +175,15 @@ assets {
 }
 ```
 
+__Note:__ This depends on the `sass` gem. You will need to install it (`gem
+install sass`). If you use Bundler, you will need to add it to your Gemfile as 
+well.
+
+``` ruby
+# Gemfile
+gem 'sass'
+```
+
 ### Sqwish CSS compression
 
 [Sqwish](http://github.com/ded/sqwish) is a NodeJS-based CSS compressor.  To use 
@@ -196,6 +214,35 @@ assets {
 }
 ```
 
+### UglifyJS compression
+
+This uses the [UglifyJS](https://github.com/mishoo/UglifyJS) compressor to 
+compress your JavaScript. You will need to install the 
+[uglifier](http://rubygems.org/gems/uglifier) gem.
+
+For options, refer to the [Uglifier 
+documentation](https://github.com/lautis/uglifier).
+
+``` ruby
+assets {
+  js_compression :uglify
+  js_compression :uglify, [options]
+}
+```
+
+__Note:__ This depends on the `uglifier` gem. In your Gemfile, you will need to 
+add it. For Heroku support, you will need to add the `therubyracer-heroku` gem 
+as well.
+
+``` ruby
+# Gemfile
+gem 'uglifier'
+
+# If you're on Heroku:
+gem "therubyracer-heroku", "0.8.1.pre3", :require => false
+```
+
+
 Images
 ------
 
@@ -378,8 +425,8 @@ from `./app/javascripts/vendor/jquery*.js`.
 
 ``` ruby
 class App < Sinatra::Base
-  serve '/js', from: '/app/javascripts'
   assets {
+    serve '/js', from: '/app/javascripts'
     js :application, [
       '/js/vendor/jquery.*.js',
       '/js/vendor/jquery.js'
@@ -390,6 +437,96 @@ end
 # In views: <%= js :application %>
 ```
 
+### assets.ignore
+Excludes any URL paths that match the given spec.
+
+These files will not show up in packages, and they will not be accessible.
+
+By default, `.*` and `_*` are ignored. The former protects folders such as 
+`.svn` from being accessed, and the latter protects Sass partial files from 
+being accessed directly.
+
+Note that this matches against URL paths, not local file paths. This means 
+something like `*.scss` will not work, as all stylesheet files will be compiled 
+to `.css`.
+
+``` ruby
+# Usage:
+assets {
+  ignore FILESPEC
+}
+```
+
+#### Example
+Here's an example.
+
+``` ruby
+class App < Sinatra::Base
+  assets {
+    # Ignores all files matching *.private.js in any folder.
+    ignore '*.private.js'
+
+    # Ignores all files in `/app/js/foo/**/*`
+    ignore '/js/foo'
+  }
+end
+```
+
+#### Advanced usage
+By default, `.*` and `_*` are ignored. To disable this behavior, you can use 
+`clear_ignores!` before your `ignore` lines.
+
+``` ruby
+assets {
+  clear_ignores!
+  ignore '*.private.js'
+}
+```
+
+To check if a certain file is ignored, use `assets.ignore?`
+
+``` ruby
+assets.ignored?("/css/_chrome.css")   #=> true
+```
+
+
+### assets.prebuild
+Caches the built packages on application startup.
+
+If this is not used, the packages will be minified when they are first 
+requested. This only has an effect in the production environment (or when
+Sinatra's `reload_templates` is otherwise set to false).
+
+``` ruby
+# Usage:
+prebuild {true|false}
+```
+
+#### Example
+In this example, the package for `:application` will be built when the 
+application is started in the production environment.
+
+``` ruby
+class App < Sinatra::Base
+  assets {
+    js_compression :closure
+
+    js :application, [
+      '/js/vendor/jquery.*.js',
+      '/js/vendor/jquery.js'
+    ]
+    prebuild true
+  }
+end
+
+# $ RACK_ENV=production ruby app.rb
+# ** Building /assets/application.js...
+# == Sinatra/1.2.6 has taken the stage on 4567 for production
+# >> Thin web server (v1.2.11 codename Bat-Shit Crazy)
+# >> Maximum connections set to 1024
+# >> Listening on 0.0.0.0:4567, CTRL+C to stop
+```
+
 API reference: helpers
 ----------------------
 
@@ -500,19 +637,6 @@ class Main
 end
 ```
 
-To do
------
-
-AssetPack will eventually have:
-
- * Nested packages
- * Ignored files (to ignore included sass files and such)
- * `rake assetpack:build` should be able to output to another folder
- * Cache folder support (best if your app has many workers)
- * Refactor *Compressor* module
- * CDN (Cloudfront, S3) support
- * Better support for Compass sprites
-
 Acknowledgements
 ----------------
 

data/examples/basic/app/js/app.js

@@ -1,3 +1,4 @@
 ("App.js goes here.");
+console.log("Hello");
 
 

data/examples/basic/app.rb

@@ -1,4 +1,4 @@
-$:.unshift File.expand_path('../../lib', __FILE__)
+$:.unshift File.expand_path('../../../lib', __FILE__)
 
 require 'sinatra/base'
 require 'sinatra/assetpack'
@@ -8,6 +8,9 @@ class App < Sinatra::Base
   register Sinatra::AssetPack
 
   assets do
+    #js_compression :closure
+    js_compression :uglify
+
     js :main, '/js/main.js', [
       '/js/vendor/*.js',
       '/js/app.js'
@@ -22,6 +25,8 @@ class App < Sinatra::Base
     css :more, '/css/more.css', [
       '/css/more/*.css'
     ]
+
+    prebuild true
   end
 
   get '/' do

data/examples/compass/app.rb

@@ -1,4 +1,4 @@
-$:.unshift File.expand_path('../../lib', __FILE__)
+$:.unshift File.expand_path('../../../lib', __FILE__)
 
 require 'sinatra/base'
 require 'sinatra/assetpack'

data/lib/sinatra/assetpack/class_methods.rb

@@ -13,6 +13,11 @@ module Sinatra
       def assets_initialize!
         add_compressed_routes!
         add_individual_routes!
+
+        # Cache the built files.
+        if assets.prebuild && !reload_templates
+          assets.cache! { |file| $stderr.write "** Building #{file}...\n" }
+        end
       end
 
       # Add routes for the compressed versions
@@ -40,6 +45,8 @@ module Sinatra
             pass unless AssetPack.supported_formats.include?(fmt)
             fn = asset_path_for(file, from)  or pass
 
+            pass  if settings.assets.ignored?("#{path}/#{file}")
+
             # Send headers
             content_type fmt.to_sym
             last_modified File.mtime(fn).to_i

data/lib/sinatra/assetpack/compressor.rb

@@ -8,102 +8,47 @@ module Sinatra
       #     compress File.read('x.js'), :js, :jsmin
       #
       def compress(str, type, engine=nil, options={})
-        engine ||= 'jsmin'   if type == :js
-        engine ||= 'simple'  if type == :css
+        # Use defaults if no engine is given.
+        return fallback(str, type, options)  if engine.nil?
 
-        key  = :"#{type}/#{engine}"
-        meth = compressors[key]
-        return str  unless meth
+        # Ensure that the engine exists.
+        klass = compressors[[type, engine]]
+        raise Error, "Engine #{engine} (#{type}) doesn't exist."  unless klass
 
-        meth[str, options]
-      end
-
-      def compressors
-        @compressors ||= {
-          :'js/jsmin'    => method(:jsmin),
-          :'js/yui'      => method(:yui_js),
-          :'js/closure'  => method(:closure_js),
-          :'css/sass'    => method(:sass),
-          :'css/yui'     => method(:yui_css),
-          :'css/simple'  => method(:simple_css),
-          :'css/sqwish'  => method(:sqwish_css)
-        }
-      end
-
-      # =====================================================================
-      # Compressors
-
-      def jsmin(str, options={})
-        require 'jsmin'
-        JSMin.minify str
-      end
-
-      def sass(str, options={})
-        Tilt.new("scss", {:style => :compressed}) { str }.render
-      rescue LoadError
-        simple_css str
-      end
+        # Ensure that the engine can support that type.
+        engine = klass.new
+        raise Error, "#{klass} does not support #{type.upcase} compression."  unless engine.respond_to?(type)
 
-      def yui_css(str, options={})
-        require 'yui/compressor'
-        YUI::CssCompressor.new.compress(str)
-      rescue Errno::ENOENT
-        sass str
+        # Build it using the engine, and fallback to defaults if it fails.
+        output   = engine.send type, str, options
+        output ||= fallback(str, type, options)  unless options[:no_fallback]
+        output
       end
 
-      def yui_js(str, options={})
-        require 'yui/compressor'
-        YUI::JavaScriptCompressor.new(options).compress(str)
-      rescue LoadError
-        jsmin str
+      # Compresses a given string using the default engines.
+      def fallback(str, type, options)
+        if type == :js
+          compress str, :js, :jsmin, :no_fallback => true
+        elsif type == :css
+          compress str, :css, :simple, :no_fallback => true
+        end
       end
 
-      def simple_css(str, options={})
-        str.gsub! /[ \r\n\t]+/m, ' '
-        str.gsub! %r{ *([;\{\},:]) *}, '\1'
-      end
-
-      def sqwish_css(str, options={})
-        cmd = "#{sqwish_bin} %f "
-        cmd += "--strict"  if options[:strict]
-
-        _, input = sys :css, str, cmd
-        output   = input.gsub(/\.css/, '.min.css')
-
-        File.read(output)
-      rescue => e
-        simple_css str
-      end
-
-      def sqwish_bin
-        ENV['SQWISH_PATH'] || "sqwish"
-      end
-
-      def closure_js(str, options={})
-        require 'net/http'
-        require 'uri'
-
-        response = Net::HTTP.post_form(URI.parse('http://closure-compiler.appspot.com/compile'), {
-          'js_code' => str,
-          'compilation_level' => options[:level] || "ADVANCED_OPTIMIZATIONS",
-          'output_format' => 'text',
-          'output_info' => 'compiled_code'
-        })
-
-        response.body
+      def compressors
+        @compressors ||= Hash.new
       end
 
-      # For others
-      def sys(type, str, cmd)
-        t = Tempfile.new ['', ".#{type}"]
-        t.write(str)
-        t.close
-
-        output = `#{cmd.gsub('%f', t.path)}`
-        FileUtils.rm t
-
-        [output, t.path]
+      def register(type, engine, meth)
+        compressors[[type, engine]] = meth
       end
     end
+
+    require "#{AssetPack::PREFIX}/assetpack/engines/simple"
+    require "#{AssetPack::PREFIX}/assetpack/engines/jsmin"
+    require "#{AssetPack::PREFIX}/assetpack/engines/yui"
+    require "#{AssetPack::PREFIX}/assetpack/engines/sass"
+    require "#{AssetPack::PREFIX}/assetpack/engines/sqwish"
+    require "#{AssetPack::PREFIX}/assetpack/engines/closure"
+    require "#{AssetPack::PREFIX}/assetpack/engines/uglify"
   end
 end

data/lib/sinatra/assetpack/engine.rb

@@ -0,0 +1,20 @@
+module Sinatra
+  module AssetPack
+    # The base class for all CSS/JS compression engines.
+    class Engine
+      # Helper for system files.
+      # Usage: sys('css', string, "sqwish %f")
+      # Returns stdout.
+      def sys(type, str, cmd)
+        t = Tempfile.new ['', ".#{type}"]
+        t.write(str)
+        t.close
+
+        output = `#{cmd.gsub('%f', t.path)}`
+        FileUtils.rm t
+
+        [output, t.path]
+      end
+    end
+  end
+end

data/lib/sinatra/assetpack/engines/closure.rb

@@ -0,0 +1,19 @@
+module Sinatra::AssetPack
+  class ClosureEngine < Engine
+    def js(str, options={})
+      require 'net/http'
+      require 'uri'
+
+      response = Net::HTTP.post_form(URI.parse('http://closure-compiler.appspot.com/compile'), {
+        'js_code' => str,
+        'compilation_level' => options[:level] || "ADVANCED_OPTIMIZATIONS",
+        'output_format' => 'text',
+        'output_info' => 'compiled_code'
+      })
+
+      response.body
+    end
+  end
+
+  Compressor.register :js, :closure, ClosureEngine
+end

data/lib/sinatra/assetpack/engines/jsmin.rb

@@ -0,0 +1,10 @@
+module Sinatra::AssetPack
+  class JsminEngine < Engine
+    def js(str, options={})
+      require 'jsmin'
+      JSMin.minify str
+    end
+  end
+
+  Compressor.register :js, :jsmin, JsminEngine
+end

data/lib/sinatra/assetpack/engines/sass.rb

@@ -0,0 +1,11 @@
+module Sinatra::AssetPack
+  class SassEngine < Engine
+    def css(str, options={})
+      Tilt.new("scss", {:style => :compressed}) { str }.render
+    rescue LoadError
+      nil
+    end
+  end
+
+  Compressor.register :css, :sass, SassEngine
+end

data/lib/sinatra/assetpack/engines/simple.rb

@@ -0,0 +1,11 @@
+module Sinatra::AssetPack
+  class SimpleEngine < Engine
+    def css(str, options={})
+      str.gsub! /[ \r\n\t]+/m, ' '
+      str.gsub! %r{ *([;\{\},:]) *}, '\1'
+      str
+    end
+  end
+
+  Compressor.register :css, :simple, SimpleEngine
+end

data/lib/sinatra/assetpack/engines/sqwish.rb

@@ -0,0 +1,21 @@
+module Sinatra::AssetPack
+  class SqwishEngine < Engine
+    def css(str, options={})
+      cmd = "#{sqwish_bin} %f "
+      cmd += "--strict"  if options[:strict]
+
+      _, input = sys :css, str, cmd
+      output   = input.gsub(/\.css/, '.min.css')
+
+      File.read(output)
+    rescue => e
+      nil
+    end
+
+    def sqwish_bin
+      ENV['SQWISH_PATH'] || "sqwish"
+    end
+  end
+
+  Compressor.register :css, :sqwish, SqwishEngine
+end

data/lib/sinatra/assetpack/engines/uglify.rb

@@ -0,0 +1,12 @@
+module Sinatra::AssetPack
+  class UglifyEngine < Engine
+    def js(str, options={})
+      require 'uglifier'
+      Uglifier.compile str, options
+    rescue => e
+      nil
+    end
+  end
+
+  Compressor.register :js, :uglify, UglifyEngine
+end

data/lib/sinatra/assetpack/engines/yui.rb

@@ -0,0 +1,22 @@
+module Sinatra::AssetPack
+  class YuiEngine < Engine
+    def initialize
+      require 'yui/compressor'
+    end
+
+    def js(str, options={})
+      YUI::JavaScriptCompressor.new(options).compress(str)
+    rescue LoadError
+      nil
+    end
+
+    def css(str, options={})
+      YUI::CssCompressor.new.compress(str)
+    rescue Errno::ENOENT
+      nil
+    end
+  end
+
+  Compressor.register :js,  :yui, YuiEngine
+  Compressor.register :css, :yui, YuiEngine
+end

data/lib/sinatra/assetpack/hasharray.rb

@@ -38,20 +38,6 @@ module Sinatra
         new arr.each_slice(2).map { |(k, v)| Hash[k, v] }
       end
 
-      # Works like Hash#each.
-      #
-      # By extension, methods that rely on #each (like #inject) will work
-      # as intended.
-      #
-      def each(&block)
-        super { |hash| yield hash.to_a.flatten }
-      end
-
-      # Works like Hash#map.
-      def map(&block)
-        super { |hash| yield hash.to_a.flatten }
-      end
-
       # Works like Hash#values.
       def values
         inject([]) { |a, (k, v)| a << v; a }
@@ -65,6 +51,16 @@ module Sinatra
       def keys
         inject([]) { |a, (k, v)| a << k; a }
       end
+
+      [:each, :map, :map!, :reject, :reject!, :select, :select!].each do |meth|
+        send(:define_method, meth) { |*a, &block|
+          if block.respond_to?(:call)
+            super(*a) { |hash| block.call *hash.to_a }
+          else
+            super(*a)
+          end
+        }
+      end
     end
   end
 end

data/lib/sinatra/assetpack/options.rb

@@ -49,6 +49,8 @@ module Sinatra
         @js_compression_options  = Hash.new
         @css_compression_options = Hash.new
 
+        @ignored = Array.new
+
         reset!
 
         # Defaults!
@@ -56,6 +58,9 @@ module Sinatra
         serve '/js',     :from => 'app/js'
         serve '/images', :from => 'app/images'
 
+        ignore '.*'
+        ignore '_*'
+
         blk.arity <= 0 ? instance_eval(&blk) : yield(self)  if block_given?
       end
 
@@ -75,6 +80,27 @@ module Sinatra
         @packages = Hash.new
       end
 
+      # Ignores a given path spec.
+      def ignore(spec)
+        if spec[0] == '/'
+          @ignored << "#{spec}"
+          @ignored << "#{spec}/**"
+        else
+          @ignored << "**/#{spec}"
+          @ignored << "**/#{spec}/**"
+        end
+      end
+
+      # Makes nothing ignored. Use this if you don't want to ignore dotfiles and underscore files.
+      def clear_ignores!
+        @ignored  = Array.new
+      end
+
+      # Checks if a given path is ignored.
+      def ignored?(fn)
+        @ignored.any? { |spec| File.fnmatch spec, fn }
+      end
+
       # Adds some JS packages.
       #
       #     js :foo, [ '/js/vendor/jquery.*.js', ... ]
@@ -122,6 +148,8 @@ module Sinatra
       attrib :js_compression_options   # Hash
       attrib :css_compression_options  # Hash
 
+      attrib :prebuild          # Bool
+
       def js_compression(name=nil, options=nil)
         @js_compression = name  unless name.nil?
         @js_compression_options = options  if options.is_a?(Hash)
@@ -142,18 +170,40 @@ module Sinatra
       def build!(&blk)
         session = Rack::Test::Session.new app
 
+        get = lambda { |path|
+          response = session.get(path)
+          out      = response.body
+          mtime    = Time.parse(response.headers['Last-Modified'])  if response.headers['Last-Modified']
+
+          [ out, mtime ]
+        }
+
         packages.each { |_, pack|
-          out = session.get(pack.path).body
+          out, mtime = get[pack.path]
 
-          write pack.path, out, &blk
-          write pack.production_path, out, &blk
+          write pack.path, out, mtime, &blk
+          write pack.production_path, out, mtime, &blk
         }
 
         files.each { |path, local|
-          out = session.get(path).body
-          write path, out, &blk
-          write BusterHelpers.add_cache_buster(path, local), out, &blk
+          out, mtime = get[path]
+
+          write path, out, mtime, &blk
+          write BusterHelpers.add_cache_buster(path, local), out, mtime, &blk
+        }
+      end
+
+      # Caches the packages.
+      def cache!(&blk)
+        return false  if app.reload_templates
+
+        session = Rack::Test::Session.new app
+        packages.each { |_, pack|
+          yield pack.path  if block_given?
+          session.get(pack.path)
         }
+
+        true
       end
 
       def served?(path)
@@ -189,7 +239,7 @@ module Sinatra
       end
 
       # Writes `public/#{path}` based on contents of `output`.
-      def write(path, output)
+      def write(path, output, mtime=nil)
         require 'fileutils'
 
         path = File.join(@output_path, path)
@@ -197,6 +247,10 @@ module Sinatra
 
         FileUtils.mkdir_p File.dirname(path)
         File.open(path, 'w') { |f| f.write output }
+
+        if mtime
+          File.utime mtime, mtime, path
+        end
       end
 
       # Returns the files as a hash.

data/lib/sinatra/assetpack/package.rb

@@ -37,7 +37,9 @@ module Sinatra
 
       # Returns a list of URIs
       def paths_and_files
-        @assets.glob @filespecs, :preserve => true
+        list = @assets.glob(@filespecs, :preserve => true)
+        list.reject! { |path, file| @assets.ignored?(path) }
+        list
       end
 
       def files

data/lib/sinatra/assetpack/version.rb

@@ -1,7 +1,7 @@
 module Sinatra
   module AssetPack
     def self.version
-      "0.0.9"
+      "0.0.10"
     end
   end
 end

data/lib/sinatra/assetpack.rb

@@ -46,6 +46,7 @@ module Sinatra
     autoload :Helpers,       "#{PREFIX}/assetpack/helpers"
     autoload :HtmlHelpers,   "#{PREFIX}/assetpack/html_helpers"
     autoload :BusterHelpers, "#{PREFIX}/assetpack/buster_helpers"
+    autoload :Engine,        "#{PREFIX}/assetpack/engine"
     autoload :Package,       "#{PREFIX}/assetpack/package"
     autoload :Compressor,    "#{PREFIX}/assetpack/compressor"
     autoload :Image,         "#{PREFIX}/assetpack/image"

data/sinatra-assetpack.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "contest"
   s.add_development_dependency "mocha"
   s.add_development_dependency "stylus"
+  s.add_development_dependency "uglifier"
 end

data/test/app/app/js/_ignoreme.js

@@ -0,0 +1 @@
+alert("HELLO I SHOULD BE IGNORED. BUMBLEBEE.");

data/test/app/app/js/ugly.js

@@ -0,0 +1,7 @@
+(function() {
+  var kitsch = 1;
+  var noodle = 2;
+  var banana = 3;
+  console.log(noodle, banana);
+})();
+

data/test/arity_test.rb

@@ -1,8 +1,7 @@
 require File.expand_path('../test_helper', __FILE__)
 
 class ArityTest < UnitTest
-  class App < Sinatra::Base
-    set :root, File.expand_path('../app', __FILE__)
+  class App < UnitTest::App
     register Sinatra::AssetPack
 
     assets do |a|

data/test/build_test.rb

@@ -11,11 +11,21 @@ class BuildTest < UnitTest
     app.assets.build!
 
     assert File.file? File.join(app.root, 'public/js/app.js')
+    assert File.mtime(File.join(app.root, 'public/js/app.js')).to_i == app.assets.packages['app.js'].mtime.to_i
+
     assert Dir[File.join(app.root, 'public/js/app.*.js')].first
 
     assert File.read(File.join(app.root, 'public/js/app.js')).include?('function(){alert("Hello");')
 
     assert Dir["#{app.root}/public/images/background.*.jpg"].first
     assert Dir["#{app.root}/public/images/email.*.png"].first
+
+    assert \
+      File.mtime(Dir["#{app.root}/public/images/background.*.jpg"].first).to_i ==
+      File.mtime(Dir["#{app.root}/public/images/background.jpg"].first).to_i
+
+    assert \
+      File.mtime(Dir["#{app.root}/public/images/background.*.jpg"].first).to_i ==
+      File.mtime(Dir["#{app.root}/app/images/background.jpg"].first).to_i
   end
 end

data/test/cache_test.rb

@@ -3,7 +3,7 @@ require File.expand_path('../test_helper', __FILE__)
 class CacheTest < UnitTest
   test "Compressed js caching" do
     app.set :reload_templates, false
-    JSMin.expects(:minify).times(1)
+    JSMin.expects(:minify).times(1).returns ""
     3.times { get '/js/app.js' }
   end
 end

data/test/ignore_test.rb

@@ -0,0 +1,30 @@
+require File.expand_path('../test_helper', __FILE__)
+
+class IgnoreTest < UnitTest
+  class App < UnitTest::App
+    register Sinatra::AssetPack
+
+    assets do
+      js :main, '/main.js', %w[/js/*.js]
+    end
+  end
+
+  def app
+    App
+  end
+
+  test "ignore as individual file" do
+    get '/js/_ignoreme.js'
+    assert last_response.status == 404
+  end
+
+  test "ignore in package" do
+    get '/main.js'
+    assert body.size > 0
+    assert !body.include?("BUMBLEBEE")
+  end
+
+  test "package files" do
+    assert !app.assets.packages['main.js'].files.any? { |s| s.include? '_ignoreme.js' }
+  end
+end

data/test/sqwish_test.rb

@@ -20,9 +20,8 @@ class SqwishTest < UnitTest
 
   if sqwish?
     test "build" do
-      Sinatra::AssetPack::Compressor.expects(:`).with() { |cmd|
-        cmd.match /^sqwish .*? --strict$/
-      }
+      Sinatra::AssetPack::Compressor
+      Sinatra::AssetPack::SqwishEngine.any_instance.expects(:css)
 
       get '/css/sq.css'
     end

data/test/uglifier_test.rb

@@ -0,0 +1,23 @@
+require File.expand_path('../test_helper', __FILE__)
+
+class UglifyTest < UnitTest
+  class App < UnitTest::App
+    register Sinatra::AssetPack
+
+    assets do
+      js_compression :uglify, :mangle => true
+      js :main, '/main.js', [
+        '/js/ugly.js'
+      ]
+    end
+  end
+
+  def app
+    App
+  end
+
+  test "build" do
+    get '/main.js'
+    assert !body.include?("noodle")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-assetpack
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &2156684180 !ruby/object:Gem::Requirement
+  requirement: &2153561760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156684180
+  version_requirements: *2153561760
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2156683760 !ruby/object:Gem::Requirement
+  requirement: &2153561340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156683760
+  version_requirements: *2153561340
 - !ruby/object:Gem::Dependency
   name: jsmin
-  requirement: &2156683300 !ruby/object:Gem::Requirement
+  requirement: &2153560880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156683300
+  version_requirements: *2153560880
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2156682880 !ruby/object:Gem::Requirement
+  requirement: &2153560460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156682880
+  version_requirements: *2153560460
 - !ruby/object:Gem::Dependency
   name: yui-compressor
-  requirement: &2156682460 !ruby/object:Gem::Requirement
+  requirement: &2153560040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156682460
+  version_requirements: *2153560040
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2156682040 !ruby/object:Gem::Requirement
+  requirement: &2153559620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156682040
+  version_requirements: *2153559620
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2156681620 !ruby/object:Gem::Requirement
+  requirement: &2153559200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156681620
+  version_requirements: *2153559200
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2156681200 !ruby/object:Gem::Requirement
+  requirement: &2153558780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156681200
+  version_requirements: *2153558780
 - !ruby/object:Gem::Dependency
   name: contest
-  requirement: &2156680780 !ruby/object:Gem::Requirement
+  requirement: &2153558360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156680780
+  version_requirements: *2153558360
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2156680360 !ruby/object:Gem::Requirement
+  requirement: &2153557940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156680360
+  version_requirements: *2153557940
 - !ruby/object:Gem::Dependency
   name: stylus
-  requirement: &2156679940 !ruby/object:Gem::Requirement
+  requirement: &2153557520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156679940
+  version_requirements: *2153557520
+- !ruby/object:Gem::Dependency
+  name: uglifier
+  requirement: &2153557100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2153557100
 description: Package your assets for Sinatra.
 email:
 - rico@sinefunc.com
@@ -176,6 +187,14 @@ files:
 - lib/sinatra/assetpack/compressor.rb
 - lib/sinatra/assetpack/configurator.rb
 - lib/sinatra/assetpack/css.rb
+- lib/sinatra/assetpack/engine.rb
+- lib/sinatra/assetpack/engines/closure.rb
+- lib/sinatra/assetpack/engines/jsmin.rb
+- lib/sinatra/assetpack/engines/sass.rb
+- lib/sinatra/assetpack/engines/simple.rb
+- lib/sinatra/assetpack/engines/sqwish.rb
+- lib/sinatra/assetpack/engines/uglify.rb
+- lib/sinatra/assetpack/engines/yui.rb
 - lib/sinatra/assetpack/hasharray.rb
 - lib/sinatra/assetpack/helpers.rb
 - lib/sinatra/assetpack/html_helpers.rb
@@ -197,8 +216,10 @@ files:
 - test/app/app/css_stylus/stylus.styl
 - test/app/app/images/background.jpg
 - test/app/app/images/email.png
+- test/app/app/js/_ignoreme.js
 - test/app/app/js/hello.js
 - test/app/app/js/hi.coffee
+- test/app/app/js/ugly.js
 - test/app/app/js_glob/a/b/c1/hello.js
 - test/app/app/js_glob/a/b/c2/hi.js
 - test/app/app/js_glob/a/b/c2/hola.js
@@ -209,6 +230,7 @@ files:
 - test/compressed_test.rb
 - test/glob_test.rb
 - test/helpers_test.rb
+- test/ignore_test.rb
 - test/img_test.rb
 - test/local_file_test.rb
 - test/mime_type_test.rb
@@ -223,6 +245,7 @@ files:
 - test/template_cache_test.rb
 - test/test_helper.rb
 - test/tilt_test.rb
+- test/uglifier_test.rb
 - test/unit_test.rb
 - test/yui_test.rb
 homepage: http://github.com/rstacruz/sinatra-assetpack