therubyracer 0.7.0 → 0.7.1.pre

data/contrib/v8/jasmine/window.js

@@ -0,0 +1,11 @@
+//needed to get around 
+(function(noop){
+  window = {
+    setInterval: noop,
+    clearInterval: noop,
+    setTimeout: function(callback, delay) {
+      callback()
+    },
+    clearTimeout: noop
+  }
+})(function() {})

data/ext/v8/extconf.rb

@@ -1,4 +1,5 @@
 require 'mkmf'
+require 'set'
 
 UPSTREAM = File.expand_path(File.dirname(__FILE__) + "/upstream")
 BUILD = "#{UPSTREAM}/build/v8"
@@ -8,8 +9,7 @@ puts "Compiling V8"
 
 system("cd #{UPSTREAM} && make") or raise "Error compiling V8"
 
-dir_config('v8', "#{BUILD}/include", "#{BUILD}")
-have_library('v8') or raise "Unable to find libv8 in #{BUILD}, was there an error compiling it?"
+find_header('v8.h', "#{BUILD}/include")
 have_library('pthread')
 have_library('objc') if RUBY_PLATFORM =~ /darwin/
 
@@ -17,6 +17,9 @@ $CPPFLAGS += " -Wall" unless $CPPFLAGS.split.include? "-Wall"
 $CPPFLAGS += " -g" unless $CPPFLAGS.split.include? "-g"
 $CPPFLAGS += " -rdynamic" unless $CPPFLAGS.split.include? "-rdynamic"
 
+$DEFLIBPATH.unshift(BUILD)
+$LIBS << ' -lv8'
+
 CONFIG['LDSHARED'] = '$(CXX) -shared' unless RUBY_PLATFORM =~ /darwin/
 
 create_makefile('v8')

data/ext/v8/v8_func.cpp

@@ -13,50 +13,33 @@ namespace {
   Local<Function> unwrap(VALUE value) {
     return V8_Ref_Get<Function>(value);
   }  
-  VALUE Call(int argc, VALUE *argv, VALUE self) {
+  VALUE Call(VALUE self, VALUE recv, VALUE arguments) {
     HandleScope handles;
-    VALUE recv; VALUE f_argv;
-    rb_scan_args(argc, argv, "1*", &recv, &f_argv);
-    
-    Local<Function> function = V8_Ref_Get<Function>(self);
-    Local<Object> thisObject;
-    if (NIL_P(recv)) {
-      if (Context::InContext()) {
-        thisObject = Context::GetEntered()->Global();
-      } else {
-        Persistent<Context> cxt = Context::New();
-        Context::Scope scope(cxt);
-        thisObject = Object::New();
-        cxt.Dispose();
-      }
-    } else {
-      if (!Context::InContext()) {
-        Persistent<Context> cxt = Context::New();
-        cxt->Enter();
-        thisObject = rr_rb2v8(recv)->ToObject();
-        cxt->Exit();
-      } else {
-        thisObject = rr_rb2v8(recv)->ToObject();
-      }
+    if (!Context::InContext()) {
+      rb_raise(rb_eScriptError, "no open V8 Context in V8::C::Function::Call()");
+      return Qnil;
     }
-    int f_argc = argc - 1;
-    Local<Value> arguments[f_argc];
-    for (int i = 0; i < f_argc; i++) {
-      arguments[i] = *rr_rb2v8(rb_ary_entry(f_argv, i));
+    Local<Function> function = unwrap(self);
+    Local<Object> thisObj = rr_rb2v8(recv)->ToObject();
+    Handle<Array> args = V8_Ref_Get<Array>(arguments);
+    int argc = args->Length();
+    Handle<Value> argv[argc];
+    for (int i = 0; i < argc; i++) {
+      argv[i] = args->Get(i);
     }
-    Local<Value> result = function->Call(thisObject, f_argc, arguments);
-    return rr_v82rb(result);
+    return rr_v82rb(function->Call(thisObj, argc, argv));
   }
-  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];
+  
+  VALUE NewInstance(VALUE self, VALUE arguments) {
+    HandleScope scope;
+    Local<Function> function = unwrap(self);
+    Handle<Array> args = V8_Ref_Get<Array>(arguments);
+    int argc = args->Length();
+    Handle<Value> argv[argc];
     for (int i = 0; i < argc; i++) {
-      arguments[i] = *rr_rb2v8(rb_ary_entry(f_argv, i));
+      argv[i] = args->Get(i);
     }
-    return rr_v82rb(function->NewInstance(argc, arguments));
+    return rr_v82rb(function->NewInstance(argc, argv));
   }
   VALUE GetName(VALUE self) {
     return rr_v82rb(unwrap(self)->GetName());
@@ -73,8 +56,8 @@ 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, "Call", Call, 2);
+  rr_define_method(FunctionClass, "NewInstance", NewInstance, 1);
   rr_define_method(FunctionClass, "GetName", GetName, 0);
   rr_define_method(FunctionClass, "SetName", SetName, 1);
   // rr_define_method(FunctionClass, "GetScriptOrigin", GetScriptOrigin, 0);

data/ext/v8/v8_obj.cpp

@@ -63,6 +63,10 @@ namespace {
     // rr_v8_ref_setref(self, "RubyPeer", )
     return Qnil;
   }
+  VALUE GetHiddenValue(VALUE self, VALUE key) {
+    HandleScope scope;
+    return rr_v82rb(unwrap(self)->GetHiddenValue(rr_rb2v8(key)->ToString()));
+  }
 }
 
 void rr_init_obj() {
@@ -72,6 +76,7 @@ void rr_init_obj() {
   rr_define_method(rr_cV8_C_Object, "Get", Get, 1);
   rr_define_method(rr_cV8_C_Object, "Set", Set, 2);
   rr_define_method(rr_cV8_C_Object, "GetPropertyNames", GetPropertyNames, 0);
+  rr_define_method(rr_cV8_C_Object, "GetHiddenValue", GetHiddenValue, 1);
   rr_define_method(rr_cV8_C_Object, "SetHiddenValue", SetHiddenValue, 2);
 }
 

data/ext/v8/v8_script.cpp

@@ -6,6 +6,14 @@
 using namespace v8;
 
 namespace {
+
+  VALUE New(VALUE self, VALUE source, VALUE source_name) {
+    HandleScope scope;
+    Local<String> src(rr_rb2v8(source)->ToString());
+    Local<String> src_name(rr_rb2v8(source_name)->ToString());
+    return rr_v8_ref_create(self, Script::Compile(src, src_name));
+  }
+
   VALUE Compile(VALUE self, VALUE source, VALUE source_name) {
     Local<String> src(rr_rb2v8(source)->ToString());
     Local<String> src_name(rr_rb2v8(source_name)->ToString());
@@ -21,6 +29,7 @@ namespace {
 
 void rr_init_script() {
   VALUE ScriptClass = rr_define_class("Script");
+  rr_define_singleton_method(ScriptClass, "New", New, 2);
   rr_define_singleton_method(ScriptClass, "Compile", Compile, 2);
   rr_define_method(ScriptClass, "Run", Run, 0);
   rb_funcall(ScriptClass, rb_intern("private_class_method"), 1, rb_str_new2("new"));

data/ext/v8/v8_str.cpp

@@ -2,6 +2,7 @@
 #include "v8_str.h"
 #include "v8.h"
 #include "v8_ref.h"
+#include "v8_value.h"
 
 using namespace v8;
 
@@ -37,7 +38,7 @@ VALUE rr_reflect_v8_string(Handle<Value> value) {
 }
 
 void rr_init_str() {
-  StringClass = rr_define_class("String");
+  StringClass = rr_define_class("String", rr_cV8_C_Value);
   rr_define_singleton_method(StringClass, "New", New, 1);
   rr_define_method(StringClass, "Utf8Value", Utf8Value, 0);
   rr_define_method(StringClass, "Utf16Value", Utf16Value, 0);

data/ext/v8/v8_try_catch.cpp

@@ -55,6 +55,7 @@ namespace {
       kill_try_catch kill_on_return(wrapper);
       VALUE rb_ref = Data_Wrap_Struct(TryCatchClass, mark_try_catch, free_try_catch, wrapper);
       VALUE result = rb_yield(rb_ref);
+      tc.Reset();
       return result;
     } else {
       return Qnil;

data/ext/v8/v8_value.cpp

@@ -7,6 +7,9 @@ namespace {
   Local<Value> unwrap(VALUE value) {
     return V8_Ref_Get<Value>(value);
   }
+  VALUE IsEmpty(VALUE value) {
+    return value == rr_cV8_C_Empty ? Qtrue : Qfalse;
+  }
   VALUE IsUndefined(VALUE self) {
     HandleScope scope;
     return rr_v82rb(unwrap(self)->IsUndefined());
@@ -128,6 +131,7 @@ void rr_init_value() {
   rr_cV8_C_Value = rr_define_class("Value");
   rr_cV8_C_Empty = rr_define_const("Empty", rr_v8_ref_create(rr_cV8_C_Value, Handle<Value>()));
 
+  rr_define_method(rr_cV8_C_Value, "IsEmpty", IsEmpty, 0);
   rr_define_method(rr_cV8_C_Value, "IsUndefined", IsUndefined, 0);
   rr_define_method(rr_cV8_C_Value, "IsNull", IsNull, 0);
   rr_define_method(rr_cV8_C_Value, "IsTrue", IsTrue, 0);

data/lib/v8.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module V8
-  VERSION = '0.7.0'
+  VERSION = '0.7.1.pre'
   require 'v8/v8' #native glue
   require 'v8/to'
   require 'v8/context'

data/lib/v8/array.rb

@@ -3,8 +3,10 @@ module V8
   class Array < V8::Object
     
     def each
-      for i in 0..(@native.Length() - 1)
-        yield To.ruby(@native.Get(i))
+      @context.enter do
+        for i in 0..(@native.Length() - 1)
+          yield To.ruby(@native.Get(i))
+        end
       end
     end
 

data/lib/v8/function.rb

@@ -1,19 +1,29 @@
 module V8
   class Function < V8::Object
     
-    def call(thisObject, *args)
+    def methodcall(thisObject, *args)
       err = nil
       return_value = nil
       C::TryCatch.try do |try|
         @context.enter do
           this = To.v8(thisObject)
-          return_value = To.ruby(@native.Call(this, *args.map {|a| To.v8(a)}))
+          return_value = To.ruby(@native.Call(this, To.v8(args)))
           err = JavascriptError.new(try) if try.HasCaught()
         end
       end
       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(To.v8(args)))
+      end
+    end
 
     def self.rubycall(rubycode, *args)
       begin

data/lib/v8/object.rb

@@ -2,19 +2,19 @@
 module V8
   class Object
     include Enumerable
-    
+
     def initialize(native, context = nil)
       @native = native
       @context = context || C::Context::GetEntered()
       raise ScriptError, "V8::Object.new called without an open V8 context" unless @context
     end
-    
+
     def [](key)
       @context.enter do
         To.ruby(@native.Get(To.v8(key)))        
       end
     end
-    
+
     def []=(key, value)
       value.tap do
         @context.enter do
@@ -22,13 +22,13 @@ module V8
         end
       end
     end
-    
+
     def to_s
       @context.enter do
         To.rb(@native.ToString())
       end
     end
-    
+
     def each
       @context.enter do
         for prop in To.rb(@native.GetPropertyNames())
@@ -36,6 +36,22 @@ module V8
         end
       end
     end
+
+    def respond_to?(method)
+      self[method] != nil
+    end
+
+    def method_missing(name, *args, &block)
+      return super(name, *args, &block) unless self.respond_to?(name)
+      property = self[name]
+      if property.kind_of?(V8::Function)
+        property.methodcall(self, *args)
+      elsif args.empty?
+        property
+      else
+        raise ArgumentError, "wrong number of arguments (#{args.length} for 0)" unless args.empty?
+      end
+    end
   end
 end
 

data/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()

data/spec/contrib/v8/jasmine_spec.rb

@@ -0,0 +1,38 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+require 'v8/jasmine'
+
+describe V8::Jasmine do
+
+  it "cannot be included" do
+    lambda {
+      Class.new.send(:include, V8::Jasmine)
+    }.should raise_error(ScriptError)
+  end
+  
+  it "can only be used to extend V8::Context objecs" do
+    lambda {
+      V8::Context.new.extend(V8::Jasmine)
+    }.should_not raise_error
+    
+    lambda {
+      Object.new.extend(V8::Jasmine)
+    }.should raise_error(ScriptError)
+  end
+  
+  it "extends a bare context with the jasmine runtime" do
+    V8::Context.new do |cxt|
+      cxt.extend V8::Jasmine
+      cxt['jasmine'].getEnv().should_not be_nil
+    end
+  end
+end
+
+describe V8::Jasmine::Context do
+  
+  it "comes pre-bundled with jasmine" do
+    V8::Jasmine::Context.new do |cxt|
+      cxt['jasmine'].should_not be_nil
+    end
+  end
+end

data/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

data/spec/redjs/jsapi_spec.rb

@@ -81,6 +81,15 @@ describe "Ruby Javascript API" do
       end
     end
 
+    it "can iterate over arrays" do
+      @cxt['a'] = @cxt.eval('[{num: 1},{num:2},{num:3},{num: 4}]')
+      a = @cxt['a']
+      a.inject(0) do |sum, item|
+        sum + item['num']
+      end.should == 10
+
+    end
+
     it "converts ruby hashes to javascript objects" do
       @cxt['h'] = {:foo => 'bar', :baz => 'bang', :bar => {'hello' => 'world'}}
       @cxt['h']['foo'].should == 'bar'
@@ -278,16 +287,46 @@ describe "Ruby Javascript API" do
     before(:each) do
       @cxt = Context.new
     end
-    
+
     it "allows you to capture a reference to a javascript function and call it" do
       f = @cxt.eval('(function add(lhs, rhs) {return lhs + rhs})')
-      f.call(nil, 1,2).should == 3
+      f.call(1,2).should == 3
+    end
+
+    it "can path the 'this' object into a function as context with methodcall()" do
+      obj = @cxt.eval('({num: 5})')
+      times = @cxt.eval('(function times(num) {return this.num * num})')
+      times.methodcall(obj, 5).should == 25
     end
 
     it "unwraps objects that are backed by javascript objects to pass their native equivalents" do |cxt|
       @cxt.eval('obj = {foo: "bar"}')
       f = @cxt.eval('(function() {return this == obj})')
-      f.call(@cxt['obj']).should be(true)
+      f.methodcall(@cxt['obj']).should be(true)
+    end
+
+    it "can invoke a javacript constructor and return the new object reflected into ruby" do
+      wrapper = @cxt.eval('(function Wrapper(value) {this.value = value})')
+      wrapper.new(5)['value'].should == 5
+    end
+
+    it "can call a javascript method directly from a ruby object" do
+      obj = @cxt.eval('Object').new
+      obj.should respond_to(:toString)
+      obj.toString().should == '[object Object]'
+    end
+
+    it "can access properties defined on a javascript object through ruby" do
+      obj = @cxt.eval('({str: "bar", num: 5})')
+      obj.str.should == "bar"
+      obj.num.should == 5
+    end
+
+    it "is an error to try and pass parameters to a property" do
+      obj = @cxt.eval('({num: 1})')
+      lambda {
+        obj.num(5)
+      }.should raise_error(ArgumentError)
     end
   end
 
@@ -492,13 +531,8 @@ end
           cxt.eval('throw "BOOM!"', "three.js")
         end
         lambda {
-          begin
-            cxt['one'].call(cxt.scope)
-          rescue JavascriptError => e
-            rputs e.backtrace
-            raise e
-          end
-        }.should raise_error(JavascriptError) {|e|
+          cxt['one'].call(cxt.scope)
+        }.should raise_error {|e|
           #TODO: assert something about the contents of the stack?
           #--cowboyd 05/25/2010
         }