coffee-processing 0.0.3 → 0.0.4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.0.4
+=====
+- Correctly adjusts line number in parse error message
+
 0.0.3
 =====
 - Constants (e.g. `P3D`, `RGB`) are now directly accessible without `processing` variable or shortcut methods.

data/lib/coffee-processing/version.rb

@@ -1,3 +1,3 @@
 module CoffeeProcessing
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/coffee-processing.rb

@@ -13,15 +13,24 @@ module CoffeeProcessing
     code = code.lines.map { |line| "#{line}  " }.join
     code = code.strip
 
-    CoffeeScript.compile(
-      Erubis::Eruby.new(
-        File.read File.join(
-          File.dirname(__FILE__),
-          'coffee-processing',
-          'boilerplate.coffee.erb'
-        )
-      ).result(binding)
-    )
+    begin
+      CoffeeScript.compile(
+        Erubis::Eruby.new(
+          File.read File.join(
+            File.dirname(__FILE__),
+            'coffee-processing',
+            'boilerplate.coffee.erb'
+          )
+        ).result(binding)
+      )
+    rescue ExecJS::ProgramError => e
+      message = e.message
+      if match = message.match(/line ([1-9][0-9]*):/)
+        range = Range.new(*match.offset(1), true)
+        message[ range ] = (match[1].to_i - 15).to_s
+      end
+      raise e, message, e.backtrace
+    end
   end
 
   def self.generate_template_page javascript_object, code, output_dir

data/test/test_coffee_processing.rb

@@ -36,8 +36,11 @@ draw = ->
   end
 
   def test_error
-    pend('Need to adjust line number (-8) in exception message') do
-      CoffeeProcessing.compile 'this.sketch', '-> = ->'
+    begin
+      CoffeeProcessing.compile 'this.sketch', %w[1 2 3 ? 5].join($/)
+      assert false, 'Exception should have been raised'
+    rescue ExecJS::ProgramError => e
+      assert e.to_s =~ /line 4:/, 'Unadjusted line number'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coffee-processing
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-20 00:00:00.000000000 Z
+date: 2012-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script