sinatra-assetpack 0.2.3 → 0.2.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e2a2068da395988d50351d523f18c6bb4cbb3372
+  data.tar.gz: b2be00f2e3fb9ac6212260ee0386885c49f80b22
+SHA512:
+  metadata.gz: a5513b043a8d0e79ea4aa593594458be7c542446cae01462e6aa9ad5da58507cf6a0e3216b91ef7600f9ffa77520b5a6103bb86e97226a7fc068d172bfa1b942
+  data.tar.gz: 2ec358eb59ea3381386cc303f49cbc05bd71266c9d41bdd1ed44ceae01dcc95d53d9c56dd77d3b4da507ea42b9bf5c966d38fd8b921fbcdf45bf8a67757773f2

data/.travis.yml

@@ -13,5 +13,4 @@ rvm:
 matrix:
   allow_failures:
     - rvm: jruby-head
-    - rvm: ruby-head
-    - rvm: 2.0.0
+    - rvm: ruby-head

data/{HISTORY.md → CHANGELOG.md}

@@ -1,5 +1,15 @@
-v0.2.3 - May 29, 2013
-----------------------
+## v0.2.4 - June 8, 2013
+
+### Added
+  * Serving from absolute path. (#107)
+  * Cache of all assets files. (#109)
+
+### Improvements
+  * Rewrote asset builder.
+  * Simplified & consolidated local_file_for & dyn_local_file_for.
+
+
+## v0.2.3 - May 29, 2013
 
 ### Added
   * Support for Rack::URLMap / url prefix (#104)
@@ -7,14 +17,14 @@ v0.2.3 - May 29, 2013
 ### Changed
   * Use optimized MD5 file digest method. (#99)
 
-v0.2.2 - April 28, 2013
-----------------------
+
+## v0.2.2 - April 28, 2013
 
 ### Fixed
   * Don't preprocess CSS data-uris. (#96)
 
-v0.2.1 - April 23, 2013
-----------------------
+
+## v0.2.1 - April 23, 2013
 
 ### Added
   * New cache_dynamic_assets option for development cache. (#94)
@@ -22,8 +32,8 @@ v0.2.1 - April 23, 2013
 ### Fixed
   * Fixed CSS preproc to keep original CSS url quotes & url fragment.
 
-v0.2.0 - April 20, 2013
-----------------------
+
+## v0.2.0 - April 20, 2013
 
 ### Changed
   * Using MD5 for cache busting URI. (#91, #71)
@@ -34,28 +44,28 @@ v0.2.0 - April 20, 2013
 ### Fixed
   * Added backports correctly for 1.8.7 support.
 
-v0.1.7 - March 11, 2013
-----------------------
+
+## v0.1.7 - March 11, 2013
 
 ### Added
 
   * Gem is now certificate signed.
 
-v0.1.6 - March 1, 2013
-----------------------
+
+## v0.1.6 - March 1, 2013
 
 ### Fixed
 
   * Do not use instance helpers for environment check. (#79)
 
-v0.1.5 - Feb 12, 2013
-----------------------
+
+## v0.1.5 - Feb 12, 2013
 
 ### Fixed
   *  Stylus 0.7.1 support.
 
-v0.1.4 - Feb 12, 2013
-----------------------
+
+## v0.1.4 - Feb 12, 2013
 
 ### Added
   * Multiple asset hosts support. (#27)
@@ -63,32 +73,33 @@ v0.1.4 - Feb 12, 2013
 ### Fixed
   * Lock stylus to 0.7.0 until 0.7.1 is supported.
 
-v0.1.3 - Feb 3, 2013
-----------------------
+
+## v0.1.3 - Feb 3, 2013
 
 ### Added
   * JRuby 1.9 and 1.8 now supported.
 
 ### Fixed:
   * Deal with assets with exact same name but extensions. (#75)
-  * Ruby 1.8 support (broken in previous v0.1 releases).
+  * Ruby 1.8 support (broken in previous
+## v0.1 releases).
 
-v0.1.2 - Jan 20, 2013
-----------------------
+
+## v0.1.2 - Jan 20, 2013
 
 ### Added:
   * Support for custom cache control headers for packed assets. (#43)
 
-v0.1.1 - Jan 15, 2013
-----------------------
+
+## v0.1.1 - Jan 15, 2013
 
 ### Fixed
   * Added less engine support and test (#69)
   * Support for fonts & other AssetPack.supported_formats file format. (#50)
   * Deal with multiple static files with same name but different extensions (ex. fonts).
 
-v0.1.0 - Jan 14, 2013
-----------------------
+
+## v0.1.0 - Jan 14, 2013
 
 ### Changed
   * Using `file` utility instead `identify` utility. (#26)
@@ -100,8 +111,8 @@ v0.1.0 - Jan 14, 2013
   * Add missing depedency for development unit test. (#63)
   * Deal with binary files copy (ex. images), fix errors like `"\x89" from ASCII-8BIT to UTF-8"`. (#38, #67)
 
-v0.0.11 - Feb 21, 2012
-----------------------
+
+## v0.0.11 - Feb 21, 2012
 
 ### Added:
   * Support for 'prebuild' to build on startup.
@@ -119,8 +130,8 @@ v0.0.11 - Feb 21, 2012
 ### Fixed:
   * Sinatra >= 1.3.0 compatibility. Use 'public_folder' in Sinatra >=1.3.0. (#25)
 
-v0.0.10 - Sep 18, 2011
-----------------------
+
+## v0.0.10 - Sep 18, 2011
 
 ### Added:
   * Support for 'prebuild' to build on startup.
@@ -133,8 +144,8 @@ v0.0.10 - Sep 18, 2011
     sources. (#12)
   * Refactor Compressor into separate engine classes.
 
-v0.0.9 - Sep 18, 2011
----------------------
+
+## v0.0.9 - Sep 18, 2011
 
 ### Fixed:
   * Fixed a bad route terminating issue. (#9)
@@ -148,8 +159,8 @@ v0.0.9 - Sep 18, 2011
   * Added .htc (IE behavior files) to the list of file formats to be served.
   * Added examples.
 
-v0.0.8 - Sep 06, 2011
----------------------
+
+## v0.0.8 - Sep 06, 2011
 
 ### Fixed:
   * Fixed the CSS preprocessing bug that gives invalid 'url()' properties to
@@ -172,8 +183,8 @@ v0.0.8 - Sep 06, 2011
   * Added .rvmrc and .sass-cache to gitignore.
   * Allow overridable multiple RVM environments in tests.
 
-v0.0.6 - Aug 30, 2011
----------------------
+
+## v0.0.6 - Aug 30, 2011
 
 ### Fixed:
   * Redundant entries are now suppressed. (eg, when specifying
@@ -186,8 +197,8 @@ v0.0.6 - Aug 30, 2011
   * Allow setting options for `js_compression` by passing a hash after it.
   * Make the path parameter in `js` and `css` in the `assets` block optional.
 
-v0.0.5 - Aug 30, 2011
----------------------
+
+## v0.0.5 - Aug 30, 2011
 
 ### Fixed:
   * Fix build failing when it finds directories.
@@ -195,8 +206,8 @@ v0.0.5 - Aug 30, 2011
 ### Added:
   * Added an example app in `example/`.
 
-v0.0.4 - Aug 30, 2011
----------------------
+
+## v0.0.4 - Aug 30, 2011
 
 ### Fixed:
   * Ruby 1.8 compatibility. Yay!
@@ -209,16 +220,16 @@ v0.0.4 - Aug 30, 2011
   :closure`.
   * Use simple CSS compression by default.
 
-v0.0.3 - Aug 30, 2011
----------------------
+
+## v0.0.3 - Aug 30, 2011
 
 ### Added:
   * Images in CSS defined in `url(...)` params are now cache-busted.
   * Add support for embedded images in CSS.
   * `rake assetpack:build` now also outputs images.
 
-v0.0.2 - Aug 29, 2011
----------------------
+
+## v0.0.2 - Aug 29, 2011
 
 ### Added:
   * Added the `img` helper.
@@ -227,7 +238,7 @@ v0.0.2 - Aug 29, 2011
 ### Fixed:
   * The gem now installs the correct dependencies.
 
-v0.0.1 - Aug 29, 2011
----------------------
+
+## v0.0.1 - Aug 29, 2011
 
 Initial release.

data/CONTRIBUTING.md

@@ -22,6 +22,10 @@ As simple as running `bundle exec rake` command.
 
 The default `rake` task is `rake test`.
 
+If you would like to test multiple ruby version using RVM, try `rvm all do rake test`.
+
+You may setup all ruby version quickly with `rvm all do bundle install`.
+
 ## Syntax
 
 Follow [Ruby Styleguide](https://github.com/styleguide/ruby) by Github and existing code.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sinatra-assetpack (0.2.2)
+    sinatra-assetpack (0.2.4)
       backports
       jsmin
       rack-test
@@ -15,7 +15,7 @@ GEM
       Platform (>= 0.4.0)
       open4
     Platform (0.4.0)
-    backports (3.3.0)
+    backports (3.3.1)
     coffee-script (2.2.0)
       coffee-script-source
       execjs

data/README.md

@@ -1,9 +1,9 @@
 # [Sinatra AssetPack](http://ricostacruz.com/sinatra-assetpack)
 
->  The most convenient way to manage your assets in Sinatra. 
+>  The most convenient way to manage your assets in Sinatra.
 
 [![Build Status](https://travis-ci.org/rstacruz/sinatra-assetpack.png?branch=master)](https://travis-ci.org/rstacruz/sinatra-assetpack)
-[![Gem Version](https://badge.fury.io/rb/sinatra-assetpack.png)](http://badge.fury.io/rb/sinatra-assetpack)
+[![Gem Version](https://badge.fury.io/rb/sinatra-assetpack.png)](http://rubygems.org/gems/sinatra-assetpack)
 [![Dependency Status](https://gemnasium.com/rstacruz/sinatra-assetpack.png)](https://gemnasium.com/rstacruz/sinatra-assetpack)
 [![Code Climate](https://codeclimate.com/github/rstacruz/sinatra-assetpack.png)](https://codeclimate.com/github/rstacruz/sinatra-assetpack)
 
@@ -67,7 +67,7 @@ In your layouts, use the `css` and `js` helpers:
 ```
 # layout.haml
 != css :application, :media => 'screen'
-!= css :app
+!= js :app
 ```
 
 ## Results
@@ -92,36 +92,36 @@ If you're on **production** mode, it serves a compressed version in the URLs you
 
 ## Features
 
- * __CoffeeScript support__ Just add your coffee files in one of the paths 
- served (in the example, `app/js/hello.coffee`) and they will be available as JS 
+ * __CoffeeScript support__ Just add your coffee files in one of the paths
+ served (in the example, `app/js/hello.coffee`) and they will be available as JS
  files (`http://localhost:4567/js/hello.js`).
 
- * __Sass/Less/SCSS support__ Works the same way. Place your dynamic CSS files 
- in there (say, `app/css/screen.sass`) and they will be available as CSS files 
+ * __Sass/Less/SCSS support__ Works the same way. Place your dynamic CSS files
+ in there (say, `app/css/screen.sass`) and they will be available as CSS files
  (`http://localhost:4567/css/screen.css`).
 
- * __Cache busting__ the `css` and `js` helpers automatically ensures the URL 
- is based on when the file was last modified. The URL `/js/jquery.js` may be 
- translated to `/js/jquery.8237898.js` to ensure visitors always get the latest 
+ * __Cache busting__ the `css` and `js` helpers automatically ensures the URL
+ is based on when the file was last modified. The URL `/js/jquery.js` may be
+ translated to `/js/jquery.8237898.js` to ensure visitors always get the latest
  version.
 
- * __Images support__ Image filenames in your CSS will automatically get a 
+ * __Images support__ Image filenames in your CSS will automatically get a
  cache-busting suffix (eg, `/images/icon.742958.png`).
 
- * __Embedded images support__ You can embed images in your CSS files as 
+ * __Embedded images support__ You can embed images in your CSS files as
  `data:` URIs by simply adding `?embed` to the end of your URL.
 
  * __No intermediate files needed__ You don't need to generate compiled files.
  You can, but it's optional. Keeps your source repo clean!
 
- * __Auto minification (with caching)__ JS and CSS files will be compressed as 
+ * __Auto minification (with caching)__ JS and CSS files will be compressed as
  needed.
 
  * __Heroku support__ Oh yes. That's right.
 
 ## Compressors
 
-By default, AssetPack uses [JSMin](http://rubygems.org/gems/jsmin) for JS 
+By default, AssetPack uses [JSMin](http://rubygems.org/gems/jsmin) for JS
 compression, and simple regexes for CSS compression. You can specify other
 compressors in the `assets` block:
 
@@ -171,8 +171,8 @@ gem 'sass'
 
 ### Sqwish CSS compression
 
-[Sqwish](http://github.com/ded/sqwish) is a NodeJS-based CSS compressor.  To use 
-Sqwish with AssetPack, install it using `npm install -g sqwish`. You need NodeJS 
+[Sqwish](http://github.com/ded/sqwish) is a NodeJS-based CSS compressor.  To use
+Sqwish with AssetPack, install it using `npm install -g sqwish`. You need NodeJS
 and NPM installed.
 
 ``` ruby
@@ -184,7 +184,7 @@ assets {
 
 ### Google Closure compression
 
-This uses the [Google closure compiler 
+This uses the [Google closure compiler
 service](http://closure-compiler.appspot.com/home)
 to compress your JavaScript. Available levels are:
 
@@ -201,11 +201,11 @@ assets {
 
 ### UglifyJS compression
 
-This uses the [UglifyJS](https://github.com/mishoo/UglifyJS) compressor to 
-compress your JavaScript. You will need to install the 
+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 
+For options, refer to the [Uglifier
 documentation](https://github.com/lautis/uglifier).
 
 ``` ruby
@@ -242,12 +242,12 @@ In your CSS files, `url()`'s will automatically be translated.
 ```
 
 #### Image embedding
-Want to embed images as `data:` URI's? Sure! Just add `?embed` at the end of the 
+Want to embed images as `data:` URI's? Sure! Just add `?embed` at the end of the
 URL.
 
 ``` css
 /* Original: */    .email { background: url(/images/email.png?embed); }
-/* Output:   */    .email { background: url(data:image/png;base64,NF8dG3I...); } 
+/* Output:   */    .email { background: url(data:image/png;base64,NF8dG3I...); }
 ```
 
 ## Precompile
@@ -291,7 +291,7 @@ end
 ```
 
 #### Getting options
-Invoking it without a block allows you to access the options. This works for 
+Invoking it without a block allows you to access the options. This works for
 almost all the options, with the exception for `css`, `js` and `serve`.
 
 ``` ruby
@@ -301,7 +301,7 @@ App.assets.js_compression   #=> :yui
 
 ### assets.serve
 
-Serves files from `LOCALPATH` in the URI path `PATH`. Both parameters are 
+Serves files from `LOCALPATH` in the URI path `PATH`. Both parameters are
 required.
 
 ``` ruby
@@ -319,7 +319,7 @@ serve '/js', from: '/app/javascripts'
 
 ### assets.js\_compression<br>assets.css\_compression
 
-Sets the compression engine to use for JavaScript or CSS. This defaults to 
+Sets the compression engine to use for JavaScript or CSS. This defaults to
 `:jsmin` and `:simple`, respectively.
 
 If `OPTIONS_HASH` is given as a hash, it sets options for the engine to use.
@@ -335,7 +335,7 @@ assets {
 ```
 
 #### Examples
-Yo seriously check this out: the first line uses Sqwish with it's defaults, and 
+Yo seriously check this out: the first line uses Sqwish with it's defaults, and
 the second line uses Sqwish with it's magic.
 
 ``` ruby
@@ -347,7 +347,7 @@ assets {
 
 ### assets.js\_compression\_options<br>assets.css\_compression\_options
 
-Sets the options for the compression engine to use. This is usually not needed 
+Sets the options for the compression engine to use. This is usually not needed
 as you can already set options using `js_compression` and `css_compression`.
 
 ``` ruby
@@ -369,15 +369,15 @@ css_compression_options :munge => true
 
 Adds packages to be used.
 
-The `NAME` is a symbol defines the ID for that given package that you can use 
-for the helpers. That is, If a CSS package was defined as `css :main, [ ... ]`, 
+The `NAME` is a symbol defines the ID for that given package that you can use
+for the helpers. That is, If a CSS package was defined as `css :main, [ ... ]`,
 then you will need to use `<%= css :main %>` to render it in views.
 
 the `URI` is a string that defines where the compressed version will be served.
 It is optional. If not provided, it will default to `"/assets/name.type"` (eg:
 `/assets/main.css`).
 
-the `PATHs` is an array that defines files that will be served. Take note that 
+the `PATHs` is an array that defines files that will be served. Take note that
 this is an array of URI paths, not local paths.
 
 If a `PATH` contains wildcards, it will be expanded in alphabetical order.
@@ -394,8 +394,8 @@ assets {
 ```
 
 #### Example
-In this example, JavaScript files will be served compressed as 
-`/js/application.js` (default since no `URI` is given). The files will be taken 
+In this example, JavaScript files will be served compressed as
+`/js/application.js` (default since no `URI` is given). The files will be taken
 from `./app/javascripts/vendor/jquery*.js`.
 
 ``` ruby
@@ -417,12 +417,12 @@ 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 
+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 
+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
@@ -448,7 +448,7 @@ end
 ```
 
 #### Advanced usage
-By default, `.*` and `_*` are ignored. To disable this behavior, you can use 
+By default, `.*` and `_*` are ignored. To disable this behavior, you can use
 `clear_ignores!` before your `ignore` lines.
 
 ``` ruby
@@ -468,7 +468,7 @@ 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 
+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).
 
@@ -478,7 +478,7 @@ prebuild {true|false}
 ```
 
 #### Example
-In this example, the package for `:application` will be built when the 
+In this example, the package for `:application` will be built when the
 application is started in the production environment.
 
 ``` ruby
@@ -530,7 +530,7 @@ end
 ### assets.cache_dynamic_assets
 Caches dynamic files unless they have been modified.
 
-Useful during development if asset compilation of all dynamic assets on each request is slow. 
+Useful during development if asset compilation of all dynamic assets on each request is slow.
 If set to true, dynamic assets will be compiled on the initial asset request, but only be re-compiled when the asset's mtime changes.
 
 ``` ruby
@@ -553,6 +553,7 @@ class App < Sinatra::Base
     cache_dynamic_assets true
   }
 end
+```
 
 ## Helpers
 
@@ -560,7 +561,7 @@ These are helpers you can use in your views.
 
 ### <%= css %>
 
-Shows a CSS package named `PACKAGE`. If `OPTIONS_HASH` is given, they will we 
+Shows a CSS package named `PACKAGE`. If `OPTIONS_HASH` is given, they will we
 passed onto the `<link>` tag to be generated as attributes.
 
 You may specify as many packages as you need, as shown in the second usage line.
@@ -617,8 +618,8 @@ This example embeds the *main* package with an ID.
 
 ### <%= img %>
 
-Shows an `<img>` tag from the given `SRC`. If the images is found in the asset 
-directories (and ImageMagick is available), `width` and `height` attributes will 
+Shows an `<img>` tag from the given `SRC`. If the images is found in the asset
+directories (and ImageMagick is available), `width` and `height` attributes will
 be added.
 
 ``` ruby
@@ -627,7 +628,7 @@ img 'SRC'
 img 'SRC', OPTIONS_HASH
 ```
 
-If `OPTIONS_HASH` is given, they will we passed onto the `<img>` tag to be 
+If `OPTIONS_HASH` is given, they will we passed onto the `<img>` tag to be
 generated as attributes.
 
 #### Example
@@ -672,4 +673,4 @@ Twitter : [@rstacruz](http://twitter.com/rstacruz), [@j15e](http://twitter.com/j
 [c]:   http://github.com/rstacruz/sinatra-assetpack/contributors
 [sf]:  http://sinefunc.com
 [j15e]: http://github.com/j15e
-[hookt]: http://github.com/hooktstudios
+[hookt]: http://github.com/hooktstudios

data/Rakefile

@@ -1,11 +1,3 @@
-desc "Invokes the test suite in multiple RVM environments"
-task :'test!' do
-  # Override this by adding RVM_TEST_ENVS=".." in .rvmrc
-  envs = ENV['RVM_TEST_ENVS'] || '1.9.2@sinatra,1.8.7@sinatra'
-  puts "* Testing in the following RVM environments: #{envs.gsub(',', ', ')}"
-  system "rvm #{envs} rake test" or abort
-end
-
 desc "Runs tests"
 task :test do
   Dir['test/*_test.rb'].each { |f| load f }

data/lib/sinatra/assetpack.rb

@@ -45,6 +45,7 @@ module Sinatra
 
     autoload :ClassMethods,  "#{PREFIX}/assetpack/class_methods"
     autoload :Options,       "#{PREFIX}/assetpack/options"
+    autoload :Builder,       "#{PREFIX}/assetpack/builder"
     autoload :Helpers,       "#{PREFIX}/assetpack/helpers"
     autoload :HtmlHelpers,   "#{PREFIX}/assetpack/html_helpers"
     autoload :BusterHelpers, "#{PREFIX}/assetpack/buster_helpers"

data/lib/sinatra/assetpack/builder.rb

@@ -0,0 +1,42 @@
+module Sinatra
+  module AssetPack
+    module Builder
+      def build!(&blk)
+        packages.each { |_, pack| build_package!(pack, &blk) }
+        files.each { |path, local| build_file!(path, local, &blk) }
+      end
+
+      private
+
+      def build_get(path, &blk)
+        @session ||= Rack::Test::Session.new app
+        @session.get(path)
+      end
+
+      def build_package!(pack, &blk)
+        response = build_get(pack.path)
+        build_write(pack.path, response, &blk)
+        build_write(pack.production_path, response, &blk)
+      end
+
+      def build_file!(path, local, &blk)
+        response = build_get(path)
+        build_write(path, response, &blk)
+        build_write(BusterHelpers.add_cache_buster(path, local), response, &blk)
+      end
+
+      def build_write(path, response, &blk)
+        require 'fileutils'
+
+        mtime = Time.parse(response.headers['Last-Modified']) if response.headers['Last-Modified']
+        path = File.join(@output_path, path)
+
+        yield path if block_given?
+
+        FileUtils.mkdir_p(File.dirname(path))
+        File.open(path, 'wb') { |f| f.write(response.body) }
+        File.utime(mtime, mtime, path) if mtime
+      end
+    end
+  end
+end

data/lib/sinatra/assetpack/options.rb

@@ -38,6 +38,7 @@ module Sinatra
     #     # Returns a HashArray of (local => remote)
     #
     class Options
+      include Builder
       include Configurator
 
       def initialize(app, &blk)
@@ -48,6 +49,7 @@ module Sinatra
         @app             = app
         @js_compression  = :jsmin
         @css_compression = :simple
+        @reload_files_cache = true
 
         begin
           @output_path   = app.public
@@ -78,16 +80,21 @@ module Sinatra
       # DSL methods
 
       def serve(path, options={})
-        raise Error  unless options[:from]
-        return  unless File.directory?(File.join(app.root, options[:from]))
+        raise Error unless options[:from]
+
+        full_path = options[:from]
+        full_path = File.join(app.root, full_path) unless File.directory?(full_path)
+        return unless File.directory?(full_path)
 
         @served[path] = options[:from]
+        @reload_files_cache = true
       end
 
       # Undo defaults.
       def reset!
         @served   = Hash.new
         @packages = Hash.new
+        @reload_files_cache = true
       end
 
       # Ignores a given path spec.
@@ -171,14 +178,14 @@ module Sinatra
       end
 
       def js_compression(name=nil, options=nil)
-        @js_compression = name  unless name.nil?
-        @js_compression_options = options  if options.is_a?(Hash)
+        @js_compression = name unless name.nil?
+        @js_compression_options = options if options.is_a?(Hash)
         @js_compression
       end
 
       def css_compression(name=nil, options=nil)
-        @css_compression = name  unless name.nil?
-        @css_compression_options = options  if options.is_a?(Hash)
+        @css_compression = name unless name.nil?
+        @css_compression_options = options if options.is_a?(Hash)
         @css_compression
       end
 
@@ -187,43 +194,15 @@ module Sinatra
 
       attr_reader :served
 
-      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, mtime = get[pack.path]
-
-          write pack.path, out, mtime, &blk
-          write pack.production_path, out, mtime, &blk
-        }
-
-        files.each { |path, local|
-          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
+        return if app.reload_templates
 
         session = Rack::Test::Session.new app
         packages.each { |_, pack|
-          yield pack.path  if block_given?
+          yield pack.path if block_given?
           session.get(pack.path)
         }
-
-        true
       end
 
       def served?(path)
@@ -232,70 +211,55 @@ module Sinatra
 
       # Returns the local file for a given URI path.
       # Returns nil if a file is not found.
-      def local_file_for(path)
-        path = path.squeeze('/')
+      def local_file_for(request)
+        request.squeeze!('/')
+        serve_path, from = served.detect { |path, _| request.start_with?(path) }
 
-        uri, local = served.detect { |uri, local| path[0...uri.size] == uri }
+        return if !from
 
-        if local
-          path = path[uri.size..-1]
-          path = File.join app.root, local, path
-
-          path  if File.exists?(path)
-        end
+        path = File.join(expand_from(from), request.sub(serve_path, ''))
+        path if File.exist?(path)
       end
 
       # Returns the local file for a given URI path. (for dynamic files)
       # Returns nil if a file is not found.
-      # TODO: consolidate with local_file_for
-      def dyn_local_file_for(requested_file, from)
-        file = requested_file
-        extension = File.extname(requested_file)
+      def dyn_local_file_for(request, from)
+        file = request
+        extension = File.extname(request)
         # Remove extension
         file.gsub!(/#{extension}$/, "")
         # Remove cache-buster (/js/app.28389 => /js/app)
         file.gsub!(/\.[a-f0-9]{32}$/, "")
-        matches = Dir[File.join(app.root, from, "#{file}.*")]
+
+        matches = Dir[File.join(expand_from(from), "#{file}.*")]
 
         # Fix for filenames with dots (can't do this with glob)
         matches.select! { |f| f =~ /#{file}\.[^.]+$/ }
 
         # Sort static file match, weighting exact file extension matches
-        matches.sort! do |f, _| 
+        matches.sort! do |f, _|
           (File.basename(f) == "#{file}#{extension}" || File.extname(f) == extension) ? -1 : 1
         end
         matches.first
       end
 
-      # Writes `public/#{path}` based on contents of `output`.
-      def write(path, output, mtime=nil)
-        require 'fileutils'
+      # Returns the files as a hash.
+      def files(match=nil)
+        return @files unless @reload_files_cache
 
-        path = File.join(@output_path, path)
-        yield path  if block_given?
+        # All
+        # A buncha tuples
+        tuples = @served.map { |prefix, local_path|
+          path = File.expand_path(File.join(@app.root, local_path))
+          spec = File.join(path, '**', '*')
 
-        FileUtils.mkdir_p File.dirname(path)
-        File.open(path, 'wb') { |f| f.write output }
+          Dir[spec].map { |f|
+            [ to_uri(f, prefix, path), f ]  unless File.directory?(f)
+          }
+        }.flatten.compact
 
-        if mtime
-          File.utime mtime, mtime, path
-        end
-      end
-
-      # Returns the files as a hash.
-      def files(match=nil)
-          # All
-          # A buncha tuples
-          tuples = @served.map { |prefix, local_path|
-            path = File.expand_path(File.join(@app.root, local_path))
-            spec = File.join(path, '**', '*')
-
-            Dir[spec].map { |f|
-              [ to_uri(f, prefix, path), f ]  unless File.directory?(f)
-            }
-          }.flatten.compact
-
-          Hash[*tuples]
+        @reload_files_cache = false
+        @files = Hash[*tuples]
       end
 
       # Returns an array of URI paths of those matching given globs.
@@ -308,7 +272,6 @@ module Sinatra
       # wildcards that don't match anything.
       #
       def glob(match, options={})
-
         match = [*match]  # Force array-ness
 
         paths = match.map { |spec|
@@ -358,6 +321,14 @@ module Sinatra
 
         fn
       end
+
+      def expand_from(from)
+        if from.start_with?('/')
+          from
+        else
+          File.join(app.root, from)
+        end
+      end
     end
   end
 end

data/lib/sinatra/assetpack/version.rb

@@ -1,7 +1,10 @@
 module Sinatra
   module AssetPack
+    VERSION = "0.2.4"
+
+    # @deprecated Please use AssetPack::VERSION instead
     def self.version
-      "0.2.3"
+      VERSION
     end
   end
 end

data/sinatra-assetpack.gemspec

@@ -2,7 +2,7 @@ require './lib/sinatra/assetpack/version'
 
 Gem::Specification.new do |s|
   s.name = 'sinatra-assetpack'
-  s.version = Sinatra::AssetPack.version
+  s.version = Sinatra::AssetPack::VERSION
   s.summary = %{Asset packager for Sinatra.}
   s.description = %Q{Package your assets for Sinatra.}
   s.authors = ['Rico Sta. Cruz']

data/test/local_file_test.rb

@@ -1,10 +1,15 @@
 require File.expand_path('../test_helper', __FILE__)
 
 class LocalFileTest < UnitTest
+
   class App < Main
+
+    ABS_FONTS_PATH = File.join(File.expand_path('../', __FILE__), 'app', 'app', 'fonts')
+
     assets {
       css :application, [ '/css/*.css' ]
-      serve '/fonts',    :from => 'app/fonts'
+      serve '/fonts', :from => 'app/fonts'
+      serve '/abs_fonts', :from => ABS_FONTS_PATH
     }
   end
 
@@ -18,6 +23,11 @@ class LocalFileTest < UnitTest
     assert_equal r('app/fonts/cantarell-regular-webfont.ttf'), fn
   end
 
+  test "local file for (in existing files, custom absolute serve path)" do
+    fn = App.assets.local_file_for '/abs_fonts/cantarell-regular-webfont.ttf'
+    assert_equal "#{App::ABS_FONTS_PATH}/cantarell-regular-webfont.ttf", fn
+  end
+
   test "local file for (in nonexisting files)" do
     fn = App.assets.local_file_for '/images/404.jpg'
     assert fn.nil?

metadata

@@ -1,298 +1,258 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-assetpack
 version: !ruby/object:Gem::Version
-  version: 0.2.3
-  prerelease: 
+  version: 0.2.4
 platform: ruby
 authors:
 - Rico Sta. Cruz
 autorequire: 
 bindir: bin
 cert_chain:
-- !binary |-
-  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURSakNDQWk2Z0F3SUJB
-  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREJKTVJzd0dRWURWUVFEREJKcVpX
-  RnUKY0docGJHbHdjR1V1Wkc5NWJHVXhGVEFUQmdvSmtpYUprL0lzWkFFWkZn
-  Vm5iV0ZwYkRFVE1CRUdDZ21TSm9tVAo4aXhrQVJrV0EyTnZiVEFlRncweE16
-  QXpNVEV5TWpNNU1qTmFGdzB4TkRBek1URXlNak01TWpOYU1Fa3hHekFaCkJn
-  TlZCQU1NRW1wbFlXNXdhR2xzYVhCd1pTNWtiM2xzWlRFVk1CTUdDZ21TSm9t
-  VDhpeGtBUmtXQldkdFlXbHMKTVJNd0VRWUtDWkltaVpQeUxHUUJHUllEWTI5
-  dE1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQgpDZ0tDQVFF
-  QXBRdHpPeU1vaTQ4UGMwQlJGKytCWGMydWxFQ3BPeXB3WXFueklkYkU1K2lM
-  b3duaXhZQjNLa0ttClZ4SWxvOXBZV0lwNUpSK1VwaHYvUDl2S0pBSWpmbGR0
-  bHVzNm84eEZUMEh1alh5RU1NYkZNR0hIMDFQdkRZa3gKdm5NdzVPNllWZHRi
-  c0t2amtuQjRKT2NPbXhRQWVYQnVuTEJKazBodU9MQUxsRFczOFVaRjNBS05W
-  UHBSK0dzdApnVFpDSUFQcTIyd0I5STBIWWZ5Q2l0anJNVks0alRIZ2pQak5O
-  UW40Qmh1aGtxRVdyNUprVnRpcEdDVUZ5bDQ1CjJJU3NrT1Bja0xXL3F3Q3E0
-  dnlqVks2SklaYjJFaTlESHRpcDQ0dTdLakZFWDVRZHZIeXU4MXhhdE1tdEt2
-  WW4KV1dLWi8ySENkV1JSaVBTdUhtQlIvUWxNbFVONjlRSURBUUFCb3prd056
-  QUpCZ05WSFJNRUFqQUFNQjBHQTFVZApEZ1FXQkJRazF2aEw3b2Q3cVpMRWZC
-  c3NRTnF6aHQxd3dEQUxCZ05WSFE4RUJBTUNCTEF3RFFZSktvWklodmNOCkFR
-  RUZCUUFEZ2dFQkFEZ2xYWWtURDFCdGFkcjJlaEtET1NBVGZMVmVoOVRod1o2
-  UGVLUDhiUFdLT3JIUGJUTjgKQWFuZHZ2Nmc2c2FtZzdwL3ZpUndzRTI5TVRB
-  Y2ZxQ2RGcDh2MzVhc2UyUHlpWHJKMFFKUDdyM0NCbytud0dWTwpoeWJEODQv
-  dlRBOUNTQmFGWDJYdGowZEM1bzZlVzYvdldvVmVKVWNNTlgvTy9yOGxSV24y
-  NFdoRmtFelc5bjFSCjJDVmVaczc4QVhXVHlVMGwwZHlzd3BhdjBBY3pYZzRV
-  SzNZMk05b1l5Qm1kZmVtNm02MTRTT3JPRkJJR2ptRjQKa3pnRjRPMk9MKzhP
-  MjN3ZTRFMUx2ZlJuNWdWNzdEaWo2czlWNEhIek1CdUx3bk5iOFQrNmxPblVX
-  YnRpSWRkRAplOGM4aTdQbHJ6aFZKLzhzWFVKc0NreUU4ZDJNeVJ5amx4TT0K
-  LS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-date: 2013-05-29 00:00:00.000000000 Z
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDRjCCAi6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBJMRswGQYDVQQDDBJqZWFu
+  cGhpbGlwcGUuZG95bGUxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT
+  8ixkARkWA2NvbTAeFw0xMzAzMTEyMjM5MjNaFw0xNDAzMTEyMjM5MjNaMEkxGzAZ
+  BgNVBAMMEmplYW5waGlsaXBwZS5kb3lsZTEVMBMGCgmSJomT8ixkARkWBWdtYWls
+  MRMwEQYKCZImiZPyLGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+  CgKCAQEApQtzOyMoi48Pc0BRF++BXc2ulECpOypwYqnzIdbE5+iLownixYB3KkKm
+  VxIlo9pYWIp5JR+Uphv/P9vKJAIjfldtlus6o8xFT0HujXyEMMbFMGHH01PvDYkx
+  vnMw5O6YVdtbsKvjknB4JOcOmxQAeXBunLBJk0huOLALlDW38UZF3AKNVPpR+Gst
+  gTZCIAPq22wB9I0HYfyCitjrMVK4jTHgjPjNNQn4BhuhkqEWr5JkVtipGCUFyl45
+  2ISskOPckLW/qwCq4vyjVK6JIZb2Ei9DHtip44u7KjFEX5QdvHyu81xatMmtKvYn
+  WWKZ/2HCdWRRiPSuHmBR/QlMlUN69QIDAQABozkwNzAJBgNVHRMEAjAAMB0GA1Ud
+  DgQWBBQk1vhL7od7qZLEfBssQNqzht1wwDALBgNVHQ8EBAMCBLAwDQYJKoZIhvcN
+  AQEFBQADggEBADglXYkTD1Btadr2ehKDOSATfLVeh9ThwZ6PeKP8bPWKOrHPbTN8
+  Aandvv6g6samg7p/viRwsE29MTAcfqCdFp8v35ase2PyiXrJ0QJP7r3CBo+nwGVO
+  hybD84/vTA9CSBaFX2Xtj0dC5o6eW6/vWoVeJUcMNX/O/r8lRWn24WhFkEzW9n1R
+  2CVeZs78AXWTyU0l0dyswpav0AczXg4UK3Y2M9oYyBmdfem6m614SOrOFBIGjmF4
+  kzgF4O2OL+8O23we4E1LvfRn5gV77Dij6s9V4HHzMBuLwnNb8T+6lOnUWbtiIddD
+  e8c8i7PlrzhVJ/8sXUJsCkyE8d2MyRyjlxM=
+  -----END CERTIFICATE-----
+date: 2013-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jsmin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: contest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: less
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: stylus
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yui-compressor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Package your assets for Sinatra.
@@ -304,10 +264,10 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
-- HISTORY.md
 - LICENSE.md
 - README.md
 - Rakefile
@@ -341,6 +301,7 @@ files:
 - examples/compass/config.ru
 - examples/compass/views/index.erb
 - lib/sinatra/assetpack.rb
+- lib/sinatra/assetpack/builder.rb
 - lib/sinatra/assetpack/buster_helpers.rb
 - lib/sinatra/assetpack/class_methods.rb
 - lib/sinatra/assetpack/compressor.rb
@@ -429,26 +390,25 @@ files:
 - test/yui_test.rb
 homepage: http://github.com/rstacruz/sinatra-assetpack
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Asset packager for Sinatra.
 test_files: []