rjb 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d6d253c1e5df6889eb04285aeaff937351317c9
-  data.tar.gz: b4bb1f5f967729a3b0571656346311ca0f2eb895
+  metadata.gz: a8d2fe4f37eb369c29fc25f688dbf8623142a59d
+  data.tar.gz: 0cbd8d8975cbd3292ea1b02e287950412f14bf8f
 SHA512:
-  metadata.gz: 1d27f2f4b4bad8f7f6e5da58c2fc723d95281043232f285e7946e2684fbd701f986b7ce50187ce467452f7cdc41a2c51b9ec3229ab66ef3fd83d3734463da092
-  data.tar.gz: fe5118788283e6615c6ba533414cb246988b8686e17474b571bdaccbf36494803084ca7fe3fafe303d67d8703869dc24d998a2dc1e24dae3c2a21e9c123acc8d
+  metadata.gz: 0064fb940021e09cd18a5154096eb9abb64ec191b30f1aefccacf57b72a2dd2d8a1d211e99f841235c8bf63173b11fa4f11b2511bb2497f8f0ba5ac7dd543d68
+  data.tar.gz: 6dfc1a8cbc9d11bc9e310186fb5340f3e2b68bcceccd7bf7b1c84a36abdcdd4904f5548fff298acf9e689593b9dcb15b614de50ea3393cd05b07cc5930551405

data/ChangeLog

@@ -1,3 +1,7 @@
+Tue Sep 23 2014 arton
+ *ext/rjb.c
+	RJB_VERSION -> 1.5.1
+	more weight for array and true/false
 Sat Sep 20 2014 arton
  *ext/rjb.c
 	RJB_VERSION -> 1.5.0

data/ext/rjb.c

@@ -15,7 +15,7 @@
  * $Id: rjb.c 199 2012-12-17 13:31:18Z arton $
  */
 
-#define RJB_VERSION "1.5.0"
+#define RJB_VERSION "1.5.1"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -2131,7 +2131,7 @@ static VALUE register_instance(JNIEnv* jenv, VALUE klass, struct jv_data* org, j
  * temporary signature check
  * return !0 if found
  */
-#define NOTFOUND 0
+#define UNMATCHED 0
 #define SATISFIED 1
 #define SOSO 2
 #define PREFERABLE 3
@@ -2162,7 +2162,7 @@ static int check_rtype(JNIEnv* jenv, VALUE* pv, char* p)
     case T_FLOAT:
         if (*p == 'D') return SOSO;
         if (*p == 'F') return SATISFIED;
-        return NOTFOUND;
+        return UNMATCHED;
     case T_STRING:
         if (pcls && (!strcmp("java.lang.String", pcls)
                      || !strcmp("java.lang.CharSequence", pcls)))
@@ -2173,12 +2173,12 @@ static int check_rtype(JNIEnv* jenv, VALUE* pv, char* p)
         {
             return SATISFIED;
         }
-        return NOTFOUND;
+        return UNMATCHED;
     case T_TRUE:
     case T_FALSE:
-        return *p == 'Z';
+        return (*p == 'Z') ? SOSO : UNMATCHED;
     case T_ARRAY:
-        return *p == '[';
+        return (*p == '[') ? SOSO : UNMATCHED;
     case T_DATA:
         if (IS_RJB_OBJECT(*pv) && pcls)
 	{
@@ -2194,7 +2194,7 @@ static int check_rtype(JNIEnv* jenv, VALUE* pv, char* p)
 	        result = (cls && (*jenv)->IsInstanceOf(jenv, ptr->obj, cls));
 	        (*jenv)->DeleteLocalRef(jenv, cls);
 	    }
-	    return (result) ? PREFERABLE : NOTFOUND;
+	    return (result) ? PREFERABLE : UNMATCHED;
 	} else if (pcls) {
             VALUE blockobj = rb_class_new_instance(1, pv, rjba);
             *pv = rjb_s_bind(rjbb, blockobj, rb_str_new2(pcls));
@@ -2207,7 +2207,7 @@ static int check_rtype(JNIEnv* jenv, VALUE* pv, char* p)
         {
             return SATISFIED;
         }
-	return NOTFOUND;
+	return UNMATCHED;
     }
 }
 

data/test/test.rb

@@ -907,7 +907,7 @@ class TestRjb < Test::Unit::TestCase
     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)
+      s1 = @jString.new_with_sig('[B', "\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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rjb
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - arton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-20 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies: []
 description: |
   RJB is a bridge program that connect between Ruby and Java with Java Native Interface.