vitrine 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc4ee8209933285451897b7e350f08d688415809
-  data.tar.gz: ee63f9d1f096126084c62426139533431c5a474e
+  metadata.gz: d4e9452a9802c22e3cd800ed12520dcfa01e0a15
+  data.tar.gz: 35f02e34fca96a5284d39aecdaca1e7667461da2
 SHA512:
-  metadata.gz: 14101114ebe8d809b452a2424b19833335498949cb39ed280377854f6fa06e8051c9d1c089f5fbc774aec7b1c89e8dbf9c4fc088f4c0f20799f4414b42c8e174
-  data.tar.gz: 65ccc5b3cf467b38a8ad86ba5d2f48bf9e6e89aed72345e60311162ef6ca39246fb4d8150561899be080f0e6f431ac055a8bd3cd0d489b9ae6d808349ac1a50f
+  metadata.gz: 0e0cfdf1366282057c2d42dbe33843978f124df3c521a92aa44b33277af3825163b108a742f1db7448d77f632772213f2e7902e6c720dcefb6ecc52bb6bd5156
+  data.tar.gz: 9a810b28d393939b931ae6df6d019a8dc283764ca6334e62bb2a22151eee20c091c6fec2a4b8402be857039ac6951eb620e42ba99cd4a2882243d6468ef070c4

data/Gemfile

@@ -2,18 +2,20 @@ source "http://rubygems.org"
 
 gem 'sinatra', '~> 1.4', require: 'sinatra/base'
 gem 'coffee-script', '~> 2.2'
-gem 'sass', '3.3.0.rc.2'
+gem 'sass', '~> 3'
 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'
+  gem 'guard-test'
+  
   gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.0"
   gem "jeweler", "~> 1.8.7"
   gem 'rack-test'
-  gem 'guard-test'
   gem 'minitest'
   gem 'pry'
 end

data/lib/asset_compiler.rb

@@ -27,41 +27,30 @@ class Vitrine::AssetCompiler < Sinatra::Base
   attr_accessor :public_dir
   
   # Try to find SCSS replacement for missing CSS
-  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
-    
+  get /(.+)\.css/ do | basename |
     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'
-      Vitrine.compile_sass(scss_source_path, get_public)
+      
+      # 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')
     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,49 +3,6 @@ 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)
-    
-    [rendered, 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.18'
+  VERSION = '0.0.19'
 end

data/test/test_vitrine_asset_compiler.rb

@@ -69,29 +69,17 @@ class TestVitrineAssetCompiler < Test::Unit::TestCase
   end
   
   def test_compiles_scss_when_requested_as_css
-    write_public '/les-styles-rococo/styles.scss' do | f |
+    write_public 'styles.scss' do | f |
       f.puts '.foo {'
       f.puts '.bar { font-size: 10px; }'
       f.puts '}'
     end
     
-    get '/les-styles-rococo/styles.css'
+    get '/styles.css'
     
     assert last_response.ok?
     assert_not_nil last_response.headers['ETag'], 'Should set ETag for the compiled version'
-    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)
+    assert last_response.body.include?('.foo .bar {'), 'Should have compiled the CSS rule'
   end
   
   def test_displays_decent_alerts_for_scss_errors

data/vitrine.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "vitrine"
-  s.version = "0.0.18"
+  s.version = "0.0.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
@@ -49,41 +49,44 @@ 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.2"])
+      s.add_runtime_dependency(%q<sass>, ["~> 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"])
+      s.add_development_dependency(%q<guard-livereload>, [">= 0"])
+      s.add_development_dependency(%q<guard-test>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.7"])
       s.add_development_dependency(%q<rack-test>, [">= 0"])
-      s.add_development_dependency(%q<guard-test>, [">= 0"])
       s.add_development_dependency(%q<minitest>, [">= 0"])
       s.add_development_dependency(%q<pry>, [">= 0"])
     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.2"])
+      s.add_dependency(%q<sass>, ["~> 3"])
       s.add_dependency(%q<rack-contrib>, [">= 0"])
       s.add_dependency(%q<rack-livereload>, [">= 0"])
+      s.add_dependency(%q<guard>, ["~> 2.2"])
+      s.add_dependency(%q<guard-livereload>, [">= 0"])
+      s.add_dependency(%q<guard-test>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
       s.add_dependency(%q<rack-test>, [">= 0"])
-      s.add_dependency(%q<guard-test>, [">= 0"])
       s.add_dependency(%q<minitest>, [">= 0"])
       s.add_dependency(%q<pry>, [">= 0"])
     end
   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.2"])
+    s.add_dependency(%q<sass>, ["~> 3"])
     s.add_dependency(%q<rack-contrib>, [">= 0"])
     s.add_dependency(%q<rack-livereload>, [">= 0"])
+    s.add_dependency(%q<guard>, ["~> 2.2"])
+    s.add_dependency(%q<guard-livereload>, [">= 0"])
+    s.add_dependency(%q<guard-test>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
     s.add_dependency(%q<rack-test>, [">= 0"])
-    s.add_dependency(%q<guard-test>, [">= 0"])
     s.add_dependency(%q<minitest>, [">= 0"])
     s.add_dependency(%q<pry>, [">= 0"])
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vitrine
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Julik Tarkhanov
@@ -42,16 +42,16 @@ dependencies:
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.3.0.rc.2
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.3.0.rc.2
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rack-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -81,63 +81,77 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: guard-livereload
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: guard-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.7
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.7
+        version: '3.12'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.7
 - !ruby/object:Gem::Dependency
-  name: guard-test
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='