rjb 1.2.0-x86-mswin32-60 → 1.2.1-x86-mswin32-60

data/ChangeLog

@@ -1,3 +1,21 @@
+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/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

@@ -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 105 2010-05-04 00:01:26Z 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;

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

@@ -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 109 2010-05-11 13:04:25Z arton $
  */
 
-#define RJB_VERSION "1.2.0"
+#define RJB_VERSION "1.2.1"
 
 #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, RBASIC(v)->klass) || RBASIC(v)->klass == 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,9 +767,9 @@ 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;
@@ -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);
     }
@@ -1729,6 +1736,7 @@ 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_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
  *
@@ -1883,14 +1903,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 +1936,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 +1966,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 +2028,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 +2066,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 +2080,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 +2097,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 +2122,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 +2148,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 +2237,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 +2271,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,6 +2286,10 @@ 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.
      */
@@ -2745,6 +2839,7 @@ void Init_rjbcore()
     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 +2858,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 +2866,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/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/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 109 2010-05-11 13:04:25Z 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 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 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
 

data/test/tx.rb

@@ -0,0 +1,52 @@
+#!/usr/local/env ruby -Ku
+# encoding: utf-8
+# $Id: test.rb 87 2009-02-15 12:25:36Z arton $
+
+begin
+  require 'rjb'
+rescue LoadError 
+  require 'rubygems' 
+  require 'rjb'
+end
+require 'test/unit'
+
+puts "start RJB(#{Rjb::VERSION}) test"
+class TestRjb < Test::Unit::TestCase
+  include Rjb
+  def setup
+    Rjb::load('.')
+    @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')
+  end
+
+  def teardown
+  end
+
+  def test_scalar
+    str = @jString.new_with_sig('Ljava.lang.String;', "abcde")
+    p str
+    p str.class    
+    # rjb object (String)
+    str2 = @jString.new_with_sig('Ljava.lang.String;', 'fghijk')
+    p str2
+    p str2.class    
+    a = str.concat(str2)
+    p a
+    p a.class
+    p str2
+    p str2.class    
+    a = str.concat(str2)
+    p a
+    p a.class
+    assert_equal('abcdefghijk', str.concat(str2))
+  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.1
 platform: x86-mswin32-60
 authors: 
 - arton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-01 00:00:00 +09:00
+date: 2010-05-11 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -26,25 +26,32 @@ extra_rdoc_files: []
 files: 
 - ext/RBridge.java
 - ext/load.c
-- ext/rjbexception.c
 - ext/riconv.c
 - ext/rjb.c
-- ext/jp_co_infoseek_hp_arton_rjb_RBridge.h
-- ext/riconv.h
+- ext/rjbexception.c
 - ext/extconf.h
 - ext/jniwrap.h
+- ext/jp_co_infoseek_hp_arton_rjb_RBridge.h
+- ext/riconv.h
 - ext/rjb.h
 - ext/depend
 - data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
 - lib/rjb.rb
 - samples/filechooser.rb
-- test/test.rb
 - test/gctest.rb
+- test/test.rb
+- test/tx.rb
+- test/Base.class
+- test/ExtBase.class
+- test/IBase.class
 - test/jp/co/infoseek/hp/arton/rjb/Base.class
+- test/jp/co/infoseek/hp/arton/rjb/ExtBase.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/jp/co/infoseek/hp/arton/rjb/Test.class
+- test/JTest.class
+- test/Test$TestTypes.class
+- test/Test.class
 - COPYING
 - ChangeLog
 - readme.sj
@@ -76,7 +83,7 @@ requirements:
 - JDK 5.0
 - " VC6 version of Ruby"
 rubyforge_project: 
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Ruby Java bridge