therubyrhino 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23aafaf63c5af04a6c05a35bf9fa2b390be1f802f2871be65460ae2deae16f8e
-  data.tar.gz: 121d8fe9f0b66fb725adb95e528e78ab08abde6e849ea839e607a85af004aa68
+  metadata.gz: 2e15819e51a33cdf6ad48d5ccdbe29732ed6c845e46c7052d7899a1ddb6fa80a
+  data.tar.gz: 2c7d2c651436969c0ef632857bf42dcd43ce88ee85717a032328c3c003f3ab02
 SHA512:
-  metadata.gz: a2ed193aa1265042172ba68b3ddea823949d7ff2ea8dc3fdbffb353d7d99640e33ee8ad12e7e5cdff4bd7abbccce0ae50d0f293c7b9c1f2c15b5c9175d23377d
-  data.tar.gz: 3f2fc23e13149d53e1aa008b2161d1580ac75357ce94316ae734056614f9b9c653113558c65154138fc1d816a9a3791d5436dd4a0cfa657067c3ac63bef947e3
+  metadata.gz: c173fc94ff7c4a34642671dc86b22e826ca3659ff4677989ff99d9d9a2d9589de0c381890ac5a0e6012b2e4ee9e3390e0c1da645edf0493ccf30c80af3aa1efb
+  data.tar.gz: bc8cee36e858478f88adbc39c073a0108d87f5d56e6cb375f1cb4165d343bb0186e6890d1caf65e586663da722d594818e2a781a1b1478660f51c9166bf07a47

data/lib/rhino/rhino_ext.rb

@@ -108,13 +108,9 @@ class Java::OrgMozillaJavascript::ScriptableObject
     else
       if property = self[name_str]
         if property.is_a?(Rhino::JS::Function)
-          begin
-            context = Rhino::JS::Context.enter
-            scope = current_scope(context)
+          with_context do |context|
             js_args = Rhino.args_to_javascript(args, self) # scope == self
-            Rhino.to_ruby property.__call__(context, scope, self, js_args)
-          ensure
-            Rhino::JS::Context.exit
+            Rhino.to_ruby property.__call__(context, current_scope(context), self, js_args)
           end
         else
           if args.size > 0
@@ -129,9 +125,23 @@ class Java::OrgMozillaJavascript::ScriptableObject
   end
   
   protected
-  
+
+    def with_context
+      context = Rhino::JS::Context.getCurrentContext
+      unless context
+        context = Rhino::JS::Context.enter
+        context.initStandardObjects
+        context_exit = true
+      end
+      begin
+        yield(context)
+      ensure
+        Rhino::JS::Context.exit if context_exit
+      end
+    end
+
     def current_scope(context)
-      getParentScope || context.initStandardObjects
+      getParentScope || Rhino::JS::ScriptRuntime.getGlobal(context)
     end
   
 end
@@ -183,16 +193,17 @@ module Rhino
       # JavaScript's Function#call but rather as Ruby's Method#call !
       # Use #apply or #bind before calling to achieve the same effect.
       def call(*args)
-        context = Rhino::JS::Context.enter; scope = current_scope(context)
-        # calling as a (var) stored function - no this === undefined "use strict"
-        # TODO can't pass Undefined.instance as this - it's not a Scriptable !?
-        this = Rhino::JS::ScriptRuntime.getGlobal(context)
-        js_args = Rhino.args_to_javascript(args, scope)
-        Rhino.to_ruby __call__(context, scope, this, js_args)
-      rescue Rhino::JS::JavaScriptException => e
-        raise Rhino::JSError.new(e)
-      ensure
-        Rhino::JS::Context.exit
+        with_context do |context|
+          begin
+            # calling as a (var) stored function - no this === undefined "use strict"
+            # TODO can't pass Undefined.instance as this - it's not a Scriptable !?
+            this = Rhino::JS::ScriptRuntime.getGlobal(context)
+            js_args = Rhino.args_to_javascript(args, scope = current_scope(context))
+            Rhino.to_ruby __call__(context, scope, this, js_args)
+          rescue Rhino::JS::JavaScriptException => e
+            raise Rhino::JSError.new(e)
+          end
+        end
       end
     end
   end
@@ -203,9 +214,10 @@ class Java::OrgMozillaJavascript::BaseFunction
   
   # Object call(Context context, Scriptable scope, Scriptable this, Object[] args)
   alias_method :__call__, :call
-  
+
+  include Rhino::Ruby::FunctionCall if RUBY_VERSION < '2.1'
   # @deprecated (but needed to support JRuby <= 9.2)
-  module_exec { define_method :call, Rhino::Ruby::FunctionCall.instance_method(:call) }
+  define_method :call, Rhino::Ruby::FunctionCall.instance_method(:call)
 
   def self.inherited(klass)
     # NOTE: in JRuby < 9.3 inherited won't be called for a Java class
@@ -216,21 +228,22 @@ class Java::OrgMozillaJavascript::BaseFunction
 
   # bind a JavaScript function into the given (this) context
   def bind(this, *args)
-    context = Rhino::JS::Context.enter; scope = current_scope(context)
-    args = Rhino.args_to_javascript(args, scope)
-    Rhino::JS::BoundFunction.new(context, scope, self, Rhino.to_javascript(this), args)
-  ensure
-    Rhino::JS::Context.exit    
+    with_context do |context|
+      args = Rhino.args_to_javascript(args, scope = current_scope(context))
+      Rhino::JS::BoundFunction.new(context, scope, self, Rhino.to_javascript(this), args)
+    end
   end
   
   # use JavaScript functions constructors from Ruby as `fn.new`
   def new(*args)
-    context = Rhino::JS::Context.enter; scope = current_scope(context)
-    construct(context, scope, Rhino.args_to_javascript(args, scope))
-  rescue Rhino::JS::JavaScriptException => e
-    raise Rhino::JSError.new(e)
-  ensure
-    Rhino::JS::Context.exit
+    with_context do |context|
+      begin
+        scope = current_scope(context)
+        construct(context, scope, Rhino.args_to_javascript(args, scope))
+      rescue Rhino::JS::JavaScriptException => e
+        raise Rhino::JSError.new(e)
+      end
+    end
   end
   
   # apply a function with the given context and (optional) arguments 
@@ -239,13 +252,14 @@ class Java::OrgMozillaJavascript::BaseFunction
   # NOTE: That #call from Ruby does not have the same semantics as
   # JavaScript's Function#call but rather as Ruby's Method#call !
   def apply(this, *args)
-    context = Rhino::JS::Context.enter; scope = current_scope(context)
-    args = Rhino.args_to_javascript(args, scope)
-    __call__(context, scope, Rhino.to_javascript(this), args)
-  rescue Rhino::JS::JavaScriptException => e
-    raise Rhino::JSError.new(e)
-  ensure
-    Rhino::JS::Context.exit
+    with_context do |context|
+      begin
+        args = Rhino.args_to_javascript(args, scope = current_scope(context))
+        __call__(context, scope, Rhino.to_javascript(this), args)
+      rescue Rhino::JS::JavaScriptException => e
+        raise Rhino::JSError.new(e)
+      end
+    end
   end
   alias_method :methodcall, :apply # V8::Function compatibility
   

data/lib/rhino/version.rb

@@ -1,3 +1,3 @@
 module Rhino
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

data/spec/rhino/rhino_ext_spec.rb

@@ -96,10 +96,6 @@ describe "NativeObject (scoped)" do
     @object = @context.newObject(@scope)
   end
   
-  after do
-    Rhino::JS::Context.exit
-  end
-  
   it_should_behave_like 'ScriptableObject'  
   
   it 'routes rhino methods' do
@@ -172,10 +168,6 @@ describe "NativeFunction" do
     object = @context.newObject(@scope)
     @object = Rhino::JS::ScriptableObject.getProperty(object, 'toString')
   end
-
-  after do
-    Rhino::JS::Context.exit
-  end
   
   it_should_behave_like 'ScriptableObject'
   
@@ -250,10 +242,6 @@ describe "NativeFunction (constructor)" do
     
     @object = Rhino::JS::ScriptableObject.getProperty(@context.newObject(@scope), 'constructor')
   end
-
-  after do
-    Rhino::JS::Context.exit
-  end
   
   it_should_behave_like 'ScriptableObject'
 

data/spec/rhino/ruby_spec.rb

@@ -5,12 +5,13 @@ shared_examples_for Rhino::Ruby::Scriptable, :shared => true do
   it "puts, gets and has a read/write attr" do
     start = mock('start')
     start.expects(:put).never
-    
+
+    @wrapper = wrapper
     @wrapper.unwrap.instance_eval do
       def foo; @foo; end
       def foo=(foo); @foo = foo; end
     end
-    
+
     @wrapper.put('foo', start, 42)
     @wrapper.has('foo', nil).should == true
     @wrapper.get('foo', nil).should == 42
@@ -20,21 +21,23 @@ shared_examples_for Rhino::Ruby::Scriptable, :shared => true do
   it "puts, gets and has a write only attr" do
     start = mock('start')
     start.expects(:put).never
-    
+
+    @wrapper = wrapper
     @wrapper.unwrap.instance_eval do
       def foo=(foo); @foo = foo; end
     end
-    
+
     @wrapper.put('foo', start, 42)
+    @wrapper.unwrap.instance_variable_get(:'@foo').should == 42
     @wrapper.has('foo', nil).should == true
     @wrapper.get('foo', nil).should be(nil)
-    @wrapper.unwrap.instance_variable_get(:'@foo').should == 42
   end
 
   it "puts, gets and has gets delegated if it acts like a Hash" do
     start = mock('start')
     start.expects(:put).never
-    
+
+    @wrapper = wrapper
     @wrapper.unwrap.instance_eval do
       def [](name); (@hash ||= {})[name]; end
       def []=(name, value); (@hash ||= {})[name] = value; end
@@ -49,7 +52,8 @@ shared_examples_for Rhino::Ruby::Scriptable, :shared => true do
   it "puts, gets and has non-existing property" do
     start = mock('start')
     start.expects(:put).once
-    
+
+    @wrapper = wrapper
     @wrapper.put('foo', start, 42)
     @wrapper.has('foo', nil).should == false
     @wrapper.get('foo', nil).should be(Rhino::JS::Scriptable::NOT_FOUND)
@@ -58,15 +62,14 @@ shared_examples_for Rhino::Ruby::Scriptable, :shared => true do
 end
 
 describe Rhino::Ruby::Object do
-  
-  before do
-    @wrapper = Rhino::Ruby::Object.wrap @object = Object.new
-  end
-  
+
+  let(:object) { Object.new }
+  let(:wrapper) { Rhino::Ruby::Object.wrap object }
+
   it "unwraps a ruby object" do
-    @wrapper.unwrap.should be(@object)
+    wrapper.unwrap.should be(object)
   end
-  
+
   it_should_behave_like Rhino::Ruby::Scriptable
   
   class UII < Object
@@ -162,13 +165,18 @@ describe Rhino::Ruby::Object do
 end
 
 describe Rhino::Ruby::Function do
-  
-  before do
-    @wrapper = Rhino::Ruby::Function.wrap @method = Object.new.method(:to_s)
+
+  let(:a_class) do
+    Class.new do
+      def self.sample; end
+      def inspect; 'SAMPLE' end
+    end
   end
-  
+  let(:method) { a_class.method(:sample) }
+  let(:wrapper) { Rhino::Ruby::Function.wrap method }
+
   it "unwraps a ruby method" do
-    @wrapper.unwrap.should be(@method)
+    wrapper.unwrap.should be(method)
   end
   
   it_should_behave_like Rhino::Ruby::Scriptable
@@ -222,8 +230,8 @@ describe Rhino::Ruby::Function do
     rb_function = Rhino::Ruby::Function.wrap klass.new.method(:foo)
     this = nil
     
-    args = [ 1.to_java, 2.to_java, 3.to_java ].to_java; js_return = nil
-    lambda { js_return = rb_function.call(context, scope, this, args) }.should_not raise_error
+    args = [ 1.to_java, 2.to_java, 3.to_java ].to_java
+    js_return = rb_function.call(context, scope, this, args)
     js_return.should == 1
   end
   
@@ -321,13 +329,12 @@ describe Rhino::Ruby::Function do
 end
 
 describe Rhino::Ruby::Constructor do
-  
-  before do
-    @wrapper = Rhino::Ruby::Constructor.wrap @class = Class.new(Object)
-  end
-  
+
+  let(:klass) { Class.new(Object) }
+  let(:wrapper) { Rhino::Ruby::Constructor.wrap(klass) }
+
   it "unwraps a ruby method" do
-    @wrapper.unwrap.should be(@class)
+    wrapper.unwrap.should be(klass)
   end
   
   it_should_behave_like Rhino::Ruby::Scriptable

data/spec/spec_helper.rb

@@ -20,15 +20,23 @@ module Rhino
       @context_factory ||= Rhino::JS::ContextFactory.new
     end
     
-    def context
+    def context(enter: true)
       @context || context_factory.call { |ctx| @context = ctx }
-      @context
+      @context.tap { Rhino::JS::Context.enter(@context, context_factory) }
     end
 
     def scope
-      context.initStandardObjects(nil, false)
+      context.initStandardObjects
     end
-    
+
+    def exit_context
+      Rhino::JS::Context.exit if @context
+    end
+
+    def self.included(base)
+      base.after { exit_context }
+    end
+
   end
 end
 

data/therubyrhino.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.3'
 
-  s.add_dependency "therubyrhino_jar", '>= 1.7.4', '< 1.7.8'
+  s.add_dependency "therubyrhino_jar", '>= 1.7.4', '< 1.7.9'
 
   s.add_development_dependency "rspec", "~> 2.14.1"
   s.add_development_dependency "mocha", "~> 0.13.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: therubyrhino
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Charles Lowell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-19 00:00:00.000000000 Z
+date: 2019-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -18,7 +18,7 @@ dependencies:
         version: 1.7.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.7.8
+        version: 1.7.9
   name: therubyrhino_jar
   type: :runtime
   prerelease: false
@@ -29,7 +29,7 @@ dependencies:
         version: 1.7.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.7.8
+        version: 1.7.9
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: