therubyrhino 1.73.4 → 1.73.5

data/Gemfile

@@ -4,4 +4,4 @@ gemspec
 
 # NOTE: some specs might be excluded @see #spec/spec_helper.rb
 gem 'redjs', :git => 'git://github.com/cowboyd/redjs.git', :group => :test,
-             :ref => "8656639e99d52b8d5414250db2e27db4bb531506"
+             :ref => "b212e50ad347c0d32e53f28d0d627df6b8077e68"

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.73.5 2012-07-25
+
+* #to_s functionName typo fix for org.mozilla.javascript.ScriptStackElement
+* make sure thrown values are correctly raised from inside JS functions
+* a better #inspect for native rhino objects
+* correct JavaScript error handling for Function#apply
+
 === 1.73.4 2012-05-21
 
 * allow rhino.jar path overrides with Rhino::JAR_PATH

data/lib/rhino/rhino_ext.rb

@@ -85,6 +85,13 @@ class Java::OrgMozillaJavascript::ScriptableObject
     to_h.to_json(*args)
   end
   
+  # make sure inspect prints the same as to_s (on --1.8)
+  # otherwise JRuby might play it a little smart e.g. :
+  # "#<#<Class:0xd790a8>:0x557c15>" instead of "Error: bar"
+  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
@@ -159,6 +166,8 @@ class Java::OrgMozillaJavascript::BaseFunction
     # 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))
+  rescue Rhino::JS::JavaScriptException => e
+    raise Rhino::JSError.new(e)
   ensure
     Rhino::JS::Context.exit
   end
@@ -176,6 +185,8 @@ class Java::OrgMozillaJavascript::BaseFunction
   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
   end
@@ -189,6 +200,8 @@ class Java::OrgMozillaJavascript::BaseFunction
     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
   end
@@ -205,7 +218,7 @@ class Java::OrgMozillaJavascript::ScriptStackElement
   def to_s
     str = "at #{fileName}"
     str << ':' << lineNumber.to_s if lineNumber > -1
-    str << " (#{funcionName})" if functionName
+    str << " (#{functionName})" if functionName
     str
   end
   

data/lib/rhino/version.rb

@@ -1,4 +1,3 @@
-
 module Rhino
-  VERSION = "1.73.4"
+  VERSION = "1.73.5"
 end

data/spec/rhino/error_spec.rb

@@ -93,6 +93,18 @@ describe Rhino::JSError do
     end
   end
 
+  it "contains function name in javascript backtrace" do
+    begin
+      Rhino::Context.eval "function fortyTwo() { throw 42 }\n fortyTwo()"
+    rescue => e
+      e.javascript_backtrace.size.should == 2
+      e.javascript_backtrace[0].should == "at <eval>:1 (fortyTwo)"
+      e.javascript_backtrace[1].should == "at <eval>:2"
+    else
+      fail "expected to rescue"
+    end
+  end
+  
   it "backtrace starts with the javascript part" do
     begin
       Rhino::Context.eval "throw 42"
@@ -115,5 +127,18 @@ describe Rhino::JSError do
       fail "expected to rescue"
     end
   end
+
+  it "raises correct error from function#apply" do
+    begin
+      context = Rhino::Context.new
+      context.eval "function foo() { throw 'bar' }"
+      context['foo'].apply(nil)
+    rescue => e
+      e.should be_a Rhino::JSError
+      e.value.should == 'bar'
+    else
+      fail "expected to rescue"
+    end
+  end
   
 end

metadata

@@ -2,7 +2,7 @@
 name: therubyrhino
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.73.4
+  version: 1.73.5
 platform: ruby
 authors: 
   - Charles Lowell
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-21 00:00:00 Z
+date: 2012-07-25 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rake