rjb 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb3a393975ffb900a204709a4c3d84520f0d30c0
-  data.tar.gz: e74ce433645a5bbc2cf701659de8a012e2dddc2d
+  metadata.gz: 83926ee6e9439e6f61436c5045886ef3e773965d
+  data.tar.gz: b00c978c98273e226533c6bbf35a47cee7256082
 SHA512:
-  metadata.gz: a1065c8664fd657042733cde7011fe795782ad4fdb9dff29ccec3e0222fda5c7b411393dae203f39d2ff7b608a7e5d1fd156eb18e83e4c38eb662a043aae9886
-  data.tar.gz: f84147dadfeb90e296576d9a3cdfeac81c6726ed3e2047d2551184db6e8adb4a4bb60e08482f45a55868339d213ab118ca74a1c8e31c9713d45fd3789dab7eea
+  metadata.gz: aef85ae6c2ccece3faf84cd42f47cbf856cd4a65123c417746900af2f002910751a0ead2f28c3af1a7a6422a5c7202bb92fe54a148dce241c23cafb16cc36e6c
+  data.tar.gz: de168714ca12bf586fa9e08bc5b552640fb0cf7c9e99774bebd8906313a170bcdca8ada5787ee3e603f349eaf5573af78e84d69ffddb69997ee4a3d1e8bfa419

data/ChangeLog

@@ -1,9 +1,15 @@
+Sat Dec 20 2014 arton
+ *ext/rjb.c
+	RJB_VERSION -> 1.5.3
+	select preferable constructor if argument is an array (for java.lang.String)
+ *test/test.rb
+	change literals to constants for kanji strings
 Sun Dec 14 2014 arton
  *lib/rjb.rb
 	FakeDL for Rubinius
  *ext/riconv.c
 	Change variable name for avoiding conflicion (Runinius)
- *ext/rjb.
+ *ext/rjb.c
 	RJB_VERSION -> 1.5.2
 	Support Rubinius (Rubinius's block is T_OBJECT instead of T_DATA -> affected to anonclass)
  *test/test.rb

data/ext/extconf.h

@@ -1,8 +1,7 @@
 #ifndef EXTCONF_H
 #define EXTCONF_H
 #define HAVE_JNI_H 1
-#define HAVE_NL_LANGINFO 1
 #define HAVE_SETLOCALE 1
 #define HAVE_GETENV 1
-#define RJB_RUBY_VERSION_CODE 220
+#define RJB_RUBY_VERSION_CODE 212
 #endif

data/ext/rjb.c

@@ -14,7 +14,7 @@
  *
  */
 
-#define RJB_VERSION "1.5.2"
+#define RJB_VERSION "1.5.3"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -2130,6 +2130,8 @@ static VALUE register_instance(JNIEnv* jenv, VALUE klass, struct jv_data* org, j
     return v;
 }
 
+#define IS_BYTE(b) (!((b) & 0xffffff00))
+#define IS_SHORT(b) (!((b) & 0xffff0000))
 /*
  * temporary signature check
  * return !0 if found
@@ -2140,6 +2142,7 @@ static VALUE register_instance(JNIEnv* jenv, VALUE klass, struct jv_data* org, j
 #define PREFERABLE 3
 static int check_rtype(JNIEnv* jenv, VALUE* pv, char* p)
 {
+    size_t i;
     char* pcls = NULL;
     if (*p == 'L')
     {
@@ -2181,7 +2184,33 @@ static int check_rtype(JNIEnv* jenv, VALUE* pv, char* p)
     case T_FALSE:
         return (*p == 'Z') ? SOSO : UNMATCHED;
     case T_ARRAY:
-        return (*p == '[') ? SOSO : UNMATCHED;
+        if (*p == '[')
+        {
+            int weight = (*(p + 1) == 'C') ? SOSO : PREFERABLE;
+            size_t len = RARRAY_LEN(*pv);
+            VALUE* ppv = RARRAY_PTR(*pv);
+            unsigned long ul;
+            if (!strchr("BCSI", *(p + 1))) return SOSO; // verify later
+            if (len > 32) len = 32;
+            for (i = 0; i < len; i++, ppv++)
+            {
+                if (!FIXNUM_P(*ppv))
+                {
+                    return UNMATCHED;
+                }
+                ul = (unsigned long)FIX2LONG(*ppv);
+                if (*(p + 1) == 'B')
+                {
+                    if (!IS_BYTE(ul)) return UNMATCHED;
+                }
+                else if (*(p + 1) == 'C' || *(p + 1) == 'S')
+                {
+                    if (!IS_SHORT(ul)) return UNMATCHED;
+                }
+            }
+            return weight;
+        }
+        return UNMATCHED;
     case T_DATA:
     case T_OBJECT:
         if (IS_RJB_OBJECT(*pv) && pcls)
@@ -2296,6 +2325,10 @@ static VALUE rjb_newinstance(int argc, VALUE* argv, VALUE self)
 	}
         if (found_pc)
         {
+#if defined(DEBUG)
+            fprintf(stderr, "ctr sig=%s\n", (*found_pc)->method_signature);
+            fflush(stderr);
+#endif
             ret = createinstance(jenv, argc, argv, self, *found_pc);
         }
     }

data/test/js.rb

@@ -0,0 +1,54 @@
+begin
+  require 'rjb'
+rescue LoadError 
+  require 'rubygems' 
+  require 'rjb'
+end
+require 'test/unit'
+require 'fileutils'
+
+FileUtils.rm_f 'jp/co/infoseek/hp/arton/rjb/Base.class'
+FileUtils.rm_f 'jp/co/infoseek/hp/arton/rjb/ExtBase.class'
+
+puts "start RJB(#{Rjb::VERSION}) test"
+class TestRjb < Test::Unit::TestCase
+  include Rjb
+  def setup
+    Rjb::load('.')
+    Rjb::add_jar(File.expand_path('rjbtest.jar'))
+    Rjb::primitive_conversion = false
+
+    @jString = import('java.lang.String')
+    @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
+
+  SJIS_STR = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
+  EUCJP_STR = "\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8"
+  UTF8_STR = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
+  def test_jsconv
+    sys = import('java.lang.System')
+    encoding = sys.property('file.encoding')
+    s = @jString.new(SJIS_STR.force_encoding Encoding::SHIFT_JIS)
+    e = @jString.new(EUCJP_STR.force_encoding Encoding::EUC_JP)
+    u = @jString.new(UTF8_STR.force_encoding Encoding::UTF_8)
+    if encoding == 'MS932'
+      s1 = @jString.new(SJIS_STR.bytes)
+    elsif encoding.upcase == 'EUC-JP'
+      s1 = @jString.new(EUCJP_STR.bytes)
+    elsif encoding.upcase == 'UTF-8'
+      s1 = @jString.new(UTF8_STR.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

data/test/test.rb

@@ -899,19 +899,23 @@ class TestRjb < Test::Unit::TestCase
     assert_equal '[Ljava.lang.Integer;', ret[1]
     assert_equal '[Ljava.net.URI;', ret[2]    
   end
+
+  SJIS_STR = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
+  EUCJP_STR = "\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8"
+  UTF8_STR = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
   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)
+    s = @jString.new(SJIS_STR.force_encoding Encoding::SHIFT_JIS)
+    e = @jString.new(EUCJP_STR.force_encoding Encoding::EUC_JP)
+    u = @jString.new(UTF8_STR.force_encoding Encoding::UTF_8)
     if encoding == 'MS932'
-      s1 = @jString.new("\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67".bytes)
+      s1 = @jString.new(SJIS_STR.bytes)
     elsif encoding.upcase == 'EUC-JP'
-      s1 = @jString.new("\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8".bytes)
+      s1 = @jString.new(EUCJP_STR.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)
+      s1 = @jString.new(UTF8_STR.bytes)
     else
       skip 'no checkable encoding'
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rjb
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - arton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-14 00:00:00.000000000 Z
+date: 2014-12-20 00:00:00.000000000 Z
 dependencies: []
 description: |
   RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
@@ -64,6 +64,7 @@ files:
 - 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/js.rb
 - test/listtest.rb
 - test/osx_jvmcheck.rb
 - test/rjbtest.jar
@@ -71,7 +72,7 @@ files:
 - test/test_osxjvm.rb
 - test/test_osxload.rb
 - test/test_unload.rb
-homepage: http://rjb.rubyforge.org/
+homepage: http://www.artonx.org/collabo/backyard/?RubyJavaBridge
 licenses:
 - LGPL
 metadata: {}
@@ -93,7 +94,7 @@ requirements:
 - none
 - JDK 5.0
 rubyforge_project: rjb
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby Java bridge