h8 0.4.11 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0948d18a5d505eae5dea20a665f08c4e585fa128
-  data.tar.gz: b3ff10f56ff8952278e3a255901d761fd86c48c6
+  metadata.gz: c3c42fdc46126f4cd9b55893dcf773b531f27dfb
+  data.tar.gz: 2b6b7b9157cd99488987657a34cbbf3449b504a8
 SHA512:
-  metadata.gz: 626e81dd8d1552775252869f5fed2c7c4c02ab6544e3edc232851d60bebb532ce20a67bd0c5a577446432f2e2eb78ffa608bd411b0602927f24d5fcaac4d0d0d
-  data.tar.gz: 50edb3ade915b7016cfd67be0879fa77ec2805ee5fa19384cd5237a874a41486f8aec7aa3aabfeaedd4b99dd47e3acd749af9335d132284225114372c7aa4a9f
+  metadata.gz: 7e4443044d235df479575c0db14d79060c3318364c8c535920d3ca4f2b074a1100813c56e8121cbf2946d9db293c82bfd0a81d252b28eda823b6563f0eac48a0
+  data.tar.gz: 5d5fa89d8992e39fd03264b2323f78965c55cfc4dada8d2aa9bb57b3e139807a0077e81af3143c5aec9bc0218617b369d7679bfe5bb087a816c681b95e75fa88

data/README.md

@@ -1,5 +1,8 @@
 # Hybrid8, aka H8
 
+*version 0.5* breaks the way nested exceptions are passed. Now riby -> js -> ruby uncaught
+exception is wrapped into H8::NestedError so one can get both ruby and javascript trace.
+
 _Warning_ this gem is in public beta at the moment - beta testers are welcome! It means it's not
 yet stable enough for running in production - we haven't tried it yet ourselves.
 

data/bin/h8

@@ -1,10 +1,13 @@
 #!/bin/env ruby
-require 'h8'
+#
+#
+require File.expand_path("#{File.dirname(__FILE__)}/../lib/h8")
 require 'h8/command'
 
 cmd = nil
 begin
   cmd = H8::Command.new(*ARGV)
+rescue SystemExit
 rescue Exception => e
   STDERR.puts "Error: #{e}\n\n#{e.backtrace.join("\n")}"
   STDERR.puts cmd.usage

data/ext/h8/h8.cpp

@@ -18,22 +18,28 @@ void h8::JsError::raise() const {
 			Local<Object> jsx = exception().As<Object>();
 			Local<Value> source = jsx->Get(h8->js("source"));
 			RubyGate *rg = RubyGate::unwrap(source.As<Object>());
-			if (rg) {
-				// Passing thru the Ruby exception
-				ruby_exception = rg->rubyObject();
-			} else {
+//			if (rg) {
+//				// Passing thru the Ruby exception
+//				ruby_exception = rg->rubyObject();
+//			} else {
 				Local<Message> m = message();
 				Local<String> s = m->Get();
 				String::Utf8Value res(s->ToString());
-				ruby_exception = ruby_exception = rb_exc_new2(js_exception,
+
+				VALUE ex_class = rg ? js_nested_exception : js_exception;
+				ruby_exception = rb_exc_new2(ex_class,
 						*res ? *res : "unknown javascript exception");
+
 				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()));
-			}
+				if( rg ) {
+				    rb_iv_set(ruby_exception, "@ruby_error", rg->rubyObject());
+				}
+//			}
 		}
 		rb_exc_raise(ruby_exception);
 //		}
@@ -180,7 +186,7 @@ void h8::H8::register_ruby_gate(RubyGate* gate) {
 }
 
 void h8::H8::unregister_ruby_gate(RubyGate* gate) {
-	add_resource(gate);
+	gate->unlink();
 	id_map.erase(gate->ruby_object);
 }
 

data/ext/h8/h8.h

@@ -13,7 +13,7 @@
 using namespace v8;
 using namespace std;
 
-extern VALUE h8_exception, js_exception, js_timeout_exception;
+extern VALUE h8_exception, js_exception, js_timeout_exception, js_nested_exception;
 extern VALUE context_class;
 extern VALUE value_class;
 extern VALUE ruby_gate_class;

data/ext/h8/main.cpp

@@ -8,7 +8,7 @@ extern "C" {
 void Init_h8(void);
 }
 
-VALUE h8_exception, js_exception, js_timeout_exception;
+VALUE h8_exception, js_exception, js_timeout_exception, js_nested_exception;
 VALUE context_class;
 VALUE ruby_gate_class;
 VALUE value_class;
@@ -231,6 +231,7 @@ void Init_h8(void) {
 
 	h8_exception = rb_define_class_under(h8, "Error", rb_eStandardError);
 	js_exception = rb_define_class_under(h8, "JsError", h8_exception);
+	js_nested_exception = rb_define_class_under(h8, "NestedError", js_exception);
 	js_timeout_exception = rb_define_class_under(h8, "TimeoutError",
 			js_exception);
 

data/ext/h8/ruby_gate.h

@@ -42,7 +42,9 @@ public:
 
 	virtual void free() {
 //		printf("RG::FREE(%p)\n", this);
-		delete this;
+		context->unregister_ruby_gate(this);
+		context = 0;
+//		delete this;
 	}
 
 	VALUE rubyObject() const {
@@ -51,9 +53,12 @@ public:
 
 	virtual ~RubyGate() {
 //		puts("~RG()");
-		context->unregister_ruby_gate(this);
-		persistent().ClearWeak();
-		persistent().Reset();
+        if( context ) {
+//            puts("rg2");
+    		context->unregister_ruby_gate(this);
+        }
+//		persistent().ClearWeak();
+//		persistent().Reset();
 		// The rest is done by the base classes
 	}
 

data/lib/h8.rb

@@ -1,8 +1,8 @@
+require 'h8/tools'
 require 'h8/version'
 require 'h8/context'
 require 'h8/value'
 require 'h8/errors'
-require 'h8/tools'
 require 'h8/coffee'
 
 # The native library should be required AFTER ruby defintions

data/lib/h8/command.rb

@@ -7,11 +7,19 @@ module H8
 
   class Command
 
-    def initialize *args, out: STDOUT, err: STDERR
+    def initialize *args, out: STDOUT, err: STDERR, dont_run: false
       @out = out
       @err = err
 
-      run *args if args.length > 0
+      run *args unless dont_run
+    end
+
+    def usage
+      puts "h8 #{H8::VERSION} CLI runner\n"
+      puts "Usage:\n h8 [keys] file1..."
+      puts
+      puts "executes 1 or more javascript/coffeescript files connected with Ruby environment"
+      puts @parser.keys_doc
     end
 
     def run *args
@@ -33,8 +41,12 @@ module H8
           count += 1
         end
       }
+          .key('-h', '--h') {
+        usage
+        count = -100000000
+      }
 
-      @parser.parse { |file|
+      rest = @parser.parse { |file|
         count   += 1
         @script = open(file, 'r').read
         file.downcase.end_with?('.coffee') and @script = H8::Coffee.compile(@script)
@@ -42,7 +54,10 @@ module H8
         context.eval @script
       }
 
-      count > 0 or raise 'Must provide at least one file'
+      unless count != 0
+        STDERR.puts 'H8: error: provide at least one file (use -h for help)'
+        exit 300
+      end
     end
 
     def context
@@ -55,17 +70,11 @@ module H8
         cxt[:puts]      = print
         cxt[:open]      = -> (name, mode='r', block=nil) { Stream.new(name, mode, block) }
         cxt['__FILE__'] = @file ? @file.to_s : '<inline>'
-        cxt[:File] = FileProxy.new
+        cxt[:File]      = FileProxy.new
         cxt
       end
     end
 
-    def usage
-      "\nh8 #{H8::VERSION} CLI inteface\n\n" +
-          "Usage: h8 <file.js/file.coffe>\n\n" +
-          @parser.keys_doc
-    end
-
     class FileProxy
       def dirname str
         File.dirname str

data/lib/h8/context.rb

@@ -1,6 +1,14 @@
 require 'thread'
 require 'h8'
 
+class Array
+  def _select_js callable
+    select { |item|
+      callable.call item
+    }
+  end
+end
+
 module H8
 
   class Context
@@ -68,6 +76,9 @@ module H8
     # It has very complex logic so the security model update should be done somehow
     # else.
     def self.secure_call instance, method, args=nil
+      if instance.is_a?(Array)
+        method == 'select' and method = '_select_js'
+      end
       method = method.to_sym
       begin
         m     = instance.public_method(method)
@@ -110,7 +121,16 @@ module H8
     # This is workaround for buggy rb_proc_call which produces segfaults
     # if proc is not exactly a proc, so we call it like this:
     def safe_proc_call proc, args
-      proc.call *args
+      if proc.respond_to?(:call)
+        proc.call(*args)
+      else
+        if args.length == 0
+          proc # Popular bug: call no-arg method not like a property
+        else
+          raise NoMethodError, "Invalid callable"
+        end
+      end
+      # proc.is_a?(Array) ? proc : proc.call(*args)
     end
 
     # :nodoc:
@@ -127,6 +147,7 @@ module H8
     end
 
     def self.can_access?(owner)
+      return true if owner.is_a?(Array.class)
       owner != Object.class && owner != Kernel && owner != BasicObject.class
     end
 

data/lib/h8/errors.rb

@@ -39,6 +39,13 @@ module H8
     end
   end
 
+  # The exception that carries out uncaught ruby exception #ruby_error
+  # therefore it is possible to get javascript backtrace too
+  class NestedError < JsError
+    # The uncaught ruby exception
+    attr :ruby_error
+  end
+
   # Script execution is timed out (see H8::Context#eval timeout parameter)
   class TimeoutError < JsError
     def initialize message

data/lib/h8/tools.rb

@@ -2,7 +2,7 @@ require 'singleton'
 
 module H8
   # The class representing undefined in javascript. Singleton
-  # Nota that H8::Undefined == false but is not FalseClass
+  # Note that H8::Undefined == false but is not FalseClass
   class UndefinedClass
     include Singleton
 
@@ -29,13 +29,13 @@ module H8
     def == x
       x.is_a?(H8::UndefinedClass) || x == false
     end
-
   end
 
   # The constant representing 'undefined' value in Javascript
   # The proper use is to compare returned value res == H8::Undefined
   Undefined = UndefinedClass.instance
 
+
   # Convert javascript 'arguments' object to ruby array
   def arguments_to_a args
     res = Array.new(l=args.length)
@@ -45,3 +45,4 @@ module H8
 
   module_function :arguments_to_a
 end
+

data/lib/h8/version.rb

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

data/spec/command_spec.rb

@@ -7,7 +7,7 @@ describe 'cli' do
   before :each do
     @out     = StringIO.new '', 'w'
     @err     = StringIO.new '', 'w'
-    @command = H8::Command.new out: @out, err: @err
+    @command = H8::Command.new out: @out, err: @err, dont_run: true
   end
 
   def output
@@ -29,12 +29,6 @@ describe 'cli' do
     File.expand_path(File.join(File.dirname(__FILE__), *path_components))
   end
 
-  it 'should print usage' do
-    expect(-> { @command.run }).to raise_error(RuntimeError, "Must provide at least one file")
-    expect(@command.usage =~ /Usage:/).to be_truthy
-    # puts @command.usage
-  end
-
   it 'should print' do
     run 'print "hello"; console.log "world"; console.error "life sucks!"'
     output.should == "hello\nworld\n"

data/spec/heavy_load_spec.rb

@@ -0,0 +1,96 @@
+require 'spec_helper'
+require 'h8'
+require 'ostruct'
+require 'hashie'
+
+desk_gen = <<END
+console.log 'started'
+
+offsets = [[-1, 0], [0, 1], [1, 0], [0, -1]]
+
+class DeskGenerator
+
+  constructor: (@n, r0=0, c0=0) ->
+    @desk = []
+    for r in [0...@n]
+      @desk.push (null for col in [0...@n])
+    @retries = 0
+    @step(r0, c0, @n * @n) or throw new Error("Failed to generate desk")
+
+  step: (r, c, depth) ->
+    @desk[r][c] = depth--
+    console.log r, c, depth
+    return true if depth == 0
+
+    for [r1, c1] in @moves(r, c)
+      return true if @step(r1, c1, depth)
+
+    @retries++
+    depth++
+    @desk[r][c] = null
+    false
+
+  moves: (r, c) ->
+    moves = []
+    for [sr, sc] in offsets
+      [r1, c1] = [r + sr, c + sc]
+      if 0 <= r1 < @n && 0 <= c1 < @n && !@desk[r1][c1]
+        moves.push [r1, c1]
+    moves
+
+  toString: ->
+    res = []
+    for r in [0...@n]
+      res.push ( (if x == 0 then '  .' else pad(x, 3)) for x in @desk[r]).join('')
+    res.join "\n"
+
+pad = (n, len) ->
+  len ?= 3
+  res = n?.toString() || '.'
+  res = ' ' + res while res.length < len
+  res
+
+timing = (name, cb) ->
+  start = new Date().getTime()
+  res = cb()
+  console.log("\#{name}: \#{(new Date().getTime() - start) / 1000}")
+  res
+
+result = timing 'default', ->
+  new DeskGenerator(6, 5, 1)
+
+console.log result.toString()
+console.log 'retries',result.retries
+END
+
+class Console
+  def debug *args
+    log *args
+  end
+
+  def log *args
+    # puts *args.join(' ')
+  end
+end
+
+describe 'heavy scripts' do
+  it 'should pass desk gen test' do
+    c           = H8::Context.new
+    c[:console] = Console.new
+    # c.eval "console.log('fine');"
+    # pending
+    js          = H8::Coffee.compile desk_gen
+    begin
+      c.eval js
+    rescue
+      n = 1
+      js.each_line { |l|
+        puts "%3d %s" % [n, l]
+        n += 1
+      }
+      raise
+    end
+  end
+end
+
+

data/spec/js_gate_spec.rb

@@ -274,7 +274,7 @@ describe 'js_gate' do
     }).to raise_error(H8::JsError)
   end
 
-  it 'should pass thru uncaught ruby exceptions from js->ruby callbacks' do
+  it 'should report thru uncaught ruby exceptions from js->ruby callbacks' do
     class MyException < StandardError;
     end;
     cxt            = H8::Context.new
@@ -287,7 +287,9 @@ describe 'js_gate' do
     End
     expect(-> {
       res.call('foo', 'bar').should == 'foo:bar'
-    }).to raise_error(MyException)
+    }).to raise_error(H8::NestedError) { |e|
+            e.ruby_error.should be_instance_of(MyException)
+          }
   end
 
   it 'should dynamically add and remove properties to js objects' do

data/spec/ruby_gate_spec.rb

@@ -135,8 +135,9 @@ describe 'ruby gate' do
       result = fn(11, 22);
       throw Error("It should not happen");
       End
-    }).to raise_error(MyException) { |e|
-            e.message.should == 'Shit happens'
+    }).to raise_error(H8::NestedError) { |e|
+            e.ruby_error.should be_instance_of(MyException)
+            e.ruby_error.message.should == 'Shit happens'
           }
   end
 
@@ -295,7 +296,7 @@ describe 'ruby gate' do
       # see Test class implementation: this is a valid test
       cxt.eval("t['foo'];").should == 'init[]'
       cxt.eval("t.foo").should == 'init[]'
-      expect(-> { cxt.eval("t['foo1'];") }).to raise_error(RuntimeError)
+      expect(-> { cxt.eval("t['foo1'];") }).to raise_error(H8::NestedError)
       cxt.eval("t.foo='bar'");
       cxt.eval("t.foo;").should == 'bar'
       t.val.should == 'bar'
@@ -366,6 +367,14 @@ describe 'ruby gate' do
       h['one'].should == 1
     end
 
+    it 'should access ruby and java array functions' do
+      cxt     = H8::Context.new
+      src = cxt[:h] = [1,20,3,4,5]
+      cxt.eval("h.reverse()").should == [5, 4, 3, 20, 1]
+      cxt.eval("h.sort()").should == [1,3,4,5,20]
+      cxt.eval("h.select(function(x){return x >=4;}).sort()").should == [4, 5, 20]
+    end
+
     it 'should pass varargs' do
       cxt        = H8::Context.new
       cxt[:test] = -> (args) {
@@ -448,7 +457,9 @@ describe 'ruby gate' do
 
       # We call gated ruby object with wrong number of args
       # which in turn causes attempt to call not callable result:
-      expect(-> { cxt.eval('g1.checkself(12)') }).to raise_error(NoMethodError)
+      expect(-> { cxt.eval('g1.checkself(12)') }).to raise_error(H8::NestedError) { |e|
+                                                      e.ruby_error.should be_instance_of(NoMethodError)
+                                                     }
     end
 
     it 'should return self from gated class' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: h8
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.5.0
 platform: ruby
 authors:
 - sergeych
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -153,6 +153,7 @@ files:
 - spec/coffee_spec.rb
 - spec/command_spec.rb
 - spec/context_spec.rb
+- spec/heavy_load_spec.rb
 - spec/js_gate_spec.rb
 - spec/ruby_gate_spec.rb
 - spec/spec_helper.rb
@@ -178,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Minimalistic and fast Ruby <--> V8 integration
@@ -187,6 +188,7 @@ test_files:
 - spec/coffee_spec.rb
 - spec/command_spec.rb
 - spec/context_spec.rb
+- spec/heavy_load_spec.rb
 - spec/js_gate_spec.rb
 - spec/ruby_gate_spec.rb
 - spec/spec_helper.rb