therubyrhino 2.0.5 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bfbbbe6278ac40b243346d4eb66423015b12097e
-  data.tar.gz: 44d5e546ce36f119d27a2fa9d76865834eabb92a
+SHA256:
+  metadata.gz: 23aafaf63c5af04a6c05a35bf9fa2b390be1f802f2871be65460ae2deae16f8e
+  data.tar.gz: 121d8fe9f0b66fb725adb95e528e78ab08abde6e849ea839e607a85af004aa68
 SHA512:
-  metadata.gz: 018a23433c6958f5e36ff9cdfd2c403bebc18d431c595cdba6b90d78affdd299268689163d48b552ad21471985f9ba0f91a45581b53256a333826ee658d601ae
-  data.tar.gz: 960f6e3be8c7692306609d11293b9307c8a2c038fce381dcd25c7ddd0f03636c01d61068f94cf97266a504b7e86a185c2ec751b38876dbb138ecbd32799e708e
+  metadata.gz: a2ed193aa1265042172ba68b3ddea823949d7ff2ea8dc3fdbffb353d7d99640e33ee8ad12e7e5cdff4bd7abbccce0ae50d0f293c7b9c1f2c15b5c9175d23377d
+  data.tar.gz: 3f2fc23e13149d53e1aa008b2161d1580ac75357ce94316ae734056614f9b9c653113558c65154138fc1d816a9a3791d5436dd4a0cfa657067c3ac63bef947e3

data/.travis.yml

@@ -1,10 +1,8 @@
+language: ruby
+jdk:
+  - openjdk8
 rvm:
-  - jruby-18mode
-  - jruby-19mode
-  - jruby-head
-#env:
-#  - JRUBY_OPTS="--1.8"
-#  - JRUBY_OPTS="--1.9"
-branches:
-  only:
-    - master
+  - jruby-1.7.24
+  - jruby-1.7.27
+  - jruby-9.1
+  - jruby-9.2

data/Gemfile

@@ -17,5 +17,4 @@ group :test do
   gem 'less', '>= 2.2.1', :require => nil
 end
 
-gem 'rake', :require => false, :group => :development
-gem 'jruby-openssl', :group => :development if JRUBY_VERSION < '1.7'
+gem 'rake', '< 11', :require => false, :group => :development

data/lib/rhino/context.rb

@@ -277,9 +277,6 @@ module Rhino
     # at org.mozilla.javascript.optimizer.Codegen.reportClassFileFormatException
 
     def code_generation_error?(exception) # :nodoc
-      if ( exception.is_a?(NativeException) rescue nil ) # JRuby 1.6 wrapping
-        exception = exception.cause
-      end
       if exception.class == Rhino::JS::EvaluatorException
         if exception.message.index(CODE_GENERATION_ERROR_MESSAGE)
           return true

data/lib/rhino/rhino_ext.rb

@@ -173,30 +173,47 @@ class Java::OrgMozillaJavascript::NativeObject
 
 end
 
+module Rhino
+  module Ruby
+    # @private
+    module FunctionCall
+      # make JavaScript functions callable Ruby style e.g. `fn.call('42')`
+      #
+      # NOTE: That invoking #call does not have the same semantics as
+      # 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
+      end
+    end
+  end
+end
+
 # The base class for all JavaScript function objects.
 class Java::OrgMozillaJavascript::BaseFunction
   
   # Object call(Context context, Scriptable scope, Scriptable this, Object[] args)
   alias_method :__call__, :call
   
-  # make JavaScript functions callable Ruby style e.g. `fn.call('42')`
-  # 
-  # NOTE: That invoking #call does not have the same semantics as
-  # 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
+  # @deprecated (but needed to support JRuby <= 9.2)
+  module_exec { 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
+    # ... so this happens pretty much only for `Rhino::Ruby::Function`
+    klass.send(:include, Rhino::Ruby::FunctionCall)
+    super(klass)
   end
-  
+
   # bind a JavaScript function into the given (this) context
   def bind(this, *args)
     context = Rhino::JS::Context.enter; scope = current_scope(context)

data/lib/rhino/version.rb

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

data/spec/rhino/error_spec.rb

@@ -85,7 +85,7 @@ describe Rhino::JSError do
       e.javascript_backtrace(true).should be_a Enumerable
       e.javascript_backtrace(true).size.should >= 1
       element = e.javascript_backtrace(true)[0]
-      element.file_name.should == '<eval>'
+      element.file_name.should match '<eval>'
       element.function_name.should be nil
       element.line_number.should == 1
     else
@@ -99,7 +99,7 @@ describe Rhino::JSError do
     rescue => e
       e.javascript_backtrace.size.should >= 2
       e.javascript_backtrace[0].should =~ /at .*?<eval>:1 \(fortyTwo\)/
-      expect( e.javascript_backtrace.find { |trace| trace == "at <eval>:2" } ).to_not be nil
+      expect( e.javascript_backtrace.find { |trace| trace.end_with? "<eval>:2" } ).to_not be nil
     else
       fail "expected to rescue"
     end
@@ -174,15 +174,13 @@ describe Rhino::JSError do
     hi = context.eval "( function hi(arg) { Hello.hello(arg); } )"
     begin
       hi.call(24)
-    rescue => e
-      e.should be_a Rhino::JSError
+      fail "expected to raise"
+    rescue Rhino::JSError => e
       e.value.should_not be nil
       e.value.should be_a Rhino::Ruby::Object
       e.value(true).should be_a RuntimeError # unwraps ruby object
       # prints the original message (beyond [ruby RuntimeError]) :
       e.message.should == "RuntimeError: hello"
-    else
-      fail "expected to rescue"
     end
     # V8::JSError: hello
     #   from (irb):4:in `hello'

data/spec/rhino/rhino_ext_spec.rb

@@ -24,8 +24,9 @@ shared_examples_for 'ScriptableObject', :shared => true do
   it "might be converted to a hash with string keys" do
     @object[42] = '42'
     @object[:foo] = 'bar'
-    expect = @object.respond_to?(:to_h_properties) ? @object.to_h_properties : {}
-    @object.to_h.should == expect.merge('42' => '42', 'foo' => 'bar')
+    prop_h = @object.to_h
+    expect( prop_h['42'] ).to eql '42'
+    expect( prop_h['foo'] ).to eql 'bar'
   end
   
   it "yields properties with each" do
@@ -66,13 +67,6 @@ describe "FunctionObject" do
     
     to_string = java.lang.Object.new.getClass.getMethod(:toString)
     @object = Rhino::JS::FunctionObject.new('to_string', to_string, scope)
-    @object.instance_eval do
-      def to_h_properties
-        h = { "arguments"=> nil, "name"=> "to_string", "arity"=> 0, "length"=> 0 }
-        RhinoHelpers.add_prototype_key(h) if Rhino.implementation_version < '1.7R4'
-        h
-      end
-    end
   end
 
   after do
@@ -80,6 +74,11 @@ describe "FunctionObject" do
   end
   
   it_should_behave_like 'ScriptableObject'
+
+  it 'has a length' do
+    prop_h = @object.to_h
+    expect( prop_h['length'] ).to_not be nil
+  end
   
 end
 
@@ -172,13 +171,6 @@ describe "NativeFunction" do
     
     object = @context.newObject(@scope)
     @object = Rhino::JS::ScriptableObject.getProperty(object, 'toString')
-    @object.instance_eval do
-      def to_h_properties
-        h = { "arguments"=> nil, "name"=> "toString", "arity"=> 0, "length"=> 0 }
-        RhinoHelpers.add_prototype_key(h) if Rhino.implementation_version < '1.7R4'
-        h
-      end
-    end
   end
 
   after do
@@ -257,29 +249,6 @@ describe "NativeFunction (constructor)" do
     factory.enterContext(@context)
     
     @object = Rhino::JS::ScriptableObject.getProperty(@context.newObject(@scope), 'constructor')
-    @object.instance_eval do
-      def to_h_properties
-        h = {
-          "arguments"=>nil, "prototype"=>{}, "name"=>"Object", "arity"=>1, "length"=>1,
-          
-          "getPrototypeOf"=> { "arguments"=>nil, "name"=>"getPrototypeOf", "arity"=>1, "length"=>1}, 
-          "keys"=>{"arguments"=>nil, "name"=>"keys", "arity"=>1, "length"=>1}, 
-          "getOwnPropertyNames"=>{"arguments"=>nil, "name"=>"getOwnPropertyNames", "arity"=>1, "length"=>1}, 
-          "getOwnPropertyDescriptor"=>{"arguments"=>nil, "name"=>"getOwnPropertyDescriptor", "arity"=>2, "length"=>2}, 
-          "defineProperty"=>{"arguments"=>nil, "name"=>"defineProperty", "arity"=>3, "length"=>3}, 
-          "isExtensible"=>{"arguments"=>nil, "name"=>"isExtensible", "arity"=>1, "length"=>1}, 
-          "preventExtensions"=>{"arguments"=>nil, "name"=>"preventExtensions", "arity"=>1, "length"=>1}, 
-          "defineProperties"=>{"arguments"=>nil, "name"=>"defineProperties", "arity"=>2, "length"=>2}, 
-          "create"=>{"arguments"=>nil, "name"=>"create", "arity"=>2, "length"=>2}, 
-          "isSealed"=>{"arguments"=>nil, "name"=>"isSealed", "arity"=>1, "length"=>1}, 
-          "isFrozen"=>{"arguments"=>nil, "name"=>"isFrozen", "arity"=>1, "length"=>1}, 
-          "seal"=>{"arguments"=>nil, "name"=>"seal", "arity"=>1, "length"=>1}, 
-          "freeze"=>{"arguments"=>nil, "name"=>"freeze", "arity"=>1, "length"=>1}
-        }
-        RhinoHelpers.add_prototype_key(h, :recurse) if Rhino.implementation_version < '1.7R4'
-        h
-      end
-    end
   end
 
   after do
@@ -287,7 +256,17 @@ describe "NativeFunction (constructor)" do
   end
   
   it_should_behave_like 'ScriptableObject'
-  
+
+  it 'has a length' do
+    prop_h = @object.to_h
+    expect( prop_h['length'] ).to_not be nil
+  end
+
+  it 'has keys property' do
+    prop_h = @object.to_h
+    expect( prop_h['keys'] ).to be_a Hash
+  end
+
   it 'is constructable' do
     @object.new.should be_a Rhino::JS::NativeObject
   end

data/spec/spec_helper.rb

@@ -36,4 +36,9 @@ RSpec.configure do |config|
   config.filter_run_excluding :compat => /(0.5.0)|(0.6.0)/ # RedJS
   config.include Rhino::SpecHelpers
   config.deprecation_stream = 'spec/deprecations.log'
+
+  config.backtrace_clean_patterns = [
+    /gems\//,
+    /lib\/rspec\/(core|expectations|matchers|mocks)/,
+  ]
 end

data/therubyrhino.gemspec

@@ -19,7 +19,9 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n").sort.
     reject { |file| file == 'therubyrhino_jar.gemspec' || file =~ /^jar\// }
 
-  s.add_dependency "therubyrhino_jar", '>= 1.7.3', '< 1.7.7'
+  s.required_ruby_version = '>= 1.9.3'
+
+  s.add_dependency "therubyrhino_jar", '>= 1.7.4', '< 1.7.8'
 
   s.add_development_dependency "rspec", "~> 2.14.1"
   s.add_development_dependency "mocha", "~> 0.13.3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: therubyrhino
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.1
 platform: ruby
 authors:
 - Charles Lowell
@@ -15,21 +15,21 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 1.7.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: 1.7.8
   name: therubyrhino_jar
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 1.7.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: 1.7.8
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -37,8 +37,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.14.1
   name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -51,14 +51,15 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.13.3
   name: mocha
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.3
-description: Call javascript code and manipulate javascript objects from ruby. Call ruby code and manipulate ruby objects from javascript.
+description: Call javascript code and manipulate javascript objects from ruby. Call
+  ruby code and manipulate ruby objects from javascript.
 email: cowboyd@thefrontside.net
 executables: []
 extensions: []
@@ -113,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -121,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: therubyrhino
-rubygems_version: 2.4.8
+rubygems_version: 2.7.6
 signing_key:
 specification_version: 4
 summary: Embed the Rhino JavaScript interpreter into JRuby