mini_racer 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef7d560456c68712a83c6167b76c27fa2f145da2
-  data.tar.gz: f299b830d1df20a115fdc8f63aea4a7c9f0328b3
+  metadata.gz: 0508a6995a631050ed4470222e522e2794322f2a
+  data.tar.gz: a42ed52c3df8490ce8e3a5766ecb5389dc813971
 SHA512:
-  metadata.gz: 007738356ef3475876ea8c125cc4ccd487df22c6cbdd1ae5a793865825ffdae79c6b578e9f038845462314ca9fcf1745c75f97818fc36ff4186f58ed202cafa7
-  data.tar.gz: 6f3da0e1c5a6898f63fa625499704a0ed4e31d47af042e90c796dd99d635723522357c7f36e1cf530844b7ff7a8f97ee13efa0d135aca3b53665b82755b6264b
+  metadata.gz: 963c946ed997001fb18d8f81e2da1a0a17c9554588b693a129a88a830631c5bf8c7a0a222944443ec97efe393d72f6981da0d938c24e1d0a5454a780c5b7d646
+  data.tar.gz: 26aa65a782780c47bb3e3683ca196e4cd26f2bd03fdf6ceca1862bb8d22f2bdf2477845b5ff096cf28cdb1713fddb35b7a3cbbc1703947772b3dca397bee5852

data/CHANGELOG

@@ -1,5 +1,11 @@
 19-05-2016
 
+- 0.1.4
+
+  - Set upper bound for libv8 inclusion @ignisf
+  - Support conversion of Date, Time and DateTime from Ruby to JS @seanmakesgames
+  - Support conversion of large numbers back from Ruby to JS @seanmakesgames
+
 - 0.1.3
 
   - Support more conversions from Ruby back to JS (Hash, Symbol, Array)

data/README.md

@@ -6,7 +6,7 @@ Minimal, modern embedded V8 for Ruby.
 
 MiniRacer provides a minimal two way bridge between the V8 JavaScript engine and Ruby.
 
-It was created as an alternative to the excellent [therubyracer](https://github.com/cowboyd/therubyracer). Unlike therubyracer, mini_racer only implements a minimal bridge. This reduces the surface area making upgrading v8 much simpler and exahustive testing simpler.
+It was created as an alternative to the excellent [therubyracer](https://github.com/cowboyd/therubyracer). Unlike therubyracer, mini_racer only implements a minimal bridge. This reduces the surface area making upgrading v8 much simpler and exhaustive testing simpler.
 
 MiniRacer has an adapter for [execjs](https://github.com/sstephenson/execjs) so it can be used directly with Rails projects to minify assets, run babel or compile CoffeeScript.
 
@@ -137,6 +137,20 @@ Or install it yourself as:
 
 **Note** using v8.h and compiling MiniRacer requires a C++11 standard compiler, more specifically clang 3.5 (or later) or gcc 4.8 (or later).
 
+
+## Travis-ci
+
+To install `mini-racer` you will need a version of gcc that supports C++11 (gcc 4.8) this is included by default in ubuntu trusty based images.
+
+Travis today ships by default with a precise based image. Precise Pangolin (12.04 LTS) was first released in August 2012. Even though you can install GCC 4.8 on precise the simpler approach is to opt for the trusty based image.
+
+Add this to your .travis.yml file:
+
+```
+- sudo: required
+- dist: trusty
+```
+
 ## Similar Projects
 
 ###therubyracer

data/ext/mini_racer_extension/mini_racer_extension.cc

@@ -47,6 +47,8 @@ static VALUE rb_eParseError;
 static VALUE rb_eScriptRuntimeError;
 static VALUE rb_cJavaScriptFunction;
 
+static VALUE rb_cDateTime = Qnil;
+
 static Platform* current_platform = NULL;
 
 static void init_v8() {
@@ -106,30 +108,40 @@ nogvl_context_eval(void* arg) {
 
 	result->executed = !maybe_value.IsEmpty();
 
-	if (!result->executed) {
-	    if (trycatch.HasCaught()) {
-		if (!trycatch.Exception()->IsNull()) {
-		    result->message = new Persistent<Value>();
-		    result->message->Reset(isolate, trycatch.Exception()->ToString());
-		} else if(trycatch.HasTerminated()) {
-		    result->terminated = true;
-		    result->message = new Persistent<Value>();
-		    Local<String> tmp = String::NewFromUtf8(isolate, "JavaScript was terminated (either by timeout or explicitly)");
-		    result->message->Reset(isolate, tmp);
-		}
-
-		if (!trycatch.StackTrace().IsEmpty()) {
-		    result->backtrace = new Persistent<Value>();
-		    result->backtrace->Reset(isolate, trycatch.StackTrace()->ToString());
-		}
-	    }
-	} else {
+	if (result->executed) {
 	    Persistent<Value>* persistent = new Persistent<Value>();
 	    persistent->Reset(isolate, maybe_value.ToLocalChecked());
 	    result->value = persistent;
 	}
     }
 
+    if (!result->executed || !result->parsed) {
+	if (trycatch.HasCaught()) {
+	    if (!trycatch.Exception()->IsNull()) {
+		result->message = new Persistent<Value>();
+		Local<Message> message = trycatch.Message();
+		char buf[1000];
+		int len;
+		len = snprintf(buf, sizeof(buf), "%s at %s:%i:%i", *String::Utf8Value(message->Get()),
+			           *String::Utf8Value(message->GetScriptResourceName()->ToString()),
+				    message->GetLineNumber(),
+				    message->GetStartColumn());
+
+		Local<String> v8_message = String::NewFromUtf8(isolate, buf, NewStringType::kNormal, (int)len).ToLocalChecked();
+		result->message->Reset(isolate, v8_message);
+	    } else if(trycatch.HasTerminated()) {
+		result->terminated = true;
+		result->message = new Persistent<Value>();
+		Local<String> tmp = String::NewFromUtf8(isolate, "JavaScript was terminated (either by timeout or explicitly)");
+		result->message->Reset(isolate, tmp);
+	    }
+	    if (!trycatch.StackTrace().IsEmpty()) {
+		result->backtrace = new Persistent<Value>();
+		result->backtrace->Reset(isolate, trycatch.StackTrace()->ToString());
+	    }
+	}
+    }
+
     return NULL;
 }
 
@@ -172,6 +184,14 @@ static VALUE convert_v8_to_ruby(Isolate* isolate, Handle<Value> &value) {
 	return rb_funcall(rb_cJavaScriptFunction, rb_intern("new"), 0);
     }
 
+    if (value->IsDate()){
+        double ts = Local<Date>::Cast(value)->ValueOf();
+        double secs = ts/1000;
+        long nanos = round((secs - floor(secs)) * 1000000);
+
+        return rb_time_new(secs, nanos);
+    }
+
     if (value->IsObject()) {
 	VALUE rb_hash = rb_hash_new();
 	Local<Context> context = Context::New(isolate);
@@ -191,7 +211,7 @@ static VALUE convert_v8_to_ruby(Isolate* isolate, Handle<Value> &value) {
     }
 
     Local<String> rstr = value->ToString();
-    return rb_enc_str_new(*v8::String::Utf8Value(rstr), rstr->Utf8Length(), rb_enc_find("utf-8"));
+    return rb_enc_str_new(*String::Utf8Value(rstr), rstr->Utf8Length(), rb_enc_find("utf-8"));
 }
 
 static Handle<Value> convert_ruby_to_v8(Isolate* isolate, VALUE value) {
@@ -201,11 +221,20 @@ static Handle<Value> convert_ruby_to_v8(Isolate* isolate, VALUE value) {
     Local<Object> object;
     VALUE hash_as_array;
     VALUE pair;
-    int length,i;
+    int i;
+    long length;
+    long fixnum;
+    VALUE klass;
 
     switch (TYPE(value)) {
     case T_FIXNUM:
-	return scope.Escape(Integer::New(isolate, NUM2INT(value)));
+        fixnum = NUM2LONG(value);
+        if (fixnum > INT_MAX)
+        {
+            return scope.Escape(Number::New(isolate, (double)fixnum));
+        }
+        
+        return scope.Escape(Integer::New(isolate, (int)fixnum));
     case T_FLOAT:
 	return scope.Escape(Number::New(isolate, NUM2DBL(value)));
     case T_STRING:
@@ -218,7 +247,7 @@ static Handle<Value> convert_ruby_to_v8(Isolate* isolate, VALUE value) {
 	return scope.Escape(False(isolate));
     case T_ARRAY:
 	length = RARRAY_LEN(value);
-	array = Array::New(isolate, length);
+	array = Array::New(isolate, (int)length);
 	for(i=0; i<length; i++) {
 	    array->Set(i, convert_ruby_to_v8(isolate, rb_ary_entry(value, i)));
 	}
@@ -237,6 +266,17 @@ static Handle<Value> convert_ruby_to_v8(Isolate* isolate, VALUE value) {
 	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:
+        klass = rb_funcall(value, rb_intern("class"), 0);
+        if (klass == rb_cTime || klass == rb_cDateTime)
+        {
+            if (klass == rb_cDateTime)
+            {
+                value = rb_funcall(value, rb_intern("to_time"), 0);
+            }
+            
+            value = rb_funcall(value, rb_intern("to_f"), 0);
+            return scope.Escape(Date::New(isolate, NUM2DBL(value) * 1000));
+        }
     case T_OBJECT:
     case T_CLASS:
     case T_ICLASS:
@@ -320,13 +360,12 @@ static VALUE rb_context_eval_unsafe(VALUE self, VALUE str) {
     }
 
     if (!eval_result.executed) {
-
 	VALUE ruby_exception = rb_iv_get(self, "@current_exception");
 	if (ruby_exception == Qnil) {
 	    ruby_exception = eval_result.terminated ? rb_eScriptTerminatedError : rb_eScriptRuntimeError;
 	    // exception report about what happened
-	    if(TYPE(message) == T_STRING && TYPE(backtrace) == T_STRING) {
-		rb_raise(ruby_exception, "%s/n%s", RSTRING_PTR(message), RSTRING_PTR(backtrace));
+	    if(TYPE(backtrace) == T_STRING) {
+		rb_raise(ruby_exception, "%s", RSTRING_PTR(backtrace));
 	    } else if(TYPE(message) == T_STRING) {
 		rb_raise(ruby_exception, "%s", RSTRING_PTR(message));
 	    } else {
@@ -564,6 +603,11 @@ VALUE allocate(VALUE klass) {
     context_info->context = new Persistent<Context>();
     context_info->context->Reset(context_info->isolate, context);
 
+    if (Qnil == rb_cDateTime && rb_funcall(rb_cObject, rb_intern("const_defined?"), 1, rb_str_new2("DateTime")) == Qtrue)
+    {
+        rb_cDateTime = rb_const_get(rb_cObject, rb_intern("DateTime"));
+    }
+
     return Data_Wrap_Struct(klass, NULL, deallocate, (void*)context_info);
 }
 

data/lib/mini_racer.rb

@@ -5,7 +5,6 @@ require "thread"
 module MiniRacer
 
   class EvalError < StandardError; end
-
   class ScriptTerminatedError < EvalError; end
   class ParseError < EvalError; end
 
@@ -18,7 +17,6 @@ module MiniRacer
       else
         @js_backtrace = nil
       end
-
       super(message)
     end
 
@@ -31,7 +29,6 @@ module MiniRacer
         val
       end
     end
-
   end
 
   # helper class returned when we have a JavaScript function

data/lib/mini_racer/version.rb

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

data/mini_racer.gemspec

@@ -25,11 +25,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "rake-compiler"
 
-  spec.add_dependency 'libv8', '~> 5.0'
+  spec.add_dependency 'libv8', '~> 5.0', '< 5.1.11'
   spec.require_paths = ["lib", "ext"]
 
   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.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,6 +73,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,6 +83,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.1.11
 description: Minimal embedded v8 engine for Ruby
 email:
 - sam.saffron@gmail.com