rjb 1.2.1-x86-mswin32-60 → 1.2.8-x86-mswin32-60

data/ChangeLog

@@ -1,3 +1,68 @@
+Fri Sep 17 arton
+ *test/test.rb
+	sort arguments order for test_java_methods (the order is implement dependent)
+	add fixnum conversion test for 64bit platform (test_64fixnum)
+ *ext/rjb.c
+	RJV_VERSION -> 1.2.8
+	fix rv2jlong bug, the solution was suggested by Ary Borenszweig
+Sun Aug 29 arton
+ *ext/rjb.c
+	ignore no arguments method signature.
+	name base classes under Rjb module.
+ *lib/rjb.rb
+	implements public_methods and methods
+ *test/test.rb
+	add non arguments method sig test
+	add methods, public_methods, java_methods test
+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
+ *ext/rjb.c
+	RJB_VERSION -> 1.2.5
+Fri Jun 5 arton	
+ *ext/rjb.h
+	defin HAVE_LONG_LONG if no HAVE_LONG_LONG but LP64
+ *ext/rjb.c
+	remove unused variables
+	RJB_VERSION -> 1.2.4	
+Fri Jun 4 arton
+ *ext/riconv.c
+	remove unused function if build with Ruby 1.9
+ *ext/rjb.c
+	RJB_VERSION -> 1.2.3	
+	to accomodate with rubinius	
+ *ext/load.c	
+	to accomodate with rubinius	
+ *ext/rjbexception.c
+	to accomodate with rubinius	
+Sun May 30 arton
+ *lib/rjbextension.rb
+	Rjb extension from Andreas Ronge's neo4j
+	- directly import jar by require method
+	- Rjb::import without quotations (Java class as Ruby object)
+ *test/exttest.rb
+	test for rjbextension.rb
+ *test/rjbtest.jar
+	test file for rjbextension.rb
+Sat May 29 arton on behalf of atoulme
+ *ext/rjb.c	
+ *ext/load.c	
+ *ext/rjbexception.c
+	to accomodate with rubinius
+	thanks atoulme !
+Wed May 12 arton
+ *test/test.rb
+	add Class name for TestMixin module because ruby 1.9 doesn't handle the constant.
 Tue May 11 arton
  *ext/rjb.c
 	fix duplicate method registering while no alias.

data/ext/jp_co_infoseek_hp_arton_rjb_RBridge.h

@@ -1,21 +1,21 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class jp_co_infoseek_hp_arton_rjb_RBridge */
-
-#ifndef _Included_jp_co_infoseek_hp_arton_rjb_RBridge
-#define _Included_jp_co_infoseek_hp_arton_rjb_RBridge
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     jp_co_infoseek_hp_arton_rjb_RBridge
- * Method:    call
- * Signature: (Ljava/lang/String;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_jp_co_infoseek_hp_arton_rjb_RBridge_call
-  (JNIEnv *, jobject, jstring, jobject, jobjectArray);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class jp_co_infoseek_hp_arton_rjb_RBridge */
+
+#ifndef _Included_jp_co_infoseek_hp_arton_rjb_RBridge
+#define _Included_jp_co_infoseek_hp_arton_rjb_RBridge
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     jp_co_infoseek_hp_arton_rjb_RBridge
+ * Method:    call
+ * Signature: (Ljava/lang/String;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_jp_co_infoseek_hp_arton_rjb_RBridge_call
+  (JNIEnv *, jobject, jstring, jobject, jobjectArray);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

data/ext/load.c

@@ -1,6 +1,6 @@
 /*
  * Rjb - Ruby <-> Java Bridge
- * Copyright(c) 2004,2005,2006,2009 arton
+ * Copyright(c) 2004,2005,2006,2009,2010 arton
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: load.c 105 2010-05-04 00:01:26Z arton $
+ * $Id: load.c 124 2010-06-08 18:24:45Z arton $
  */
 
 #include <stdlib.h>
@@ -104,11 +104,13 @@ static int open_jvm(char* libpath)
     VALUE* argv;
 
     rb_require("dl");
+#if !defined(RUBINIUS)
     if (!rb_const_defined_at(rb_cObject, rb_intern("DL")))
     {
 	rb_raise(rb_eRuntimeError, "Constants DL is not defined.");
 	return 0;
     }
+#endif
     argv = ALLOCA_N(VALUE, 4);
     *argv = rb_const_get(rb_cObject, rb_intern("DL"));
     *(argv + 1) = rb_intern("dlopen");
@@ -146,12 +148,20 @@ static int load_jvm(char* jvmtype)
     }
     else
     {
-        if (strlen(jh) > HOME_NAME_LEN 
-            && strcasecmp(jh + strlen(jh) - HOME_NAME_LEN, HOME_NAME) == 0)
+        if (strlen(jh) > HOME_NAME_LEN)
         {
-            char* p = ALLOCA_N(char, strlen(jh) + 8);
-            sprintf(p, "%s/..", jh);
-            jh = p;
+            int len = strlen(jh);
+            char* p = ALLOCA_N(char, len + 8);
+            jh = strcpy(p, jh);
+            if (*(jh + len - 1) == '/')
+            {
+                --len;
+                *(jh + len) = '\0';
+            }
+            if (strcasecmp(jh + len - HOME_NAME_LEN, HOME_NAME) == 0)
+            {
+                strcpy(p + len, "/..");
+            }
         }
     }
 #endif
@@ -204,8 +214,13 @@ static int load_bridge(JNIEnv* jenv)
     jmethodID getSysLoader = (*jenv)->GetStaticMethodID(jenv, loader,
 		   "getSystemClassLoader", "()Ljava/lang/ClassLoader;");
     jobject iloader = (*jenv)->CallStaticObjectMethod(jenv, loader, getSysLoader);
+#if defined(RUBINIUS)
+    VALUE v = rb_const_get(rb_cObject, rb_intern("RjbConf"));
+    v = rb_const_get(v, rb_intern("BRIDGE_FILE"));
+#else
     VALUE v = rb_const_get_at(rb_const_get(rb_cObject, rb_intern("RjbConf")), 
 			      rb_intern("BRIDGE_FILE"));
+#endif
     bridge = StringValuePtr(v);
 #if defined(DOSISH)
     bridge = ALLOCA_N(char, strlen(bridge) + 8);
@@ -295,7 +310,8 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
             }
 #endif
         }
-#if RJB_RUBY_VERSION_CODE < 190
+ 
+#if RJB_RUBY_VERSION_CODE < 190 && !defined(RUBINIUS)
         ruby_errinfo = Qnil;
 #else
         rb_set_errinfo(Qnil);
@@ -366,4 +382,3 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
     }
     return result;
 }
-

data/ext/riconv.c

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: riconv.c 104 2010-03-16 12:19:18Z arton $
+ * $Id: riconv.c 117 2010-06-04 12:16:25Z arton $
  */
 
 #include "ruby.h"
@@ -43,6 +43,7 @@ static const char* const CS_SJIS = "SHIFT_JIS";
 static const char* const CS_UTF8 = "UTF-8";
 
 
+#if RJB_RUBY_VERSION_CODE < 190
 static VALUE objIconvJ2R;
 static VALUE objIconvR2J;
 static const char* charcode; //is this necessary?
@@ -58,7 +59,9 @@ static int find_table(const char* const str, const char* const table[])
     }
     return 0;
 }
+#endif
 
+#if RJB_RUBY_VERSION_CODE < 190
 static const char* get_charcode_name_by_locale(const char* const name)
 {
     if (find_table(name, LOCALE_UTF8_TABLE))
@@ -119,8 +122,9 @@ static const char* get_charcode_name()
     }
     return result;
 }
+#endif
 
-
+#if RJB_RUBY_VERSION_CODE < 190
 static void reinit()
 {
     charcode = get_charcode_name();
@@ -142,7 +146,9 @@ static void reinit()
         objIconvR2J = objIconvJ2R = Qnil;
     }
 }
+#endif
 
+#if RJB_RUBY_VERSION_CODE < 190
 static void check_kcode()
 {
     VALUE rb_iconv_klass = rb_const_get(rb_cObject, rb_intern("Iconv"));
@@ -161,6 +167,7 @@ static void check_kcode()
         objIconvR2J = objIconvJ2R = Qnil;
     }
 }
+#endif
 
 VALUE exticonv_local_to_utf8(VALUE local_string)
 {

data/ext/rjb.c

@@ -1,6 +1,6 @@
 /*
  * Rjb - Ruby <-> Java Bridge
- * Copyright(c) 2004,2005,2006,2007,2008,2009 arton
+ * Copyright(c) 2004,2005,2006,2007,2008,2009,2010 arton
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -12,10 +12,10 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjb.c 109 2010-05-11 13:04:25Z arton $
+ * $Id: rjb.c 131 2010-09-16 15:53:33Z arton $
  */
 
-#define RJB_VERSION "1.2.1"
+#define RJB_VERSION "1.2.8"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -55,7 +55,14 @@
 #define RJB_LOAD_STATIC_METHOD(var, obj, name, sig) \
     var = (*jenv)->GetStaticMethodID(jenv, obj, name, sig); \
     rjb_check_exception(jenv, 1)
-#define IS_RJB_OBJECT(v) (rb_class_inherited(rjbi, RBASIC(v)->klass) || RBASIC(v)->klass == rjb)
+#if defined(RUBINIUS)
+#define CLASS_NEW(obj, name) rb_define_class_under(rjb, name, obj)
+#define CLASS_INHERITED(spr, kls) rb_funcall(spr, rb_intern("inherited"), 1, kls)
+#else
+#define CLASS_NEW(obj, name) rb_define_class_under(rjb, name, obj)
+#define CLASS_INHERITED(spr, kls) rb_class_inherited(spr, kls)
+#endif
+#define IS_RJB_OBJECT(v) (CLASS_INHERITED(rjbi, rb_obj_class(v)) || rb_obj_class(v) == rjb)
 #define USER_INITIALIZE "@user_initialize"
 
 static void register_class(VALUE, VALUE);
@@ -296,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))
     {
@@ -652,7 +659,7 @@ static void rv2jlong(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, int
     switch (TYPE(val))
     {
     case T_FIXNUM:
-	jv->j = NUM2INT(val);
+	jv->j = FIX2LONG(val);
 	break;
     default:
 #if HAVE_LONG_LONG
@@ -665,8 +672,17 @@ static void rv2jlong(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, int
 }
 static void rv2jshort(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, int release)
 {
-    if (!release)
-	jv->s = (short)NUM2INT(val);    
+    if (release) return;
+    if (TYPE(val) == T_FIXNUM)
+    {
+        int n = FIX2INT(val);    
+        if (abs(n) < 0x7fff)
+        {
+            jv->s = (short)n;
+            return;
+        }
+    }
+    rb_raise(rb_eRuntimeError, "can't change to short");
 }
 static void rv2jboolean(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, int release)
 {
@@ -774,13 +790,13 @@ static void rv2jobject(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, in
 		    Data_Get_Struct(val, struct jvi_data, ptr);
 		    jv->l = ptr->obj;
 		}
-		else if (RBASIC(val)->klass == rjbb)
+		else if (rb_obj_class(val) == rjbb)
 		{
 		    struct rj_bridge* ptr;
 		    Data_Get_Struct(val, struct rj_bridge, ptr);
 		    jv->l = ptr->proxy;
 		}
-		else if (rb_class_inherited(rjbc, RBASIC(val)->klass)) 
+		else if (CLASS_INHERITED(rjbc, rb_obj_class(val))) 
 		{
 		    struct jv_data* ptr;
 		    Data_Get_Struct(val, struct jv_data, ptr);
@@ -1596,14 +1612,14 @@ static void load_constants(JNIEnv* jenv, jclass klass, VALUE self, jobjectArray
 		strcpy(pname, cname);
 		*pname = toupper(*pname);
 		if (!isupper(*pname) 
-                    || rb_const_defined(RBASIC(self)->klass, rb_intern(pname))) 
+                    || rb_const_defined(rb_obj_class(self), rb_intern(pname))) 
 		{
 	            pname = NULL;
 		}
 	    }
 	    if (pname)
 	    {
-	        rb_define_const(RBASIC(self)->klass, pname, j2r(jenv, jv));
+	        rb_define_const(rb_obj_class(self), pname, j2r(jenv, jv));
 	    }
 	    rjb_release_string(jenv, nm, cname);
 	}
@@ -1735,8 +1751,8 @@ static VALUE rjb_s_load(int argc, VALUE* argv, VALUE self)
     }
 
     jklass = import_class(jenv, j_class, rb_str_new2("java.lang.Class"));
-    rb_define_method(RBASIC(jklass)->klass, "forName", rjb_class_forname, -1);
-    rb_define_method(RBASIC(jklass)->klass, "for_name", rjb_class_forname, -1);    
+    rb_define_method(rb_singleton_class(jklass), "forName", rjb_class_forname, -1);
+    rb_define_method(rb_singleton_class(jklass), "for_name", rjb_class_forname, -1);    
     rb_gc_register_address(&jklass);
     
     return Qnil;
@@ -1780,7 +1796,16 @@ static int clear_classes(VALUE key, VALUE val, VALUE dummy)
 static VALUE rjb_s_unload(int argc, VALUE* argv, VALUE self)
 {
     int result = 0;
+#if defined(HAVE_RB_HASH_FOREACH) || defined(RUBINIUS)
+	rb_hash_foreach(rjb_loaded_classes, clear_classes, 0);
+#else
+#if defined(RHASH_TBL)
     st_foreach(RHASH_TBL(rjb_loaded_classes), clear_classes, 0);
+#else
+    st_foreach(RHASH(rjb_loaded_classes)->tbl, clear_classes, 0);
+#endif
+#endif
+    
     if (rjb_jvm)
     {
         JNIEnv* jenv = rjb_attach_current_thread();
@@ -2165,7 +2190,11 @@ static VALUE get_signatures(VALUE mname, st_table* st)
     ret = rb_ary_new();
     for (; pm; pm = pm->next)
     {
-        rb_ary_push(ret, rb_str_new2(pm->basic.method_signature));
+        if (pm->basic.method_signature) {
+            rb_ary_push(ret, rb_str_new2(pm->basic.method_signature));
+        } else {
+            rb_ary_push(ret, Qnil);
+        }
     }
     return ret;
 }
@@ -2254,8 +2283,11 @@ static VALUE rjb_class_eval(int argc, VALUE* argv, VALUE self)
  */
 static VALUE rjb_s_unbind(VALUE self, VALUE rbobj)
 {
-    JNIEnv* jenv = rjb_prelude();
+#if defined(RUBINIUS)
+    return rb_funcall(proxies, rb_intern("delete"), 1, rbobj);
+#else
     return rb_ary_delete(proxies, rbobj);
+#endif
 }
 
 /*
@@ -2293,7 +2325,16 @@ static void register_class(VALUE self, VALUE clsname)
     /*
      * the hash was frozen, so it need to call st_ func directly.
      */
+
+#if defined(HAVE_RB_HASH_ASET) || defined(RUBINIUS)
+	rb_hash_aset(rjb_loaded_classes, clsname, self);
+#else
+#ifdef RHASH_TBL
     st_insert(RHASH_TBL(rjb_loaded_classes), clsname, self);
+#else
+    st_insert(RHASH(rjb_loaded_classes)->tbl, clsname, self);
+#endif
+#endif
 }
 
 /*
@@ -2796,7 +2837,7 @@ static VALUE rjb_missing(int argc, VALUE* argv, VALUE self)
     {
         VALUE r, args[2];
         int state = 0;
-	args[0] = RBASIC(self)->klass;
+	args[0] = rb_obj_class(self);
 	args[1] = rmid;
         r = rb_protect(find_const, (VALUE)args, &state);
 	if (!state)
@@ -2832,15 +2873,20 @@ static VALUE rjb_class_forname(int argc, VALUE* argv, VALUE self)
  */
 void Init_rjbcore()
 {
+#if defined(RUBINIUS)
+    rb_require("iconv");
+#else
     rb_protect((VALUE(*)(VALUE))rb_require, (VALUE)"iconv", NULL);
-
+#endif
     rjb_loaded_classes = rb_hash_new();
+#ifndef RUBINIUS
     OBJ_FREEZE(rjb_loaded_classes);
+#endif
     rb_global_variable(&rjb_loaded_classes);
     proxies = rb_ary_new();
     rb_global_variable(&proxies);
     user_initialize = rb_intern(USER_INITIALIZE);
-    
+
     rjb = rb_define_module("Rjb");
     rb_define_module_function(rjb, "load", rjb_s_load, -1);
     rb_define_module_function(rjb, "unload", rjb_s_unload, -1);
@@ -2854,14 +2900,14 @@ void Init_rjbcore()
     rb_define_const(rjb, "VERSION", rb_str_new2(RJB_VERSION));
 
     /* Java class object */    
-    rjbc = rb_class_new(rb_cObject);
+    rjbc = CLASS_NEW(rb_cObject, "Rjb_JavaClass");
     rb_gc_register_address(&rjbc);
     rb_define_method(rjbc, "method_missing", rjb_missing, -1);
     rb_define_method(rjbc, "_invoke", rjb_invoke, -1);
     rb_define_method(rjbc, "_classname", rjb_i_class, 0);
 
     /* Java instance object */
-    rjbi = rb_class_new(rb_cObject);
+    rjbi = CLASS_NEW(rb_cObject, "Rjb_JavaProxy");
     rb_gc_register_address(&rjbi);
     rb_define_method(rjbi, "method_missing", rjb_i_missing, -1);    
     rb_define_method(rjbi, "_invoke", rjb_i_invoke, -1);
@@ -2870,7 +2916,7 @@ void Init_rjbcore()
     rb_define_alias(rjbi, "include", "extend");
 
     /* Ruby-Java Bridge object */
-    rjbb = rb_class_new(rb_cObject);
+    rjbb = CLASS_NEW(rb_cObject, "Rjb_JavaBridge");
     rb_gc_register_address(&rjbb);
 }
 

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 81 2008-08-26 12:44:44Z 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
@@ -53,6 +53,9 @@
 #define _I64_MAX      9223372036854775807i64
 #endif
 
+#if !defined(HAVE_LONG_LONG) && defined(__LP64__)
+#define HAVE_LONG_LONG 1
+#endif
 
 /* in load.c */
 extern int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs*, char*, VALUE);
@@ -70,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

@@ -1,6 +1,6 @@
 /*
  * Rjb - Ruby <-> Java Bridge
- * Copyright(c) 2004,2005,2006 arton
+ * Copyright(c) 2004,2005,2006,2010 arton
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjbexception.c 94 2009-09-10 13:54:42Z 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,7 +60,17 @@ VALUE rjb_get_exception_class(JNIEnv* jenv, jstring str)
     if (rexp == Qnil)
     {
 	rexp = rb_define_class(pcls, rb_eStandardError);
-	st_insert(RHASH_TBL(rjb_loaded_classes), cname, rexp);
+        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
+#ifdef RHASH_TBL
+    st_insert(RHASH_TBL(rjb_loaded_classes), cname, rexp);
+#else
+    st_insert(RHASH(rjb_loaded_classes)->tbl, cname, rexp);
+#endif
+#endif
+	
     }
     return rexp;
 }
@@ -128,13 +144,17 @@ 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/lib/rjb.rb

@@ -20,4 +20,72 @@ end
 
 require 'rjbcore'
 
+module Rjb
+  MODIFIER = import('java.lang.reflect.Modifier')
 
+  module JMethod
+    def instance_method?(m)
+      m.modifiers & MODIFIER.STATIC == 0
+    end
+    def public_method?(m)
+      (m.modifiers & MODIFIER.PUBLIC) == MODIFIER.PUBLIC
+    end
+    def jmethods(org, klass, &blk)
+      (org + klass.getMethods.select do |m|
+         blk.call(m)
+      end.map do |m|
+        m.name
+      end).uniq
+    end
+    def format_sigs(s)
+      if s.size < 0
+        ''
+      elsif s.size == 1
+        s[0]
+      else
+        "[#{s.map{|m|m.nil? ? 'void' : m}.join(', ')}]"
+      end
+    end
+  end
+
+  class Rjb_JavaClass
+    include JMethod
+    def public_methods(inh = true)
+      jmethods(super(inh), self) do |m|
+        !instance_method?(m) && public_method?(m)
+      end
+    end
+    def methods(inh = true)
+      jmethods(super(inh), self) do |m|
+        !instance_method?(m) && public_method?(m)
+      end
+    end
+    def java_methods
+      jmethods([], self) do |m|
+        !instance_method?(m) && public_method?(m)
+      end.map do |m|
+        "#{m}(#{format_sigs(self.static_sigs(m))})"
+      end
+    end
+  end
+  class Rjb_JavaProxy
+    include JMethod
+    def public_methods(inh = true)
+      jmethods(super(inh), getClass) do |m|
+        instance_method?(m) && public_method?(m)
+      end
+    end
+    def methods(inh = true)
+      jmethods(super(inh), getClass) do |m|
+        instance_method?(m) && public_method?(m)
+      end
+    end
+    def java_methods
+      jmethods([], getClass) do |m|
+        instance_method?(m) && public_method?(m)
+      end.map do |m|
+        "#{m}(#{format_sigs(getClass.sigs(m))})"
+      end
+    end
+  end
+end

data/lib/rjbextension.rb

@@ -0,0 +1,135 @@
+=begin
+Copyright(c) 2010 arton
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+$Id: rjbextension.rb 116 2010-05-30 14:23:07Z arton $
+
+ This file is from Andreas Ronge project neo4j
+   http://github.com/andreasronge/neo4j/blob/rjb/lib/rjb_ext.rb
+
+Copyright (c) 2008 Andreas Ronge
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+=end
+
+# Loads the JVM with the given <tt>classpath</tt> and arguments to the jre.
+# All needed .jars should be included in <tt>classpath</tt>.
+
+module Kernel
+  alias rjb_original_require require
+
+  def require(path)
+    rjb_original_require(path)
+  rescue LoadError
+    # check that it's not a jar file
+    raise unless path =~ /\.jar/
+
+    # This will maybe use the wrong jar file from a previous version of the GEM
+    # puts "LOAD PATH #{$LOAD_PATH}" 
+    found_path = $LOAD_PATH.reverse.find{|p| File.exist?(File.join(p,path))}
+    raise unless found_path
+
+    abs_path = File.join(found_path, path)
+    # check that the file exists
+    raise unless  File.exist?(abs_path)
+
+    # try to load it using RJB
+    @@rjb_jars ||= []
+    @@rjb_jars << abs_path unless @@rjb_jars.include?(abs_path)
+    # TODO
+  end
+
+  @@jvm_loaded = false
+
+  def load_jvm(jargs = [])
+    # avoid starting the JVM twice
+    return if @@jvm_loaded
+    
+    @@jvm_loaded = true
+    classpath = ENV['CLASSPATH'] ||= ''
+    @@rjb_jars.each do |jar|
+      classpath += File::PATH_SEPARATOR unless classpath.empty?
+      classpath += jar
+    end
+    Rjb::load(classpath, jargs)
+  end
+end
+
+class JavaPackage
+
+  def initialize(pack_name, parent_pack = nil)
+    @pack_name = pack_name
+    @parent_pack = parent_pack
+    @cache = {}
+  end
+
+  def method_missing(m, *args)
+    # return if possible old module/class
+    @cache[m] ||= create_package_or_class(m)
+  end
+  def create_package_or_class(m)
+    method = m.to_s
+    if class?(method)
+      Rjb::import("#{self}.#{method}")
+    else
+      JavaPackage.new(method, self)
+    end
+  end
+
+  def to_s
+    if @parent_pack
+      "#{@parent_pack.to_s}.#@pack_name"
+    else
+      "#@pack_name"
+    end
+  end
+
+  def class?(a)
+    first_letter = a[0,1]
+    first_letter >= 'A' && first_letter <= 'Z'
+  end
+
+  @@cache = {}
+  def self.new(pack_name, parent_pack = nil)
+    @@cache[pack_name] ||= super
+  end
+end
+
+module RjbConf
+  # make them as singleton
+  ORG = JavaPackage.new('org')
+  JAVA = JavaPackage.new('java')
+end
+
+def org
+  RjbConf::ORG
+end
+
+def java
+  RjbConf::JAVA
+end

data/test/exttest.rb

@@ -0,0 +1,34 @@
+#!/usr/local/env ruby -Ku
+# encoding: utf-8
+# $Id:$
+
+begin
+  require 'rjb'
+rescue LoadError 
+  require 'rubygems' 
+  require 'rjb'
+end
+
+if Rjb::VERSION < '1.2.2'
+  puts "Rjb #{Rjb::VERSION} does not support rjbextension. exit"
+  exit 0
+end
+
+require 'rjbextension'
+require 'test/unit'
+
+puts "start RJB(#{Rjb::VERSION}) test"
+class ExtTestRjb < Test::Unit::TestCase
+
+  def jp
+    JavaPackage.new('jp')
+  end
+  
+  def test_require_extension
+    require 'rjbtest.jar'
+    load_jvm
+    
+    base = jp.co.infoseek.hp.arton.rjb.Base.new
+    assert_equal('hello', base.instance_var)
+  end
+end

data/test/m.rb

@@ -0,0 +1,20 @@
+puts RUBY_VERSION
+class X
+  module Y
+    def hello
+      puts 'hello'
+    end
+  end
+  def make_proc(&block)
+    block
+  end
+  def test
+    Proc.new do
+      extend Y
+    end
+  end
+end
+x = X.new
+a = Object.new
+a.instance_eval &x.test
+a.hello

data/test/test.rb

@@ -1,6 +1,6 @@
 #!/usr/local/env ruby -Ku
 # encoding: utf-8
-# $Id: test.rb 109 2010-05-11 13:04:25Z arton $
+# $Id: test.rb 133 2010-09-16 16:01:02Z arton $
 
 begin
   require 'rjb'
@@ -257,7 +257,7 @@ class TestRjb < Test::Unit::TestCase
   def test_unbind()
     it = TestIter.new
     it = bind(it, 'java.util.Iterator')
-    assert(it, unbind(it))
+    assert_equal(it, unbind(it))
   end
 
   class TestComparator
@@ -274,9 +274,9 @@ class TestRjb < Test::Unit::TestCase
     cp = bind(cp, 'java.util.Comparator')
     test = import('jp.co.infoseek.hp.arton.rjb.Test')
     a = test.new
-    assert(0, a.check(cp, 123, 123))
-    assert(5, a.check(cp, 81, 76))
-    assert(-5, a.check(cp, 76, 81))
+    assert_equal(0, a.check(cp, 123, 123))
+    assert_equal(5, a.check(cp, 81, 76))
+    assert_equal(-5, a.check(cp, 76, 81))
   end
 
   # assert_raise is useless in this test, because NumberFormatException may be defined in
@@ -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
@@ -658,7 +659,7 @@ class TestRjb < Test::Unit::TestCase
   end
   def test_extend
     @jString.class_eval do
-      include TestMixin
+      include TestRjb::TestMixin
     end
     s = @jString.new
     assert_equal('hello world', s.test_hello('world'))
@@ -666,7 +667,7 @@ class TestRjb < Test::Unit::TestCase
   def test_extend_with_factory
     point = import('java.awt.Point')
     point.class_eval do
-      include TestMixin
+      include TestRjb::TestMixin
     end
     p = point.new(11, 12)
     assert_equal(11, p.x)
@@ -682,6 +683,10 @@ class TestRjb < Test::Unit::TestCase
     sig = @jString.sigs('indexOf').sort
     assert_equal(expected, sig)
   end
+  def test_fetch_method_without_signature
+    sig = 
+    assert_equal([nil], @jString.sigs('toString'))
+  end
   def test_fetch_static_method_signature
     expected = ['Ljava.lang.String;[Ljava.lang.Object;', 
                 'Ljava.util.Locale;Ljava.lang.String;[Ljava.lang.Object;']
@@ -693,5 +698,37 @@ class TestRjb < Test::Unit::TestCase
     sig = @jInteger.ctor_sigs.sort
     assert_equal(expected, sig)
   end
+  def test_methods_extension
+    m = @jString.new('').methods
+    assert m.include?('indexOf')
+  end
+  def test_class_methods_extension
+    m = @jString.methods
+    assert m.include?('format')
+  end
+  def test_pmethods_extension
+    m = @jString.new('').public_methods
+    assert m.include?('indexOf')
+  end
+  def test_class_pmethods_extension
+    m = @jString.public_methods
+    assert m.include?('format')
+  end
+  def test_java_methods
+    indexof = @jString.new('').java_methods.find do |m|
+      m =~ /^indexOf/
+    end
+    args = indexof.match(/\[([^\]]+)\]/)[1]
+    assert_equal('Ljava.lang.String;I, II, I, Ljava.lang.String;'.split(/,\s*/).sort, 
+                 args.split(/,\s*/).sort)
+  end
+  def test_java_class_methods
+    m = @jString.java_methods
+    assert m.include?('format([Ljava.lang.String;[Ljava.lang.Object;, Ljava.util.Locale;Ljava.lang.String;[Ljava.lang.Object;])')
+  end
+  def test_64fixnum
+    big = @jLong.new_with_sig('J', 1230918239495)
+    assert_equal 1230918239495, big.long_value
+  end
 end
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rjb
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  hash: 15
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 8
+  version: 1.2.8
 platform: x86-mswin32-60
 authors: 
 - arton
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-11 00:00:00 +09:00
+date: 2010-09-17 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -37,8 +43,11 @@ files:
 - ext/depend
 - data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
 - lib/rjb.rb
+- lib/rjbextension.rb
 - samples/filechooser.rb
+- test/exttest.rb
 - test/gctest.rb
+- test/m.rb
 - test/test.rb
 - test/tx.rb
 - test/Base.class
@@ -52,6 +61,7 @@ files:
 - test/JTest.class
 - test/Test$TestTypes.class
 - test/Test.class
+- test/rjbtest.jar
 - COPYING
 - ChangeLog
 - readme.sj
@@ -67,23 +77,31 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 51
+      segments: 
+      - 1
+      - 8
+      - 2
       version: 1.8.2
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: 
 - none
 - JDK 5.0
 - " VC6 version of Ruby"
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby Java bridge