rjb 1.2.5 → 1.2.6

data/ChangeLog

@@ -1,3 +1,13 @@
+Thu Jul 22 arton
+ *ext/rjb.c
+	RJB_VERSION -> 1.2.6
+	export jv2rv for rjbexception.c
+ *ext/rjb.h
+	export jv2rv for rjbexception.c
+ *ext/rjbexception.c
+	create and keep java exception object for its properties.
+ *test/test.rb
+	add Exception#cause test
 Wed Jun 9 arton
  *ext/load.c
 	accept JAVA_HOME having an extra slash at the end

data/ext/load.c

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: load.c 119 2010-06-04 12:51:34Z arton $
+ * $Id: load.c 124 2010-06-08 18:24:45Z arton $
  */
 
 #include <stdlib.h>

data/ext/rjb.c

@@ -12,10 +12,10 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjb.c 122 2010-06-05 03:08:29Z arton $
+ * $Id: rjb.c 126 2010-07-22 13:58:15Z arton $
  */
 
-#define RJB_VERSION "1.2.5"
+#define RJB_VERSION "1.2.6"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -303,7 +303,7 @@ static VALUE jv2rv_r(JNIEnv* jenv, jvalue val)
     return v;
 }
 
-static VALUE jv2rv(JNIEnv* jenv, jvalue val)
+VALUE jv2rv(JNIEnv* jenv, jvalue val)
 {
     if (RTEST(primitive_conversion))
     {

data/ext/rjb.h

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjb.h 120 2010-06-05 03:02:06Z arton $
+ * $Id: rjb.h 126 2010-07-22 13:58:15Z arton $
  * $Log: rjb.h,v $
  * Revision 1.1  2005/01/16 17:36:10  arton
  * Initial revision
@@ -73,6 +73,7 @@ extern jclass rjb_find_class(JNIEnv* jenv, VALUE name);
 extern void rjb_release_string(JNIEnv *jenv, jstring str, const char* chrs);
 extern VALUE rjb_load_vm_default();
 extern VALUE rjb_safe_funcall(VALUE args);
+extern VALUE jv2rv(JNIEnv* jenv, jvalue val);
 
 /* in rjbexception.c */
 extern VALUE rjb_get_exception_class(JNIEnv* jenv, jstring str);

data/ext/rjbexception.c

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjbexception.c 119 2010-06-04 12:51:34Z arton $
+ * $Id: rjbexception.c 126 2010-07-22 13:58:15Z arton $
  */
 
 #include "ruby.h"
@@ -26,6 +26,12 @@
 #include "riconv.h"
 #include "rjb.h"
 
+static VALUE missing_delegate(int argc, VALUE* argv, VALUE self)
+{
+    ID rmid = rb_to_id(argv[0]);
+    return rb_funcall(rb_ivar_get(self, rb_intern("@cause")), rmid, argc - 1, argv + 1);
+}
+
 /*
  * handle Java exception
  *  At this time, the Java exception is defined without the package name.
@@ -54,6 +60,7 @@ VALUE rjb_get_exception_class(JNIEnv* jenv, jstring str)
     if (rexp == Qnil)
     {
 	rexp = rb_define_class(pcls, rb_eStandardError);
+        rb_define_method(rexp, "method_missing", missing_delegate, -1);
 #if defined(HAVE_RB_HASH_ASET) || defined(RUBINIUS)
 	rb_hash_aset(rjb_loaded_classes, cname, rexp);
 #else
@@ -137,11 +144,16 @@ void rjb_check_exception(JNIEnv* jenv, int t)
 	    }
 	    if (rexp == Qnil)
 	    {
+                (*jenv)->DeleteLocalRef(jenv, exp);
 		rb_raise(rb_eRuntimeError, "%s", msg);
 	    }
 	    else
 	    {
-                rb_raise(rexp, "%s", msg);
+                VALUE rexpi = rb_funcall(rexp, rb_intern("new"), 1, rb_str_new2(msg));
+                jvalue val;
+                val.l = exp;
+                rb_ivar_set(rexpi, rb_intern("@cause"), jv2rv(jenv, val));
+                rb_exc_raise(rexpi);
 	    }
         }
     }

data/test/test.rb

@@ -1,6 +1,6 @@
 #!/usr/local/env ruby -Ku
 # encoding: utf-8
-# $Id: test.rb 111 2010-05-12 12:34:28Z arton $
+# $Id: test.rb 126 2010-07-22 13:58:15Z arton $
 
 begin
   require 'rjb'
@@ -286,6 +286,7 @@ class TestRjb < Test::Unit::TestCase
       @jInteger.parseInt('blabla')
       flunk('no exception')
     rescue NumberFormatException => e
+      assert_nil(e.cause)
       # OK
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rjb
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 2
-  - 5
-  version: 1.2.5
+  - 6
+  version: 1.2.6
 platform: ruby
 authors: 
 - arton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-09 00:00:00 +09:00
+date: 2010-07-22 00:00:00 +09:00
 default_executable: 
 dependencies: []