vitrine 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 971d547f108ab4d65cf6b0e0f153b9a63ccffca0
-  data.tar.gz: 2c6090f3fc8fab542d0dda3484f4e7cd00fff967
+  metadata.gz: ba03e630b806374d517a9071c6daf71ce227ce45
+  data.tar.gz: bd1bc8688272d5ecbd9987da739d34aeea36e182
 SHA512:
-  metadata.gz: 06ec844ce2805eaa367f19d232e1557f22ab678f350cfa13c88d0328b74295bb6bba221006365015ef97fcf8c1253f9fbef50ec8ea054fdab4d43d668a314fe7
-  data.tar.gz: b7bd4521a17dd013a5dfecea5109806ddc1955db6002093dd052d72eb28714c7d73737b869ae6d59bb21f0fa480caa5ec4ae7c138798a9e538b6179519ad2fb8
+  metadata.gz: a9279bc814cea9619f26f0dc5546502282f486bd92fdffbfe7100fde7c37f63037ad037e72f679451963efe37f49b64c042dd7eab3030b54295556ffb855d46b
+  data.tar.gz: 88a612c8538fecf944c7851656a858e64c6dec687b38aa4354d7e176f362c0c0ef87bd83abe358a8862de5a89372a85deb0d17a3ebc1881c5619ea9aa2789657

data/lib/asset_compiler.rb

@@ -118,8 +118,9 @@ class Vitrine::AssetCompiler < Sinatra::Base
     # and mtime
     key = [File.expand_path(path), File.mtime(path), request.path_info, get_public]
     cache_sha = Digest::SHA1.hexdigest(Marshal.dump(key))
-    cache_control :public
+    
     etag cache_sha
+    cache_control :public, :must_revalidate
     
     log "---> Vitrine AC: Recompiling #{path} -> #{request.path_info}"
   end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Vitrine
-  VERSION = '0.0.28'
+  VERSION = '0.0.29'
 end

data/lib/vitrine.rb

@@ -23,6 +23,7 @@ class Vitrine::App < Sinatra::Base
   # Sets whether Vitrine will output messages about dynamic assets
   set :silent, true
   set :public_folder, ->{ File.join(settings.root, 'public') } 
+  set :static_cache_control, [:public, :must_revalidate, :max_age => 60 * 60]
   
   use Vitrine::AssetCompiler
   

data/test/test_vitrine_asset_compiler.rb

@@ -14,9 +14,10 @@ class TestVitrineAssetCompiler < Test::Unit::TestCase
     
     get '/nice.js'
     
-    assert_not_nil last_response.headers['ETag'], 'Should set ETag for the compiled version'
     assert_equal 200, last_response.status
     assert_equal 'text/javascript;charset=utf-8', last_response.content_type
+    assert_not_nil last_response.headers['ETag'], 'Should set ETag for the compiled version'
+    assert_equal 'public, must-revalidate', last_response['Cache-Control'], 'Should set cache-control'
     
     assert_include last_response.body, 'alert("rockage!")', 'Should include the compiled function'
     assert_include last_response.body, '//# sourceMappingURL=/nice.js.map', 'Should include the reference to the source map'
@@ -68,7 +69,8 @@ class TestVitrineAssetCompiler < Test::Unit::TestCase
     
     get '/nice.js'
     assert_equal 200, last_response.status
-    assert_not_nil last_response.headers['ETag']
+    assert_not_nil last_response['ETag']
+    assert_equal 'public, must-revalidate', last_response['Cache-Control']
     
     etag = last_response.headers['ETag']
     get '/nice.js', {}, rack_env = {'HTTP_IF_NONE_MATCH' => etag}
@@ -86,6 +88,8 @@ class TestVitrineAssetCompiler < Test::Unit::TestCase
     
     assert last_response.ok?
     assert_not_nil last_response.headers['ETag'], 'Should set ETag for the compiled version'
+    assert_equal 'public, must-revalidate', last_response['Cache-Control'], 'Should set cache-control'
+    
     assert_include last_response.body, '.foo .bar {'
     assert_include last_response.body, '*# sourceMappingURL=/les-styles-rococo/styles.css.map */'
     

data/test/test_vitrine_in_rack_stack.rb

@@ -26,6 +26,17 @@ class TestVitrineInRackStack < Test::Unit::TestCase
     assert_match /Lobstericious/, last_response.body, "Should have forwarded to downstream Lobster"
   end
   
+  def test_fetch_static_file_sets_cache_control
+    write_public('hello.coffee') do | f |
+      f << 'window.alert "Hello Coffee"'
+    end
+    
+    get '/hello.coffee'
+    assert last_response.ok?
+    assert last_response['Last-Modified'], 'Last-Modified should be set'
+    assert_equal 'public, must-revalidate, max-age=3600', last_response['Cache-Control']
+  end
+  
   def test_fetch_js
     write_public('hello.coffee') do | f |
       f << 'window.alert "Hello Coffee"'

data/vitrine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "vitrine"
-  s.version = "0.0.28"
+  s.version = "0.0.29"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2014-02-17"
+  s.date = "2014-02-21"
   s.description = " Serves ERB templates with live CoffeeScript and SASS "
   s.email = "me@julik.nl"
   s.executables = ["vitrine"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vitrine
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra