therubyrhino 2.0.1 → 2.0.2

data/History.txt

@@ -1,3 +1,15 @@
+=== 2.0.2 2012-12-05
+
+* handle Rhino's 64K code generation (method) limit on the fly (#23)
+* correct explicit Ruby equality == and eql? (JRuby 1.7.1 compat)
+* allow to set javascript version programatically - globally also allow
+  reading it from system properties by default
+* allow to set optimization level globally also allow reading it from 
+  system properties by default 
+* make sure Ruby function wrapper has (Ruby) #call semantics just like 
+  JavaScript functions exposed into the Ruby side
+* function's return value should be converted to Ruby (Ruby #call style)
+
 === 2.0.1 2012-08-24
 
 * JSError improvement to preserve nested Ruby error message

data/README.rdoc

@@ -176,6 +176,36 @@ methods "defined in their classes" are exposed by default e.g.
     cxt.eval("b.a()") # => 'TypeError: undefined property 'a' is not a function'
   end
   
+==== Using a custom Rhino version
+
+Officially supported versions of Rhino's _js.jar_ are packaged separately as 
+*therubyrhino_jar* gem. Make sure you're using the latest gem version if you 
+feel like missing something available with Rhino. For experimenters the jar can
+be overriden by defining a +Rhino::JAR_PATH+ before +require 'rhino'+ e.g. :
+
+  module Rhino
+    JAR_PATH = File.expand_path('lib/rhino/build/rhino1_7R5pre/js.jar')
+  end
+  # ...
+  require 'rhino'
+
+==== Context customizations
+
+Just like the JVM packaged Rhino scripting engine, therubyrhino gem supports
+specifying JavaScript context properies (optimization level and language version)
+using system properties e.g. to force interpreted mode :
+
+  jruby -J-Drhino.opt.level=-1 -rtherubyrhino -S ...
+
+You might also set these programatically as a default for all created contexts :
+
+  Rhino::Context.default_optimization_level = 1
+  Rhino::Context.default_javascript_version = 1.6
+
+Or using plain old JAVA_OPTS e.g. when setting JavaScript version :
+
+  -Drhino.js.version=1.7
+
 == Rhino
 
 Rhino is currently maintained at https://github.com/mozilla/rhino

data/lib/rhino.rb

@@ -4,8 +4,8 @@ module Rhino
   
    # allow for rhino.jar overrides for "experimental" jrubyists 
    # fallback to rhino/jar_path provided therubyrhino_jar gem :
-  require 'rhino/jar_path' unless defined?(Rhino::JAR_PATH)
-  load Rhino::JAR_PATH
+  require 'rhino/jar_path' unless const_defined?(:JAR_PATH)
+  load JAR_PATH
   
   # This module contains all the native Rhino objects implemented in Java
   # e.g. Rhino::JS::NativeObject # => org.mozilla.javascript.NativeObject
@@ -16,7 +16,7 @@ module Rhino
     end
   end
   
-  @@implementation_version = nil
+  @@implementation_version = nil  # :nodoc
   # Helper to resolve what version of Rhino's .jar we're really using.
   def self.implementation_version
     @@implementation_version ||= begin
@@ -33,6 +33,24 @@ module Rhino
     end
   end
   
+  @@silence = java.lang.Boolean.getBoolean('rhino.silence') # :nodoc
+  # Should we be silent - no warnings will be printed.
+  def self.silence?; @@silence; end
+  # Silence ! (... or I kill you)
+  def self.silence!; @@silence = true; end
+
+  @@warnings = {} # :nodoc
+  
+  def self.warn(msg) # :nodoc
+    return if silence?
+    # only print out deprecations once (even when non-silent)
+    if msg[0, 13] == '[DEPRECATION]'
+      return nil if @@warnings[msg]
+      @@warnings[msg] = true
+    end
+    super # Kernel.warn
+  end
+
 end
 
 require 'rhino/version'

data/lib/rhino/context.rb

@@ -58,6 +58,24 @@ module Rhino
       @@default_factory = factory
     end
     
+    @@default_optimization_level = java.lang.Integer.getInteger('rhino.opt.level')
+    def self.default_optimization_level
+      @@default_optimization_level
+    end
+    
+    def self.default_optimization_level=(level)
+      @@default_optimization_level = level
+    end
+
+    @@default_javascript_version = java.lang.System.getProperty('rhino.js.version')
+    def self.default_javascript_version
+      @@default_javascript_version
+    end
+    
+    def self.default_javascript_version=(version)
+      @@default_javascript_version = version
+    end
+
     attr_reader :scope
     
     # Create a new javascript environment for executing javascript and ruby code.
@@ -82,6 +100,12 @@ module Rhino
           end
         end
       end
+      if optimization_level = options[:optimization_level] || self.class.default_optimization_level
+        self.optimization_level = optimization_level
+      end
+      if javascript_version = options[:javascript_version] || self.class.default_javascript_version
+        self.javascript_version = javascript_version
+      end
       yield(self) if block_given?
     end
     
@@ -191,16 +215,17 @@ module Rhino
 
     # Get the JS interpreter version. 
     # Returns a number e.g. 1.7, nil if unknown and 0 for default.
-    def version
+    def javascript_version
       case const_value = @native.getLanguageVersion
         when -1 then nil # VERSION_UNKNOWN
         when  0 then 0 # VERSION_DEFAULT
         else const_value / 100.0 # VERSION_1_1 (1.1 = 110 / 100)
       end
     end
+    alias :version :javascript_version
     
     # Sets interpreter mode a.k.a. JS language version e.g. 1.7 (if supported).
-    def version=(version)
+    def javascript_version=(version)
       const = version.to_s.gsub('.', '_').upcase
       const = "VERSION_#{const}" if const[0, 7] != 'VERSION'
       if JS::Context.constants.find { |c| c.to_s == const }
@@ -212,26 +237,59 @@ module Rhino
         nil
       end
     end
+    alias :version= :javascript_version= 
     
     # Enter this context for operations. 
-    # Some methods such as eval() will fail unless this context is open !
+    # Some methods such as eval() will fail unless the context is open.
     def open(&block)
       do_open(&block)
     rescue JS::RhinoException => e
+      if code_generation_error?(e)
+        warn "[INFO] Rhino byte-code generation failed forcing #{@native} into interpreted mode"
+        self.optimization_level = -1
+        retry
+      end
       raise Rhino::JSError.new(e)
     end
     
     private
     
-      def do_open
-        factory.enterContext(@native)
-        begin
-          yield self
-        ensure
-          factory.exit
-        end      
+    def do_open # :nodoc
+      factory.enterContext(@native)
+      begin
+        yield self
+      ensure
+        factory.exit
       end
+    end
     
+    CODE_GENERATION_ERROR_MESSAGE = 'generated bytecode for method exceeds 64K limit' # :nodoc
+
+    CODE_GENERATION_TRACE_CLASS_NAME = 'org.mozilla.javascript.optimizer.Codegen' # :nodoc
+    CODE_GENERATION_TRACE_METHOD_NAME = 'reportClassFileFormatException' # :nodoc
+    # 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
+        end
+        # NOTE: unfortunately Rhino localizes the error messages!
+        # and the ClassFileFormatException is not kept as a cause
+        class_name = CODE_GENERATION_TRACE_CLASS_NAME
+        method_name = CODE_GENERATION_TRACE_METHOD_NAME
+        for trace in exception.getStackTrace()
+          if class_name == trace.class_name && method_name == trace.method_name
+            return true
+          end
+        end
+      end
+      false
+    end
+
   end
 
   class IOReader < java.io.Reader # :nodoc:

data/lib/rhino/deprecations.rb

@@ -1,9 +1,9 @@
 
 module Rhino
   
-  @@stub_class = Class.new(Object)
+  @@stub_class = Class.new(Object) # :nodoc
   
-  def self.const_missing(name)
+  def self.const_missing(name) # :nodoc
     case name.to_s
     when 'J' then
       warn "[DEPRECATION] `Rhino::J` is deprecated, use `Rhino::JS` instead."
@@ -21,30 +21,19 @@ module Rhino
     end
   end
   
-  @@warnings = {}
-  
-  def self.warn(msg)
-    # only print out deprecation warnings once
-    if msg[0, 13] == '[DEPRECATION]'
-      return nil if @@warnings[msg]
-      @@warnings[msg] = true
-    end
-    super # Kernel.warn
-  end
-  
-  module To
+  module To # :nodoc
   
     extend self
 
-    # @deprecated use {#to_ruby} instead
+    # #deprecated use {Rhino#to_ruby} instead
     def self.ruby(object)
-      Rhino.warn "[DEPRECATION] `Rhino::To.ruby` is deprecated, use `Rhino.to_ruby` instead."
+      warn "[DEPRECATION] `Rhino::To.ruby` is deprecated, use `Rhino.to_ruby` instead."
       to_ruby(object)
     end
 
-    # @deprecated use {#to_javascript} instead
+    # #deprecated use {Rhino#to_javascript} instead
     def self.javascript(object, scope = nil) 
-      Rhino.warn "[DEPRECATION] `Rhino::To.javascript` is deprecated, use `Rhino.to_javascript` instead."
+      warn "[DEPRECATION] `Rhino::To.javascript` is deprecated, use `Rhino.to_javascript` instead."
       to_javascript(object, scope)
     end
   

data/lib/rhino/rhino_ext.rb

@@ -80,6 +80,14 @@ class Java::OrgMozillaJavascript::ScriptableObject
     hash
   end
 
+  def ==(other)
+    equivalentValues(other) == true # JS ==
+  end
+
+  def eql?(other)
+    self.class == other.class && self.==(other)
+  end
+
   # Convert this javascript object into a json string.
   def to_json(*args)
     to_h.to_json(*args)
@@ -91,7 +99,7 @@ class Java::OrgMozillaJavascript::ScriptableObject
   def inspect
     toString
   end
-  
+
   # Delegate methods to JS object if possible when called from Ruby.
   def method_missing(name, *args)
     name_str = name.to_s
@@ -147,6 +155,22 @@ class Java::OrgMozillaJavascript::NativeObject
     ScriptableObject.putProperty(self, key.to_s, Rhino.to_javascript(value, scope))
   end
   
+  def ==(other)
+    return true if super
+    if other.is_a?(Hash) || other.is_a?(java.util.Map)
+      for key, val in other
+        return false if self[key] != val
+      end
+      return true
+    end
+    false
+  end
+
+  # NOTE: need to re-implement this as JRuby 1.7.1 seems to be not routing to super
+  def eql?(other) # :nodoc
+    self.class == other.class && self.==(other)
+  end
+
 end
 
 # The base class for all JavaScript function objects.
@@ -165,7 +189,8 @@ class Java::OrgMozillaJavascript::BaseFunction
     # 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)
-    __call__(context, scope, this, Rhino.args_to_javascript(args, scope))
+    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

data/lib/rhino/ruby.rb

@@ -176,7 +176,11 @@ module Rhino
 
       # override Object BaseFunction#call(Context context, Scriptable scope, 
       #                                   Scriptable thisObj, Object[] args)
-      def call(context, scope, this, args)
+      def call(*args)
+        unless args.first.is_a?(JS::Context)
+          return super # assume a Ruby #call
+        end
+        _, scope, this, args = *args # Java Function#call dispatch
         args = args.to_a # java.lang.Object[] -> Array
         # JS function style :
         if ( arity = @callable.arity ) != -1 # (a1, *a).arity == -2
@@ -268,8 +272,8 @@ module Rhino
     
   end
   
-  RubyObject = Ruby::Object
-  RubyFunction = Ruby::Function
-  RubyConstructor = Ruby::Constructor
+  RubyObject = Ruby::Object # :nodoc
+  RubyFunction = Ruby::Function # :nodoc
+  RubyConstructor = Ruby::Constructor # :nodoc
   
 end

data/lib/rhino/version.rb

@@ -1,3 +1,3 @@
 module Rhino
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/spec/rhino/context_spec.rb

@@ -140,4 +140,45 @@ describe Rhino::Context do
     }.should raise_error(Rhino::RunawayScriptError)
   end
   
+  it "allows to set (default) optimization level" do
+    context = Rhino::Context.new :optimization_level => 2
+    context.eval %Q{ for (var i = 0; i < 42; i++) Number(i).toString(); }
+    context.optimization_level.should == 2
+    begin
+      Rhino::Context.default_optimization_level = 3
+      context = Rhino::Context.new
+      context.eval %Q{ for (var i = 0; i < 42; i++) Number(i).toString(); }
+      context.optimization_level.should == 3
+    ensure
+      Rhino::Context.default_optimization_level = nil
+    end
+  end
+
+  it "allows to set (default) language version" do
+    context = Rhino::Context.new :javascript_version => '1.6'
+    context.javascript_version.should == 1.6
+    begin
+      Rhino::Context.default_javascript_version = '1.5'
+      context = Rhino::Context.new
+      context.javascript_version.should == 1.5
+    ensure
+      Rhino::Context.default_javascript_version = nil
+    end
+  end
+
+  it "handles code generation error when 'generated bytecode for method exceeds 64K limit'" do
+    context = Rhino::Context.new
+    
+    big_script = ''
+    10000.times { |i| big_script << "var s#{i} = '#{i}';\n" }
+    10000.times { |i| big_script << "var n#{i} = +#{i} ;\n" }
+
+    lambda {
+      context.eval big_script
+    }.should_not raise_error
+
+    context.eval('( s9999 )').should == '9999'
+    context.eval('( n9999 )').should == +9999
+  end
+
 end

data/spec/rhino/rhino_ext_spec.rb

@@ -87,14 +87,14 @@ describe "NativeObject (scoped)" do
   
   before do
     factory = Rhino::JS::ContextFactory.new
-    context, scope = nil, nil
+    @context, @scope = nil, nil
     factory.call do |ctx|
-      context = ctx
-      scope = context.initStandardObjects(nil, false)
+      @context = ctx
+      @scope = @context.initStandardObjects(nil, false)
     end
-    factory.enterContext(context)
+    factory.enterContext(@context)
     
-    @object = context.newObject(scope)
+    @object = @context.newObject(@scope)
   end
   
   after do
@@ -104,7 +104,7 @@ describe "NativeObject (scoped)" do
   it_should_behave_like 'ScriptableObject'  
   
   it 'routes rhino methods' do
-    @object.prototype.should == {}
+    @object.prototype.should_not be nil
     @object.getTypeOf.should == 'object'
   end
   
@@ -128,6 +128,35 @@ describe "NativeObject (scoped)" do
     @object.foo.should == 42
   end
   
+  it 'is == to an empty Hash / Map' do
+    ( @object == {} ).should be true
+    ( @object == java.util.HashMap.new ).should be true
+  end
+
+  it 'is === to an empty Hash' do
+    ( @object === {} ).should be true
+  end
+
+  it 'is not eql? to an empty Hash / Map' do
+    ( @object.eql?( {} ) ).should be false
+    ( @object.eql?( java.util.HashMap.new ) ).should be false
+  end
+
+  it 'is eql? to another native object' do
+    object = @context.newObject(scope)
+    ( @object.eql?( object ) ).should be true
+    ( object.eql?( @object ) ).should be true
+    ( @object == object ).should be true
+    ( object === @object ).should be true
+  end
+
+  it 'native objects with same values are equal' do
+    obj1 = @context.evaluateString @scope, "( { ferko: 'suska', answer: 42 } )", '<eval>', 0, nil
+    obj2 = @context.evaluateString @scope, "var obj = {}; obj['answer'] = 42; obj.ferko = 'suska'; obj", '<eval>', 0, nil
+    ( obj1 == obj2 ).should be true
+    ( obj1.eql?( obj2 ) ).should be true
+  end
+
 end
 
 describe "NativeFunction" do
@@ -158,10 +187,22 @@ describe "NativeFunction" do
   
   it_should_behave_like 'ScriptableObject'
   
-  it 'is callable' do
+  it 'is (Ruby) callable' do
     # NOTE: no implicit or bound this thus this === global
     @object.call.should == '[object global]'
   end
+
+  it 'is (Ruby) callable passing arguments' do
+    js = "( function foo(arg) { return 'foo' + arg; } )"
+    foo = @context.evaluateString(@scope, js, '<eval>', 0, nil)
+    foo.call(42).should == 'foo42'
+  end
+
+  it 'is (Ruby) callable converting result' do
+    js = "( function foo(arg) { return [ 1, 2, arg ]; } )"
+    foo = @context.evaluateString(@scope, js, '<eval>', 0, nil)
+    foo.call('x').should == [ 1, 2, 'x' ]
+  end
   
   it 'might be bind and called' do
     @object.bind(@object).should be_a(Rhino::JS::Function)
@@ -208,14 +249,14 @@ describe "NativeFunction (constructor)" do
   
   before do
     factory = Rhino::JS::ContextFactory.new
-    context, scope = nil, nil
+    @context, @scope = nil, nil
     factory.call do |ctx|
-      context = ctx
-      scope = context.initStandardObjects(nil, false)
+      @context = ctx
+      @scope = @context.initStandardObjects(nil, false)
     end
-    factory.enterContext(context)
+    factory.enterContext(@context)
     
-    @object = Rhino::JS::ScriptableObject.getProperty(context.newObject(scope), 'constructor')
+    @object = Rhino::JS::ScriptableObject.getProperty(@context.newObject(@scope), 'constructor')
     @object.instance_eval do
       def to_h_properties
         h = {
@@ -248,7 +289,21 @@ describe "NativeFunction (constructor)" do
   it_should_behave_like 'ScriptableObject'
   
   it 'is constructable' do
-    @object.new.should == {}
+    @object.new.should be_a Rhino::JS::NativeObject
   end
   
+  it 'is not equal to an empty Hash' do
+    ( @object == {} ).should be false
+    ( @object === {} ).should be false
+    ( @object.eql?( {} ) ).should be false
+  end
+
+  it 'empty functions are not considered equal' do
+    fn1 = @context.evaluateString @scope, "( function() {} )", '<eval>', 0, nil
+    fn2 = @context.evaluateString @scope, "var f = function() {}", '<eval>', 0, nil
+    ( fn1 == fn2 ).should be false
+    ( fn1 === fn2 ).should be false
+    ( fn1.eql?( fn2 ) ).should be false
+  end
+
 end

data/spec/rhino/ruby_spec.rb

@@ -172,13 +172,23 @@ describe Rhino::Ruby::Function do
   end
   
   it_should_behave_like Rhino::Ruby::Scriptable
+  
+  it "is (JavaScript) callable as a function" do
+    rb_function = Rhino::Ruby::Function.wrap 'foo'.method(:upcase)
+    this = nil; args = nil
+    rb_function.call(context, scope, this, args).should == 'FOO'
+  end
 
-  it "is callable as a function" do
-    rb_function = Rhino::Ruby::Function.wrap method = 'foo'.method(:to_s)
-    context = nil; scope = nil; this = nil; args = nil
-    rb_function.call(context, scope, this, args).should == 'foo'
+  it 'is Ruby callable' do
+    rb_function = Rhino::Ruby::Function.wrap 'foo'.method(:upcase)
+    rb_function.call.should == 'FOO'
   end
 
+  it 'is Ruby callable passing arguments' do
+    rb_function = Rhino::Ruby::Function.wrap 'foo'.method(:scan)
+    rb_function.call('o').should == ['o', 'o']
+  end
+  
   it "args get converted before delegating a ruby function call" do
     klass = Class.new(Object) do
       def foo(array)
@@ -186,7 +196,7 @@ describe Rhino::Ruby::Function do
       end
     end
     rb_function = Rhino::Ruby::Function.wrap method = klass.new.method(:foo)
-    context = nil; scope = nil; this = nil
+    this = nil
     args = [ '1'.to_java, java.lang.String.new('2') ].to_java
     args = [ Rhino::JS::NativeArray.new(args) ].to_java
     rb_function.call(context, scope, this, args).should be(true)
@@ -199,7 +209,7 @@ describe Rhino::Ruby::Function do
       end
     end
     rb_function = Rhino::Ruby::Function.wrap method = klass.new.method(:foo)
-    context = nil; scope = nil; this = nil; args = [].to_java
+    this = nil; args = [].to_java
     rb_function.call(context, scope, this, args).should be_a(Rhino::JS::NativeArray)
   end
 
@@ -209,8 +219,8 @@ describe Rhino::Ruby::Function do
         a1
       end
     end
-    rb_function = Rhino::Ruby::Function.wrap method = klass.new.method(:foo)
-    context = nil; scope = nil; this = nil
+    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
@@ -224,7 +234,7 @@ describe Rhino::Ruby::Function do
       end
     end
     rb_function = Rhino::Ruby::Function.wrap klass.new.method(:foo)
-    context = nil; scope = nil; this = nil
+    this = nil
     
     args = [ 1.to_java ].to_java; js_return = nil
     lambda { js_return = rb_function.call(context, scope, this, args) }.should_not raise_error
@@ -242,7 +252,7 @@ describe Rhino::Ruby::Function do
       end
     end
     rb_function = Rhino::Ruby::Function.wrap klass.new.method(:foo)
-    context = nil; scope = nil; this = nil
+    this = nil
 
     args = [ ].to_java; js_return = nil
     lambda { js_return = rb_function.call(context, scope, this, args) }.should_not raise_error
@@ -292,22 +302,11 @@ describe Rhino::Ruby::Function do
   
   describe 'with scope' do
     
-    before do
-      factory = Rhino::JS::ContextFactory.new
-      context = nil
-      factory.call do |ctx|
-        context = ctx
-        @scope = context.initStandardObjects(nil, false)
-      end
-      factory.enterContext(context)
-    end
-
-    after do
-      Rhino::JS::Context.exit
-    end
+    before { context_factory.enterContext(context) }
+    after { Rhino::JS::Context.exit }
     
     it "sets up correct prototype" do
-      rb_function = Rhino::Ruby::Function.wrap 'foo'.method(:concat), @scope
+      rb_function = Rhino::Ruby::Function.wrap 'foo'.method(:concat), scope
       rb_function.getPrototype.should_not be(nil)
       rb_function.getPrototype.should be_a(Rhino::JS::Function)
     end
@@ -338,7 +337,7 @@ describe Rhino::Ruby::Constructor do
   
   it "is callable as a function" do
     rb_new = Rhino::Ruby::Constructor.wrap Foo
-    context = nil; scope = nil; this = nil; args = nil
+    this = nil; args = nil
     rb_new.call(context, scope, this, args).should be_a(Rhino::Ruby::Object)
     rb_new.call(context, scope, this, args).unwrap.should be_a(Foo)
   end
@@ -398,7 +397,7 @@ describe Rhino::Ruby::Exception do
       end
     end
     rb_function = Rhino::Ruby::Function.wrap klass.new.method(:foo)
-    context = nil; scope = nil; this = nil; args = [ 42.to_java ].to_java
+    this = nil; args = [ 42.to_java ].to_java
     begin
       rb_function.call(context, scope, this, args)
     rescue java.lang.Exception => e

data/spec/rhino/wormhole_spec.rb

@@ -168,12 +168,12 @@ describe Rhino::To do
     it "converts procs and methods into native functions" do
       Rhino.to_javascript(lambda {|lhs,rhs| lhs * rhs}).tap do |f|
         f.should be_kind_of(Rhino::JS::Function)
-        f.call(nil, nil, nil, [7, 6].to_java).should be(42)
+        f.call(context, scope, nil, [7, 6].to_java).should be(42)
       end
       
       Rhino.to_javascript("foo,bar,baz".method(:split)).tap do |f|
         f.should be_kind_of(Rhino::JS::Function)
-        Rhino.to_ruby(f.call(nil, nil, nil, [','].to_java)).should == ['foo', 'bar', 'baz']
+        Rhino.to_ruby(f.call(context, scope, nil, [','].to_java)).should == ['foo', 'bar', 'baz']
       end
     end
 

data/spec/spec_helper.rb

@@ -10,6 +10,26 @@ module RedJS
   Error = Rhino::JSError
 end
 
+module Rhino
+  module SpecHelpers
+    
+    def context_factory
+      @context_factory ||= Rhino::JS::ContextFactory.new
+    end
+    
+    def context
+      @context || context_factory.call { |ctx| @context = ctx }
+      @context
+    end
+
+    def scope
+      context.initStandardObjects(nil, false)
+    end
+    
+  end
+end
+
 RSpec.configure do |config|
-  config.filter_run_excluding :compat => /(0.5.0)|(0.6.0)/
+  config.filter_run_excluding :compat => /(0.5.0)|(0.6.0)/ # RedJS
+  config.include Rhino::SpecHelpers
 end

metadata

@@ -1,142 +1,148 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: therubyrhino
-version: !ruby/object:Gem::Version
-  prerelease:
-  version: 2.0.1
+version: !ruby/object:Gem::Version 
+  prerelease: 
+  version: 2.0.2
 platform: ruby
-authors:
-- Charles Lowell
-autorequire:
+authors: 
+  - Charles Lowell
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-24 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: therubyrhino_jar
-  version_requirements: &3954 !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.7.3
-    none: false
-  requirement: *3954
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rake
-  version_requirements: &3972 !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  requirement: *3972
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
-  version_requirements: &3990 !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.10'
-    none: false
-  requirement: *3990
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  name: mocha
-  version_requirements: &4006 !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  requirement: *4006
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  name: jruby-openssl
-  version_requirements: &4022 !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  requirement: *4022
-  prerelease: false
-  type: :development
+
+date: 2012-12-05 00:00:00 Z
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: therubyrhino_jar
+    version_requirements: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.7.3
+    requirement: *id001
+    prerelease: false
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: rake
+    version_requirements: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    requirement: *id002
+    prerelease: false
+    type: :development
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    version_requirements: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: "2.10"
+    requirement: *id003
+    prerelease: false
+    type: :development
+  - !ruby/object:Gem::Dependency 
+    name: mocha
+    version_requirements: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    requirement: *id004
+    prerelease: false
+    type: :development
+  - !ruby/object:Gem::Dependency 
+    name: jruby-openssl
+    version_requirements: &id005 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    requirement: *id005
+    prerelease: false
+    type: :development
 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: []
-extra_rdoc_files:
-- README.rdoc
-files:
-- .gitignore
-- .travis.yml
-- Gemfile
-- History.txt
-- README.rdoc
-- Rakefile
-- lib/rhino.rb
-- lib/rhino/context.rb
-- lib/rhino/deprecations.rb
-- lib/rhino/error.rb
-- lib/rhino/object.rb
-- lib/rhino/rhino_ext.rb
-- lib/rhino/ruby.rb
-- lib/rhino/ruby/access.rb
-- lib/rhino/ruby/attribute_access.rb
-- lib/rhino/ruby/default_access.rb
-- lib/rhino/version.rb
-- lib/rhino/wormhole.rb
-- spec/rhino/access_spec.rb
-- spec/rhino/context_spec.rb
-- spec/rhino/deprecations_spec.rb
-- spec/rhino/error_spec.rb
-- spec/rhino/integration/bar.js
-- spec/rhino/integration/foo.js
-- spec/rhino/integration/index.js
-- spec/rhino/integration/loop.js
-- spec/rhino/integration/loop/element1.js
-- spec/rhino/integration/loop/element2.js
-- spec/rhino/integration_spec.rb
-- spec/rhino/redjs_spec.rb
-- spec/rhino/rhino_ext_spec.rb
-- spec/rhino/ruby_spec.rb
-- spec/rhino/wormhole_spec.rb
-- spec/spec_helper.rb
-- therubyrhino.gemspec
+
+extra_rdoc_files: 
+  - README.rdoc
+files: 
+  - .gitignore
+  - .travis.yml
+  - Gemfile
+  - History.txt
+  - README.rdoc
+  - Rakefile
+  - lib/rhino.rb
+  - lib/rhino/context.rb
+  - lib/rhino/deprecations.rb
+  - lib/rhino/error.rb
+  - lib/rhino/object.rb
+  - lib/rhino/rhino_ext.rb
+  - lib/rhino/ruby.rb
+  - lib/rhino/ruby/access.rb
+  - lib/rhino/ruby/attribute_access.rb
+  - lib/rhino/ruby/default_access.rb
+  - lib/rhino/version.rb
+  - lib/rhino/wormhole.rb
+  - spec/rhino/access_spec.rb
+  - spec/rhino/context_spec.rb
+  - spec/rhino/deprecations_spec.rb
+  - spec/rhino/error_spec.rb
+  - spec/rhino/integration/bar.js
+  - spec/rhino/integration/foo.js
+  - spec/rhino/integration/index.js
+  - spec/rhino/integration/loop.js
+  - spec/rhino/integration/loop/element1.js
+  - spec/rhino/integration/loop/element2.js
+  - spec/rhino/integration_spec.rb
+  - spec/rhino/redjs_spec.rb
+  - spec/rhino/rhino_ext_spec.rb
+  - spec/rhino/ruby_spec.rb
+  - spec/rhino/wormhole_spec.rb
+  - spec/spec_helper.rb
+  - therubyrhino.gemspec
 homepage: http://github.com/cowboyd/therubyrhino
 licenses: []
-post_install_message:
+
+post_install_message: 
 rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2
-      version: '0'
+
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2
-      version: '0'
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
+        version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
+        version: "0"
 requirements: []
+
 rubyforge_project: therubyrhino
-rubygems_version: 1.8.15
-signing_key:
+rubygems_version: 1.8.24
+signing_key: 
 specification_version: 3
 summary: Embed the Rhino JavaScript interpreter into JRuby
 test_files: []
-...
+