rjb 1.4.9 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edd42f717ffa2d437e0384f16a568be037da995c
-  data.tar.gz: d358b67fb76943b1afce022739f2219b5dc2d19d
+  metadata.gz: 7d6d253c1e5df6889eb04285aeaff937351317c9
+  data.tar.gz: b4bb1f5f967729a3b0571656346311ca0f2eb895
 SHA512:
-  metadata.gz: bfedeefc159b9365f9e89dc8233cd19aae57c77401884412694d55678db74f76fec6706590b0492563021a003e74fe5b187ea9cbb371f76e8c2a5d9f5e118b33
-  data.tar.gz: f83c4a7f1c700655cbfd1feea42257edd22c444b4b5f24947d625229baaddf2a33e49f985227c98b83183c75daf2a04aa25a7d98afa739dc2415bf696b112a4c
+  metadata.gz: 1d27f2f4b4bad8f7f6e5da58c2fc723d95281043232f285e7946e2684fbd701f986b7ce50187ce467452f7cdc41a2c51b9ec3229ab66ef3fd83d3734463da092
+  data.tar.gz: fe5118788283e6615c6ba533414cb246988b8686e17474b571bdaccbf36494803084ca7fe3fafe303d67d8703869dc24d998a2dc1e24dae3c2a21e9c123acc8d

data/ChangeLog

@@ -1,3 +1,15 @@
+Sat Sep 20 2014 arton
+ *ext/rjb.c
+	RJB_VERSION -> 1.5.0
+	fix ctor_sigs with non argment ctor (represented by '')
+	select preferable constructor
+ *ext/riconv.c
+	restruct encoding function
+ *test/test.rb
+	add constructor selection test (Ljava.lang.String; vs [B)
+Wed Jan 15 2014 arton
+ *rjb.rake
+	add lib/rjb/*.rb into gem
 Fri Jan 4 2014 arton
  *test/Test.java
  *test/rjbtest.jar

data/ext/riconv.c

@@ -169,6 +169,16 @@ static void check_kcode()
 }
 #endif
 
+#if defined(DEBUG)
+static void debug_out(VALUE v)
+{
+    char* p = StringValuePtr(v);
+    printf("-- %d, %d, %s\n", rb_num2long(rb_funcall(v, rb_intern("size"), 0)),
+           strlen(p), p);
+    fflush(stdout);
+}
+#endif
+
 VALUE exticonv_local_to_utf8(VALUE local_string)
 {
 #if RJB_RUBY_VERSION_CODE < 190
@@ -182,16 +192,18 @@ VALUE exticonv_local_to_utf8(VALUE local_string)
         return local_string;
     }
 #else
-    VALUE rb_cEncoding, encoding, sjis, eucjp, iso2022jp;
+    VALUE rb_cEncoding, encoding, utf8;
     rb_cEncoding = rb_const_get(rb_cObject, rb_intern("Encoding"));
-    sjis = rb_const_get(rb_cEncoding, rb_intern("SHIFT_JIS"));
-    eucjp = rb_const_get(rb_cEncoding, rb_intern("EUC_JP"));
-    iso2022jp = rb_const_get(rb_cEncoding, rb_intern("ISO_2022_JP"));
     encoding = rb_funcall(local_string, rb_intern("encoding"), 0);
-
-    if (encoding == sjis || encoding == eucjp || encoding == iso2022jp)
+    utf8 = rb_const_get(rb_cEncoding, rb_intern("UTF_8"));
+    if (encoding != utf8)
     {
-        return rb_funcall(local_string, rb_intern("encode"), 1, rb_str_new2("utf-8"));
+        VALUE ret = rb_funcall(local_string, rb_intern("encode"), 2, utf8, encoding);
+#if defined(DEBUG)
+        debug_out(local_string);
+        debug_out(ret);
+#endif        
+        return ret;
     }
     else
     {
@@ -213,6 +225,6 @@ VALUE exticonv_utf8_to_local(VALUE utf8_string)
         return utf8_string;
     }
 #else
-    return rb_funcall(utf8_string, rb_intern("force_encoding"), 1, rb_str_new2("utf-8"));
+    return rb_funcall(utf8_string, rb_intern("force_encoding"), 1, rb_const_get(rb_cEncoding, rb_intern("UTF_8")));
 #endif
 }

data/ext/rjb.c

@@ -15,7 +15,7 @@
  * $Id: rjb.c 199 2012-12-17 13:31:18Z arton $
  */
 
-#define RJB_VERSION "1.4.9"
+#define RJB_VERSION "1.5.0"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -846,7 +846,7 @@ static void rv2jobject(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, in
 #endif                
             case T_OBJECT:
             default:
-#if DEBUG
+#if defined(DEBUG)
                 fprintf(stderr, "rtype:%d, sig=%s\n", TYPE(val), psig);
                 fflush(stderr);
 #endif
@@ -2131,6 +2131,10 @@ static VALUE register_instance(JNIEnv* jenv, VALUE klass, struct jv_data* org, j
  * temporary signature check
  * return !0 if found
  */
+#define NOTFOUND 0
+#define SATISFIED 1
+#define SOSO 2
+#define PREFERABLE 3
 static int check_rtype(JNIEnv* jenv, VALUE* pv, char* p)
 {
     char* pcls = NULL;
@@ -2146,18 +2150,30 @@ static int check_rtype(JNIEnv* jenv, VALUE* pv, char* p)
     }
     if (pcls && !strcmp("java.lang.Object", pcls))
     {
-        return 1;
+        return SATISFIED;
     }
     switch (TYPE(*pv))
     {
     case T_FIXNUM:
-        return strchr("BCDFIJS", *p) != NULL;
+        if (strchr("IJ", *p)) return SOSO;
+        return strchr("BCDFS", *p) != NULL;
     case T_BIGNUM:
         return strchr("BCDFIJS", *p) != NULL;        
     case T_FLOAT:
-	return strchr("DF", *p) != NULL;
+        if (*p == 'D') return SOSO;
+        if (*p == 'F') return SATISFIED;
+        return NOTFOUND;
     case T_STRING:
-        return pcls && !strcmp("java.lang.String", pcls) || *p == '[' && *(p + 1) == 'B';
+        if (pcls && (!strcmp("java.lang.String", pcls)
+                     || !strcmp("java.lang.CharSequence", pcls)))
+        {
+            return PREFERABLE;
+        }
+        else if (*p == '[' && *(p + 1) == 'B')
+        {
+            return SATISFIED;
+        }
+        return NOTFOUND;
     case T_TRUE:
     case T_FALSE:
         return *p == 'Z';
@@ -2170,15 +2186,15 @@ static int check_rtype(JNIEnv* jenv, VALUE* pv, char* p)
 	    jclass cls;
             struct jvi_data* ptr;
 	    int result = 0;
-            if (!strcmp("java.lang.String", pcls)) return 1;
+            if (!strcmp("java.lang.String", pcls)) return SATISFIED;
 	    Data_Get_Struct(*pv, struct jvi_data, ptr);
             RJB_FIND_CLASS(cls, java2jniname(pcls));
 	    if (cls)
-        	    {
+            {
 	        result = (cls && (*jenv)->IsInstanceOf(jenv, ptr->obj, cls));
 	        (*jenv)->DeleteLocalRef(jenv, cls);
 	    }
-	    return result;
+	    return (result) ? PREFERABLE : NOTFOUND;
 	} else if (pcls) {
             VALUE blockobj = rb_class_new_instance(1, pv, rjba);
             *pv = rjb_s_bind(rjbb, blockobj, rb_str_new2(pcls));
@@ -2189,9 +2205,9 @@ static int check_rtype(JNIEnv* jenv, VALUE* pv, char* p)
     default:
         if (pcls || *p == '[')
         {
-            return 1;
+            return SATISFIED;
         }
-	return 0;
+	return NOTFOUND;
     }
 }
 
@@ -2235,7 +2251,10 @@ static VALUE rjb_newinstance(int argc, VALUE* argv, VALUE self)
     VALUE ret = Qnil;
     struct jv_data* ptr;
     struct cls_constructor** pc;
+    struct cls_constructor** found_pc = NULL;
     int found = 0;
+    int weight = 0;
+    int cweight;
     JNIEnv* jenv = rjb_prelude();
     
     Data_Get_Struct(self, struct jv_data, ptr);
@@ -2246,28 +2265,39 @@ static VALUE rjb_newinstance(int argc, VALUE* argv, VALUE self)
 	char* psig;
 	for (pc = ptr->constructors; *pc; pc++)
 	{
+            found = 0;
 	    if ((*pc)->arg_count == argc)
 	    {
-	        found = 1;
+                found = 1;
+                cweight = 0;
 		psig = (*pc)->method_signature;
 		for (i = 0; i < argc; i++)
 		{
-		    if (!check_rtype(jenv, argv + i, psig))
+                    int w = check_rtype(jenv, argv + i, psig);
+		    if (!w)
                     {
 		        found = 0;
 			break;
 		    }
+                    cweight += w;
 		    psig = next_sig(psig);
 		}
-		if (found)
-		{
-		    ret = createinstance(jenv, argc, argv, self, *pc);
-		    break;
-		}
 	    }
+            if (found)
+            {
+                if (cweight > weight || weight == 0)
+                {
+                    found_pc = pc;
+                    weight = cweight;
+                }
+            }
 	}
+        if (found_pc)
+        {
+            ret = createinstance(jenv, argc, argv, self, *found_pc);
+        }
     }
-    if (!found) {
+    if (!found_pc) {
 	rb_raise(rb_eRuntimeError, "Constructor not found");
     }
     return ret;
@@ -2364,7 +2394,8 @@ static VALUE rjb_get_ctor_signatures(VALUE self)
     {
         for (pc = ptr->constructors; *pc; pc++)
         {
-            rb_ary_push(ret, rb_str_new2((*pc)->method_signature));
+            const char* sig = (*pc)->method_signature;
+            rb_ary_push(ret, rb_str_new2(sig ? sig : ""));
         }
     }
     return ret;
@@ -2861,11 +2892,13 @@ static void setter(JNIEnv* jenv, struct cls_field* pf,  struct jvi_data* ptr, VA
 static VALUE invoke(JNIEnv* jenv, struct cls_method* pm, struct jvi_data* ptr,
 		    int argc, VALUE* argv, const char* sig)
 {
-    int i, found;
+    int i, found, cweight;
     jvalue jv;
     jvalue* args;
     char* psig;
     struct cls_method* orgpm = pm;
+    struct cls_method* prefer_pm = NULL;
+    int weight = 0;
 
     if (rb_block_given_p())
     {
@@ -2876,8 +2909,9 @@ static VALUE invoke(JNIEnv* jenv, struct cls_method* pm, struct jvi_data* ptr,
         argv = pargs;
     }
 
-    for (found = 0; pm; pm = pm->next)
+    for (; pm; pm = pm->next)
     {
+        found = 0;
         if (argc == pm->basic.arg_count)
         {
             if (sig && pm->basic.method_signature) 
@@ -2885,27 +2919,38 @@ static VALUE invoke(JNIEnv* jenv, struct cls_method* pm, struct jvi_data* ptr,
                 if (!strcmp(sig, pm->basic.method_signature))
                 {
 	            found = 1;
+                    prefer_pm = pm;
                     break;
 		}
 	    }
             else
             {
-	        psig = pm->basic.method_signature;
                 found = 1;
+                cweight = 0;
+	        psig = pm->basic.method_signature;
                 for (i = 0; i < argc; i++)
                 {
-		    if (!check_rtype(jenv, argv + i, psig))
+                    int w = check_rtype(jenv, argv + i, psig);
+		    if (!w)
                     {
                         found = 0;
                         break;
                     }
+                    cweight += w;
 		    psig = next_sig(psig);
                 }
-                if (found) break;
 	    }
 	}
+        if (found)
+        {
+            if (cweight > weight || weight == 0)
+            {
+                prefer_pm = pm;
+                weight = cweight;
+            }
+        }
     }
-    if (!found)
+    if (!prefer_pm)
     {
 	const char* tname = rb_id2name(orgpm->name);
 	if (sig) 
@@ -2918,71 +2963,71 @@ static VALUE invoke(JNIEnv* jenv, struct cls_method* pm, struct jvi_data* ptr,
 	}
     }
     args = (argc) ? ALLOCA_N(jvalue, argc) : NULL;
-    psig = pm->basic.method_signature;
+    psig = prefer_pm->basic.method_signature;
     for (i = 0; i < argc; i++)
     {
-	R2J pr2j = *(pm->basic.arg_convert + i);
+	R2J pr2j = *(prefer_pm->basic.arg_convert + i);
 	pr2j(jenv, argv[i], args + i, psig, 0);
 	psig = next_sig(psig);
     }
-    switch (pm->basic.result_signature)
+    switch (prefer_pm->basic.result_signature)
     {
     case 'D':
       {
-        INVOKEAD voked = *(INVOKEAD*)(((char*)*jenv) + pm->method);
-	jv.d = voked(jenv, ptr->obj, pm->basic.id, args);
+        INVOKEAD voked = *(INVOKEAD*)(((char*)*jenv) + prefer_pm->method);
+	jv.d = voked(jenv, ptr->obj, prefer_pm->basic.id, args);
       }
       break;
     case 'Z':
     case 'B':
       {
-        INVOKEAZ vokez = *(INVOKEAZ*)(((char*)*jenv) + pm->method);
-	jv.z = vokez(jenv, ptr->obj, pm->basic.id, args);
+        INVOKEAZ vokez = *(INVOKEAZ*)(((char*)*jenv) + prefer_pm->method);
+	jv.z = vokez(jenv, ptr->obj, prefer_pm->basic.id, args);
       }
       break;
     case 'F':
       {
-        INVOKEAF vokef = *(INVOKEAF*)(((char*)*jenv) + pm->method);
-	jv.f = vokef(jenv, ptr->obj, pm->basic.id, args);
+        INVOKEAF vokef = *(INVOKEAF*)(((char*)*jenv) + prefer_pm->method);
+	jv.f = vokef(jenv, ptr->obj, prefer_pm->basic.id, args);
       }
       break;
     case 'C':
     case 'S':
       {
-        INVOKEAS vokes = *(INVOKEAS*)(((char*)*jenv) + pm->method);
-	jv.s = vokes(jenv, ptr->obj, pm->basic.id, args);
+        INVOKEAS vokes = *(INVOKEAS*)(((char*)*jenv) + prefer_pm->method);
+	jv.s = vokes(jenv, ptr->obj, prefer_pm->basic.id, args);
       }
       break;
 #if HAVE_LONG_LONG
     case 'J':
       {
-        INVOKEAL vokel = *(INVOKEAL*)(((char*)*jenv) + pm->method);
-	jv.j = vokel(jenv, ptr->obj, pm->basic.id, args);
+        INVOKEAL vokel = *(INVOKEAL*)(((char*)*jenv) + prefer_pm->method);
+	jv.j = vokel(jenv, ptr->obj, prefer_pm->basic.id, args);
       }
       break;
 #endif
     default:
       {
-        INVOKEA voke = *(INVOKEA*)(((char*)*jenv) + pm->method);
-        jv.l = voke(jenv, ptr->obj, pm->basic.id, args);
+        INVOKEA voke = *(INVOKEA*)(((char*)*jenv) + prefer_pm->method);
+        jv.l = voke(jenv, ptr->obj, prefer_pm->basic.id, args);
       }
       break;
     }
     rjb_check_exception(jenv, 1);
-    psig = pm->basic.method_signature;
+    psig = prefer_pm->basic.method_signature;
     for (i = 0; i < argc; i++)
     {
-	R2J pr2j = *(pm->basic.arg_convert + i);
+	R2J pr2j = *(prefer_pm->basic.arg_convert + i);
 	pr2j(jenv, argv[i], args + i, psig, 1);
 	psig = next_sig(psig);
     }
-    if (pm->basic.result_arraydepth)
+    if (prefer_pm->basic.result_arraydepth)
     {
-        return ja2r(pm->result_convert, jenv, jv, pm->basic.result_arraydepth);
+        return ja2r(prefer_pm->result_convert, jenv, jv, prefer_pm->basic.result_arraydepth);
     }
     else
     {
-        return pm->result_convert(jenv, jv);
+        return prefer_pm->result_convert(jenv, jv);
     }
 }
 

data/lib/rjb/extension.rb

@@ -0,0 +1,128 @@
+=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 147 2010-10-23 05:10:33Z 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
+    if Rjb::loaded?
+      Rjb::add_jar abs_path
+    else
+      Rjb::add_classpath abs_path
+    end
+  end
+
+  def load_jvm(jargs = [])
+    return if Rjb::loaded?
+    classpath = ENV['CLASSPATH'] ||= ''
+    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/lib/rjb/list.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+=begin
+  Copyright(c) 2012 arton
+=end
+
+require 'rjb'
+
+module Rjb
+  JIterable = import('java.lang.Iterable')
+  JIterator = import('java.util.Iterator')
+  module Iterable
+    def each
+      it = iterator
+      while it.has_next
+        yield it.next
+      end
+    end
+  end
+  module Iterator
+    def each
+      while has_next
+        yield self.next
+      end
+    end
+  end
+  class Rjb_JavaProxy
+    def initialize_proxy
+      if JIterable.isInstance(self)
+        include Iterable
+        include Enumerable
+      elsif JIterator.isInstance(self)
+        include Iterator
+        include Enumerable
+      end
+    end
+  end
+end

data/test/test.rb

@@ -147,25 +147,25 @@ class TestRjb < Test::Unit::TestCase
     if Object::const_defined?(:Encoding)
       test = import('jp.co.infoseek.hp.arton.rjb.Test').new
       euc_kj = "\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8".force_encoding Encoding::EUC_JP
-      s = @jString.new(euc_kj)
+      s = @jString.new_with_sig('Ljava.lang.String;', euc_kj)
       assert_equal(s.toString().encoding, Encoding::UTF_8)
       assert(test.isSameString(s))
       assert(test.isSameString(euc_kj))
       assert_equal(s.toString().encode(Encoding::EUC_JP), euc_kj)
       sjis_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67".force_encoding Encoding::SHIFT_JIS
-      s = @jString.new(sjis_kj)
+      s = @jString.new_with_sig('Ljava.lang.String;', sjis_kj)
       assert_equal(s.toString().encoding, Encoding::UTF_8)
       assert(test.isSameString(s))
       assert(test.isSameString(sjis_kj))
       assert_equal(s.toString().encode(Encoding::SHIFT_JIS), sjis_kj)
       utf8_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88".force_encoding Encoding::UTF_8
-      s = @jString.new(utf8_kj)
+      s = @jString.new_with_sig('Ljava.lang.String;', utf8_kj)
       assert_equal(s.toString().encoding, Encoding::UTF_8)
       assert(test.isSameString(s))
       assert(test.isSameString(utf8_kj))
       assert_equal(s.toString().encode(Encoding::UTF_8), utf8_kj)
       iso2022jp_kj = "\x1b\x24\x42\x34\x41\x3b\x7a\x25\x46\x25\x2d\x25\x39\x25\x48\x1b\x28\x42".force_encoding Encoding::ISO_2022_JP
-      s = @jString.new(iso2022jp_kj)
+      s = @jString.new_with_sig('Ljava.lang.String;', iso2022jp_kj)
       assert_equal(s.toString().encoding, Encoding::UTF_8)
       assert(test.isSameString(s))
       assert(test.isSameString(iso2022jp_kj))
@@ -899,5 +899,25 @@ class TestRjb < Test::Unit::TestCase
     assert_equal '[Ljava.lang.Integer;', ret[1]
     assert_equal '[Ljava.net.URI;', ret[2]    
   end
+  def test_auto_constructor_selection
+    skip 'no encoding' unless Object::const_defined?(:Encoding)
+    sys = import('java.lang.System')
+    encoding = sys.property('file.encoding')
+    s = @jString.new("\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67".force_encoding Encoding::SHIFT_JIS)
+    e = @jString.new("\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8".force_encoding Encoding::EUC_JP)
+    u = @jString.new("\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88".force_encoding Encoding::UTF_8)
+    if encoding == 'MS932'
+      s1 = @jString.new("\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67".bytes)
+    elsif encoding.upcase == 'EUC-JP'
+      s1 = @jString.new("\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8".bytes)
+    elsif encoding.upcase == 'UTF-8'
+      s1 = @jString.new("\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88".bytes)
+    else
+      skip 'no checkable encoding'
+    end
+    assert_equal s1.toString, s.toString
+    assert_equal s1.toString, e.toString
+    assert_equal s1.toString, u.toString
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rjb
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.5.0
 platform: ruby
 authors:
 - arton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2014-09-20 00:00:00.000000000 Z
 dependencies: []
 description: |
   RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
@@ -18,52 +18,62 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
-- COPYING
-- ChangeLog
-- data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
 - ext/RBridge.java
-- ext/depend
+- ext/load.c
+- ext/riconv.c
+- ext/rjb.c
+- ext/rjbexception.c
 - ext/extconf.h
-- ext/extconf.rb
 - ext/jniwrap.h
 - ext/jp_co_infoseek_hp_arton_rjb_RBridge.h
-- ext/load.c
-- ext/riconv.c
 - ext/riconv.h
-- ext/rjb.c
 - ext/rjb.h
-- ext/rjbexception.c
+- ext/depend
+- data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
 - lib/rjb.rb
 - lib/rjbextension.rb
-- readme.sj
-- readme.txt
+- lib/rjb/extension.rb
+- lib/rjb/list.rb
 - samples/filechooser.rb
 - samples/unzip.rb
-- test/Test$TestTypes.class
-- test/Test.class
-- test/Two.class
-- test/TwoCaller.class
 - test/exttest.rb
 - test/gctest.rb
-- test/jartest.jar
 - test/jartest.rb
-- test/jartest2.jar
 - test/jartest2.rb
 - test/jartest3.rb
-- test/jp/co/infoseek/hp/arton/rjb/CallbackTest$Callback.class
-- test/jp/co/infoseek/hp/arton/rjb/CallbackTest.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
 - test/listtest.rb
 - test/osx_jvmcheck.rb
-- test/rjbtest.jar
 - test/test.rb
 - test/test_osxjvm.rb
 - test/test_osxload.rb
 - test/test_unload.rb
+- test/Base.class
+- test/CallbackTest$Callback.class
+- test/CallbackTest.class
+- test/ExtBase.class
+- test/IBase.class
+- test/JTest.class
+- test/Test$TestTypes.class
+- test/Test.class
+- test/Two.class
+- test/TwoCaller.class
+- test/jp/co/infoseek/hp/arton/rjb/CallbackTest$Callback.class
+- test/jp/co/infoseek/hp/arton/rjb/CallbackTest.class
+- test/jp/co/infoseek/hp/arton/rjb/IBase.class
+- test/jp/co/infoseek/hp/arton/rjb/JTest.class
+- test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.class
+- test/jp/co/infoseek/hp/arton/rjb/Test.class
+- test/jartest.jar
+- test/jartest2.jar
+- test/rjbtest.jar
+- COPYING
+- ChangeLog
+- readme.sj
+- readme.txt
+- ext/extconf.rb
 homepage: http://rjb.rubyforge.org/
-licenses: []
+licenses:
+- LGPL
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -71,19 +81,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - none
 - JDK 5.0
 rubyforge_project: rjb
-rubygems_version: 2.2.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Ruby Java bridge