sinatra-assetpack 0.1.1 → 0.1.2

data/.gitignore

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

data/Gemfile.lock

@@ -0,0 +1,79 @@
+PATH
+  remote: .
+  specs:
+    sinatra-assetpack (0.1.1)
+      jsmin
+      rack-test
+      sinatra
+      tilt (>= 1.3.0)
+
+GEM
+  remote: http://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.4.0)
+    columnize (0.3.6)
+    commonjs (0.2.6)
+    contest (0.1.3)
+    debugger (1.2.4)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.1.1)
+      debugger-ruby_core_source (~> 1.1.7)
+    debugger-linecache (1.1.2)
+      debugger-ruby_core_source (>= 1.1.1)
+    debugger-ruby_core_source (1.1.7)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
+    haml (3.1.7)
+    jsmin (1.0.1)
+    less (2.2.2)
+      commonjs (~> 0.2.6)
+    metaclass (0.0.1)
+    mocha (0.13.1)
+      metaclass (~> 0.0.1)
+    multi_json (1.5.0)
+    open4 (1.3.0)
+    rack (1.4.4)
+    rack-protection (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (10.0.3)
+    sass (3.2.5)
+    sinatra (1.3.3)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    stylus (0.6.2)
+      execjs
+      stylus-source
+    stylus-source (0.31.0)
+    tilt (1.3.3)
+    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
+  ruby
+
+DEPENDENCIES
+  coffee-script
+  contest
+  debugger
+  haml
+  less
+  mocha
+  rake
+  sass
+  sinatra-assetpack!
+  stylus
+  uglifier
+  yui-compressor

data/HISTORY.md

@@ -1,3 +1,9 @@
+v0.1.2 - Jan 20, 2013
+----------------------
+
+### Added:
+  * Support for custom cache control headers for packed assets. (#43)
+
 v0.1.1 - Jan 15, 2013
 ----------------------
 

data/README.md

@@ -529,6 +529,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
 ----------------------
 

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
@@ -50,7 +51,7 @@ module Sinatra
             # 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]
 

data/lib/sinatra/assetpack/helpers.rb

@@ -56,6 +56,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

data/lib/sinatra/assetpack/options.rb

@@ -159,6 +159,14 @@ module Sinatra
 
       attrib :prebuild          # Bool
 
+      def expires(*args)
+        if args.empty?
+          @expires
+        else
+          @expires = args
+        end
+      end
+
       def js_compression(name=nil, options=nil)
         @js_compression = name  unless name.nil?
         @js_compression_options = options  if options.is_a?(Hash)

data/lib/sinatra/assetpack/version.rb

@@ -1,7 +1,7 @@
 module Sinatra
   module AssetPack
     def self.version
-      "0.1.1"
+      "0.1.2"
     end
   end
 end

data/sinatra-assetpack.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "uglifier"
   s.add_development_dependency "rake"
   s.add_development_dependency "less"
+  s.add_development_dependency "debugger"
 end

data/test/app/app.rb

@@ -53,6 +53,7 @@ class Main < Sinatra::Base
       '/css/scre*.css',
       '/css/screen.css'
     ]
+
   }
 
   get '/index.html' do

data/test/test_helper.rb

@@ -4,7 +4,8 @@ require 'tilt'
 require 'stylus'
 require 'rack/test'
 require 'yaml'
-require 'mocha'
+require 'mocha/setup'
+require 'debugger'
 
 require File.expand_path('../app/app.rb', __FILE__)
 

data/test/unit_test.rb

@@ -103,4 +103,37 @@ class AppTest < UnitTest
     get '/helpers/css'
     assert body =~ %r{link rel='stylesheet' href='/css/screen.[0-9]+.css' media='screen'}
   end
+
+  test 'default expiration of single assets' do
+    get '/js/hi.js'
+    assert_equal "public, max-age=#{86400*30}", last_response.headers['Cache-Control']
+    assert_equal (Time.now + (86400*30)).httpdate, last_response.headers['Expires']
+  end
+
+  test 'custom expiration of single assets' do
+    app.settings.assets.expires 86400*365, :public
+
+    get '/js/hi.js'
+    assert_equal "public, max-age=#{86400*365}", last_response.headers['Cache-Control']
+    assert_equal (Time.now + (86400*365)).httpdate, last_response.headers['Expires']
+
+    app.settings.assets.instance_variable_set('@expires', nil)
+  end
+
+  test 'default expiration of packed assets' do
+    get '/js/app.js'
+    assert_equal "public, max-age=#{86400*30}", last_response.headers['Cache-Control']
+    assert_equal (Time.now + (86400*30)).httpdate, last_response.headers['Expires']
+  end
+
+  test 'custom expiration of single assets' do
+    app.settings.assets.expires 86400*365, :public
+
+    get '/js/app.js'
+    assert_equal "public, max-age=#{86400*365}", last_response.headers['Cache-Control']
+    assert_equal (Time.now + (86400*365)).httpdate, last_response.headers['Expires']
+
+    app.settings.assets.instance_variable_set('@expires', nil)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-assetpack
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -235,6 +235,22 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
     none: false
+- !ruby/object:Gem::Dependency
+  name: debugger
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 description: Package your assets for Sinatra.
 email:
 - rico@sinefunc.com
@@ -245,6 +261,7 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
+- Gemfile.lock
 - HISTORY.md
 - README.md
 - Rakefile