vitrine 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91384529ab3b17a8f37ab9c2e78cecc2182cc091
-  data.tar.gz: 4031c3404bd57c1d9cf13e45193b60df945ac79e
+  metadata.gz: fe7abf99aab7d3ee66abc1be9c1c28a19cf2aef7
+  data.tar.gz: 29d1551d75b724d0645467cb38cfd9cdbb1eb951
 SHA512:
-  metadata.gz: 894d0915eab432b3bfd615792c924ab200ca7f3f9cfd6b74ff7ca3d4990e1353d37392f61a12636b2fa781d6fc4b21f8cdfdfd7b9c5a5df1b4ba5f0e48da05f4
-  data.tar.gz: 55f4a1a7a8d009fbe6ec9cee1bcadaa705e884362bbc3270bc667e71c668ec410df9e9b1a2dbf4295a86857a60e8f1c2fc1660560a3945701bed925d09355f7f
+  metadata.gz: d5be1d60c2fc56e9e4ecdad8486d3fb64edc86f64e54baf06ffb88e0840401205c7637197a3cee31c9335345ad0273690ef3e153a63d45bf01ed42910fc571cb
+  data.tar.gz: 4afdf3e31b68ae1d326d7205062cd7615637caf517f42be0a9ccc8e2edcaa7d4f545198540cccd0487bd2f2eb170359472d1ae1900c92a754896c6c71ae4e1f5

data/lib/asset_compiler.rb

@@ -82,16 +82,14 @@ class Vitrine::AssetCompiler < Sinatra::Base
     # If this file is not found resort back to a coffeescript
     begin
       coffee_source = File.join(get_public, "#{basename}.coffee")
-      mtime_cache coffee_source
+      mtime_cache coffee_source # Avoid CS recompilation if it isn't needed
       content_type 'text/javascript'
       source_body = File.read(coffee_source)
-      # 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")
+      
+      built = Vitrine.compile_coffeescript(source_body),
+      response.headers['X-SourceMap'] = "#{basename}.js.map"
+      response.headers['SourceMap'] = "#{basename}.js.map"
+      built
     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.25'
+  VERSION = '0.0.26'
 end

data/test/test_vitrine_asset_compiler.rb

@@ -18,11 +18,10 @@ class TestVitrineAssetCompiler < Test::Unit::TestCase
     assert_equal 200, last_response.status
     assert_equal 'text/javascript;charset=utf-8', last_response.content_type
     
-    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'
+    assert_equal '/nice.js.map', last_response.headers['X-SourceMap'] 
+    assert_equal '/nice.js.map', last_response.headers['SourceMap'] 
     
-    last_line = last_response.body.split("\n").pop
-    assert_include last_line, 'sourceMappingURL'
+    assert_include last_response.body, 'alert("rockage!")', 'Should include the compiled function'
   end
   
   def test_compiles_coffeescript_sourcemap

data/vitrine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "vitrine"
-  s.version = "0.0.25"
+  s.version = "0.0.26"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2014-02-10"
+  s.date = "2014-02-17"
   s.description = " Serves ERB templates with live CoffeeScript and SASS "
   s.email = "me@julik.nl"
   s.executables = ["vitrine"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vitrine
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra