therubyrhino 1.72.1-jruby → 1.72.2-jruby

data/History.txt

@@ -1,5 +1,9 @@
-=== 1.72.1 2009-10-XX
-* N major enhancements:
+=== 1.72.2 2009-11-10
+* 1 major enhancement:
+  * ability to limit the instruction count for a context
+
+=== 1.72.1 2009-11-09
+* 4 major enhancements:
   * easily manipulate javascript objects from ruby (NativeObject)
   * make NativeObject Enumerable
   * to_h and to_json for NativeObject

data/lib/rhino.rb

@@ -3,7 +3,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 
 module Rhino
-  VERSION = '1.72.1'
+  VERSION = '1.72.2'
   require 'rhino/java'
   require 'rhino/context'
   require 'rhino/wormhole'

data/lib/rhino/context.rb

@@ -1,5 +1,4 @@
 module Rhino
-  
   def function(&impl)
     Function.new &impl
   end
@@ -8,7 +7,7 @@ module Rhino
 
     class << self
       def open
-        J::ContextFactory.new.call do |native|
+        ContextFactory.new.call do |native|
           yield new(native)
         end
       end
@@ -45,6 +44,11 @@ module Rhino
       end
     end
     
+    def instruction_limit=(limit)
+      @native.setInstructionObserverThreshold(limit);
+      @native.factory.instruction_limit = limit
+    end
+    
     def standard
       yield @native.initStandardObjects()
     end
@@ -65,6 +69,17 @@ module Rhino
       '"[Native Function]"'
     end
   end
+  
+  class ContextFactory < J::ContextFactory
+    
+    def observeInstructionCount(cxt, count)
+      raise RunawayScriptError, "script exceeded allowable instruction count" if count > @limit
+    end
+        
+    def instruction_limit=(count)
+      @limit = count
+    end
+  end
     
     
   class RhinoError < StandardError
@@ -80,4 +95,6 @@ module Rhino
       @native.getScriptStackTrace()
     end        
   end
+  
+  class RunawayScriptError < StandardError; end
 end

data/spec/rhino/context_spec.rb

@@ -20,7 +20,7 @@ describe Rhino::Context do
     Context.open do |cxt|
       cxt.init_standard_objects.tap do |scope|
         scope["foo"] = "Hello World"
-        cxt.eval("foo", scope).should == "Hello World"
+        cxt.eval("foo", scope).unwrap.should == "Hello World"
       end
     end
   end  
@@ -91,6 +91,17 @@ describe Rhino::Context do
       end
     end
   end
+  
+  it "can limit the number of instructions that are executed in the context" do
+    lambda {
+      Context.open_std do |cxt, scope|
+        cxt.instruction_limit = 100 * 1000
+        timeout(1) do
+          cxt.eval('while (true);')
+        end
+      end
+    }.should raise_error(Rhino::RunawayScriptError)
+  end
     
   it "has a private constructor" do
     lambda {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: therubyrhino
 version: !ruby/object:Gem::Version 
-  version: 1.72.1
+  version: 1.72.2
 platform: jruby
 authors: 
   - Charles Lowell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-09 00:00:00 -05:00
+date: 2009-11-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency