therubyracer 0.9.2 → 0.9.3beta1

data/ext/v8/v8.cpp

@@ -25,6 +25,7 @@ extern "C" {
 
 extern "C" {
   void Init_v8() {
+    v8::Locker locker;
     rr_init_handle();
     rr_init_context();
     rr_init_value();

data/ext/v8/v8_handle.cpp

@@ -6,7 +6,9 @@ using namespace v8;
 
 /**
 * Creates a new Persistent storage cell for `handle`
-* so that we can reference it from Ruby.
+* so that we can reference it from Ruby. Ruby metadat
+* is contained on the handle object, and then the actual
+* v8 references are contain in an instance of `Payload`
 */
 v8_handle::v8_handle(Handle<void> object) {
   this->weakref_callback = Qnil;
@@ -17,6 +19,14 @@ v8_handle::v8_handle(Handle<void> object) {
 
 v8_handle::~v8_handle() {}
 
+/**
+* Construct a new handle payload.
+*
+* Each payload contains a Ruby object wrapper so that it
+* can be enqueued for V8 GC (the GC queue is a ruby Array)
+* the wrapper is pre-allocated at payload creation time
+* so that no Ruby objects are allocated during Ruby GC.
+*/
 v8_handle::Payload::Payload(Handle<void> object) {
   rb_gc_register_address(&wrapper);
   handle = Persistent<void>::New(object);
@@ -56,7 +66,7 @@ namespace {
   /**
   * Whenver a V8::C::Handle becomes garbage collected, we do not free it immediately.
   * instead, we put them into a "zombie" queue, where its corresponding V8 storage cell
-  * can be released safely while the V8 engine is running. A zombie Ruby object is 
+  * can be released safely while the V8 engine is running. A zombie Ruby object is
   * created to wrap it so that it can be stored in the queue.
   */
   void v8_handle_enqueue(v8_handle* handle) {

data/ext/v8/v8_handle.h

@@ -7,7 +7,6 @@
 /**
 * Holds a reference to a V8 heap object. This serves as the base
 * class for all of the low-level proxies that reference into V8.
-*
 */
 struct v8_handle  {
 

data/lib/v8/context.rb

@@ -7,24 +7,26 @@ module V8
     def initialize(opts = {})
       @access = Access.new
       @to = Portal.new(self, @access)
-      with = opts[:with]
-      constructor = nil
-      template = if with
-        constructor = @to.templates.to_constructor(with.class)
-        constructor.disable()
-        constructor.template.InstanceTemplate()
-      else
-        C::ObjectTemplate::New()
-      end
-      @native = opts[:with] ? C::Context::New(template) : C::Context::New()
-      @native.enter do
-        @global = @native.Global()
-        @to.proxies.register_javascript_proxy @global, :for => with if with
-        constructor.enable() if constructor
-        @scope = @to.rb(@global)
-        @global.SetHiddenValue(C::String::NewSymbol("TheRubyRacer::RubyContext"), C::External::New(self))
+      @to.lock do
+        with = opts[:with]
+        constructor = nil
+        template = if with
+          constructor = @to.templates.to_constructor(with.class)
+          constructor.disable()
+          constructor.template.InstanceTemplate()
+        else
+          C::ObjectTemplate::New()
+        end
+        @native = opts[:with] ? C::Context::New(template) : C::Context::New()
+        @native.enter do
+          @global = @native.Global()
+          @to.proxies.register_javascript_proxy @global, :for => with if with
+          constructor.enable() if constructor
+          @scope = @to.rb(@global)
+          @global.SetHiddenValue(C::String::NewSymbol("TheRubyRacer::RubyContext"), C::External::New(self))
+        end
+        yield(self) if block_given?
       end
-      yield(self) if block_given?
     end
 
     def eval(javascript, filename = "<eval>", line = 1)
@@ -33,17 +35,19 @@ module V8
       end
       err = nil
       value = nil
-      C::TryCatch.try do |try|
-        @native.enter do
-          script = C::Script::Compile(@to.v8(javascript.to_s), @to.v8(filename.to_s))
-          if try.HasCaught()
-            err = JSError.new(try, @to)
-          else
-            result = script.Run()
+      @to.lock do
+        C::TryCatch.try do |try|
+          @native.enter do
+            script = C::Script::Compile(@to.v8(javascript.to_s), @to.v8(filename.to_s))
             if try.HasCaught()
               err = JSError.new(try, @to)
             else
-              value = @to.rb(result)
+              result = script.Run()
+              if try.HasCaught()
+                err = JSError.new(try, @to)
+              else
+                value = @to.rb(result)
+              end
             end
           end
         end
@@ -59,11 +63,16 @@ module V8
     end
 
     def [](key)
-      @scope[key]
+      @to.open do
+        @to.rb @global.Get(@to.v8(key))
+      end
     end
 
     def []=(key, value)
-      @scope[key] = value
+      @to.open do
+        @global.Set(@to.v8(key), @to.v8(value))
+      end
+      return value
     end
 
     def self.stack(limit = 99)

data/lib/v8/function.rb

@@ -1,11 +1,11 @@
 module V8
   class Function < V8::Object
-    
+
     def methodcall(thisObject, *args)
       err = nil
       return_value = nil
-      C::TryCatch.try do |try|
-        @portal.open do |to|
+      @portal.open do |to|
+        C::TryCatch.try do |try|
           this = to.v8(thisObject)
           return_value = to.rb(@native.Call(this, to.v8(args)))
           err = JSError.new(try, to) if try.HasCaught()
@@ -14,11 +14,13 @@ module V8
       raise err if err
       return return_value
     end
-    
+
     def call(*args)
-      self.methodcall(@portal.context.native.Global(), *args)
+      @portal.open do
+        self.methodcall(@portal.context.native.Global(), *args)
+      end
     end
-    
+
     def new(*args)
       @portal.open do |to|
         to.rb(@native.NewInstance(to.v8(args)))

data/lib/v8/portal.rb

@@ -11,10 +11,19 @@ module V8
       @caller = Caller.new(self)
     end
 
+    def lock
+      lock = V8::C::Locker.new
+      yield
+    ensure
+      lock.delete
+    end
+
     def open
-      @context.native.enter do
-        yield(self)
-      end if block_given?
+      lock do
+        @context.native.enter do
+          yield(self)
+        end if block_given?
+      end
     end
 
     def rb(value)

data/lib/v8/version.rb

@@ -1,3 +1,3 @@
 module V8
-  VERSION = "0.9.2"
+  VERSION = "0.9.3beta1"
 end

data/spec/ext/cxt_spec.rb

@@ -3,12 +3,22 @@ require "#{File.dirname(__FILE__)}/../spec_helper.rb"
 
 include V8
 
-describe C::Context do  
+describe C::Context do
+
+  before {@lock = C::Locker.new}
+  after {@lock.delete}
 
   it "should not have a current context if no context is open" do
     C::Context::GetEntered().should be_nil
   end
 
+  it "can javascript properties on the global scope via ruby when the default scope is a ruby object" do
+    V8::Context.new(:with => Object.new) do |cxt|
+      cxt['foo'] = 'bar'
+      cxt.eval('foo').should eql('bar')
+    end
+  end
+
   it "can get the current javascript execution stack" do
     V8::Context.new do |cxt|
       trace = nil
@@ -19,11 +29,11 @@ describe C::Context do
       function one() {
         return two();
       }
-      
+
       function two() {
         return three();
       }
-      
+
       function three() {
         return getTrace()
       }

data/spec/ext/ext_spec_helper.rb

@@ -4,12 +4,14 @@ module V8::ExtSpec
   def self.included(object)
     object.class_eval do
       before do
+        @lock = c::Locker.new
         @cxt = c::Context::New()
         @cxt.Enter()
       end
       after do
         @cxt.Exit()
         @cxt.Dispose()
+        @lock.delete
       end
     end
   end

data/spec/ext/try_catch_spec.rb

@@ -4,25 +4,25 @@ include V8
 
 describe C::TryCatch do
 
-  before {@cxt = C::Context::New()}
-  after {@cxt.Dispose()}
+  before {@lock = C::Locker.new;@cxt = C::Context::New();}
+  after {@cxt.Dispose(); @lock.delete}
 
   it "does not allow instance creation by default" do
     lambda {
-     C::TryCatch.new 
+     C::TryCatch.new
     }.should raise_error
   end
-  
+
   it "will do nothing if not passed a block" do
     C::TryCatch.try.should == nil
   end
-  
+
   it "executes a block in the context of a C++ stack frame" do
     C::TryCatch.try do |catch|
-      catch.HasCaught().should be(false)      
+      catch.HasCaught().should be(false)
     end
   end
-  
+
   it "raises an erro if you try to access it outside of its scope" do
     tc = C::TryCatch.try do |catch|
       catch.tap {}

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: therubyracer
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.9.2
+  prerelease: 5
+  version: 0.9.3beta1
 platform: ruby
 authors: 
 - Charles Lowell
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-23 00:00:00 -05:00
+date: 2011-07-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -174,19 +174,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3220606308753649861
+      hash: 2112963294827499619
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: -3220606308753649861
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: therubyracer