rjb 1.2.0 → 1.2.2

data/ChangeLog

@@ -1,3 +1,39 @@
+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.
+	add class methods for inspecting method signatures.
+	add class_eval method for extending Java class
+ *test/test.rb
+	add class methods test for inspecting method signatures.
+	add mixin tests
+Tue May	4 arton
+ *ext/load.c
+	corrected wrong function signature (BUG#28088), pointed and fixed by Romulo A. Ceccon (thanks)
+ *ext/rjb.c
+	using inheritance check while inspecting a object is RJB's instance (for extending it).
+Tue Mar 16 arton
+ *ext/riconv.c
+	change locale setting "" to "C", fixed by Fabien Sartor (rjb-Bugs-27968)
+ *ext/rjb.c
+	RJB_VERSION -> 1.2.1	
 Sun Nov 1 arton
  *ext/load.c
 	load jvm pointed by JVM_LIB environment variable first (suggested by Ittay Dror).

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 102 2009-11-01 14:01:41Z arton $
+ * $Id: load.c 112 2010-05-29 03:09:11Z arton $
  */
 
 #include <stdlib.h>
@@ -90,8 +90,8 @@
  #define GETDEFAULTJVMINITARGS "JNI_GetDefaultJavaVMInitArgs"
 #endif
 
-typedef int (*GETDEFAULTJAVAVMINITARGS)(void*);
-typedef int (*CREATEJAVAVM)(JavaVM**, JNIEnv**, void*);
+typedef int (JNICALL *GETDEFAULTJAVAVMINITARGS)(void*);
+typedef int (JNICALL *CREATEJAVAVM)(JavaVM**, JNIEnv**, void*);
 
 
 static VALUE jvmdll = Qnil;
@@ -295,7 +295,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 +367,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 65 2008-03-26 13:19:29Z arton $
+ * $Id: riconv.c 104 2010-03-16 12:19:18Z arton $
  */
 
 #include "ruby.h"
@@ -98,14 +98,14 @@ static const char* get_charcode_name()
 #if defined _WIN32 || defined __CYGWIN__
         if (932 == GetACP()) result = CS_CP932;
 #elif defined HAVE_NL_LANGINFO
-        setlocale(LC_ALL, ""); //initialize
+        setlocale(LC_ALL, "C"); //initialize
         lang = nl_langinfo(CODESET);
         if (find_table(lang, NL_EUC_TABLE))
                 result =  CS_EUCJP;
         else if (find_table(lang, NL_SJIS_TABLE))
                 result = CS_SJIS;
 #elif defined HAVE_SETLOCALE
-        setlocale(LC_ALL, ""); //initialize
+        setlocale(LC_ALL, "C"); //initialize
         result = get_charcode_name_by_locale(setlocale(LC_ALL, NULL));
 #elif defined HAVE_GETENV
         if (result = get_charcode_name_by_locale(getenv("LC_ALL")))

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 102 2009-11-01 14:01:41Z arton $
+ * $Id: rjb.c 112 2010-05-29 03:09:11Z arton $
  */
 
-#define RJB_VERSION "1.2.0"
+#define RJB_VERSION "1.2.2"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -55,10 +55,12 @@
 #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, rb_obj_class(v)) || rb_obj_class(v) == rjb)
+#define USER_INITIALIZE "@user_initialize"
 
 static void register_class(VALUE, VALUE);
 static VALUE import_class(JNIEnv* jenv, jclass, VALUE);
-static VALUE register_instance(JNIEnv* jenv, struct jvi_data*, jobject);
+static VALUE register_instance(JNIEnv* jenv, VALUE klass, struct jv_data*, jobject);
 static VALUE rjb_s_free(struct jv_data*);
 static VALUE rjb_class_forname(int argc, VALUE* argv, VALUE self);
 static void setup_metadata(JNIEnv* jenv, VALUE self, struct jv_data*, VALUE classname);
@@ -73,6 +75,8 @@ static VALUE rjbc;
 static VALUE rjbi;
 static VALUE rjbb;
 
+static ID user_initialize;
+
 VALUE rjb_loaded_classes;
 static VALUE proxies;
 JavaVM* rjb_jvm;
@@ -286,7 +290,7 @@ static VALUE jv2rv_r(JNIEnv* jenv, jvalue val)
         v = import_class(jenv, klass, clsname);
     }
     Data_Get_Struct(v, struct jv_data, ptr);
-    v = register_instance(jenv, (struct jvi_data*)ptr, val.l);
+    v = register_instance(jenv, v, (struct jv_data*)ptr, val.l);
     (*jenv)->DeleteLocalRef(jenv, klass);
     (*jenv)->DeleteLocalRef(jenv, val.l);    
     return v;
@@ -673,8 +677,7 @@ static void rv2jstring(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, in
 {
     if (!release)
     {
-	if (TYPE(val) == T_DATA
-	    && (RBASIC(val)->klass == rjbi || RBASIC(val)->klass == rjb))
+	if (TYPE(val) == T_DATA && IS_RJB_OBJECT(val))
 	{
 	    struct jvi_data* ptr;
 	    Data_Get_Struct(val, struct jvi_data, ptr);
@@ -710,7 +713,7 @@ static void rv2jstring(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, in
     {
 	if (TYPE(val) == T_DATA)
 	{
-	    if (RBASIC(val)->klass == rjbi || RBASIC(val)->klass == rjb)
+            if (IS_RJB_OBJECT(val))
 	    {
 		struct jvi_data* ptr;
 		Data_Get_Struct(val, struct jvi_data, ptr);
@@ -764,20 +767,20 @@ static void rv2jobject(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, in
 	    switch (TYPE(val))
 	    {
 	    case T_DATA:
-	        if (RBASIC(val)->klass == rjbi || RBASIC(val)->klass == rjb)
+                if (IS_RJB_OBJECT(val))
 		{
-		    /* TODO: check instanceof (class (in psig) ) */
+                    /* TODO: check instanceof (class (in psig) ) */
 		    struct jvi_data* ptr;
 		    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 (rb_class_inherited(rjbc, rb_obj_class(val))) 
 		{
 		    struct jv_data* ptr;
 		    Data_Get_Struct(val, struct jv_data, ptr);
@@ -1327,14 +1330,16 @@ static struct cls_method* clone_methodinfo(struct cls_method* pm)
     return result;
 }
 
-static void make_alias(const char* jname, char* rname)
+static int make_alias(const char* jname, char* rname)
 {
+    int ret = 0;
     while (*jname)
     {
         if (isupper(*jname))
         {
             *rname++ = '_';
             *rname++ = tolower(*jname++);
+            ret = 1;
         }
         else
         {
@@ -1342,6 +1347,7 @@ static void make_alias(const char* jname, char* rname)
         }
     }
     *rname = '\0';
+    return ret;
 }
 
 static void create_methodinfo(JNIEnv* jenv, st_table* tbl, jobject m, int static_method)
@@ -1349,6 +1355,7 @@ static void create_methodinfo(JNIEnv* jenv, st_table* tbl, jobject m, int static
     struct cls_method* result;
     struct cls_method* pm;    
     const char* jname;
+    int alias;
     jstring nm;
     jobjectArray parama;
     jobject cls;
@@ -1365,7 +1372,7 @@ static void create_methodinfo(JNIEnv* jenv, st_table* tbl, jobject m, int static
     rjb_check_exception(jenv, 0);	    
     jname = (*jenv)->GetStringUTFChars(jenv, nm, NULL);
     rname = ALLOCA_N(char, strlen(jname) * 2 + 8);
-    make_alias(jname, rname);
+    alias = make_alias(jname, rname);
     result->name = rb_intern(jname);
     rjb_release_string(jenv, nm, jname);    
     result->basic.id = (*jenv)->FromReflectedMethod(jenv, m);
@@ -1404,7 +1411,7 @@ static void create_methodinfo(JNIEnv* jenv, st_table* tbl, jobject m, int static
         if (*rname == '_') rname++;
         strcat(rname, "?");
     }
-    else
+    else if (alias)
     {
         pm = clone_methodinfo(result);
     }
@@ -1589,14 +1596,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);
 	}
@@ -1728,7 +1735,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(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;
@@ -1745,6 +1753,18 @@ VALUE rjb_load_vm_default()
     return rjb_s_load(0, NULL, 0);
 }
 
+/*
+ * common prelude
+ */
+JNIEnv* rjb_prelude()
+{
+    JNIEnv* jenv = NULL;
+    rjb_load_vm_default();
+    jenv = rjb_attach_current_thread();
+    (*jenv)->ExceptionClear(jenv);
+    return jenv;
+}
+
 /*
  * unload Java Virtual Machine
  *
@@ -1760,7 +1780,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;
+#ifdef HAVE_RB_HASH_FOREACH
+	rb_hash_foreach(rjb_loaded_classes, clear_classes, 0);
+#else
+#ifdef 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();
@@ -1883,14 +1912,19 @@ static VALUE rjb_s_free(struct jv_data* ptr)
  * create new instance of this class
  */
 static VALUE createinstance(JNIEnv* jenv, int argc, VALUE* argv,
-	    struct jvi_data* org, struct cls_constructor* pc)
+	    VALUE self, struct cls_constructor* pc)
 {
     int i;
     char* psig = pc->method_signature;
     jobject obj = NULL;
     VALUE result;
-
+    struct jv_data* jklass;
+    struct jvi_data* org;
     jvalue* args = (argc) ? ALLOCA_N(jvalue, argc) : NULL;
+    
+    Data_Get_Struct(self, struct jv_data, jklass);
+    org = &jklass->idata;
+
     for (i = 0; i < argc; i++)
     {
 	R2J pr2j = *(pc->arg_convert + i);
@@ -1911,7 +1945,7 @@ static VALUE createinstance(JNIEnv* jenv, int argc, VALUE* argv,
 	psig = next_sig(psig);
     }
 
-    result = register_instance(jenv, org, obj);
+    result = register_instance(jenv, self, jklass, obj);
     (*jenv)->DeleteLocalRef(jenv, obj);
     return result;
 }
@@ -1941,16 +1975,29 @@ static VALUE import_class(JNIEnv* jenv, jclass jcls, VALUE clsname)
     return v;
 }
 
-static VALUE register_instance(JNIEnv* jenv, struct jvi_data* org, jobject obj)
+static VALUE rjb_i_prepare_proxy(VALUE self)
+{
+    return rb_funcall(self, rb_intern("instance_eval"), 1, 
+               rb_str_new2("instance_eval &" USER_INITIALIZE));
+}
+
+static VALUE register_instance(JNIEnv* jenv, VALUE klass, struct jv_data* org, jobject obj)
 {
     VALUE v;
+    VALUE iproc;
     struct jvi_data* ptr = ALLOC(struct jvi_data);
     memset(ptr, 0, sizeof(struct jvi_data));
     v = Data_Wrap_Struct(rjbi, NULL, rjb_delete_ref, ptr);
-    ptr->klass = org->obj;
+    ptr->klass = org->idata.obj;
     ptr->obj = (*jenv)->NewGlobalRef(jenv, obj);
-    ptr->methods = org->methods;
-    ptr->fields = org->fields;
+    ptr->methods = org->idata.methods;
+    ptr->fields = org->idata.fields;
+    iproc = rb_ivar_get(klass, user_initialize);
+    if (iproc != Qnil)
+    {
+        rb_ivar_set(v, user_initialize, iproc);
+        rb_funcall(v, rb_intern("_prepare_proxy"), 0, 0);
+    }
     return v;
 }
 
@@ -1990,7 +2037,7 @@ static int check_rtype(JNIEnv* jenv, VALUE v, char* p)
     case T_ARRAY:
         return *p == '[';
     case T_DATA:
-        if (RBASIC(v)->klass == rjbi && pcls)
+        if (IS_RJB_OBJECT(v) && pcls)
 	{
 	    /* imported object */
 	    jclass cls;
@@ -2028,11 +2075,7 @@ static VALUE rjb_newinstance_s(int argc, VALUE* argv, VALUE self)
     VALUE ret = Qnil;
     struct jv_data* ptr;
     int found = 0;
-    JNIEnv* jenv = NULL;
-
-    rjb_load_vm_default();
-    jenv = rjb_attach_current_thread();
-    (*jenv)->ExceptionClear(jenv);
+    JNIEnv* jenv = rjb_prelude();
 
     rb_scan_args(argc, argv, "1*", &vsig, &rest);
     sig = StringValueCStr(vsig);
@@ -2046,7 +2089,7 @@ static VALUE rjb_newinstance_s(int argc, VALUE* argv, VALUE self)
 		&& !strcmp(sig, (*pc)->method_signature))
 	    {
 	        found = 1;
-		ret = createinstance(jenv, argc - 1, argv + 1, &ptr->idata, *pc);
+		ret = createinstance(jenv, argc - 1, argv + 1, self, *pc);
 		break;
 	    }
 	}
@@ -2063,12 +2106,8 @@ static VALUE rjb_newinstance(int argc, VALUE* argv, VALUE self)
     struct jv_data* ptr;
     struct cls_constructor** pc;
     int found = 0;
-    JNIEnv* jenv = NULL;
+    JNIEnv* jenv = rjb_prelude();
     
-    rjb_load_vm_default();
-    jenv = rjb_attach_current_thread();
-    (*jenv)->ExceptionClear(jenv);
-
     Data_Get_Struct(self, struct jv_data, ptr);
 
     if (ptr->constructors)
@@ -2092,7 +2131,7 @@ static VALUE rjb_newinstance(int argc, VALUE* argv, VALUE self)
 		}
 		if (found)
 		{
-		    ret = createinstance(jenv, argc, argv, &ptr->idata, *pc);
+		    ret = createinstance(jenv, argc, argv, self, *pc);
 		    break;
 		}
 	    }
@@ -2118,18 +2157,71 @@ jclass rjb_find_class(JNIEnv* jenv, VALUE name)
     return (*jenv)->FindClass(jenv, java2jniname(jnicls));
 }
 
+/*
+ * get specified method signature
+ */
+static VALUE get_signatures(VALUE mname, st_table* st)
+{
+    VALUE ret;
+    struct cls_method* pm;
+    ID rmid = rb_to_id(mname);
+
+    if (!st_lookup(st, rmid, (st_data_t*)&pm))
+    {
+        const char* tname = rb_id2name(rmid);
+        rb_raise(rb_eRuntimeError, "Fail: unknown method name `%s'", tname);
+    }
+    ret = rb_ary_new();
+    for (; pm; pm = pm->next)
+    {
+        rb_ary_push(ret, rb_str_new2(pm->basic.method_signature));
+    }
+    return ret;
+}
+
+static VALUE rjb_get_signatures(VALUE self, VALUE mname)
+{
+    struct jv_data* ptr;
+
+    Data_Get_Struct(self, struct jv_data, ptr);
+    return get_signatures(mname, ptr->idata.methods);
+}
+
+static VALUE rjb_get_static_signatures(VALUE self, VALUE mname)
+{
+    struct jv_data* ptr;
+
+    Data_Get_Struct(self, struct jv_data, ptr);
+    return get_signatures(mname, ptr->static_methods);
+}
+
+static VALUE rjb_get_ctor_signatures(VALUE self)
+{
+    VALUE ret;
+    struct jv_data* ptr;
+    struct cls_constructor** pc;
+
+    Data_Get_Struct(self, struct jv_data, ptr);
+    ret = rb_ary_new();
+    if (ptr->constructors)
+    {
+        for (pc = ptr->constructors; *pc; pc++)
+        {
+            rb_ary_push(ret, rb_str_new2((*pc)->method_signature));
+        }
+    }
+    return ret;
+}
+
 /*
  * jclass Rjb::bind(rbobj, interface_name)
  */
 static VALUE rjb_s_bind(VALUE self, VALUE rbobj, VALUE itfname)
 {
     VALUE result = Qnil;
-    JNIEnv* jenv = NULL;
     jclass itf;
+    JNIEnv* jenv = rjb_prelude();
     
-    rjb_load_vm_default();
-    jenv = rjb_attach_current_thread();
-    (*jenv)->ExceptionClear(jenv);
     itf = rjb_find_class(jenv, itfname); 
     rjb_check_exception(jenv, 1);
     if (itf)
@@ -2154,15 +2246,24 @@ static VALUE rjb_s_bind(VALUE self, VALUE rbobj, VALUE itfname)
     return result;
 }
 
+/*
+ * Rjb's class is not Class but Object, so add class_eval for the Java class.
+ */
+static VALUE rjb_class_eval(int argc, VALUE* argv, VALUE self)
+{
+    if (rb_block_given_p())
+    {
+        rb_ivar_set(self, user_initialize, rb_block_proc());
+    }
+    return self;
+}
+
 /*
  * jclass Rjb::bind(rbobj, interface_name)
  */
 static VALUE rjb_s_unbind(VALUE self, VALUE rbobj)
 {
-    JNIEnv* jenv;
-    rjb_load_vm_default();
-    jenv = rjb_attach_current_thread();
-    (*jenv)->ExceptionClear(jenv);
+    JNIEnv* jenv = rjb_prelude();
     return rb_ary_delete(proxies, rbobj);
 }
 
@@ -2179,9 +2280,7 @@ static VALUE rjb_s_import(VALUE self, VALUE clsname)
 	return v;
     }
 
-    rjb_load_vm_default();
-    jenv = rjb_attach_current_thread();
-    (*jenv)->ExceptionClear(jenv);
+    jenv = rjb_prelude();
     jcls = rjb_find_class(jenv, clsname);
     if (!jcls)
     {
@@ -2196,10 +2295,23 @@ static void register_class(VALUE self, VALUE clsname)
 {
     rb_define_singleton_method(self, "new", rjb_newinstance, -1);
     rb_define_singleton_method(self, "new_with_sig", rjb_newinstance_s, -1);
+    rb_define_singleton_method(self, "class_eval", rjb_class_eval, -1);
+    rb_define_singleton_method(self, "sigs", rjb_get_signatures, 1);
+    rb_define_singleton_method(self, "static_sigs", rjb_get_static_signatures, 1);
+    rb_define_singleton_method(self, "ctor_sigs", rjb_get_ctor_signatures, 0);
     /*
      * the hash was frozen, so it need to call st_ func directly.
      */
+
+#ifdef HAVE_RB_HASH_ASET
+	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
 }
 
 /*
@@ -2702,7 +2814,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)
@@ -2741,10 +2853,13 @@ void Init_rjbcore()
     rb_protect((VALUE(*)(VALUE))rb_require, (VALUE)"iconv", NULL);
 
     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);
@@ -2763,7 +2878,7 @@ void Init_rjbcore()
     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);    
+    rb_define_method(rjbc, "_classname", rjb_i_class, 0);
 
     /* Java instance object */
     rjbi = rb_class_new(rb_cObject);
@@ -2771,6 +2886,8 @@ void Init_rjbcore()
     rb_define_method(rjbi, "method_missing", rjb_i_missing, -1);    
     rb_define_method(rjbi, "_invoke", rjb_i_invoke, -1);
     rb_define_method(rjbi, "_classname", rjb_i_class, 0);
+    rb_define_method(rjbi, "_prepare_proxy", rjb_i_prepare_proxy, 0);
+    rb_define_alias(rjbi, "include", "extend");
 
     /* Ruby-Java Bridge object */
     rjbb = rb_class_new(rb_cObject);

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 112 2010-05-29 03:09:11Z arton $
  */
 
 #include "ruby.h"
@@ -54,7 +54,16 @@ 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);
+#ifdef HAVE_RB_HASH_ASET
+	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;
 }
@@ -137,4 +146,3 @@ void rjb_check_exception(JNIEnv* jenv, int t)
         }
     }
 }
-

data/lib/rjb.rb

@@ -1,5 +1,5 @@
 =begin
-  Copyright(c) 2006 arton
+  Copyright(c) 2006-2010 arton
 =end
 
 require 'rbconfig'
@@ -20,3 +20,4 @@ end
 
 require 'rjbcore'
 
+

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:$
+
+ 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/test.rb

@@ -1,6 +1,6 @@
 #!/usr/local/env ruby -Ku
 # encoding: utf-8
-# $Id: test.rb 87 2009-02-15 12:25:36Z arton $
+# $Id: test.rb 111 2010-05-12 12:34:28Z arton $
 
 begin
   require 'rjb'
@@ -18,14 +18,14 @@ class TestRjb < Test::Unit::TestCase
     Rjb::primitive_conversion = false
 
     @jString = import('java.lang.String')
-    @jInteger = Rjb::import('java.lang.Integer')
-    @jShort = Rjb::import('java.lang.Short')
-    @jDouble = Rjb::import('java.lang.Double')
-    @jFloat = Rjb::import('java.lang.Float')
-    @jBoolean = Rjb::import('java.lang.Boolean')
-    @jByte = Rjb::import('java.lang.Byte')
-    @jLong = Rjb::import('java.lang.Long')
-    @jChar = Rjb::import('java.lang.Character')
+    @jInteger = import('java.lang.Integer')
+    @jShort = import('java.lang.Short')
+    @jDouble = import('java.lang.Double')
+    @jFloat = import('java.lang.Float')
+    @jBoolean = import('java.lang.Boolean')
+    @jByte = import('java.lang.Byte')
+    @jLong = import('java.lang.Long')
+    @jChar = import('java.lang.Character')
   end
 
   def teardown
@@ -650,5 +650,48 @@ class TestRjb < Test::Unit::TestCase
       assert_equal "can't create Java VM", $!.message
     end
   end
+  
+  module TestMixin
+    def test_hello(s)
+      'hello ' + s
+    end
+  end
+  def test_extend
+    @jString.class_eval do
+      include TestRjb::TestMixin
+    end
+    s = @jString.new
+    assert_equal('hello world', s.test_hello('world'))
+  end
+  def test_extend_with_factory
+    point = import('java.awt.Point')
+    point.class_eval do
+      include TestRjb::TestMixin
+    end
+    p = point.new(11, 12)
+    assert_equal(11, p.x)
+    assert_equal(12, p.y)    
+    assert_equal('hello world', p.test_hello('world'))
+    p = p.location
+    assert_equal(11, p.x)
+    assert_equal(12, p.y)    
+    assert_equal('hello world', p.test_hello('world'))
+  end
+  def test_fetch_method_signature
+    expected = ['I', 'II', 'Ljava.lang.String;', 'Ljava.lang.String;I']
+    sig = @jString.sigs('indexOf').sort
+    assert_equal(expected, sig)
+  end
+  def test_fetch_static_method_signature
+    expected = ['Ljava.lang.String;[Ljava.lang.Object;', 
+                'Ljava.util.Locale;Ljava.lang.String;[Ljava.lang.Object;']
+    sig = @jString.static_sigs('format').sort
+    assert_equal(expected, sig)
+  end
+  def test_fetch_ctor_signature
+    expected = ['I', 'Ljava.lang.String;']
+    sig = @jInteger.ctor_sigs.sort
+    assert_equal(expected, sig)
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rjb
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors: 
 - arton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-01 00:00:00 +09:00
+date: 2010-05-30 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -36,14 +36,17 @@ files:
 - ext/depend
 - data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
 - lib/rjb.rb
+- lib/rjbextension.rb
 - samples/filechooser.rb
 - test/test.rb
+- test/exttest.rb
 - test/gctest.rb
 - test/jp/co/infoseek/hp/arton/rjb/Base.class
 - test/jp/co/infoseek/hp/arton/rjb/IBase.class
 - test/jp/co/infoseek/hp/arton/rjb/Test.class
 - test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.class
 - test/jp/co/infoseek/hp/arton/rjb/ExtBase.class
+- test/rjbtest.jar
 - COPYING
 - ChangeLog
 - readme.sj