vitrine 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69628563d51142a39a52b1327d3c863886e83688
-  data.tar.gz: 442bd527960f9ee697af2a42c169d4523e23245d
+  metadata.gz: 1be383ad7930897d7eac948769771973025f8dfc
+  data.tar.gz: c6ea725fc65c8108579d1b7efe63cf54ce23ffd5
 SHA512:
-  metadata.gz: 311ab78e5a8d58b5723134c3d733508e8889d92e99cb84f97b0f5c7a3a0a68885256215163a9bf86fe20bf164e9a27f799d62e5d95981b1dd10b83e3e7b64b75
-  data.tar.gz: bd09d14767ea2d5ed4af6fb1d4af9228ca808d73f53371e09cf48736443f82518805cdccf13b1215f2b88d93c373b11a49c4292655025fd8fe12288253131be2
+  metadata.gz: cc7cb63c45b36f46f8e3ca85f216c3ab59d4c9c1668d2532aafca79ccb44ae107aae6712998c5481fdaa4c345f67b9392ed2b11fe70b431d2310a5985f969624
+  data.tar.gz: ea3fab8af49c20184b2e8d418729c9112c512828c48cd487823659511034d8f23241f802222b0a797df4e340e2c7a400363cb396e7d28261b248c6fd2968e9a6

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', '3.3.0.alpha.136'
+gem 'sass', git: 'https://github.com/nex3/sass.git', branch: 'master'
 gem 'rack-contrib'
 gem 'rack-livereload'
 

data/lib/sourcemaps.rb

@@ -26,7 +26,7 @@ module Vitrine
     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)
+    raw_css, mapping = engine.render_with_sourcemap(sourcemap_uri)
     
     # Serialize the sourcemap
     # We need to pass the map options so that the generated sourcemap refers to the
@@ -35,12 +35,14 @@ module Vitrine
     
     # We are using a pre-release version of SASS which still had old sourcemap reference
     # syntax, so we have to fix it by hand
+    # TODO: remove once there is a gem for https://github.com/nex3/sass/pull/982
     chunk = Regexp.escape('/*@ sourceMappingURL')
     replacement = '/*# sourceMappingURL'
     re = /^#{chunk}/
+    raw_css = raw_css.gsub(re,replacement)
     
     # And return both
-    [rendered.gsub(re,replacement), sourcemap_body]
+    [raw_css, sourcemap_body]
   end
   
   # Compile SASS and return the source map only

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Vitrine
-  VERSION = '0.0.22'
+  VERSION = '0.0.23'
 end

data/test/test_vitrine_asset_compiler.rb

@@ -88,10 +88,11 @@ class TestVitrineAssetCompiler < Test::Unit::TestCase
     
     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"
+    resp = {"file"=>"styles.css",
+       "mappings"=>"AACA,SAAK;EAAE,SAAS,EAAE,IAAI",
+       "names"=>[],
+       "sources"=>["/les-styles-rococo/styles.scss"],
+       "version"=>3
     }
     assert_equal resp, JSON.parse(last_response.body)
   end

data/vitrine.gemspec

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