function.call() now assumes global "this" object. use function.methodcall(thisObj,...) to change the context. fuction.new() invokes function as javascript constructor.

ext/v8/v8_func.cpp

@@ -47,16 +47,15 @@ namespace {
     Local<Value> result = function->Call(thisObject, f_argc, arguments);
     return rr_v82rb(result);
   }
-  VALUE NewInstance(int argc, VALUE *argv, VALUE self) {
-    HandleScope handles;
-    VALUE f_argv;
-    rb_scan_args(argc, argv, "*", &f_argv);
-    Local<Function> function = V8_Ref_Get<Function>(self);
-    Local<Value> arguments[argc];
-    for (int i = 0; i < argc; i++) {
-      arguments[i] = *rr_rb2v8(rb_ary_entry(f_argv, i));
+  VALUE NewInstance(VALUE self, VALUE argc, VALUE args) {
+    HandleScope scope;
+    Local<Function> function = unwrap(self);
+    Handle<Array> arguments = V8_Ref_Get<Array>(args);
+    Handle<Value> argv[arguments->Length()];
+    for (int i = 0; i < arguments->Length(); i++) {
+      argv[i] = arguments->Get(i);
     }
-    return rr_v82rb(function->NewInstance(argc, arguments));
+    return rr_v82rb(function->NewInstance(NUM2INT(argc), argv));
   }
   VALUE GetName(VALUE self) {
     return rr_v82rb(unwrap(self)->GetName());
@@ -74,7 +73,7 @@ namespace {
 void rr_init_func() {
   FunctionClass = rr_define_class("Function", rr_cV8_C_Object);
   rr_define_method(FunctionClass, "Call", Call, -1);
-  rr_define_method(FunctionClass, "NewInstance", NewInstance, -1);
+  rr_define_method(FunctionClass, "NewInstance", NewInstance, 2);
   rr_define_method(FunctionClass, "GetName", GetName, 0);
   rr_define_method(FunctionClass, "SetName", SetName, 1);
   // rr_define_method(FunctionClass, "GetScriptOrigin", GetScriptOrigin, 0);

lib/v8/function.rb

@@ -1,7 +1,7 @@
 module V8
   class Function < V8::Object
     
-    def call(thisObject, *args)
+    def methodcall(thisObject, *args)
       err = nil
       return_value = nil
       C::TryCatch.try do |try|
@@ -14,6 +14,16 @@ module V8
       raise err if err
       return return_value
     end
+    
+    def call(*args)
+      self.methodcall(@context.Global(), *args)
+    end
+    
+    def new(*args)
+      @context.enter do
+        To.rb(@native.NewInstance(args.length, To.v8(args)))
+      end
+    end
 
     def self.rubycall(rubycode, *args)
       begin

lib/v8/to.rb

@@ -45,7 +45,7 @@ module V8
           end
         when ::Time
           C::Date::New(value)
-        when nil,Numeric,TrueClass,FalseClass
+        when nil,Numeric,TrueClass,FalseClass, C::Value
           value
         else
           rubyobject = C::ObjectTemplate::New()

spec/ext/func_spec.rb

@@ -6,21 +6,21 @@ describe C::Function do
   it "is callable" do
     Context.new do |cxt|
       f = cxt.eval('(function() {return "Hello World"})', '<eval>');      
-      f.call(nil).should == "Hello World"      
+      f.call().should == "Hello World"      
     end
   end
   
   it "receives proper argument length from ruby" do
     Context.new do |cxt|
       f = cxt.eval('(function() {return arguments.length})', 'eval')
-      f.call(nil,1, 2, 3).should == 3
+      f.call(1, 2, 3).should == 3
     end
   end
   
   it "maps all arguments from ruby" do
     Context.new do |cxt|
       f = cxt.eval('(function(one, two, three) {return one + two + three})', 'eval')
-      f.call(nil, 1,2,3).should == 6
+      f.call(1,2,3).should == 6
     end
   end
   
@@ -28,7 +28,7 @@ describe C::Function do
     Context.new do |cxt|
       Object.new.tap do |this|
          f = cxt.eval('(function() {return this})', 'eval')
-         f.call(this).should be(this)
+         f.methodcall(this).should be(this)
       end
     end
   end 
@@ -37,7 +37,7 @@ describe C::Function do
     Context.new do |cxt|
       @f = cxt.eval('(function() {return "Call Me"})', 'eval')
     end
-    @f.call(nil).should == "Call Me"
+    @f.call().should == "Call Me"
   end
   
   it "is reflected properly" do