execjs 1.1.1 → 1.1.2

data/lib/execjs/module.rb

@@ -1,7 +1,7 @@
 require "rbconfig"
 
 module ExecJS
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 
   class Error           < ::StandardError; end
   class RuntimeError              < Error; end

data/lib/execjs/ruby_racer_runtime.rb

@@ -4,8 +4,10 @@ module ExecJS
       def initialize(source = "")
         source = source.encode('UTF-8') if source.respond_to?(:encode)
 
-        @v8_context = ::V8::Context.new
-        @v8_context.eval(source)
+        lock do
+          @v8_context = ::V8::Context.new
+          @v8_context.eval(source)
+        end
       end
 
       def exec(source, options = {})
@@ -20,7 +22,9 @@ module ExecJS
         source = source.encode('UTF-8') if source.respond_to?(:encode)
 
         if /\S/ =~ source
-          unbox @v8_context.eval("(#{source})")
+          lock do
+            unbox @v8_context.eval("(#{source})")
+          end
         end
       rescue ::V8::JSError => e
         if e.value["name"] == "SyntaxError"
@@ -31,7 +35,9 @@ module ExecJS
       end
 
       def call(properties, *args)
-        unbox @v8_context.eval(properties).call(*args)
+        lock do
+          unbox @v8_context.eval(properties).call(*args)
+        end
       rescue ::V8::JSError => e
         if e.value["name"] == "SyntaxError"
           raise RuntimeError, e.message
@@ -59,6 +65,24 @@ module ExecJS
           value
         end
       end
+
+      private
+        def lock
+          result, exception = nil, nil
+          V8::C::Locker() do
+            begin
+              result = yield
+            rescue Exception => e
+              exception = e
+            end
+          end
+
+          if exception
+            raise exception
+          else
+            result
+          end
+        end
     end
 
     def name

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: execjs
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Sam Stephenson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-07 00:00:00 -05:00
+date: 2011-06-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency