vitrine 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 955345ceb4a3649556a839783121dd317f7cd2ab
-  data.tar.gz: 501cc975a85516715fb7dee011f4347b09df9f73
+  metadata.gz: 6c4afcd269b9abc86ecb39b02b1a54c969ef98a2
+  data.tar.gz: 6487d2ed130c0ac7859ec8c7307a720054192396
 SHA512:
-  metadata.gz: 9974b4c8184348f91d2c22723aad8a486e3d5c1a3492cac3de78dd56521e124dec9cd920fac9d705a8cfc76403be3b64d94db9645b4724dfc43126ed9a1bc28f
-  data.tar.gz: 2a225a39a6ec2ca54e027fd87130116d1af827988838cfcacf52825bd89f1afdf6e0e1a5cced4afd86b46033a350cae0a9e1fe8b9734f5dcf30ea8b88f1fc352
+  metadata.gz: 74a076f0a0c24bbe1e09d03fea87bf85747515104a2e83f6477b43b4950d244970a4c74e3cf465f9fc71e9a61aac2d791f5c733c5aa055b7260052950130dd44
+  data.tar.gz: c1cb7930928de1182867c03b3c8a073d364a847e521c9ad737c75a951d2c7b602781d579e389f25ce9be6f900a630881b1f7cec754e370e4ba5a67a0df1d89f4

data/lib/asset_compiler.rb

@@ -79,7 +79,7 @@ class Vitrine::AssetCompiler < Sinatra::Base
         # whereas otherwise it would have been discarded
         [
           "//# sourceMappingURL=#{basename}.js.map", 
-          CoffeeScript.compile(source_body)
+          Vitrine.compile_coffeescript(source_body)
         ].join("\n")
       end
     rescue Errno::ENOENT # Missing CoffeeScript

data/lib/sourcemaps.rb

@@ -2,6 +2,39 @@ require 'pathname'
 require 'json'
 
 module Vitrine
+  
+  # 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
+  # which propagates error line
+  def self.compile_coffeescript(script, options = {})
+    script = script.read if script.respond_to?(:read)
+
+    if options.key?(:bare)
+    elsif options.key?(:no_wrap)
+      options[:bare] = options[:no_wrap]
+    else
+      options[:bare] = false
+    end
+
+    wrapper = <<-WRAPPER
+      (function(script, options) {
+        try {
+          return CoffeeScript.compile(script, options);
+        } catch (err) {
+          if (err instanceof SyntaxError && err.location) {
+            throw new SyntaxError([options.filename, err.location.first_line + 1, err.location.first_column + 1].join(":") + ": " + err.message)
+          } else {
+            throw err;
+          }
+        }
+      })
+    WRAPPER
+    CoffeeScript::Source.context.call(wrapper, script, options)
+  end
+  
+  # Compile a CS source map.
+  # TODO: this method should be married to the method that compiles the source code itself
   def self.build_coffeescript_source_map_body(full_coffeescript_file_path, public_folder_path)
     
     script = File.read(full_coffeescript_file_path)

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Vitrine
-  VERSION = '0.0.15'
+  VERSION = '0.0.16'
 end

data/test/test_vitrine_asset_compiler.rb

@@ -50,7 +50,7 @@ class TestVitrineAssetCompiler < Test::Unit::TestCase
     
     assert_equal 200, last_response.status
     assert_equal 'text/javascript;charset=utf-8', last_response.content_type
-    err = 'console.error("ExecJS::RuntimeError\n--> SyntaxError: reserved word \"function\"")'
+    err = 'console.error("ExecJS::RuntimeError\n--> SyntaxError: :1:1: reserved word \"function\"")'
     assert_equal err, last_response.body
   end
   

data/vitrine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "vitrine"
-  s.version = "0.0.15"
+  s.version = "0.0.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2014-01-05"
+  s.date = "2014-01-06"
   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.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-05 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra