vitrine 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f43d48a50f634873d3fc8ac0d3e871aa7ace6ce
-  data.tar.gz: a3773daf43afe32bf7760e674f76f793dad56445
+  metadata.gz: 971d547f108ab4d65cf6b0e0f153b9a63ccffca0
+  data.tar.gz: 2c6090f3fc8fab542d0dda3484f4e7cd00fff967
 SHA512:
-  metadata.gz: 1dc1afd55e950806ca858a8c797b1f75b326758433ba395bb5a2a02847ec377d0682b582f616169d6544069f58aaae3575706ae03f044fb8aeaf7c7fbcc0f5e1
-  data.tar.gz: ee31d50efa5d357d672e3e24f8f8664312602cfa21107f7b10beadd78f0eade7f6ffbd376bfc4f2395c9266de0336c03a745ac676a80b7b6fb8a20acef5d91a7
+  metadata.gz: 06ec844ce2805eaa367f19d232e1557f22ab678f350cfa13c88d0328b74295bb6bba221006365015ef97fcf8c1253f9fbef50ec8ea054fdab4d43d668a314fe7
+  data.tar.gz: b7bd4521a17dd013a5dfecea5109806ddc1955db6002093dd052d72eb28714c7d73737b869ae6d59bb21f0fa480caa5ec4ae7c138798a9e538b6179519ad2fb8

data/lib/asset_compiler.rb

@@ -85,11 +85,13 @@ class Vitrine::AssetCompiler < Sinatra::Base
       mtime_cache coffee_source # Avoid CS recompilation if it isn't needed
       content_type 'text/javascript'
       source_body = File.read(coffee_source)
-      
-      built = Vitrine.compile_coffeescript(source_body)
-      response.headers['X-SourceMap'] = "#{basename}.js.map"
-      response.headers['SourceMap'] = "#{basename}.js.map"
-      built
+      # We could have sent a header, but it's a nice idea to have the
+      # sourcemap header saved if we write out the compiled JS,
+      # whereas otherwise it would have been discarded
+      [
+        Vitrine.compile_coffeescript(source_body),
+        "//# sourceMappingURL=#{basename}.js.map", 
+      ].join("\n")
     rescue Errno::ENOENT # Missing CoffeeScript
       forward_or_halt "No such JS file and could not find a .coffee replacement"
     rescue Exception => e # CS syntax error or something alike

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Vitrine
-  VERSION = '0.0.27'
+  VERSION = '0.0.28'
 end

data/test/test_vitrine_asset_compiler.rb

@@ -18,12 +18,11 @@ class TestVitrineAssetCompiler < Test::Unit::TestCase
     assert_equal 200, last_response.status
     assert_equal 'text/javascript;charset=utf-8', last_response.content_type
     
-    assert_equal '/nice.js.map', last_response.headers['X-SourceMap'] 
-    assert_equal '/nice.js.map', last_response.headers['SourceMap'] 
-    
-    assert_equal "(function() {\n  alert(\"rockage!\");\n\n}).call(this);\n", last_response.body
-    
     assert_include last_response.body, 'alert("rockage!")', 'Should include the compiled function'
+    assert_include last_response.body, '//# sourceMappingURL=/nice.js.map', 'Should include the reference to the source map'
+    
+    last_line = last_response.body.split("\n").pop
+    assert_include last_line, 'sourceMappingURL'
   end
   
   def test_compiles_coffeescript_sourcemap
@@ -40,7 +39,7 @@ class TestVitrineAssetCompiler < Test::Unit::TestCase
     
     get '/js/nice.js.map'
     ref = {"version"=>3, "file"=>"", "sourceRoot"=>"", "sources"=>["/js/nice.coffee"], 
-      "names"=>[], "mappings"=>"AAAA;CAAA,CAAA,GAAA,KAAA;CAAA"}
+      "names"=>[], "mappings"=>"AAAA;AAAA,EAAA,KAAA,CAAM,UAAN,CAAA,CAAA;AAAA"}
     assert_equal ref, JSON.parse(last_response.body)
   end
   

data/vitrine.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "vitrine"
-  s.version = "0.0.27"
+  s.version = "0.0.28"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vitrine
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
 platform: ruby
 authors:
 - Julik Tarkhanov