therubyrhino 1.73.3 → 1.73.4

data/Gemfile

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

data/History.txt

@@ -1,3 +1,12 @@
+=== 1.73.4 2012-05-21
+
+* allow rhino.jar path overrides with Rhino::JAR_PATH
+* 'correct' JSError#inspect - show thrown value
+* fix JSError#javascript_backtrace to be an array and add it on top of the 
+  (ruby) backtrace
+* make sure JSError#cause always points to native rhino cause (#19)
+* avoid using instance variables with 'native' JS::Context (JRuby 1.7 warnings)
+
 === 1.73.3 2012-04-23
 RedJS 0.4 compatible
 

data/lib/rhino.rb

@@ -1,9 +1,9 @@
 require 'java'
 
-require 'rhino/rhino-1.7R3.jar'
-
 module Rhino
   
+  require defined?(Rhino::JAR_PATH) ? JAR_PATH : 'rhino/rhino-1.7R3.jar'
+  
   # This module contains all the native Rhino objects implemented in Java
   # e.g. Rhino::JS::NativeObject # => org.mozilla.javascript.NativeObject
   module JS

data/lib/rhino/error.rb

@@ -1,4 +1,3 @@
-
 module Rhino
 
   class JSError < StandardError
@@ -9,9 +8,20 @@ module Rhino
       super(message)
     end
     
+    def inspect
+      "#<#{self.class.name}: #{message}>"
+    end
+    
     # most likely a Rhino::JS::JavaScriptException
     def cause
-      @native.respond_to?(:cause) ? @native.cause : nil
+      return @cause if defined?(@cause)
+      @cause = begin
+        if @native.respond_to?(:cause) && @native.cause
+          @native.cause
+        else
+          @native.is_a?(JS::RhinoException) ? @native : nil
+        end
+      end
     end
 
     def value
@@ -40,10 +50,26 @@ module Rhino
       end
     end
     
-    def javascript_backtrace
-      cause.is_a?(JS::RhinoException) ? cause.getScriptStackTrace : nil
+    def backtrace
+      if js_backtrace = javascript_backtrace
+        js_backtrace.push(*super)
+      else
+        super
+      end
+    end
+    
+    def javascript_backtrace(keep_elements = false)
+      if cause.is_a?(JS::RhinoException)
+        cause.getScriptStack.map do |element| # ScriptStackElement[]
+          keep_elements ? element : element.to_s
+        end
+      else
+        nil
+      end
     end
     
+    Rhino::JS::RhinoException.useMozillaStackStyle(false)
+    
   end
   
 end

data/lib/rhino/rhino_ext.rb

@@ -196,18 +196,35 @@ class Java::OrgMozillaJavascript::BaseFunction
   
 end
 
+class Java::OrgMozillaJavascript::ScriptStackElement
+  
+  def file_name; fileName; end # public final String fileName;
+  def function_name; functionName; end # public final String functionName;
+  def line_number; lineNumber; end # public final int lineNumber;
+  
+  def to_s
+    str = "at #{fileName}"
+    str << ':' << lineNumber.to_s if lineNumber > -1
+    str << " (#{funcionName})" if functionName
+    str
+  end
+  
+end
+
 class Java::OrgMozillaJavascript::Context
   
+  CACHE = java.util.WeakHashMap.new
+  
   def reset_cache!
-    @cache = java.util.WeakHashMap.new
+    CACHE[self] = java.util.WeakHashMap.new
   end
 
   def enable_cache!
-    @cache = nil unless @cache
+    CACHE[self] = nil unless CACHE[self]
   end
 
   def disable_cache!
-    @cache = false
+    CACHE[self] = false
   end
   
   # Support for caching JS data per context.
@@ -217,20 +234,20 @@ class Java::OrgMozillaJavascript::Context
   #       (implementing #equals & #hashCode e.g. RubyStrings will work ...)
   #
   def cache(key)
-    return yield if @cache == false
-    reset_cache! unless @cache
-    fetch(key) || store(key, yield)
+    return yield if (cache = CACHE[self]) == false
+    cache = reset_cache! unless cache
+    fetch(key, cache) || store(key, yield, cache)
   end
     
   private
 
-    def fetch(key)
-      ref = @cache.get(key)
+    def fetch(key, cache = CACHE[self])
+      ref = cache.get(key)
       ref ? ref.get : nil
     end
 
-    def store(key, value)
-      @cache.put(key, java.lang.ref.WeakReference.new(value))
+    def store(key, value, cache = CACHE[self])
+      cache.put(key, java.lang.ref.WeakReference.new(value))
       value
     end
     

data/lib/rhino/version.rb

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

data/spec/rhino/error_spec.rb

@@ -59,5 +59,61 @@ describe Rhino::JSError do
       fail "expected to rescue"
     end
   end
+
+  it "contains the native error as the cause" do
+    begin
+      Rhino::Context.eval "throw 42"
+    rescue => e
+      e.cause.should_not be nil
+      e.cause.should be_a Java::OrgMozillaJavascript::JavaScriptException
+      e.cause.getValue.should == 42
+      e.cause.lineNumber.should == 1
+      e.cause.sourceName.should == '<eval>'
+    else
+      fail "expected to rescue"
+    end
+  end
+  
+  it "has a correct javascript backtrace" do
+    begin
+      Rhino::Context.eval "throw 42"
+    rescue => e
+      e.javascript_backtrace.should be_a Enumerable
+      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
+      element = e.javascript_backtrace(true)[0]
+      element.file_name.should == '<eval>'
+      element.function_name.should be nil
+      element.line_number.should == 1
+    else
+      fail "expected to rescue"
+    end
+  end
+
+  it "backtrace starts with the javascript part" do
+    begin
+      Rhino::Context.eval "throw 42"
+    rescue => e
+      e.backtrace.should be_a Array
+      e.backtrace[0].should == "at <eval>:1"
+      e.backtrace[1].should_not be nil
+    else
+      fail "expected to rescue"
+    end
+  end
+
+  it "inspect shows the javascript value" do
+    begin
+      Rhino::Context.eval "throw '42'"
+    rescue => e
+      e.inspect.should == '#<Rhino::JSError: 42>'
+      e.to_s.should == '42'
+    else
+      fail "expected to rescue"
+    end
+  end
   
 end

data/spec/spec_helper.rb

@@ -8,3 +8,7 @@ module RedJS
   Context = Rhino::Context
   Error = Rhino::JSError
 end
+
+RSpec.configure do |config|
+  config.filter_run_excluding :compat => /(0.5.0)|(0.6.0)/
+end

metadata

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