rjb 1.6.7 → 1.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a210706c728d5d00f5c4c34fc0b4309404ec5303a5b7cd6d52264d0c0e838be5
-  data.tar.gz: 49968075c5e92ccd2083d1943fd95dd5856b8cc6a1c2372f48f4284ce9db7ac2
+  metadata.gz: db68bd4fe5b0ad8ab33ded261ddfbddac69c2f1713b3be5ccec7c19bf6d504ef
+  data.tar.gz: 05cfef71f471a7e181964971cc9efdbf14a6be594957c8f7f2cc79d66abcb634
 SHA512:
-  metadata.gz: 811023ee8c809b9221cf3e7c802d0697bc2bec4c8491d832fef925e65005c355967bb8429e4f3bcf195856e11a6fb46fbdb89469784746260a9d8a07d6c728fd
-  data.tar.gz: 14ac35e925c6a0bdb09cc8ace7f1f2157e617cdafef5c64689fcb2da76bd67bfceee0638023240da35d34f51dfa9131ed508ff7df6f05346cdf8594ca09a51e2
+  metadata.gz: d03e67bbe85d5d21ad9368d9956d48e802d2948260f9df551ebf9c3ea5c98753400dfe0446bd0a6fa5711e1f23ce2ed3144e2529c88a6507d8d5ca01fbb91d79
+  data.tar.gz: 1811c379afd0cfae646b3fd055399d706e3ee94270c9585f34b0ddbe4c7225694480fce0b390e9762e54292c1d6e8d9073a7deb71e6561b3923b46f79585109b

data/ChangeLog

@@ -1,3 +1,18 @@
+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
+	call rb_undef_alloc_fund if HAV_RB_DEFINE_ALLOC_FUNC
+Wed Mar 1 2023 mahendrapk
+ Fix typo and broken URI
+ * README.md
+ * readme.txt
 Wed Feb 15 2023 geekontheway
  Fix aarch64 checking exception
  * ext/load.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 320
+#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.7"
+#define RJB_VERSION "1.6.9"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -64,6 +64,10 @@
 #define IS_RJB_OBJECT(v) (CLASS_INHERITED(rjbi, rb_obj_class(v)) || rb_obj_class(v) == rjb || CLASS_INHERITED(rjbb, rb_obj_class(v)))
 #define USER_INITIALIZE "@user_initialize"
 
+#if !defined(HAVE_RB_DEFINE_ALLOC_FUNC)
+static void rb_undef_alloc_func(v) {}
+#endif
+
 static void register_class(VALUE, VALUE);
 static VALUE import_class(JNIEnv* jenv, jclass, VALUE);
 static VALUE register_instance(JNIEnv* jenv, VALUE klass, struct jv_data*, jobject);
@@ -2095,6 +2099,7 @@ static VALUE import_class(JNIEnv* jenv, jclass jcls, VALUE clsname)
 	}
     }
     rexp = rb_define_class_under(rjb, nm, rjbc);
+    rb_undef_alloc_func(rexp);
     ptr = ALLOC(struct jv_data);
     memset(ptr, 0, sizeof(struct jv_data));
     v = Data_Wrap_Struct(rexp, NULL, rjb_s_free, ptr);
@@ -3333,6 +3338,7 @@ void Init_rjbcore()
 
     /* Java instance object */
     rjbi = CLASS_NEW(rb_cObject, "Rjb_JavaProxy");
+    rb_undef_alloc_func(rjbi);
     rb_gc_register_address(&rjbi);
     rb_define_method(rjbi, "method_missing", rjb_i_missing, -1);
     rb_define_method(rjbi, "_invoke", rjb_i_invoke, -1);
@@ -3342,6 +3348,7 @@ void Init_rjbcore()
 
     /* Ruby-Java Bridge object */
     rjbb = CLASS_NEW(rb_cObject, "Rjb_JavaBridge");
+    rb_undef_alloc_func(rjbb);
     rb_gc_register_address(&rjbb);
 
     /* anonymous interface object */

data/readme.txt

@@ -28,10 +28,10 @@ see test/readme.unix
 you must set LD_LIBRARY_PATH environmental variable to run rjb.
 
 -- Notice for opening non-ASCII 7bit filename
-If you'll plan to open the non-ascii character named file by Java class through Rjb, it may require to set LC_ALL environment variable in you sciprt.
+If you'll plan to open the non-ascii character named file by Java class through Rjb, it may require to set LC_ALL environment variable in your script.
 For example in Rails, set above line in production.rb as your environment.
 ENV['LC_ALL'] = 'en_us.utf8' # or ja_JP.utf8 etc.
- cf: http://bugs.sun.com/view_bug.do?bug_id=4733494
+ cf: https://bugs.java.com/bugdatabase/view_bug.do?bug_id=4733494
    (Thanks Paul for this information).
 
 artonx@yahoo.co.jp

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,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: rjb
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 1.6.9
 platform: ruby
 authors:
 - arton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-15 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.
 
-'
+  '
 email: artonx@gmail.com
 executables: []
 extensions:
@@ -44,10 +44,7 @@ files:
 - readme.txt
 - samples/filechooser.rb
 - samples/unzip.rb
-- test/anon-test-50.rb
 - test/anon-test-60.rb
-- test/anon.rb
-- test/b.rb
 - test/exttest.rb
 - test/gctest.rb
 - test/jartest.jar
@@ -71,7 +68,6 @@ files:
 - test/test_osxjvm.rb
 - test/test_osxload.rb
 - test/test_unload.rb
-- test/x.rb
 homepage: https://www.artonx.org/collabo/backyard/?RubyJavaBridge
 licenses:
 - LGPL-2.1-or-later
@@ -93,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 - JDK 5.0
-rubygems_version: 3.4.2
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Ruby Java bridge

data/test/anon-test-50.rb

@@ -1,13 +0,0 @@
-require 'rjb'
-Rjb::load
-begin
-  Rjb::throw('java.lang.NumberFormatException', 'test')
-  Rjb::throw(Rjb::import('java.lang.NumberFormatException').new('test'))
-rescue NumberFormatException => e
-  puts "I expect a NumberFormatException to be thrown"
-rescue Exception => e
-  puts "I at least expect *some* excetpion to be thrown"
-else
-  puts "Unexpectedly no exception is thrown"
-end
-

data/test/anon.rb

@@ -1,23 +0,0 @@
-require 'rjb'
-Rjb::load
-begin
-  Rjb::import('java.lang.Integer').parseInt('x')
-rescue NumberFormatException => e
-  puts e.class
-  puts e.message
-  begin
-    puts (StandardError === e).to_s
-    raise e
-  rescue => f
-    puts f.class
-    puts f.message
-    puts f.cause.inspect
-    puts f.exception.inspect
-    if e.class == f.class
-      puts "I expect the equality to be true"
-    else
-      puts "Unexpectedly the re-raised Java exception has changed " +
-           "from a #{e.class} into a #{f.class}"
-    end
-  end
-end

data/test/b.rb

@@ -1,13 +0,0 @@
-class TestError < StandardError
-end
-
-begin
-  raise TestError.new
-rescue => e
-  puts e.class
-  begin
-    raise e, 'abc'
-  rescue => f
-    puts f.class
-  end
-end

data/test/x.rb

@@ -1,10 +0,0 @@
-begin
-  i.foo
-rescue => e
-  puts e.class
-  begin
-    raise e
-  rescue => f
-    puts f.class
-  end
-end