mini_racer 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 365bb5119d8c0f9fef1a0014571bb0e2a1cde1cc
-  data.tar.gz: 9ba16c2f09d9fe6866f241e48799e4dbb98f7595
+  metadata.gz: ef7d560456c68712a83c6167b76c27fa2f145da2
+  data.tar.gz: f299b830d1df20a115fdc8f63aea4a7c9f0328b3
 SHA512:
-  metadata.gz: af0228ed94c7145c9847c5106b1c8a5d6b71e419e42d778f1945a8bd94d18763c19da2975a6e68300b02ed6ea9ab52193a62304b8517a48a379938375a440325
-  data.tar.gz: 63f0160dec7e7e5583486be942d1cee07ebb3af30f4ae9ed88db231986918332bf8b343335376a69a30c890bb2c014954d9b84f60818d354fad2bb5596f7ac58
+  metadata.gz: 007738356ef3475876ea8c125cc4ccd487df22c6cbdd1ae5a793865825ffdae79c6b578e9f038845462314ca9fcf1745c75f97818fc36ff4186f58ed202cafa7
+  data.tar.gz: 6f3da0e1c5a6898f63fa625499704a0ed4e31d47af042e90c796dd99d635723522357c7f36e1cf530844b7ff7a8f97ee13efa0d135aca3b53665b82755b6264b

data/CHANGELOG

@@ -1,11 +1,26 @@
+19-05-2016
+
+- 0.1.3
+
+  - Support more conversions from Ruby back to JS (Hash, Symbol, Array)
+  - Support attaching nested objects
+
+
+17-05-2016
+
+- 0.1.2
+
+  - Gemspec specifies minimal version of Ruby (2.0)
+  - Implement #load on Context to load files
+
 17-05-2016
 
-- 0.0.1
+- 0.1.1
 
   - Added unblock function so SIGINT does not lead to a crash
 
 14-05-2016
 
-- 0.0.1.beta.1
+- 0.1.1.beta.1
 
    - First release

data/README.md

@@ -29,11 +29,18 @@ You can attach one or many ruby proc that can be accessed via JavaScript
 
 ```ruby
 context = MiniRacer::Context.new
-context.attach("adder", proc{|a,b| a+b})
-puts context.eval 'adder(20,22)'
+context.attach("math.adder", proc{|a,b| a+b})
+puts context.eval 'math.adder(20,22)'
 # => 42
 ```
 
+```ruby
+context = MiniRacer::Context.new
+context.attach("array_and_hash", proc{{a: 1, b: [1, {a: 1}]}})
+puts context.eval 'array_and_hash()'
+# => {"a" => 1, "b" => [1, {"a" => 1}]}
+```
+
 ### GIL free JavaScript execution
 
 The Ruby Global interpreter lock is released when scripts are executing
@@ -87,7 +94,7 @@ The `bench` folder contains benchmark.
 
 ### Benchmark minification of Discourse application.js (both minified and unminified)
 
-- MiniRacer version 0.1 (unreleased)
+- MiniRacer version 0.1
 - therubyracer version 0.12.2
 
 ```
@@ -173,7 +180,7 @@ Or install it yourself as:
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/mini_racer. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/discourse/mini_racer. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 
 ## License

data/ext/mini_racer_extension/mini_racer_extension.cc

@@ -197,6 +197,12 @@ static VALUE convert_v8_to_ruby(Isolate* isolate, Handle<Value> &value) {
 static Handle<Value> convert_ruby_to_v8(Isolate* isolate, VALUE value) {
     EscapableHandleScope scope(isolate);
 
+    Local<Array> array;
+    Local<Object> object;
+    VALUE hash_as_array;
+    VALUE pair;
+    int length,i;
+
     switch (TYPE(value)) {
     case T_FIXNUM:
 	return scope.Escape(Integer::New(isolate, NUM2INT(value)));
@@ -210,6 +216,26 @@ static Handle<Value> convert_ruby_to_v8(Isolate* isolate, VALUE value) {
 	return scope.Escape(True(isolate));
     case T_FALSE:
 	return scope.Escape(False(isolate));
+    case T_ARRAY:
+	length = RARRAY_LEN(value);
+	array = Array::New(isolate, length);
+	for(i=0; i<length; i++) {
+	    array->Set(i, convert_ruby_to_v8(isolate, rb_ary_entry(value, i)));
+	}
+	return scope.Escape(array);
+    case T_HASH:
+	object = Object::New(isolate);
+	hash_as_array = rb_funcall(value, rb_intern("to_a"), 0);
+	length = RARRAY_LEN(hash_as_array);
+	for(i=0; i<length; i++) {
+	    pair = rb_ary_entry(hash_as_array, i);
+	    object->Set(convert_ruby_to_v8(isolate, rb_ary_entry(pair, 0)),
+			convert_ruby_to_v8(isolate, rb_ary_entry(pair, 1)));
+	}
+	return scope.Escape(object);
+    case T_SYMBOL:
+	value = rb_funcall(value, rb_intern("to_s"), 0);
+	return scope.Escape(String::NewFromUtf8(isolate, RSTRING_PTR(value), NewStringType::kNormal, (int)RSTRING_LEN(value)).ToLocalChecked());
     case T_DATA:
     case T_OBJECT:
     case T_CLASS:
@@ -217,16 +243,12 @@ static Handle<Value> convert_ruby_to_v8(Isolate* isolate, VALUE value) {
     case T_MODULE:
     case T_REGEXP:
     case T_MATCH:
-    case T_ARRAY:
-    case T_HASH:
     case T_STRUCT:
     case T_BIGNUM:
     case T_FILE:
-    case T_SYMBOL:
     case T_UNDEF:
     case T_NODE:
     default:
-     // rb_warn("unknown conversion to V8 for: %s", RSTRING_PTR(rb_inspect(value)));
       return scope.Escape(String::NewFromUtf8(isolate, "Undefined Conversion"));
     }
 
@@ -427,27 +449,65 @@ static VALUE rb_external_function_notify_v8(VALUE self) {
 
     VALUE parent = rb_iv_get(self, "@parent");
     VALUE name = rb_iv_get(self, "@name");
+    VALUE parent_object = rb_iv_get(self, "@parent_object");
+    VALUE parent_object_eval = rb_iv_get(self, "@parent_object_eval");
+
+    bool parse_error = false;
+    bool attach_error = false;
 
     Data_Get_Struct(parent, ContextInfo, context_info);
 
-    Locker lock(context_info->isolate);
-    Isolate::Scope isolate_scope(context_info->isolate);
-    HandleScope handle_scope(context_info->isolate);
+    {
+	Locker lock(context_info->isolate);
+	Isolate::Scope isolate_scope(context_info->isolate);
+	HandleScope handle_scope(context_info->isolate);
 
-    Local<Context> context = context_info->context->Get(context_info->isolate);
-    Context::Scope context_scope(context);
+	Local<Context> context = context_info->context->Get(context_info->isolate);
+	Context::Scope context_scope(context);
+
+	Local<String> v8_str = String::NewFromUtf8(context_info->isolate, RSTRING_PTR(name),
+						  NewStringType::kNormal, (int)RSTRING_LEN(name)).ToLocalChecked();
 
-    Local<String> v8_str = String::NewFromUtf8(context_info->isolate, RSTRING_PTR(name),
-					      NewStringType::kNormal, (int)RSTRING_LEN(name)).ToLocalChecked();
+	// copy self so we can access from v8 external
+	VALUE* self_copy;
+	Data_Get_Struct(self, VALUE, self_copy);
+	*self_copy = self;
 
+	Local<Value> external = External::New(context_info->isolate, self_copy);
 
-    // copy self so we can access from v8 external
-    VALUE* self_copy;
-    Data_Get_Struct(self, VALUE, self_copy);
-    *self_copy = self;
+	if (parent_object == Qnil) {
+	    context->Global()->Set(v8_str, FunctionTemplate::New(context_info->isolate, ruby_callback, external)->GetFunction());
+	} else {
+
+	    Local<String> eval = String::NewFromUtf8(context_info->isolate, RSTRING_PTR(parent_object_eval),
+						      NewStringType::kNormal, (int)RSTRING_LEN(parent_object_eval)).ToLocalChecked();
 
-    Local<Value> external = External::New(context_info->isolate, self_copy);
-    context->Global()->Set(v8_str, FunctionTemplate::New(context_info->isolate, ruby_callback, external)->GetFunction());
+	    MaybeLocal<Script> parsed_script = Script::Compile(context, eval);
+	    if (parsed_script.IsEmpty()) {
+		parse_error = true;
+	    } else {
+		MaybeLocal<Value> maybe_value = parsed_script.ToLocalChecked()->Run(context);
+		attach_error = true;
+
+		if (!maybe_value.IsEmpty()) {
+		    Local<Value> value = maybe_value.ToLocalChecked();
+		    if (value->IsObject()){
+			value.As<Object>()->Set(v8_str, FunctionTemplate::New(context_info->isolate, ruby_callback, external)->GetFunction());
+			attach_error = false;
+		    }
+		}
+	    }
+	}
+    }
+
+    // always raise out of V8 context
+    if (parse_error) {
+	rb_raise(rb_eParseError, "Invalid object %s", RSTRING_PTR(parent_object));
+    }
+
+    if (attach_error) {
+	rb_raise(rb_eParseError, "Was expecting %s to be an object", RSTRING_PTR(parent_object));
+    }
 
     return Qnil;
 }

data/lib/mini_racer.rb

@@ -46,9 +46,33 @@ module MiniRacer
 
     class ExternalFunction
       def initialize(name, callback, parent)
-        @name = name
+        unless String === name
+          raise ArgumentError, "parent_object must be a String"
+        end
+        parent_object, _ , @name = name.rpartition(".")
         @callback = callback
         @parent = parent
+        @parent_object_eval = nil
+        @parent_object = nil
+
+        unless parent_object.empty?
+          @parent_object = parent_object
+
+          @parent_object_eval = ""
+          prev = ""
+          first = true
+          parent_object.split(".").each do |obj|
+            prev << obj
+            if first
+              @parent_object_eval << "if (typeof #{prev} === 'undefined') { #{prev} = {} };\n"
+            else
+              @parent_object_eval << "#{prev} = #{prev} || {};\n"
+            end
+            prev << "."
+            first = false
+          end
+          @parent_object_eval << "#{parent_object};"
+        end
         notify_v8
       end
     end
@@ -62,7 +86,11 @@ module MiniRacer
       if options
         @timeout = options[:timeout]
       end
+    end
 
+    def load(filename)
+      # TODO do this native cause no need to allocate VALUE here
+      eval(File.read(filename))
     end
 
     def eval(str)
@@ -75,7 +103,7 @@ module MiniRacer
     def attach(name, callback)
       @lock.synchronize do
         external = ExternalFunction.new(name, callback, self)
-        @functions[name.to_s] = external
+        @functions["#{name}"] = external
       end
     end
 

data/lib/mini_racer/version.rb

@@ -1,3 +1,3 @@
 module MiniRacer
-  VERSION = "0.1.0"
+  VERSION = "0.1.3"
 end

data/mini_racer.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Minimal embedded v8 for Ruby}
   spec.description   = %q{Minimal embedded v8 engine for Ruby}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/discourse/mini_racer"
   spec.license       = "MIT"
 
 
@@ -30,4 +30,6 @@ Gem::Specification.new do |spec|
 
   spec.extensions = ["ext/mini_racer_extension/extconf.rb"]
 
+  spec.required_ruby_version = '>= 2.0'
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_racer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,7 +103,7 @@ files:
 - lib/mini_racer.rb
 - lib/mini_racer/version.rb
 - mini_racer.gemspec
-homepage: ''
+homepage: https://github.com/discourse/mini_racer
 licenses:
 - MIT
 metadata: {}
@@ -116,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="