sundawg-sinatra-assetpack-fork 0.0.12.pre1 → 0.1.6

data/.gitignore

@@ -1,4 +1,4 @@
-/Gemfile.lock
 /.rvmrc
 /.sass-cache
 /doc/
+*.gem

data/.travis.yml

@@ -0,0 +1,17 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - rbx-18mode
+  - rbx-19mode
+  - jruby-18mode
+  - jruby-19mode
+  - jruby-head
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: jruby-head
+    - rvm: ruby-head
+    - rvm: 2.0.0

data/CONTRIBUTING.md

@@ -0,0 +1,27 @@
+# Contributing
+
+> If I have seen further it is by standing on the shoulders of giants. - Isaac Newton
+
+Please follow theses simples steps to contribute to this project :
+
+1. Fork the repo.
+
+2. Run the tests before doing anything.
+
+3. Add test(s) for your code modification.
+
+4. Rebase your code onto upstream master (this repository) if not up to date.
+
+5. Squash or fixup your commits to achieve a clean commit log.
+
+6. Submit a pull request and ensure tests passes on travis-ci for all supported ruby versions.
+
+## Running the tests
+
+As simple as running the `rake` command.
+
+The default `rake` task is `rake test`.
+
+## Syntax
+
+Follow [Ruby Styleguide](https://github.com/styleguide/ruby) by Github and existing code.

data/Gemfile

@@ -1,2 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
+
 gemspec

data/Gemfile.lock

@@ -0,0 +1,72 @@
+PATH
+  remote: .
+  specs:
+    sinatra-assetpack (0.1.6)
+      jsmin
+      rack-test
+      sinatra
+      tilt (>= 1.3.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    POpen4 (0.1.4)
+      Platform (>= 0.4.0)
+      open4
+    Platform (0.4.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.5.0)
+    commonjs (0.2.6)
+    contest (0.1.3)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
+    haml (4.0.0)
+      tilt
+    jsmin (1.0.1)
+    less (2.2.2)
+      commonjs (~> 0.2.6)
+    metaclass (0.0.1)
+    mocha (0.13.2)
+      metaclass (~> 0.0.1)
+    multi_json (1.6.1)
+    open4 (1.3.0)
+    rack (1.5.2)
+    rack-protection (1.4.0)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (10.0.3)
+    sass (3.2.6)
+    sinatra (1.3.5)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
+      tilt (~> 1.3, >= 1.3.3)
+    stylus (0.7.1)
+      execjs
+      stylus-source
+    stylus-source (0.31.0)
+    tilt (1.3.4)
+    uglifier (1.3.0)
+      execjs (>= 0.3.0)
+      multi_json (~> 1.0, >= 1.0.2)
+    yui-compressor (0.9.6)
+      POpen4 (>= 0.1.4)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  coffee-script
+  contest
+  haml
+  less
+  mocha
+  rake
+  sass
+  sinatra-assetpack!
+  stylus
+  uglifier
+  yui-compressor

data/HISTORY.md

@@ -1,3 +1,62 @@
+v0.1.6 - March 1, 2013
+----------------------
+
+### Fixed
+
+  * Do not use instance helpers for environment check. (#79)
+
+v0.1.5 - Feb 12, 2013
+----------------------
+
+### Fixed
+  *  Stylus 0.7.1 support.
+
+v0.1.4 - Feb 12, 2013
+----------------------
+
+### Added
+  * Multiple asset hosts support. (#27)
+
+### Fixed
+  * Lock stylus to 0.7.0 until 0.7.1 is supported.
+
+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).
+
+v0.1.2 - Jan 20, 2013
+----------------------
+
+### Added:
+  * Support for custom cache control headers for packed assets. (#43)
+
+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
+----------------------
+
+### Changed
+  * Using `file` utility instead `identify` utility. (#26)
+
+### Fixed
+  * Deal with different encodings in combined assets. (#47)
+  * Serve files with dots in name. (#32, #66)
+  * Deal with character encoding issues in ruby 1.8. (#51)
+  * 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
 ----------------------
 
@@ -12,7 +71,7 @@ v0.0.11 - Feb 21, 2012
   * Built files from 'rake assetpack:build' now match the mtimes of their sources. (#12)
   * Update the readme with a note on SASS compression.
   * Use regular expression route matcher instead of splat pattern for Padrino compatibility. (#19)
-  * Made <link> and <script> tags (generated by helpers) be more HTML5-like.
+  * Made `link` and `script` tags (generated by helpers) be more HTML5-like.
 
 ### Fixed:
   * Sinatra >= 1.3.0 compatibility. Use 'public_folder' in Sinatra >=1.3.0. (#25)

data/README.md

@@ -1,5 +1,14 @@
 # [Sinatra AssetPack](http://ricostacruz.com/sinatra-assetpack)
-#### Asset packer for Sinatra
+
+>  Package your assets transparently 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)
+[![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)
+
+How it works
+------------
 
 This is *the* most convenient way to set up your CSS/JS (and images) in a 
 [Sinatra](http://sinatrarb.com) app. Seriously. No need for crappy routes to 
@@ -9,9 +18,9 @@ render Sass or whatever. No-siree!
    * JavaScript/CoffeeScript files in `/app/js`
    * CSS/Sass/Less/CSS files in `/app/css`
    * Images into `/app/images`
-3. Add `register Sinatra::AssetPack` and set up options to your app (see below)
-4. Use `<%= css :application %>` to your layouts. Use this instead of
-   messy *script* and *link* tags
+3. Add `register Sinatra::AssetPack` and set up options to your app (see below).
+4. Use `<%= js :app %>` and `<%= css :application %>` to your layouts. Use these instead of
+   messy *script* and *link* tags.
 5. BOOM! You're in business baby!
 
 Installation
@@ -527,6 +536,32 @@ end
 # >> Listening on 0.0.0.0:4567, CTRL+C to stop
 ```
 
+### assets.expires
+Sets cache control headers for all assets handled by AssetPack. Defaults to `expires 86400*30, :public`. Passes the arguments to [Sinatras #expires](http://rubydoc.info/gems/sinatra/Sinatra/Helpers#expires-instance_method).
+
+``` ruby
+# Usage:
+expires amount, *values
+```
+
+#### Example
+In this example all assets get cached for a year.
+
+``` ruby
+class App < Sinatra::Base
+  assets {
+    js_compression :closure
+
+    js :application, [
+      '/js/vendor/jquery.*.js',
+      '/js/vendor/jquery.js'
+    ]
+    expires 86400*365, :public
+  }
+end
+```
+
+
 API reference: helpers
 ----------------------
 
@@ -637,20 +672,28 @@ class Main
 end
 ```
 
+Contributing
+------------
+
+See [CONTRIBUTING.md](https://github.com/rstacruz/sinatra-assetpack/blob/master/CONTRIBUTING.md) for details on contributing and running test.
+
 Acknowledgements
 ----------------
 
-© 2011, Rico Sta. Cruz. Released under the [MIT 
+© 2011-2013, Rico Sta. Cruz. Released under the [MIT
 License](http://www.opensource.org/licenses/mit-license.php).
 
-Sinatra-AssetPack is authored and maintained by [Rico Sta. Cruz][rsc] with help 
-from it's [contributors][c]. It is sponsored by my startup, [Sinefunc, Inc][sf].
+Sinatra-AssetPack is authored by [Rico Sta. Cruz][rsc] with help
+from it's [contributors][c]. It is sponsored by [Sinefunc, Inc][sf].
+
+Sinatra-AssetPack is maintained by [Jean-Philipe Doyle][j15e] at [Hookt Studios][hookt].
+
+Github : [@rstacruz](http://github.com/rstacruz), [@j15e](http://github.com/j15e)
 
- * [My website](http://ricostacruz.com) (ricostacruz.com)
- * [Sinefunc, Inc.](http://sinefunc.com) (sinefunc.com)
- * [Github](http://github.com/rstacruz) (@rstacruz)
- * [Twitter](http://twitter.com/rstacruz) (@rstacruz)
+Twitter : [@rstacruz](http://twitter.com/rstacruz), [@j15e](http://twitter.com/j15e)
 
 [rsc]: http://ricostacruz.com
 [c]:   http://github.com/rstacruz/sinatra-assetpack/contributors
 [sf]:  http://sinefunc.com
+[j15e]: http://github.com/j15e
+[hookt]: http://github.com/hooktstudios

data/examples/basic/app.rb

@@ -26,7 +26,18 @@ class App < Sinatra::Base
       '/css/more/*.css'
     ]
 
-    prebuild true
+    prebuild false
+
+    # Can set this as an environment variable like "HOST" or "CDN_HOST"
+    # This will add the domain name to the beginning of compiled assets
+    # Useful if you need to serve production assets from a CDN
+    asset_hosts [
+      '//cdn-0.example.org',
+      '//cdn-1.example.org',
+      '//cdn-2.example.org',
+      '//cdn-3.example.org'
+    ]
+
   end
 
   get '/' do

data/lib/sinatra/assetpack.rb

@@ -1,4 +1,5 @@
 require 'rack/test'
+require 'backports' if RUBY_VERSION < "1.9"
 
 module Sinatra
   module AssetPack
@@ -47,7 +48,6 @@ module Sinatra
     autoload :Image,         "#{PREFIX}/assetpack/image"
     autoload :Css,           "#{PREFIX}/assetpack/css"
     autoload :Configurator,  "#{PREFIX}/assetpack/configurator"
-    autoload :HashArray,     "#{PREFIX}/assetpack/hasharray"
 
     include ClassMethods
 

data/lib/sinatra/assetpack/class_methods.rb

@@ -30,6 +30,7 @@ module Sinatra
 
             content_type package.type
             last_modified mtime
+            assets_expires
             contents
           end
         end
@@ -43,24 +44,25 @@ module Sinatra
 
             # Sanity checks
             pass unless AssetPack.supported_formats.include?(fmt)
-            fn = asset_path_for(file, from)  or pass
+            fn = asset_path_for(file, from) or pass
 
-            pass  if settings.assets.ignored?("#{path}/#{file}")
+            pass if settings.assets.ignored?("#{path}/#{file}")
 
             # Send headers
             content_type fmt.to_sym
             last_modified File.mtime(fn).to_i
-            expires 86400*30, :public
+            assets_expires
 
             format = File.extname(fn)[1..-1]
 
             if AssetPack.supported_formats.include?(format)
-              # It's a raw file, just send it
-              not_found  unless format == fmt
-
+              # Static file
               if fmt == 'css'
+                # Matching static file format
+                pass unless fmt == File.extname(fn)[1..-1]
                 @template_cache.fetch(fn) { asset_filter_css File.read(fn) }
               else
+                # It's a raw file, just send it
                 send_file fn
               end
             else

data/lib/sinatra/assetpack/compressor.rb

@@ -47,6 +47,7 @@ module Sinatra
     require "#{AssetPack::PREFIX}/assetpack/engines/jsmin"
     require "#{AssetPack::PREFIX}/assetpack/engines/yui"
     require "#{AssetPack::PREFIX}/assetpack/engines/sass"
+    require "#{AssetPack::PREFIX}/assetpack/engines/less"
     require "#{AssetPack::PREFIX}/assetpack/engines/sqwish"
     require "#{AssetPack::PREFIX}/assetpack/engines/closure"
     require "#{AssetPack::PREFIX}/assetpack/engines/uglify"

data/lib/sinatra/assetpack/css.rb

@@ -11,7 +11,7 @@ module Sinatra
             if options.to_s.include?('embed')
               to_data_uri(local)
             else
-              BusterHelpers.add_cache_buster(file, local)
+              HtmlHelpers.get_file_uri(file, assets)
             end
           else
             path

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

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

data/lib/sinatra/assetpack/helpers.rb

@@ -15,7 +15,9 @@ module Sinatra
         local = settings.assets.local_file_for src
         if local
           i = Image[local]
-          attrs[:src] = BusterHelpers.add_cache_buster(src, local)
+
+          attrs[:src] = HtmlHelpers.get_file_uri(src, settings.assets)
+
           if i.dimensions?
             attrs[:width]  ||= i.width
             attrs[:height] ||= i.height
@@ -42,8 +44,7 @@ module Sinatra
         pack = settings.assets.packages["#{name}.#{type}"]
         return ""  unless pack
 
-        # force production packageing for override, stage, or production
-        if ENV['ASSETPACK_FORCE_PRODUCTION'] || settings.stage? || settings.production?
+        if settings.environment == :production || settings.environment == :stage
           pack.to_production_html options
         else
           pack.to_development_html options
@@ -57,6 +58,15 @@ module Sinatra
       def asset_path_for(file, from)
         settings.assets.dyn_local_file_for file, from
       end
+
+      def assets_expires
+        if settings.assets.expires.nil?
+          expires 86400*30, :public
+        else
+          expires *settings.assets.expires
+        end
+      end
+
     end
   end
 end