vitrine 0.0.19 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4e9452a9802c22e3cd800ed12520dcfa01e0a15
-  data.tar.gz: 35f02e34fca96a5284d39aecdaca1e7667461da2
+  metadata.gz: 49fedd846e606aff4360c45e4556e2e414825970
+  data.tar.gz: 5729915ef21f08204acd7c20c19b0d0ab4a425c5
 SHA512:
-  metadata.gz: 0e0cfdf1366282057c2d42dbe33843978f124df3c521a92aa44b33277af3825163b108a742f1db7448d77f632772213f2e7902e6c720dcefb6ecc52bb6bd5156
-  data.tar.gz: 9a810b28d393939b931ae6df6d019a8dc283764ca6334e62bb2a22151eee20c091c6fec2a4b8402be857039ac6951eb620e42ba99cd4a2882243d6468ef070c4
+  metadata.gz: f7d58844b0376a6815342d87dc3b44cbd36eaf9825ffdf4401264ced9b67688b4a95c411e5abcc8bae5c06716f43a84e086411855936e71417ff6e351e3afe68
+  data.tar.gz: bcaa8447a233db781468ca3a58e3faf193f88823ae1559b0d180f14b538397e4a3539acd85b243ea244faac5d950d093b93c64b9a141c65e347836052457ae83

data/Gemfile

@@ -2,7 +2,26 @@ source "http://rubygems.org"
 
 gem 'sinatra', '~> 1.4', require: 'sinatra/base'
 gem 'coffee-script', '~> 2.2'
-gem 'sass', '~> 3'
+
+=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.alpha.136'
 gem 'rack-contrib'
 gem 'rack-livereload'
 

data/lib/asset_compiler.rb

@@ -27,30 +27,41 @@ class Vitrine::AssetCompiler < Sinatra::Base
   attr_accessor :public_dir
   
   # Try to find SCSS replacement for missing CSS
-  get /(.+)\.css/ do | basename |
+  get /(.+)\.css$/ do | basename |
+    # Return vanilla CSS
+    if File.exist?(File.join(get_public, basename + '.css'))
+      return send_file(File.join(get_public, basename + '.css'))
+    end
+    
     begin
       # TODO: handle .sass ext as well
       scss_source_path = File.join(get_public, "#{basename}.scss")
       mtime_cache(scss_source_path)
       content_type 'text/css', :charset => 'utf-8'
-      
-      # TODO: Examine http://sass-lang.com/documentation/file.SASS_REFERENCE.html
-      # It already has provisions for error display, among other things
-      Sass.compile_file(scss_source_path, cache_location: '/tmp/vitrine/sass-cache')
+      Vitrine.compile_sass(scss_source_path, get_public)
     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
+     # 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
   
+  # Try to find SCSS replacement for missing CSS
+  get /(.+)\.css\.map$/ do | basename |
+    # TODO: handle .sass ext as well
+    scss_source_path = File.join(get_public, "#{basename}.scss")
+    mtime_cache(scss_source_path)
+    content_type 'application/json', :charset => 'utf-8'
+    Vitrine.compile_sass_source_map(scss_source_path, get_public)
+  end
+  
   # Generate a sourcemap for CoffeeScript files
   get /(.+)\.js\.map$/ do | basename |
     begin

data/lib/sourcemaps.rb

@@ -3,6 +3,54 @@ require 'json'
 
 module Vitrine
   
+  # We need to override the Sass importer
+  # so that it gives us URLs relative to the server root for sourcemaps
+  class Imp < Sass::Importers::Filesystem
+    def public_url(of_filesystem_path)
+      scss_uri = '/' + Pathname.new(of_filesystem_path).relative_path_from(Pathname.new(root)).to_s
+    end
+  end
+  
+  # Compile a SASS/SCSS file to CSS
+  def self.compile_sass_and_sourcemap(scss_path, public_folder_path)
+    # Compute the paths relative to the webserver public root
+    scss_uri = '/' + Pathname.new(scss_path).relative_path_from(Pathname.new(public_folder_path)).to_s
+    css_uri = scss_uri.gsub(/\.scss$/, '.css')
+    sourcemap_uri= css_uri + '.map'
+    
+    engine_opts = {importer: Imp.new(public_folder_path), sourcemap: true, cache: false}
+    map_options = {css_path: css_uri, sourcemap_path: sourcemap_uri }
+    
+    engine = Sass::Engine.for_file(scss_path, engine_opts)
+    
+    # Determine the sourcemap URL for the SASS file
+    rendered, mapping = engine.render_with_sourcemap(sourcemap_uri)
+    
+    # Serialize the sourcemap
+    # We need to pass css_uri: so that the generated sourcemap refers to the
+    # file that can be pulled of the server as opposed to a file on the filesystem
+    sourcemap_body = mapping.to_json(map_options)
+    
+    # We are using a pre-release version of SASS which still had old sourcemap reference
+    # syntax, so we have to fix it by hand
+    chunk = Regexp.escape('/*@ sourceMappingURL')
+    replacement = '/*# sourceMappingURL'
+    re = /^#{chunk}/
+    [rendered.gsub(re,replacement), sourcemap_body]
+  end
+  
+  # Compile SASS and return the source map only
+  def self.compile_sass_source_map(scss_path, public_folder_path)
+    css, map = compile_sass_and_sourcemap(scss_path, public_folder_path)
+    map
+  end
+  
+  # Compiles SASS and it's sourcemap and returns the CSS only
+  def self.compile_sass(scss_path, public_folder_path)
+    css, map = compile_sass_and_sourcemap(scss_path, public_folder_path)
+    css
+  end
+  
   # Compile a script (String or IO) to JavaScript.
   # This is a version lifted from here
   # https://github.com/josh/ruby-coffee-script/blob/114b65b638f66ba04b60bf9c24b54360260f9898/lib/coffee_script.rb

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Vitrine
-  VERSION = '0.0.19'
+  VERSION = '0.0.21'
 end

data/test/test_vitrine_asset_compiler.rb

@@ -69,17 +69,29 @@ class TestVitrineAssetCompiler < Test::Unit::TestCase
   end
   
   def test_compiles_scss_when_requested_as_css
-    write_public 'styles.scss' do | f |
+    write_public '/les-styles-rococo/styles.scss' do | f |
       f.puts '.foo {'
       f.puts '.bar { font-size: 10px; }'
       f.puts '}'
     end
     
-    get '/styles.css'
+    get '/les-styles-rococo/styles.css'
     
     assert last_response.ok?
     assert_not_nil last_response.headers['ETag'], 'Should set ETag for the compiled version'
-    assert last_response.body.include?('.foo .bar {'), 'Should have compiled the CSS rule'
+    assert_include last_response.body, '.foo .bar {'
+    assert_include last_response.body, '*# sourceMappingURL=/les-styles-rococo/styles.css.map */'
+    
+    get '/les-styles-rococo/styles.css.map'
+    
+    assert last_response.ok?
+    assert_equal "application/json;charset=utf-8", last_response.content_type
+    resp = {"version"=> "3",
+      "mappings"=> "AACA,SAAK;EAAE,SAAS,EAAE,IAAI",
+      "sources"=> ["/les-styles-rococo/styles.scss"],
+      "file" => "styles.css"
+    }
+    assert_equal resp, JSON.parse(last_response.body)
   end
   
   def test_displays_decent_alerts_for_scss_errors

data/vitrine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "vitrine"
-  s.version = "0.0.19"
+  s.version = "0.0.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2014-01-12"
+  s.date = "2014-01-13"
   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"])
+      s.add_runtime_dependency(%q<sass>, ["= 3.3.0.alpha.136"])
       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"])
+      s.add_dependency(%q<sass>, ["= 3.3.0.alpha.136"])
       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"])
+    s.add_dependency(%q<sass>, ["= 3.3.0.alpha.136"])
     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.19
+  version: 0.0.21
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2014-01-13 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'
+        version: 3.3.0.alpha.136
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 3.3.0.alpha.136
 - !ruby/object:Gem::Dependency
   name: rack-contrib
   requirement: !ruby/object:Gem::Requirement