h8 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3c42fdc46126f4cd9b55893dcf773b531f27dfb
-  data.tar.gz: 2b6b7b9157cd99488987657a34cbbf3449b504a8
+  metadata.gz: 1fbec1007c8688390ed4e78bcb8fb828d6f1335a
+  data.tar.gz: 1fc40b29112ab15dc624aea10bb21e7e136d353c
 SHA512:
-  metadata.gz: 7e4443044d235df479575c0db14d79060c3318364c8c535920d3ca4f2b074a1100813c56e8121cbf2946d9db293c82bfd0a81d252b28eda823b6563f0eac48a0
-  data.tar.gz: 5d5fa89d8992e39fd03264b2323f78965c55cfc4dada8d2aa9bb57b3e139807a0077e81af3143c5aec9bc0218617b369d7679bfe5bb087a816c681b95e75fa88
+  metadata.gz: 886728e46a82de26977f1c3d517b1ec2d719ed9828cc47782eb6f13fe520928af145e409aab5de52b5ea780f9301f5983a4fe85827f2f6dd9b5155e155c283a5
+  data.tar.gz: 848d3efdb932098ac8d756e9bee535f222c6af8a66e4dcb17203024c9d70152767692535c8eb12067b48c51652de9b2a4bf8c54d949a5d8394e41aa628c7296a

data/ext/h8/h8.cpp

@@ -56,11 +56,18 @@ void h8::JsTimeoutError::raise() const {
 	rb_raise(js_timeout_exception, "timeout expired");
 }
 
+//static void prototype_cb(Local<String> prop,const PropertyCallbackInfo<Value>& info) {
+//	puts("PROTOCB!");
+//	info.GetReturnValue().Set(info.This()->GetPrototype());
+//}
+
 void h8::H8::SetupGateTemplate(const Local<ObjectTemplate>& templ) {
 	templ->SetInternalFieldCount(2);
 	templ->SetCallAsFunctionHandler(&RubyGate::ObjectCallback);
 	templ->SetNamedPropertyHandler(RubyGate::mapGet, RubyGate::mapSet, 0, RubyGate::mapDelete);
 	templ->SetIndexedPropertyHandler(RubyGate::indexGet, RubyGate::indexSet);
+//	templ->SetAccessor(String::NewFromUtf8(isolate, "prototype"),
+//			prototype_cb);
 }
 
 h8::H8::H8()
@@ -95,6 +102,10 @@ h8::H8::H8()
 	persistent_context.Reset(isolate, context);
 	gate_function_template.Reset(isolate,ft);
 	gate_function.Reset(isolate,fn);
+
+	ft->Set(String::NewFromUtf8(isolate, "prototype"),
+			ft->GetFunction());
+
 }
 
 

data/ext/h8/h8.h

@@ -233,7 +233,7 @@ public:
 private:
 	friend VALUE h8::context_alloc(VALUE klass);
 	void invoke(v8::Handle<v8::Script> script, Local<Value>& result);
-	static void SetupGateTemplate(const Local<ObjectTemplate>& templ);
+	void SetupGateTemplate(const Local<ObjectTemplate>& templ);
 
 	Isolate *isolate;
 	VALUE self;

data/ext/h8/ruby_gate.cpp

@@ -75,6 +75,12 @@ h8::RubyGate::RubyGate(H8* _context, Handle<Object> instance, VALUE object) :
 
 void h8::RubyGate::mapGet(Local<String> name,
 		const PropertyCallbackInfo<Value> &info) {
+	v8::String::Utf8Value val(name);
+	if( strcmp(*val, "prototype") == 0 ) {
+		info.GetReturnValue().Set(info.This()->GetPrototype());
+		return;
+	}
+
 	Local<Value> loc = info.This()->GetRealNamedPropertyInPrototypeChain(name);
 	if (!loc.IsEmpty())
 		info.GetReturnValue().Set(loc);
@@ -220,14 +226,14 @@ void h8::RubyGate::setProperty(Local<String> name, Local<Value> value,
 	with_gvl(this, [&] {
 		VALUE rb_args = rb_ary_new2(3);
 		rb_ary_push(rb_args, context->to_ruby(value)); // value
-		rb_ary_push(rb_args, ruby_object);		   // object
-		VALUE method = context->to_ruby(name);
-		method = rb_str_cat2(method, "=");
-		rb_ary_push(rb_args, method);			   // name=
-		rescued_call(rb_args, secure_call, [&] (VALUE res) {
-					info.GetReturnValue().Set(context->to_js(res));
+			rb_ary_push(rb_args, ruby_object);// object
+			VALUE method = context->to_ruby(name);
+			method = rb_str_cat2(method, "=");
+			rb_ary_push(rb_args, method);// name=
+			rescued_call(rb_args, secure_call, [&] (VALUE res) {
+						info.GetReturnValue().Set(context->to_js(res));
+					});
 		});
-	});
 }
 
 void h8::RubyGate::deleteProperty(Local<String> name,
@@ -235,12 +241,12 @@ void h8::RubyGate::deleteProperty(Local<String> name,
 	with_gvl(this, [&] {
 		VALUE rb_args = rb_ary_new2(2);
 		rb_ary_push(rb_args, context->to_ruby(name));	// name
-		rb_ary_push(rb_args, ruby_object);		   		// object
+			rb_ary_push(rb_args, ruby_object);// object
 
-		rescued_call(rb_args, ruby_delete_handler, [&] (VALUE res) {
-					auto success = Boolean::New(isolate(), res == Qnil ? false : true );
-					info.GetReturnValue().Set(success);
-				});
+			rescued_call(rb_args, ruby_delete_handler, [&] (VALUE res) {
+						auto success = Boolean::New(isolate(), res == Qnil ? false : true );
+						info.GetReturnValue().Set(success);
+					});
 		});
 }
 

data/lib/h8/context.rb

@@ -1,5 +1,6 @@
 require 'thread'
 require 'h8'
+require 'json'
 
 class Array
   def _select_js callable
@@ -7,6 +8,26 @@ class Array
       callable.call item
     }
   end
+
+  def indexOf item
+    index(item) || -1
+  end
+end
+
+class String
+  def indexOf item
+    index(item) || -1
+  end
+end
+
+class Object
+  def __to_json
+    if respond_to?(:as_json)
+      as_json
+    else
+      JSON[JSON[self]]
+    end
+  end
 end
 
 module H8
@@ -19,7 +40,12 @@ module H8
       _set_var '___create_ruby_class', -> (cls, args) {
         _do_create_ruby_class cls, args
       }
-      # noglobals or execute_script 'globals.coffee'
+
+      self[:debug] = -> (*args) {
+        puts args.join(' ')
+      }
+
+      noglobals or execute_script 'globals.coffee'
     end
 
     # set variables from keyword arguments to this context
@@ -76,6 +102,7 @@ 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
+      # p [:sc, instance, method, args]
       if instance.is_a?(Array)
         method == 'select' and method = '_select_js'
       end
@@ -177,9 +204,9 @@ module H8
     @@cache = {}
 
     def execute_script name
-      p [:exs, name]
+      # p [:exs, name]
       script = @@cache[name] ||= begin
-        p 'cache miss'
+        # p 'cache miss'
         script = open(File.join(@@base, name), 'r').read
         name.downcase.end_with?('.coffee') ? H8::Coffee.compile(script) : script
       end

data/lib/h8/errors.rb

@@ -44,6 +44,10 @@ module H8
   class NestedError < JsError
     # The uncaught ruby exception
     attr :ruby_error
+
+    def to_s
+      ruby_error.to_s
+    end
   end
 
   # Script execution is timed out (see H8::Context#eval timeout parameter)

data/lib/h8/version.rb

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

data/lib/scripts/globals.coffee

@@ -3,3 +3,9 @@
 
 @globalsIncluded = true
 
+RubyGate.prototype.toJSON = ->
+  src = @__to_json
+  res = {}
+  for key in src.keys()
+    res[key] = src[key]
+  res

data/spec/ruby_gate_spec.rb

@@ -368,11 +368,42 @@ describe 'ruby gate' do
     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]
+      begin
+        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]
+        cxt.eval("h.indexOf(20)").should == 1
+        cxt.eval("h.indexOf(21)").should == -1
+      rescue H8::NestedError => e
+        puts e.ruby_error.backtrace.join("\n")
+        raise
+      end
+    end
+
+    it 'should access ruby string functions' do
+      begin
+        cxt = H8::Context.new
+        src = cxt[:h] = "Hello!"
+        cxt.eval("h.indexOf('ll')").should == 2
+        cxt.eval("h.indexOf('meow')").should == -1
+      rescue H8::NestedError => e
+        puts e.ruby_error.backtrace.join("\n")
+        raise
+      end
+    end
+
+    it 'should process to_json' do
+      begin
+        cxt = H8::Context.new
+        src = cxt[:h] = { 'hello' => 'world' }
+        cxt.eval("JSON.stringify(h)").should == "{\"hello\":\"world\"}"
+      rescue H8::NestedError => e
+        puts e.ruby_error.backtrace.join("\n")
+        raise
+      end
+
     end
 
     it 'should pass varargs' do
@@ -458,7 +489,7 @@ 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(H8::NestedError) { |e|
-                                                      e.ruby_error.should be_instance_of(NoMethodError)
+                                                       e.ruby_error.should be_instance_of(NoMethodError)
                                                      }
     end
 

metadata

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