h8 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f5c5adc5319ca033ede79775cb4c46f72afff6c
-  data.tar.gz: fddfbb454e2e80d137012fe3c1b62a58712cded2
+  metadata.gz: 0948d18a5d505eae5dea20a665f08c4e585fa128
+  data.tar.gz: b3ff10f56ff8952278e3a255901d761fd86c48c6
 SHA512:
-  metadata.gz: aa01ac0f07a92865c81034f4d2d983b85c7a2de368f146556568dbf2d775ed15e44be34bd83f84f1e1a5bf904728a004833858f9171355859a2a6ba9e72d2d11
-  data.tar.gz: 88e68a141d22a7a0f4eeab6e3d84af9d13e8d38408ae630a2e0d1b8dbd15b4f05697eec0fd30e3edfc4486a4a2bab28e02134a0194589338cf8239b92d989688
+  metadata.gz: 626e81dd8d1552775252869f5fed2c7c4c02ab6544e3edc232851d60bebb532ce20a67bd0c5a577446432f2e2eb78ffa608bd411b0602927f24d5fcaac4d0d0d
+  data.tar.gz: 50edb3ade915b7016cfd67be0879fa77ec2805ee5fa19384cd5237a874a41486f8aec7aa3aabfeaedd4b99dd47e3acd749af9335d132284225114372c7aa4a9f

data/ext/h8/h8.cpp

@@ -30,6 +30,9 @@ void h8::JsError::raise() const {
 				rb_iv_set(ruby_exception, "@message", h8->to_ruby(s));
 				rb_iv_set(ruby_exception, "@javascript_error",
 						h8->to_ruby(jsx));
+				rb_iv_set(ruby_exception, "@origin_name", h8->to_ruby(m->GetScriptResourceName()));
+				rb_iv_set(ruby_exception, "@origin_line", INT2FIX(m->GetLineNumber()));
+				rb_iv_set(ruby_exception, "@origin_column", INT2FIX(m->GetEndColumn()));
 			}
 		}
 		rb_exc_raise(ruby_exception);

data/lib/h8/errors.rb

@@ -10,7 +10,7 @@ module H8
   class JsError < Error
 
     # Javascript Error object. May be nil
-    attr :javascript_error
+    attr :javascript_error, :origin_name, :origin_line, :origin_column
 
     # Error name
     def name
@@ -19,7 +19,15 @@ module H8
 
     # String that represents stack trace if any as multiline string (\n separated)
     def javascript_backtrace
-      @javascript_error ? @javascript_error.stack : @message
+      if @javascript_error
+        s = @javascript_error.stack
+        if s !~ /at\s+.*\d+/
+          s += "\n\tat #{@origin_name}:#{@origin_line}:#{@origin_column}\n"
+        end
+        s
+      else
+        @message
+      end
     end
 
     def to_s
@@ -36,7 +44,7 @@ module H8
     def initialize message
       super
       @message = message
-      @source = nil
+      @source  = nil
     end
   end
 

data/lib/h8/version.rb

@@ -1,3 +1,3 @@
 module H8
-  VERSION = "0.4.10"
+  VERSION = "0.4.11"
 end

data/spec/coffee_spec.rb

@@ -40,40 +40,6 @@ describe 'coffeescript' do
     }).to raise_error(H8::JsError) { |e| e.to_s.should =~ /test.coffee\:4/ }
   end
 
-  it 'should report exceptions' do
-    src = <<-END
-      fnb = ->
-        throw new Error 'lets check'
-      fna = ->
-        fnb()
-      CoffeeScript.getSourceMap = (name) ->
-        puts "DUMMUY \#{name}"
-        undefined
-
-      # fna()
-      # puts globalsIncluded
-    END
-    script = <<-END
-      function require(name) {
-        puts("REQ! "+name);
-      }
-      var res = CoffeeScript.compile(src, {sourceMap: true, filename: 'inner.coffee'});
-      //var sourceMaps = { 'inner.coffee' : res.sourceMap }
-      // puts("Compiled ok",JSON.stringify(CoffeeScript.sourceMaps));
-      // CoffeeScript.sourceMaps['inner'] = res.sourceMap
-      eval(res.js);
-    END
-    cxt        = H8::Coffee.new.context
-    cxt[:puts] = -> (*args) { puts args.join(' ') }
-    cxt[:src]  = src
-    # cxt[:src] = 'return "hello"'
-    begin
-      res = cxt.eval script, file_name: 'extest.coffee'
-    rescue Exception => e
-      puts e
-    end
-  end
-
   context 'realword' do
     class Room
     end

data/spec/context_spec.rb

@@ -148,9 +148,14 @@ describe 'context' do
 
   it 'should report syntax errors source' do
     c = H8::Context.new
-    expect(->{ c.eval "debug('started'); shit happens!"}).to raise_error { |e|
-                                                              p e.javascript_backtrace
-                                                             }
+    script = <<-END
+      var x = 0;
+      throw new Error("shit happens!");
+    END
+    expect(-> { c.eval script })
+        .to raise_error { |e|
+              (e.javascript_backtrace =~ /\:\d/).should > 0
+            }
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: h8
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - sergeych
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler