vitrine 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: decd2f863fee2ee85665a655ba3bf0b9e119f89d
-  data.tar.gz: 5d01078ac0d84a7b7c9e3c882a4cb5572ad66186
+  metadata.gz: 91384529ab3b17a8f37ab9c2e78cecc2182cc091
+  data.tar.gz: 4031c3404bd57c1d9cf13e45193b60df945ac79e
 SHA512:
-  metadata.gz: d3bc122058c0142438dd3019209eb33a5fb2f286599312d95f29c438010393a17d9dacb9d5b5975767fad44ba37d28445de2b1af43e7534ed1d393f209637303
-  data.tar.gz: fbd77d2b1d504c4d7b933adc71a48fd3982234e00fa12512c5b96a5651c898e66e3e50365628c06971bf899c3b7bbefaa70d6a562e9f0d437a9f0f922eb7061f
+  metadata.gz: 894d0915eab432b3bfd615792c924ab200ca7f3f9cfd6b74ff7ca3d4990e1353d37392f61a12636b2fa781d6fc4b21f8cdfdfd7b9c5a5df1b4ba5f0e48da05f4
+  data.tar.gz: 55f4a1a7a8d009fbe6ec9cee1bcadaa705e884362bbc3270bc667e71c668ec410df9e9b1a2dbf4295a86857a60e8f1c2fc1660560a3945701bed925d09355f7f

data/Gemfile

@@ -21,7 +21,7 @@ https://github.com/nex3/sass/pull/982
 Better still, SASS authors should remove filesystem watching or implement
 it in a portable/vendored manner.
 =end
-gem 'sass', git: 'https://github.com/nex3/sass.git', branch: 'master'
+gem 'sass', '3.3.0.rc.3'
 gem 'rack-contrib'
 gem 'rack-livereload'
 

data/lib/asset_compiler.rb

@@ -42,14 +42,15 @@ class Vitrine::AssetCompiler < Sinatra::Base
     rescue Errno::ENOENT # Missing SCSS
       forward_or_halt "No such CSS or SCSS file found"
     rescue Exception => e # CSS syntax error or something alike
-     # Add a generated DOM element before <body/> to inject
-     # a visible error message
-     error_tpl = 'body:before {
-       background: white; padding: 3px; font-family: monospaced; color: red; 
-       font-size: 14px; content: %s }'
-     css_message = error_tpl % [e.class, "\n", "--> ", e.message].join.inspect
-     # If we halt with 500 this will not be shown as CSS
-     halt 200, css_message
+      cache_bust!
+      # Add a generated DOM element before <body/> to inject
+      # a visible error message
+      error_tpl = 'body:before {
+        background: white; padding: 3px; font-family: monospaced; color: red; 
+        font-size: 14px; content: %s }'
+      css_message = error_tpl % [e.class, "\n", "--> ", e.message].join.inspect
+      # If we halt with 500 this will not be shown as CSS
+      halt 200, css_message
     end
   end
   
@@ -96,9 +97,7 @@ class Vitrine::AssetCompiler < Sinatra::Base
     rescue Exception => e # CS syntax error or something alike
       
       # Ensure the response with the exception gets reloaded on next request
-      response.headers['Cache-Control'] = 'private'
-      response.headers['Pragma'] = 'no-cache'
-      response.headers.delete('ETag')
+      cache_bust!
       
       # Inject the syntax error into the browser console
       console_message = 'console.error(%s)' % [e.class, "\n", "--> ", e.message].join.inspect
@@ -107,6 +106,12 @@ class Vitrine::AssetCompiler < Sinatra::Base
     end
   end
   
+  def cache_bust!
+    response.headers['Cache-Control'] = 'private'
+    response.headers['Pragma'] = 'no-cache'
+    response.headers.delete('ETag')
+  end
+  
   def mtime_cache(path)
     # Mix in the request URL into the cache key so that we can hash
     # .map sourcemaps and .js compiles based off of the same file path

data/lib/sourcemaps.rb

@@ -6,7 +6,7 @@ module Vitrine
   # We need to override the Sass importer
   # so that it gives us URLs relative to the server root for sourcemaps
   class SassImporter < Sass::Importers::Filesystem
-    def public_url(of_filesystem_path)
+    def public_url(of_filesystem_path, unknown_arg) # TODO: figure out what the second one does
       # Importer defines a basic attribute called "root" which we set when initializing
       # We have to return the server-relative URL of the path from here
       '/' + Pathname.new(of_filesystem_path).relative_path_from(Pathname.new(root)).to_s

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Vitrine
-  VERSION = '0.0.24'
+  VERSION = '0.0.25'
 end

data/test/test_vitrine_asset_compiler.rb

@@ -50,13 +50,13 @@ class TestVitrineAssetCompiler < Test::Unit::TestCase
     
     get '/faulty.js'
     
-    assert_equal 200, last_response.status
-    assert_equal 'text/javascript;charset=utf-8', last_response.content_type, "Should set JS content type"
-    
     assert_equal 'private', last_response.headers['Cache-Control'], "Should be cache busting"
     assert_equal 'no-cache', last_response.headers['Pragma'], "Should be cache busting with Pragma: no-cache"
     assert_nil last_response.headers['ETag'], 'Should send no etag across'
     
+    assert_equal 200, last_response.status
+    assert_equal 'text/javascript;charset=utf-8', last_response.content_type, "Should set JS content type"
+    
     err = 'console.error("ExecJS::RuntimeError\n--> SyntaxError: :1:1: reserved word \"function\"")'
     assert_equal err, last_response.body
   end
@@ -110,6 +110,11 @@ class TestVitrineAssetCompiler < Test::Unit::TestCase
     get '/faulty.css'
     
     assert_equal 200, last_response.status
+    
+    assert_equal 'private', last_response.headers['Cache-Control'], "Should be cache busting"
+    assert_equal 'no-cache', last_response.headers['Pragma'], "Should be cache busting with Pragma: no-cache"
+    assert_nil last_response.headers['ETag'], 'Should send no etag across'
+    
     assert last_response.body.include?('body:before {'), 'Should include the generated element selector'
     assert last_response.body.include?('Sass::SyntaxError'), 'Should include the syntax error class'
   end

data/vitrine.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "vitrine"
-  s.version = "0.0.24"
+  s.version = "0.0.25"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, ["~> 1.4"])
       s.add_runtime_dependency(%q<coffee-script>, ["~> 2.2"])
-      s.add_runtime_dependency(%q<sass>, [">= 0"])
+      s.add_runtime_dependency(%q<sass>, ["= 3.3.0.rc.3"])
       s.add_runtime_dependency(%q<rack-contrib>, [">= 0"])
       s.add_runtime_dependency(%q<rack-livereload>, [">= 0"])
       s.add_development_dependency(%q<guard>, ["~> 2.2"])
@@ -63,7 +63,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<sinatra>, ["~> 1.4"])
       s.add_dependency(%q<coffee-script>, ["~> 2.2"])
-      s.add_dependency(%q<sass>, [">= 0"])
+      s.add_dependency(%q<sass>, ["= 3.3.0.rc.3"])
       s.add_dependency(%q<rack-contrib>, [">= 0"])
       s.add_dependency(%q<rack-livereload>, [">= 0"])
       s.add_dependency(%q<guard>, ["~> 2.2"])
@@ -78,7 +78,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<sinatra>, ["~> 1.4"])
     s.add_dependency(%q<coffee-script>, ["~> 2.2"])
-    s.add_dependency(%q<sass>, [">= 0"])
+    s.add_dependency(%q<sass>, ["= 3.3.0.rc.3"])
     s.add_dependency(%q<rack-contrib>, [">= 0"])
     s.add_dependency(%q<rack-livereload>, [">= 0"])
     s.add_dependency(%q<guard>, ["~> 2.2"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vitrine
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Julik Tarkhanov
@@ -42,16 +42,16 @@ dependencies:
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.0.rc.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.0.rc.3
 - !ruby/object:Gem::Dependency
   name: rack-contrib
   requirement: !ruby/object:Gem::Requirement