therubyrhino 2.0.3 → 2.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: eee1c4a4933c0a914ccffeb49c390807403d25e1
+  data.tar.gz: 38c583809186d31db93ff6f5ddcfa996532a181c
+SHA512:
+  metadata.gz: 001058b9b1923bb6f29c21ba8e0c1a007c54057a7307f4d0c4e12681073b050c4ffe9420921b0431696e44a2cddf1f7bf2ad4e61d6c76dcf6cc3500af1ef0bf1
+  data.tar.gz: 3dba6c0a9383181e58534561860f29be78e85b524b9ccfc7f29c97eadf2511ac8e77f1521d29781d2b6ac5976c5f82cc1d61695819f728ba7050899b9c498230

data/lib/rhino/context.rb

@@ -46,23 +46,23 @@ module Rhino
       def eval(javascript)
         new.eval(javascript)
       end
-      
+
     end
-    
+
     @@default_factory = nil
     def self.default_factory
       @@default_factory ||= ContextFactory.new
     end
-    
+
     def self.default_factory=(factory)
       @@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
@@ -71,35 +71,22 @@ module Rhino
     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.
     # * <tt>:sealed</tt> - if this is true, then the standard objects such as Object, Function, Array will not be able to be modified
     # * <tt>:with</tt> - use this ruby object as the root scope for all javascript that is evaluated
     # * <tt>:java</tt> - if true, java packages will be accessible from within javascript
     def initialize(options = {}) #:nodoc:
-      factory = options[:factory] || 
+      factory = options[:factory] ||
         (options[:restrictable] ? RestrictableContextFactory.instance : self.class.default_factory)
-      factory.call do |context|
-        @native = context
-        @global = @native.initStandardObjects(nil, options[:sealed] == true)
-        if with = options[:with]
-          @scope = Rhino.to_javascript(with)
-          @scope.setParentScope(@global)
-        else
-          @scope = @global
-        end
-        unless options[:java]
-          for package in ["Packages", "java", "javax", "org", "com", "edu", "net"]
-            @global.delete(package)
-          end
-        end
-      end
+      @options = options
+      factory.call(self) # org.mozilla.javascript.ContextAction (invokes #run)
       if optimization_level = options[:optimization_level] || self.class.default_optimization_level
         self.optimization_level = optimization_level
       end
@@ -108,12 +95,32 @@ module Rhino
       end
       yield(self) if block_given?
     end
-    
+
+    include JS::ContextAction
+
+    # org.mozilla.javascript.ContextAction public Object run(Context context);
+    def run(context) # :nodoc:
+      @native = context
+      @global = @native.initStandardObjects(nil, @options[:sealed] == true)
+      if with = @options[:with]
+        @scope = Rhino.to_javascript(with)
+        @scope.setParentScope(@global)
+      else
+        @scope = @global
+      end
+      unless @options[:java]
+        @global.delete('Packages')
+        @global.delete('java'); @global.delete('javax')
+        @global.delete('org'); @global.delete('com')
+        @global.delete('edu'); @global.delete('net')
+      end
+    end
+
     # Returns the ContextFactory used while creating this context.
     def factory
       @native.getFactory
     end
-    
+
     # Read a value from the global scope of this context
     def [](key)
       @scope[key]
@@ -139,7 +146,7 @@ module Rhino
         Rhino.to_ruby(result)
       end
     end
-    
+
     def evaluate(*args) # :nodoc:
       eval(*args) # an alias
     end
@@ -161,11 +168,11 @@ module Rhino
     def restrictable?
       @native.is_a?(RestrictableContextFactory::Context)
     end
-    
+
     def instruction_limit
       restrictable? ? @native.instruction_limit : false
     end
-    
+
     # Set the maximum number of instructions that this context will execute.
     # If this instruction limit is exceeded, then a #Rhino::RunawayScriptError
     # will be raised.
@@ -173,7 +180,7 @@ module Rhino
       if restrictable?
         @native.instruction_limit = limit
       else
-        raise "setting an instruction_limit has no effect on this context, use " + 
+        raise "setting an instruction_limit has no effect on this context, use " <<
               "Context.open(:restrictable => true) to gain a restrictable instance"
       end
     end
@@ -181,7 +188,7 @@ module Rhino
     def timeout_limit
       restrictable? ? @native.timeout_limit : false
     end
-    
+
     # Set the duration (in seconds e.g. 1.5) this context is allowed to execute.
     # After the timeout passes (no matter if any JS has been evaluated) and this
     # context is still attempted to run code, a #Rhino::ScriptTimeoutError will
@@ -190,15 +197,15 @@ module Rhino
       if restrictable?
         @native.timeout_limit = limit
       else
-        raise "setting an timeout_limit has no effect on this context, use " + 
+        raise "setting an timeout_limit has no effect on this context, use " <<
               "Context.open(:restrictable => true) to gain a restrictable instance"
       end
     end
-    
+
     def optimization_level
       @native.getOptimizationLevel
     end
-    
+
     # Set the optimization level that this context will use. This is sometimes necessary
     # in Rhino, if the bytecode size of the compiled javascript exceeds the 64KB limit.
     # By using the -1 optimization level, you tell Rhino to run in interpretative mode,
@@ -213,7 +220,7 @@ module Rhino
       end
     end
 
-    # Get the JS interpreter version. 
+    # Get the JS interpreter version.
     # Returns a number e.g. 1.7, nil if unknown and 0 for default.
     def javascript_version
       case const_value = @native.getLanguageVersion
@@ -223,7 +230,7 @@ module Rhino
       end
     end
     alias :version :javascript_version
-    
+
     # Sets interpreter mode a.k.a. JS language version e.g. 1.7 (if supported).
     def javascript_version=(version)
       const = version.to_s.gsub('.', '_').upcase
@@ -237,9 +244,9 @@ module Rhino
         nil
       end
     end
-    alias :version= :javascript_version= 
-    
-    # Enter this context for operations. 
+    alias :version= :javascript_version=
+
+    # Enter this context for operations.
     # Some methods such as eval() will fail unless the context is open.
     def open(&block)
       do_open(&block)
@@ -251,9 +258,9 @@ module Rhino
       end
       raise Rhino::JSError.new(e)
     end
-    
+
     private
-    
+
     def do_open # :nodoc
       factory.enterContext(@native)
       begin
@@ -262,7 +269,7 @@ module Rhino
         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
@@ -316,7 +323,7 @@ module Rhino
         return jstr.length
       end
     end
-    
+
   end
 
   ContextFactory = JS::ContextFactory # :nodoc: backward compatibility
@@ -327,24 +334,24 @@ module Rhino
     def self.instance
       @@instance ||= new
     end
-    
+
     # protected Context makeContext()
     def makeContext
       Context.new(self)
     end
-    
+
     # protected void observeInstructionCount(Context context, int instructionCount)
     def observeInstructionCount(context, count)
       context.check!(count) if context.is_a?(Context)
     end
-    
-    # protected Object doTopCall(Callable callable, Context context, 
+
+    # protected Object doTopCall(Callable callable, Context context,
     #                            Scriptable scope, Scriptable thisObj, Object[] args)
     def doTopCall(callable, context, scope, this, args)
       context.reset! if context.is_a?(Context)
       super
     end
-    
+
     class Context < JS::Context # :nodoc:
 
       def initialize(factory)
@@ -353,7 +360,7 @@ module Rhino
       end
 
       attr_reader :instruction_limit
-      
+
       def instruction_limit=(limit)
         treshold = getInstructionObserverThreshold
         if limit && (treshold == 0 || treshold > limit)
@@ -363,11 +370,11 @@ module Rhino
       end
 
       attr_reader :instruction_count
-      
+
       TIMEOUT_INSTRUCTION_TRESHOLD = 42
-      
+
       attr_reader :timeout_limit
-      
+
       def timeout_limit=(limit) # in seconds
         treshold = getInstructionObserverThreshold
         if limit && (treshold == 0 || treshold > TIMEOUT_INSTRUCTION_TRESHOLD)
@@ -375,9 +382,9 @@ module Rhino
         end
         @timeout_limit = limit
       end
-      
+
       attr_reader :start_time
-      
+
       def check!(count = nil)
         @instruction_count += count if count
         check_instruction_limit!
@@ -389,7 +396,7 @@ module Rhino
           raise RunawayScriptError, "script exceeded allowable instruction count: #{instruction_limit}"
         end
       end
-      
+
       def check_timeout_limit!(count = nil)
         if timeout_limit
           elapsed_time = Time.now.to_f - start_time.to_f
@@ -410,17 +417,17 @@ module Rhino
           end
         end
       end
-      
+
       def reset!
         @instruction_count = 0
         @start_time = Time.now
         self
       end
-      
+
     end
-    
+
   end
-    
+
   class ContextError < StandardError # :nodoc:
   end
 
@@ -429,5 +436,5 @@ module Rhino
 
   class ScriptTimeoutError < ContextError # :nodoc:
   end
-  
+
 end

data/lib/rhino/version.rb

@@ -1,3 +1,3 @@
 module Rhino
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 end

data/spec/rhino/error_spec.rb

@@ -1,40 +1,40 @@
 require File.expand_path('../spec_helper', File.dirname(__FILE__))
 
 describe Rhino::JSError do
-  
+
   it "works as a StandardError with a message being passed" do
     js_error = Rhino::JSError.new 'an error message'
     lambda { js_error.to_s && js_error.inspect }.should_not raise_error
-    
+
     js_error.cause.should be nil
     js_error.message.should == 'an error message'
     js_error.javascript_backtrace.should be nil
   end
-  
+
   it "might wrap a RhinoException wrapped in a NativeException like error" do
     # JRuby's NativeException.new(rhino_e) does not work as it is
     # intended to handle Java exceptions ... no new on the Ruby side
     native_error_class = Class.new(RuntimeError) do
-      
+
       def initialize(cause)
         @cause = cause
       end
-      
+
       def cause
         @cause
       end
-      
+
     end
-    
+
     rhino_e = Rhino::JS::JavaScriptException.new("42".to_java)
     js_error = Rhino::JSError.new native_error_class.new(rhino_e)
     lambda { js_error.to_s && js_error.inspect }.should_not raise_error
-    
+
     js_error.cause.should be rhino_e
     js_error.message.should == '42'
     js_error.javascript_backtrace.should_not be nil
   end
-  
+
   it "keeps the thrown javascript object value" do
     begin
       Rhino::Context.eval "throw { foo: 'bar' }"
@@ -73,17 +73,17 @@ describe Rhino::JSError do
       fail "expected to rescue"
     end
   end
-  
+
   it "has a correct javascript backtrace" do
     begin
       Rhino::Context.eval "throw 42"
     rescue => e
+      # [ "at <eval>:1", "at org/mozilla/javascript/gen/<eval>:1" ]
       e.javascript_backtrace.should be_a Enumerable
-      e.javascript_backtrace.size.should == 1
+      e.javascript_backtrace.size.should >= 1
       e.javascript_backtrace[0].should == "at <eval>:1"
-      
       e.javascript_backtrace(true).should be_a Enumerable
-      e.javascript_backtrace(true).size.should == 1
+      e.javascript_backtrace(true).size.should >= 1
       element = e.javascript_backtrace(true)[0]
       element.file_name.should == '<eval>'
       element.function_name.should be nil
@@ -97,14 +97,14 @@ describe Rhino::JSError do
     begin
       Rhino::Context.eval "function fortyTwo() { throw 42 }\n fortyTwo()"
     rescue => e
-      e.javascript_backtrace.size.should == 2
+      e.javascript_backtrace.size.should >= 2
       e.javascript_backtrace[0].should == "at <eval>:1 (fortyTwo)"
-      e.javascript_backtrace[1].should == "at <eval>:2"
+      expect( e.javascript_backtrace.find { |trace| trace == "at <eval>:2" } ).to_not be nil
     else
       fail "expected to rescue"
     end
   end
-  
+
   it "backtrace starts with the javascript part" do
     begin
       Rhino::Context.eval "throw 42"
@@ -149,7 +149,7 @@ describe Rhino::JSError do
       fail "expected to rescue"
     end
   end
-  
+
   it "raises correct error from function#apply" do
     begin
       context = Rhino::Context.new
@@ -166,7 +166,7 @@ describe Rhino::JSError do
   it "prints info about nested (ruby) error" do
     context = Rhino::Context.new
     klass = Class.new do
-      def hello(arg = 42) 
+      def hello(arg = 42)
         raise RuntimeError, 'hello' if arg != 42
       end
     end
@@ -189,5 +189,5 @@ describe Rhino::JSError do
     #   from at hi (<eval>:1:28)
     #   from (irb):9
   end
-  
+
 end

metadata

@@ -1,127 +1,122 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: therubyrhino
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 2.0.3
+version: !ruby/object:Gem::Version
+  version: 2.0.4
 platform: ruby
-authors: 
-  - Charles Lowell
-autorequire: 
+authors:
+- Charles Lowell
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2014-02-20 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: rspec
-    version_requirements: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: 2.14.1
-    requirement: *id002
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: mocha
-    version_requirements: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: 0.13.3
-    requirement: *id003
-    prerelease: false
-    type: :development
+date: 2014-07-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: therubyrhino_jar
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.3
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: mocha
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.13.3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.13.3
+  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.md
-files: 
-  - .gitignore
-  - .rspec
-  - .travis.yml
-  - Gemfile
-  - History.md
-  - README.md
-  - 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.md
+files:
+- .gitignore
+- .rspec
+- .travis.yml
+- Gemfile
+- History.md
+- README.md
+- 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: 
-  - MIT
-post_install_message: 
+licenses:
+- MIT
+metadata: {}
+post_install_message:
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  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"
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: therubyrhino
-rubygems_version: 1.8.29
-signing_key: 
-specification_version: 3
+rubygems_version: 2.2.2
+signing_key:
+specification_version: 4
 summary: Embed the Rhino JavaScript interpreter into JRuby
 test_files: []
-