rjb 1.0.9-mswin32 → 1.0.11-mswin32

data/ChangeLog

@@ -1,3 +1,21 @@
+Fri Nov 9 arton
+ *test.rb
+ *Test.java
+	add test for reproducing rjb-bugs-15430
+ *rjb.c
+	fix rjb-bugs-15430 that caused by bad array conversion.
+	(generics method result signature is an object, but the real result is typed array)
+ *riconv.c
+	correct to get the number of array element.
+Tue Oct 23 Kuwashima
+ *riconv.c
+	Change string encoding conversion rule.
+Mon Oct 22 Kuwashima
+ *riconv.c
+ *riconv.h
+	recycle iconv instance.
+ *test/test.rb
+	add cases for test_kjconv
 Sun Sep 23 arton
  *rjb.c
 	version 1.0.9

data/ext/extconf.h

@@ -0,0 +1,6 @@
+#ifndef EXTCONF_H
+#define EXTCONF_H
+#define HAVE_JNI_H 1
+#define HAVE_SETLOCALE 1
+#define HAVE_GETENV 1
+#endif

data/ext/riconv.c

@@ -12,144 +12,179 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: riconv.c 4 2006-09-11 15:21:38Z arton $
+ * $Id: riconv.c 37 2007-11-08 17:25:36Z arton $
  */
 
 #include "ruby.h"
+#include "extconf.h"
+
+#if defined _WIN32 || defined __CYGWIN__
+#include <windows.h>
+#endif
+
+#if defined HAVE_NL_LANGINFO
+#include <langinfo.h>
+static const char* const NL_EUC_TABLE[] = { "EUC-JISX0213", "EUC-JP", "EUC-JP-MS" };
+static const char* const NL_SJIS_TABLE[] = { "SHIFT_JIS", "SHIFT_JISX0213", "WINDOWS-31J" };
+#endif
+
+#if defined HAVE_SETLOCALE
+#include <locale.h>
+static const char* const LOCALE_EUC_TABLE[] = { "japanese", "ja_JP.eucJP", "japanese.euc", "ja_JP", "ja_JP.ujis" };
+static const char* const LOCALE_SJIS_TABLE[] = { "japanese.sjis", "ja_JP.SJIS" };
+static const char* const LOCALE_UTF8_TABLE[] = { "ja_JP.UTF-8", "ja_JP.utf8" };
+#endif
+
 #include "riconv.h"
 
-static const char* cs_eucjp = "EUC-JP";
-static const char* cs_sjis = "Shift_JIS";
-static const char* cs_cp932 = "CP932";
-static const char* cs_ms932 = "MS932";
-static const char* cs_utf8 = "UTF-8";
+static const char* const CS_EUCJP = "EUC-JP";
+static const char* const CS_CP932 = "CP932";
+static const char* const CS_SJIS = "SHIFT_JIS";
+static const char* const CS_UTF8 = "UTF-8";
+
+
+static VALUE objIconvJ2R;
+static VALUE objIconvR2J;
+static const char* charcode; //is this necessary?
+static char Kcode = '\0';
 
-/* Regexp::match�̃��b�p�[ */
-static int regxp_is_match(VALUE str, VALUE regxp)
+static int find_table(const char* const str, const char* const table[])
 {
-    return rb_funcall(str, rb_intern("match"), 1, RREGEXP(regxp)) != Qnil ? 1 : 0 ;
+    int i;
+    int size = sizeof(table) / sizeof(table[0]);
+    for (i = 0; i < size; ++i)
+    {
+        if (strstr(str, table[i])) return 1;
+    }
+    return 0;
 }
 
-/* RUBY_PLATFORM����ސ�����Windows�Ȃ�1���A�����łȂ����0��Ԃ� */
-static int platform_is_windows()
+static const char* get_charcode_name_by_locale(const char* const name)
 {
-  VALUE platform = rb_const_get(rb_cObject, rb_intern("RUBY_PLATFORM"));
-    return regxp_is_match(platform, rb_str_new2("msvcrt|mswin|bccwin|mingw|cygwin"))
-      ? 1
-      : 0;
+    if (find_table(name, LOCALE_UTF8_TABLE))
+        return NULL;
+    else if (find_table(name, LOCALE_EUC_TABLE))
+        return CS_EUCJP;
+    else if (find_table(name, LOCALE_SJIS_TABLE))
+        return CS_SJIS;
+    else
+        return NULL;
 }
-
 /*
- * RUBY_PLATFORM��$KCODE������Iconv�ŗL���ȓK���ȕ����R�[�h����Ԃ�
- * TODO: ���s�‹���LOCALE,LANG,LC_ALL�����Q�l�ɂ���
+ * Get better charcode name.
  */
-static char* get_charset_name()
+static const char* get_charcode_name()
 {
-    char* result = NULL;
-    ID id_Iconv = rb_intern("Iconv");
-    
-    if (rb_const_defined(rb_cObject, id_Iconv))
-      {
-        VALUE kcode = rb_gv_get("$KCODE");
-        VALUE platform = rb_const_get(rb_cObject, rb_intern("RUBY_PLATFORM"));
-        char* kcodep = (TYPE(kcode) == T_STRING) ? StringValuePtr(kcode) : "";
-
-        switch(toupper(*kcodep))
-        {
-        case 'E':
-            result = (char*)cs_eucjp;
-            break;
-        case 'S':
-          if (platform_is_windows())
-            {
-              result = (char*)cs_cp932;
-            }
-          else
-            {
-              result = (char*)cs_sjis;
-            }
-          break;
-        case 'N':
-          if (platform_is_windows())
-            {
-              result = (char*)cs_cp932;
-            }
-          else
-            {
-                result = NULL;
-            }
-            break;
-        case 'U':
-        default:
-            result = NULL;
-            break;
-        }
-      }else{
-        result = NULL;
-      }
+    const char* result = NULL;
+    const char* lang = NULL;
+
+    switch(Kcode)
+    {
+    case 'E':
+        result = CS_EUCJP;
+        break;
+    case 'S':
+#if defined _WIN32 || defined __CYGWIN__
+        result = CS_CP932;
+#else
+        result = CS_SJIS;
+#endif
+        break;
+    case 'U':
+        //as is.
+        break;
+    case 'N':
+    default:
+#if defined _WIN32 || defined __CYGWIN__
+        if (932 == GetACP()) result = CS_CP932;
+#elif defined HAVE_NL_LANGINFO
+        setlocale(LC_ALL, ""); //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
+        result = get_charcode_name_by_locale(setlocale(LC_ALL, NULL));
+#elif defined HAVE_GETENV
+        printf("HAVE_GETENV\n");
+        if (result = get_charcode_name_by_locale(getenv("LC_ALL")))
+                ;
+        else if (result = get_charcode_name_by_locale(getenv("LC_CTYPE")))
+                ;
+        else if (result = get_charcode_name_by_locale(getenv("LANG")))
+                ;
+#endif
+        break;
+    }
     return result;
 }
 
-/*
- * �g�����C�u������Iconv������ꍇ��1,�Ȃ��ꍇ��0��Ԃ�
- */
-static int has_exticonv()
-{
-	ID id_Iconv = rb_intern("Iconv");
-        VALUE Iconv = rb_const_get(rb_cObject, id_Iconv);
-	if(Iconv == Qnil)
-	{
-	        return 0;
-	}
-	else
-	{
-		return 1;
-	}
-}
 
-VALUE exticonv_local_to_utf8(VALUE local_string)
+static void reinit()
 {
-	char* cs = get_charset_name();
-	if(cs)
-	{
-		return exticonv_cc(local_string, cs, cs_utf8);
-	}
-	else
-	{
-		return local_string;
-	}
+    charcode = get_charcode_name();
+    if (charcode)
+    {
+        VALUE rb_iconv_klass = rb_const_get(rb_cObject, rb_intern("Iconv"));
+        if (RTEST(rb_iconv_klass)) {
+            ID sym_new = rb_intern("new");
+	    rb_gc_unregister_address(&objIconvR2J);
+            objIconvR2J = rb_funcall(rb_iconv_klass, sym_new, 2, rb_str_new2(CS_UTF8), rb_str_new2(charcode));
+	    rb_gc_register_address(&objIconvR2J);
+	    rb_gc_unregister_address(&objIconvJ2R);
+            objIconvJ2R = rb_funcall(rb_iconv_klass, sym_new, 2, rb_str_new2(charcode), rb_str_new2(CS_UTF8));
+	    rb_gc_register_address(&objIconvJ2R);
+        }
+    }
+    else
+    {
+        objIconvR2J = objIconvJ2R = Qnil;
+    }
 }
 
-VALUE exticonv_utf8_to_local(VALUE utf8_string)
+static void check_kcode()
 {
-	char* cs = get_charset_name();
-	if(cs)
-	{
-		return exticonv_cc(utf8_string, cs_utf8, cs);
-	}
-	else
-	{
-		return utf8_string;
-	}
+    VALUE rb_iconv_klass = rb_const_get(rb_cObject, rb_intern("Iconv"));
+    VALUE kcode = rb_gv_get("$KCODE");
+    if (RTEST(rb_iconv_klass) && TYPE(kcode) == T_STRING) {
+        char* kcodep = StringValuePtr(kcode);
+        char upper_kcode = toupper(*kcodep);
+        if (Kcode != upper_kcode)
+        {
+            Kcode = upper_kcode;
+            reinit();
+        }
+    }
+    else
+    {
+        objIconvR2J = objIconvJ2R = Qnil;
+    }
 }
 
-VALUE exticonv_cc(VALUE original_string, const char* from, const char* to)
+VALUE exticonv_local_to_utf8(VALUE local_string)
 {
-	return exticonv_vv(original_string, rb_str_new2(from), rb_str_new2(to));
+    check_kcode();
+    if(RTEST(objIconvR2J))
+    {
+        return rb_funcall(objIconvR2J, rb_intern("iconv"), 1, local_string);
+    }
+    else
+    {
+        return local_string;
+    }
 }
 
-VALUE exticonv_vv(VALUE original_string, VALUE from, VALUE to)
+VALUE exticonv_utf8_to_local(VALUE utf8_string)
 {
-	if(has_exticonv())
-	{
-		ID id_Iconv = rb_intern("Iconv");
-		ID id_iconv = rb_intern("iconv");
-		VALUE Iconv = rb_const_get(rb_cObject, id_Iconv);
-		return rb_ary_entry(rb_funcall(Iconv, id_iconv, 3, to, from, original_string), 0);
-	}
-	else
-	{
-		//iconv���Ȃ���΂��̂܂ܕԂ�
-		return original_string;
-	}
+    check_kcode();
+    if(RTEST(objIconvR2J))
+    {
+        return rb_funcall(objIconvJ2R, rb_intern("iconv"), 1, utf8_string);
+    }
+    else
+    {
+        return utf8_string;
+    }
 }

data/ext/riconv.h

@@ -12,14 +12,12 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: riconv.h 4 2006-09-11 15:21:38Z arton $
+ * $Id: riconv.h 29 2007-10-22 08:29:05Z kuwa1 $
  */
 #ifndef _RICONV_H
 #define _RICONV_H
 
 extern VALUE exticonv_local_to_utf8(VALUE);
 extern VALUE exticonv_utf8_to_local(VALUE);
-extern VALUE exticonv_cc(VALUE, const char*, const char*);
-extern VALUE exticonv_vv(VALUE, VALUE, VALUE);
 
 #endif /* _RICONV_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 25 2007-09-23 00:30:23Z arton $
+ * $Id: rjb.c 39 2007-11-08 17:33:57Z arton $
  */
 
-#define RJB_VERSION "1.0.9"
+#define RJB_VERSION "1.0.11"
 
 #include "ruby.h"
 #include "st.h"
@@ -45,6 +45,7 @@ static void setup_metadata(JNIEnv* jenv, VALUE self, struct jv_data*, VALUE clas
 static VALUE jarray2rv(JNIEnv* jenv, jvalue val);
 static jarray r2objarray(JNIEnv* jenv, VALUE v, const char* cls);
 static VALUE jv2rv_withprim(JNIEnv* jenv, jobject o);
+static J2R get_arrayconv(const char* cname, char* depth);
 
 static VALUE rjb;
 static VALUE jklass;
@@ -237,6 +238,7 @@ static VALUE jv2rv_r(JNIEnv* jenv, jvalue val)
     // object to ruby
     if (!val.l) return Qnil;
     klass = (*jenv)->GetObjectClass(jenv, val.l);
+
     if ((*jenv)->IsSameObject(jenv, klass, j_class))
     {
         (*jenv)->DeleteLocalRef(jenv, klass);
@@ -247,8 +249,13 @@ static VALUE jv2rv_r(JNIEnv* jenv, jvalue val)
     cname = (*jenv)->GetStringUTFChars(jenv, nm, NULL);
     if (*cname == '[')
     {
+        char depth = 0;
+        J2R j2r = get_arrayconv(cname, &depth);
         rjb_release_string(jenv, nm, cname);
-        return jarray2rv(jenv, val);
+        v = j2r(jenv, val);
+        (*jenv)->DeleteLocalRef(jenv, klass);
+        (*jenv)->DeleteLocalRef(jenv, val.l);
+        return v;
     }
     clsname = rb_str_new2(cname);
     rjb_release_string(jenv, nm, cname);
@@ -1146,6 +1153,27 @@ static R2J get_r2j(JNIEnv* jenv, jobject o, int* siglen,  char* sigp)
     return result;
 }
 
+static J2R get_arrayconv(const char* cname, char* pdepth)
+{
+    int i;
+    int start;
+    for (start = 1; *(cname + start) == '['; start++);
+    *pdepth = (char)start;
+    for (i = 0; i < COUNTOF(jcvt); i++)
+    {
+        if (*(cname + start) == jcvt[i].jntype[0])
+        {
+            if (jcvt[i].jntype[0] == 'L'
+                && strncmp(cname + start, jcvt[i].jntype, strlen(jcvt[i].jntype)))
+            {
+                break;
+            }
+            return jcvt[i].ja2r;
+        }
+    }
+    return &jarray2rv;
+}
+
 static J2R get_j2r(JNIEnv* jenv, jobject cls, char* psig, char* pdepth, char* ppsig, off_t* piv, int static_method)
 {
     int i;
@@ -1158,26 +1186,7 @@ static J2R get_j2r(JNIEnv* jenv, jobject cls, char* psig, char* pdepth, char* pp
 
     if (*cname == '[')
     {
-        int start;
-	for (start = 1; *(cname + start) == '['; start++);
-	*pdepth = (char)start;
-	for (i = 0; i < COUNTOF(jcvt); i++)
-	{
-	    if (*(cname + start) == jcvt[i].jntype[0])
-	    {
-		if (jcvt[i].jntype[0] == 'L'
-		    && strncmp(cname + start, jcvt[i].jntype, strlen(jcvt[i].jntype)))
-		{
-		    break;
-		}
-		result = jcvt[i].ja2r;
-		break;
-	    }
-	}
-	if (!result)
-	{
-	    result = jarray2rv;
-	}
+        result = get_arrayconv(cname, pdepth);
 	jname = cname;
     }
     else

data/test/test.rb

@@ -1,5 +1,5 @@
 #!/usr/local/env ruby
-# $Id: test.rb 23 2007-09-22 23:07:05Z arton $
+# $Id: test.rb 34 2007-11-08 16:52:07Z arton $
 
 require 'test/unit'
 require 'rjb'
@@ -142,6 +142,32 @@ class TestRjb < Test::Unit::TestCase
     sjis_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
     s = @jString.new(sjis_kj)
     assert_equal(s.toString(), sjis_kj)
+    $KCODE = 'utf8'
+    utf8_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
+    s = @jString.new(utf8_kj)
+    assert_equal(s.toString(), utf8_kj)
+    $KCODE = 'none'
+    if /mswin(?!ce)|mingw|cygwin|bccwin/ =~ RUBY_PLATFORM
+      #expecting shift_jis on windows
+      none_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
+    else
+      #expecting utf-8 unless windows
+      none_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
+    end
+    s = @jString.new(none_kj)
+    assert_equal(s.toString(), none_kj)
+    $KCODE = 'utf8'
+    utf8_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
+    s = @jString.new(utf8_kj)
+    assert_equal(s.toString(), utf8_kj)
+    $KCODE = 'sjis'
+    sjis_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
+    s = @jString.new(sjis_kj)
+    assert_equal(s.toString(), sjis_kj)
+    $KCODE = 'euc'
+    euc_kj = "\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8"
+    s = @jString.new(euc_kj)
+    assert_equal(s.toString(), euc_kj)
   end
 
   def test_constants()
@@ -499,5 +525,22 @@ class TestRjb < Test::Unit::TestCase
     assert_equal 8070450532247928832, a.get(7)
     assert_equal ?A, a.get(8)
   end
+
+  def test_enum
+    t = Rjb::import('jp.co.infoseek.hp.arton.rjb.Test$TestTypes')
+    assert t.ONE.equals(t.values()[0])
+    assert_equal 3, t.values().size
+    assert_equal 2, t.THREE.ordinal
+    assert_equal "TWO", t.TWO.name
+    assert_equal "THREE", t.THREE.toString
+  end
+
+  #rjb-bugs-15430 rebported by Bryan Duxbury
+  def test_generics_map
+    test = import('jp.co.infoseek.hp.arton.rjb.Test').new
+    map = test.sorted_map
+    assert_equal "\0\x1\x2\x3\x4", map.get('abc')
+    assert_equal "\x5\x6\x7\x8\x9", map.get('def')
+  end
 end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: rjb
 version: !ruby/object:Gem::Version 
-  version: 1.0.9
-date: 2007-09-23 00:00:00 +09:00
+  version: 1.0.11
+date: 2007-11-09 00:00:00 +09:00
 summary: Ruby Java bridge
 require_paths: 
 - lib
@@ -34,6 +34,7 @@ files:
 - ext/riconv.c
 - ext/rjb.c
 - ext/rjbexception.c
+- ext/extconf.h
 - ext/jniwrap.h
 - ext/jp_co_infoseek_hp_arton_rjb_RBridge.h
 - ext/riconv.h
@@ -47,6 +48,7 @@ files:
 - 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$TestTypes.class
 - test/jp/co/infoseek/hp/arton/rjb/Test.class
 - COPYING
 - ChangeLog