h8 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c147d817635f52206f230a99f941ededb8bd21f5
-  data.tar.gz: d771197accf297eab3aa8e9044c13ff410321a46
+  metadata.gz: 866cc21525fd34d68526f69d2439e6c92b851eb7
+  data.tar.gz: 15517b88b2bf5cc132e57f6313b923f03c71ae14
 SHA512:
-  metadata.gz: 48336caaf28e4ed9eccd01585ae265a90b5f1de45ec27aa5b7901809aaee1856c7c5557cb2467cbc46a5e53c9d9c290fd894485b7264046c8e6aa6bc0f31d84e
-  data.tar.gz: 23c4e7500daa48e91dbf043d7b293441c1a7bc054d451fded0b51d4a93579d7cab1822a551fbfc6a1497ad2d527552c5e87c2d30e69bc1996432adab4fc9e874
+  metadata.gz: 7e4bf6c5081483747ab4bf13bc4869701d6bb96831bec5b7e7419ba340fce4be8d038ae76f7b6c4e5da9152be8a48aa54f4600a6dad94495e74f3f65a430bc0a
+  data.tar.gz: bedab9933c97710834681624d5d97ffd571d986e61f4e8ad7cd3f41cd21bc91e99b05f8a364385949a9b4de40ab4464d864318d67796f8d2af54c2b77ab6b661

data/ext/h8/h8.cpp

@@ -64,8 +64,8 @@ void h8::JsTimeoutError::raise() const {
 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->SetIndexedPropertyHandler(RubyGate::indexGet, RubyGate::indexSet,0,0,RubyGate::indexEnumerate);
+	templ->SetNamedPropertyHandler(RubyGate::mapGet, RubyGate::mapSet, RubyGate::mapQuery, RubyGate::mapDelete, RubyGate::mapEnumerate);
 //	templ->SetAccessor(String::NewFromUtf8(isolate, "prototype"),
 //			prototype_cb);
 }

data/ext/h8/ruby_gate.cpp

@@ -76,7 +76,7 @@ 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 ) {
+	if (strcmp(*val, "prototype") == 0) {
 		info.GetReturnValue().Set(info.This()->GetPrototype());
 		return;
 	}
@@ -105,6 +105,19 @@ void h8::RubyGate::mapDelete(Local<String> name,
 	rg->deleteProperty(name, info);
 }
 
+void h8::RubyGate::mapQuery(Local<String> name,
+		const PropertyCallbackInfo<Integer>& info) {
+	RubyGate *rg = RubyGate::unwrap(info.This());
+	assert(rg != 0);
+	rg->queryProperty(name, info);
+}
+
+void h8::RubyGate::mapEnumerate(const PropertyCallbackInfo<Array> &info) {
+	RubyGate *rg = RubyGate::unwrap(info.This());
+	assert(rg != 0);
+	rg->enumerateProperties(info);
+}
+
 void h8::RubyGate::indexGet(uint32_t index,
 		const PropertyCallbackInfo<Value> &info) {
 	RubyGate *rg = RubyGate::unwrap(info.This());
@@ -119,6 +132,12 @@ void h8::RubyGate::indexSet(uint32_t index, Local<Value> value,
 	rg->setIndex(index, value, info);
 }
 
+void h8::RubyGate::indexEnumerate(const PropertyCallbackInfo<Array>& info) {
+	RubyGate *rg = RubyGate::unwrap(info.This());
+	assert(rg != 0);
+	rg->enumerateProperties(info);
+}
+
 void h8::RubyGate::ObjectCallback(
 		const v8::FunctionCallbackInfo<v8::Value>& args) {
 	v8::HandleScope scope(args.GetIsolate());
@@ -250,6 +269,40 @@ void h8::RubyGate::deleteProperty(Local<String> name,
 		});
 }
 
+void h8::RubyGate::enumerateProperties(
+		const PropertyCallbackInfo<Array>& info) {
+	with_gvl(this,
+			[&] {
+				VALUE rb_args = rb_ary_new2(2);
+				rb_ary_push(rb_args, ruby_object);
+				rb_ary_push(rb_args, rb_str_new2("__js_enumerate"));
+				rescued_call(rb_args, secure_call, [&] (VALUE res) {
+							int len = (int) RARRAY_LEN(res);
+							v8::Handle<Array> a = v8::Array::New(context->getIsolate(), len);
+							for(int i=0; i<len; i++) {
+								a->Set(i, context->to_js(rb_ary_entry(res, i)));
+							}
+							info.GetReturnValue().Set(a);
+						});
+			});
+}
+
+void h8::RubyGate::queryProperty(Local<String> name,
+		const PropertyCallbackInfo<Integer>& info) {
+	with_gvl(this,
+			[&] {
+				VALUE rb_args = rb_ary_new2(2);
+				rb_ary_push(rb_args, context->to_ruby(name));
+				rb_ary_push(rb_args, ruby_object);
+				rb_ary_push(rb_args, rb_str_new2("!__js_has_property"));
+				rescued_call(rb_args, secure_call, [&] (VALUE res) {
+							if( res != Qnil && res != Qfalse) {
+								info.GetReturnValue().Set(Integer::New(context->getIsolate(), v8::None));
+							}
+						});
+			});
+}
+
 void h8::RubyGate::getIndex(uint32_t index,
 		const PropertyCallbackInfo<Value> &info) {
 	with_gvl(this, [&] {

data/ext/h8/ruby_gate.h

@@ -117,10 +117,14 @@ protected:
 			const PropertyCallbackInfo<Value> &info);
 	void setProperty(Local<String> name, Local<Value> value,
 			const PropertyCallbackInfo<Value> &info);
+	void queryProperty(Local<String> name,
+			const PropertyCallbackInfo<Integer> &info);
 
 	void deleteProperty(Local<String> name,
 			const PropertyCallbackInfo<Boolean> &info);
 
+	void enumerateProperties(const PropertyCallbackInfo<Array>& info);
+
 	void getIndex(uint32_t index, const PropertyCallbackInfo<Value> &info);
 	void setIndex(uint32_t index, Local<Value> value,
 			const PropertyCallbackInfo<Value> &info);
@@ -138,13 +142,17 @@ private:
 			const PropertyCallbackInfo<Value> &info);
 	static void mapSet(Local<String> name, Local<Value> value,
 			const PropertyCallbackInfo<Value> &info);
+	static void mapQuery(Local<String> name,
+			const PropertyCallbackInfo<Integer> &info);
 	static void mapDelete(Local<String> name,
 			const PropertyCallbackInfo<Boolean> &info);
+	static void mapEnumerate(const PropertyCallbackInfo<Array>& info);
 
 	static void indexGet(uint32_t index,
 			const PropertyCallbackInfo<Value> &info);
 	static void indexSet(uint32_t index, Local<Value> value,
 			const PropertyCallbackInfo<Value> &info);
+	static void indexEnumerate(const PropertyCallbackInfo<Array>& info);
 
 	void throw_js();
 

data/lib/h8/context.rb

@@ -1,6 +1,8 @@
 require 'thread'
 require 'h8'
 require 'json'
+require 'ostruct'
+require 'hashie'
 
 class Array
   def _select_js callable
@@ -12,6 +14,12 @@ class Array
   def indexOf item
     index(item) || -1
   end
+
+  def splice(start, len, *replace)
+    ret = self[start, len]
+    self[start, len] = replace
+    ret
+  end
 end
 
 class String
@@ -20,10 +28,46 @@ class String
   end
 end
 
+class OpenStruct
+
+  def __to_json
+    JSON.unparse to_h
+  end
+
+  def __js_enumerate
+    to_h.keys.map(&:to_s)
+  end
+
+end
+
+def Hashie::Mash
+  def __to_json
+    JSON.unparse self
+  end
+
+  def __js_enumerate
+    to_h.keys.map(&:to_s)
+  end
+
+end
+
 class Object
   def __to_json
     JSON.unparse self
   end
+
+  def __js_has_property name
+    __js_enumerate.include?(name)
+  end
+
+  def __js_enumerate
+    if respond_to?(:keys)
+      self.keys.map(&:to_s)
+    else
+      []
+    end
+  end
+
 end
 
 module H8
@@ -102,12 +146,18 @@ module H8
       if instance.is_a?(Array)
         method == 'select' and method = '_select_js'
       end
+      immediate_call = if method[0] == '!'
+                         method = method[1..-1]
+                         true
+                       else
+                         false
+                       end
       method = method.to_sym
       begin
         m     = instance.public_method(method)
         owner = m.owner
         if can_access?(owner)
-          return m.call(*args) if method[0] == '[' || method[-1] == '='
+          return m.call(*args) if method[0] == '[' || method[-1] == '=' || immediate_call
           if m.arity != 0
             return ProcGate.new( -> (*args) { m.call *args } )
           else

data/lib/h8/value.rb

@@ -111,6 +111,10 @@ module H8
       each.reduce({}) { |all, kv| all[kv[0]] = kv[1].to_ruby depth; all }
     end
 
+    def to_json *params
+      __rb_to_js
+    end
+
     # Iterate over javascript object keys
     def each_key
       keys.each

data/lib/h8/version.rb

@@ -1,3 +1,3 @@
 module H8
-  VERSION = "0.5.2"
+  VERSION = "0.5.4"
 end

data/lib/scripts/globals.coffee

@@ -5,3 +5,6 @@
 
 RubyGate.prototype.toJSON = ->
   JSON.parse @__to_json
+
+Object.prototype.__rb_to_js = ->
+  JSON.stringify @

data/spec/ruby_gate_spec.rb

@@ -394,16 +394,64 @@ describe 'ruby gate' do
       end
     end
 
+    it 'should enumerate hashes' do
+      begin
+        cxt = H8::Context.new
+        src = cxt[:h] = { "the" => "test", "value" => 121 }
+        res = cxt.coffee <<-End
+          res = {}
+          for own k,v of h
+            res[k] = v
+          return res
+        End
+        res.should == src
+        src1 = cxt[:h] = OpenStruct.new
+        src1.the =  "test"
+        src1.value = 121
+        res = cxt.coffee <<-End
+          res = {}
+          for own k,v of h
+            res[k] = v
+          return res
+        End
+        res.should == src
+        cxt = H8::Context.new
+        src = cxt[:h] = Hashie::Mash.new  "the" => "test", "value" => 121
+        res = cxt.coffee <<-End
+          res = {}
+          for own k,v of h
+            res[k] = v
+          return res
+        End
+        res.should == src
+      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' => { 'my' => 'world', 'arr' => [1,2,'tre'] } }
+        src = cxt[:h] = { 'hello' => { 'my' => 'world', 'arr' => [1, 2, 'tre'] } }
         JSON[cxt.eval("JSON.stringify(h)")].should == src
+        src = cxt[:h] = [-1, -2, { 'hello' => { 'my' => 'world', 'arr' => [1, 2, 'tre'] } }]
+        JSON[cxt.eval("JSON.stringify(h)")].should == src
+
+        src = cxt[:h] = { 'one' => cxt.eval("[ 'hello', { wor: 'ld'} ]") }
+        JSON[cxt.eval("JSON.stringify(h)")].should == src
+
+        src = cxt[:h] = Hashie::Mash.new
+        res = cxt.coffee <<-End
+          h.arr = (c*10 for c in [-1, +1]);
+          return JSON.stringify(h)
+        End
+        res.should == "{\"arr\":[-10,10]}"
       rescue H8::NestedError => e
         puts e.ruby_error.backtrace.join("\n")
         raise
       end
-
     end
 
     it 'should pass varargs' do

metadata

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