vitrine 0.0.29 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba03e630b806374d517a9071c6daf71ce227ce45
-  data.tar.gz: bd1bc8688272d5ecbd9987da739d34aeea36e182
+  metadata.gz: 526ab2ee866786010e8162284356302fb0303190
+  data.tar.gz: b7692db261cbf07f07a19805d08a4ece2f38c13c
 SHA512:
-  metadata.gz: a9279bc814cea9619f26f0dc5546502282f486bd92fdffbfe7100fde7c37f63037ad037e72f679451963efe37f49b64c042dd7eab3030b54295556ffb855d46b
-  data.tar.gz: 88a612c8538fecf944c7851656a858e64c6dec687b38aa4354d7e176f362c0c0ef87bd83abe358a8862de5a89372a85deb0d17a3ebc1881c5619ea9aa2789657
+  metadata.gz: b90294a20a52e7f29e7b0520cdbb9c487e5bca5cd146dd90dda3906271ce1e665e75b2e0395222a7513818b3fe782a6dae81173bce25b9c1b8a7e48406e1d1c3
+  data.tar.gz: 6248a50cbf58446fd68d0ec87255600b3dc5020093cf85ecabc5274c4e1451d82be72fb3314d85236427d3fbf09c187af545758d814bd2c42047dc6e07c5970c

data/Gemfile

@@ -3,30 +3,10 @@ source "http://rubygems.org"
 gem 'sinatra', '~> 1.4', require: 'sinatra/base'
 gem 'coffee-script', '~> 2.2'
 
-=begin
-
-Now here we get into an issue. I am using Guard BIG TIME.
-That means that Sass above this version will puke out because
-the Sass authors wisely decided to burden me with having a version
-of 'listen' even though I never use their watching features.
-
-According to this:
-https://rubygems.org/api/v1/dependencies?gems=sass
-the last version of SASS which does not have a "listen" dependency
-is '3.3.0.alpha.136', so this is what we are going to depend on
-until at least this issue is resolved
-
-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', '3.3.0.rc.3'
+gem 'sass', '~> 3.3.0'
 gem 'rack-contrib'
 gem 'rack-livereload'
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
 group :development do
   gem 'guard', '~> 2.2'
   gem 'guard-livereload'

data/README.md

@@ -103,9 +103,9 @@ You can also only opt-in to the asset compilation system of Vitrine only once yo
 the prototype stage into, say, a Sinatra application.
 
 Note that you _need_ to have an `ExecJS` environment on your server for this:
-
-    use Vitrine::AssetCompiler.new do | ac |
-      vitrine.settings.set :root => File.dirname(__FILE__)
+    
+    use Vitrine::AssetCompiler do | ac |
+      ac.settings.set :root => File.dirname(__FILE__)
     end
 
 But you can also choose to have your JSON-serving API backend at the end of the Rack stack, and `Vitrine`

data/lib/asset_compiler.rb

@@ -43,6 +43,7 @@ class Vitrine::AssetCompiler < Sinatra::Base
       forward_or_halt "No such CSS or SCSS file found"
     rescue Exception => e # CSS syntax error or something alike
       cache_bust!
+      print_compilation_error(e)
       # Add a generated DOM element before <body/> to inject
       # a visible error message
       error_tpl = 'body:before {
@@ -99,6 +100,8 @@ class Vitrine::AssetCompiler < Sinatra::Base
       # Ensure the response with the exception gets reloaded on next request
       cache_bust!
       
+      print_compilation_error(e)
+      
       # Inject the syntax error into the browser console
       console_message = 'console.error(%s)' % [e.class, "\n", "--> ", e.message].join.inspect
       # Avoid 500 because it plays bad with LiveReload
@@ -151,5 +154,14 @@ class Vitrine::AssetCompiler < Sinatra::Base
   def log(msg)
     env['captivity.logger'].debug(msg) if env['captivity.logger']
   end
+  
+  def print_compilation_error(e)
+    # Print the error to $stderr for good measure
+    $stderr.puts "Error when building asset #{request.url.inspect}: #{e.class}: #{e.message}"
+    e.backtrace.each do | line |
+      $stderr.puts "\t#{line}"
+    end
+  end
+  
 end
 

data/lib/version.rb

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

data/vitrine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "vitrine"
-  s.version = "0.0.29"
+  s.version = "0.0.30"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2014-02-21"
+  s.date = "2014-05-02"
   s.description = " Serves ERB templates with live CoffeeScript and SASS "
   s.email = "me@julik.nl"
   s.executables = ["vitrine"]
@@ -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>, ["= 3.3.0.rc.3"])
+      s.add_runtime_dependency(%q<sass>, ["~> 3.3.0"])
       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>, ["= 3.3.0.rc.3"])
+      s.add_dependency(%q<sass>, ["~> 3.3.0"])
       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>, ["= 3.3.0.rc.3"])
+    s.add_dependency(%q<sass>, ["~> 3.3.0"])
     s.add_dependency(%q<rack-contrib>, [">= 0"])
     s.add_dependency(%q<rack-livereload>, [">= 0"])
     s.add_dependency(%q<guard>, ["~> 2.2"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vitrine
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -42,16 +42,16 @@ dependencies:
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.3.0.rc.3
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.3.0.rc.3
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: rack-contrib
   requirement: !ruby/object:Gem::Requirement