Merge branch 'stormbreakerbg-4.5/object-methods' into upgrade-to-v8-4.5

Author: cowboyd

ext/v8/array.h

@@ -13,6 +13,8 @@ namespace rr {
 
     inline Array(v8::Isolate* isolate, v8::Handle<v8::Array> array) : Ref<v8::Array>(isolate, array) {}
     inline Array(VALUE value) : Ref<v8::Array>(value) {}
+
+    typedef MaybeLocal<Array, v8::Array> Maybe;
   };
 
 }

ext/v8/enum.h

@@ -16,6 +16,15 @@ namespace rr {
     operator T() {
       return RTEST(value) ? (T)NUM2INT(value) : defaultValue;
     }
+
+    class Maybe : public rr::Maybe {
+    public:
+      Maybe(v8::Maybe<T> maybe) {
+        if (maybe.IsJust()) {
+          just(INT2FIX((int)maybe.FromJust()));
+        }
+      }
+    };
   };
 
   inline void DefineEnums() {

ext/v8/object-template.h

@@ -8,10 +8,12 @@ namespace rr {
     ObjectTemplate(VALUE self) : Ref<v8::ObjectTemplate>(self) {}
     ObjectTemplate(v8::Isolate* isolate, v8::Handle<v8::ObjectTemplate> tmpl) :
       Ref<v8::ObjectTemplate>(isolate, tmpl) {}
+
     inline static void Init() {
       ClassBuilder("ObjectTemplate", Template::Class).
         defineSingletonMethod("New", &New).
         defineMethod("NewInstance", &NewInstance).
+        defineMethod("SetInternalFieldCount", &SetInternalFieldCount).
         store(&Class);
     }
 
@@ -20,16 +22,26 @@ namespace rr {
       rb_scan_args(argc, argv, "11", &r_isolate, &r_constructor);
       Isolate isolate(r_isolate);
       Locker lock(isolate);
+
       return ObjectTemplate(isolate, v8::ObjectTemplate::New(isolate));
     }
 
-    static VALUE NewInstance(VALUE self , VALUE r_context) {
+    static VALUE NewInstance(VALUE self, VALUE r_context) {
       ObjectTemplate t(self);
       Context context(r_context);
       Isolate isolate(context.getIsolate());
       Locker lock(isolate);
-      v8::MaybeLocal<v8::Object> object(t->NewInstance());
-      return Object::Maybe(isolate, ObjectTemplate(self)->NewInstance(context));
+
+      return Object::Maybe(isolate, t->NewInstance(context));
+    }
+
+    static VALUE SetInternalFieldCount(VALUE self, VALUE value) {
+      ObjectTemplate t(self);
+      Locker lock(t);
+
+      t->SetInternalFieldCount(NUM2INT(value));
+
+      return Qnil;
     }
   };
 }