rjb 1.6.8 → 1.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c844ae35b7db5e279feb4088495040f16f520173a65c096b564a88a2816faba6
-  data.tar.gz: 842e428865248d83b1a49d61ffa5b654586ecb80cf566e78b9b6ff4c0a7a5dbf
+  metadata.gz: db68bd4fe5b0ad8ab33ded261ddfbddac69c2f1713b3be5ccec7c19bf6d504ef
+  data.tar.gz: 05cfef71f471a7e181964971cc9efdbf14a6be594957c8f7f2cc79d66abcb634
 SHA512:
-  metadata.gz: 115259efb72d586e6cea9d2b12ccbd90c5b18bc531f60753b4348463f768d3721ff17af0f3a3979b5830e98c023a7d02818edc125b2a6779816440b8fc6bc297
-  data.tar.gz: 93e80bc33b9f8ea9f658a8566e9b4e72d03a01eca89f283323180ec4d146a625b5ca751e1c20fc93ffb8864d162a5370b2e0f2513a10f569729131bbbd60f4ac
+  metadata.gz: d03e67bbe85d5d21ad9368d9956d48e802d2948260f9df551ebf9c3ea5c98753400dfe0446bd0a6fa5711e1f23ce2ed3144e2529c88a6507d8d5ca01fbb91d79
+  data.tar.gz: 1811c379afd0cfae646b3fd055399d706e3ee94270c9585f34b0ddbe4c7225694480fce0b390e9762e54292c1d6e8d9073a7deb71e6561b3923b46f79585109b

data/ChangeLog

@@ -1,3 +1,10 @@
+Thu Nov 9 2023 arton
+ * ext/rjb.c
+	RJB_VERSION -> 1.6.9
+ * ext/riconv.c
+	fix CESU-8 check
+ * test/est.rb
+	add test_jav_hangul_syllable for checking CESU-8 bug (char start with 0xed)
 Thu Sep 28 2023 chaddow
  #93 fake allocation framework to remove T_DATA warning
  * ext/rjb.c

data/ext/extconf.h

@@ -4,5 +4,5 @@
 #define HAVE_NL_LANGINFO 1
 #define HAVE_SETLOCALE 1
 #define HAVE_GETENV 1
-#define RJB_RUBY_VERSION_CODE 278
+#define RJB_RUBY_VERSION_CODE 322
 #endif

data/ext/riconv.c

@@ -14,7 +14,6 @@
  *
  * $Id: riconv.c 117 2010-06-04 12:16:25Z arton $
  */
-
 #include "ruby.h"
 #include "extconf.h"
 
@@ -196,12 +195,15 @@ static int contains_auxchar(const unsigned char* p)
 {
     while (*p)
     {
-      if (*p == 0xed)
+        if (*p == 0xed && *(p + 1) && *(p + 1))
         {
 #if defined(DEBUG)
-          printf("find %02x %02x %02x %02x %02x %02x\n", *p, *(p + 1), *(p + 2), *(p + 3), *(p + 4), *(p + 5));
+            printf("find %02x %02x %02x %02x %02x %02x\n", *p, *(p + 1), *(p + 2), *(p + 3), *(p + 4), *(p + 5));
 #endif
-          return 1;
+	    if ((*(p + 1) & 0xa0) == 0xa0 && (*(p + 2) & 0xb0) == 0xb0)
+	    {    
+                return 1;
+	    }
         }
         switch (*p & 0xe0)
         {

data/ext/rjb.c

@@ -14,7 +14,7 @@
  *
  */
 
-#define RJB_VERSION "1.6.8"
+#define RJB_VERSION "1.6.9"
 
 #include "ruby.h"
 #include "extconf.h"

data/test/test.rb

@@ -960,10 +960,20 @@ class TestRjb < Test::Unit::TestCase
   end
 
   def test_java_utf8
-    y = @jString.new('𠮷野家')
+    y = @jString.new('𠮷野家')  # with surrogate pair
     assert_equal '𠮷野家', y.toString
   end
 
+  def test_java_hangul_syllable
+    # 토 \uD1A => ED 86 A0 (utf-8)
+    test_string = "토"    # simple unicode char (not surrogate pair)
+    y = @jString.new_with_sig('Ljava.lang.String;', test_string)
+    assert_equal(test_string, y.toString)
+    test_string = "토토"    # simple unicode char (not surrogate pair)
+    y = @jString.new_with_sig('Ljava.lang.String;', test_string)
+    assert_equal(test_string, y.toString)
+  end
+
   def test_respond_to
     str = @jString.new('blabla')
     assert str.respond_to? :substring

metadata

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