rjb 1.6.8 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c844ae35b7db5e279feb4088495040f16f520173a65c096b564a88a2816faba6
-  data.tar.gz: 842e428865248d83b1a49d61ffa5b654586ecb80cf566e78b9b6ff4c0a7a5dbf
+  metadata.gz: eb30d6521841ff5187f03891746f241d1484f6acec69219124321a77d0f9e183
+  data.tar.gz: fcbcc52de14fd2103fdb2e3ffad9644cbf74587c621c5362c02a4fa46c6a40b2
 SHA512:
-  metadata.gz: 115259efb72d586e6cea9d2b12ccbd90c5b18bc531f60753b4348463f768d3721ff17af0f3a3979b5830e98c023a7d02818edc125b2a6779816440b8fc6bc297
-  data.tar.gz: 93e80bc33b9f8ea9f658a8566e9b4e72d03a01eca89f283323180ec4d146a625b5ca751e1c20fc93ffb8864d162a5370b2e0f2513a10f569729131bbbd60f4ac
+  metadata.gz: 77f20a728bad840480a3851c78a60970cd6e773d3b4261c8d738099177af9f69d04010d7ba3c4ee914dcbed0c5608976689ba4a7cd7d94797d523709ab1b81ad
+  data.tar.gz: 499ca077eb5cedae7eef353d2964a7e6be942bcbddcf14939d141913856ede4a2d5f09cbf76a0edebb4cb00c021ba64859dc1517dc9769a85ea609b46ec9b249

data/ChangeLog

@@ -1,3 +1,16 @@
+Sun Apr 14 2024 arton
+ * ext/rjb.c
+	RJB_VERSION -> 1.7.0
+	java2jniname replaces second '.' to '$' for nested/inner classes
+ * test/test.rb
+	add test_load_nested/inner_class_as_java_naming_convention
+Thu Nov 9 2023 arton
+ * ext/rjb.c
+	RJB_VERSION -> 1.6.9
+ * ext/riconv.c
+	fix CESU-8 check
+ * test/test.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/README.md

@@ -0,0 +1,65 @@
+# Rjb is Ruby-Java bridge using Java Native Interface.
+
+The [Ruby Kaigi 2010](http://www.slideshare.net/artonx/j-ruby-kaigi-2010)
+Presentation on `Rjb`.
+
+A short [introduction](https://www.artonx.org/collabo/backyard/?RubyJavaBridge)
+in English.
+
+Some [examples](https://www.artonx.org/collabo/backyard/?RjbQandA) in
+Japanese, but the source code is clear for everybody.
+
+# How to install
+
+You need to install Java2 sdk, and setup `JAVA_HOME` enviromental
+varible except for OS X. I assume that OS X's `JAVA_HOME` is reported
+by calling `/usr/libexec/java_home`.
+
+This done please proceed with:
+
+``` bash
+ruby setup.rb config
+ruby setup.rb setup
+```
+
+``` bash
+# (in Unix)
+sudo ruby setup.rb install
+```
+
+or
+
+``` bash
+# (in win32)
+ruby setup.rb install
+```
+
+# How to test
+
+On Windows based machines:
+
+``` bash
+cd test
+ruby test.rb
+```
+
+On Unix based machines plese see `test/readme.unix`. You need to 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 your script.
+
+For example in Rails, set above line in `production.rb` as your environment:
+
+``` bash
+ENV['LC_ALL'] = 'en_us.utf8' # or ja_JP.utf8 etc.
+```
+
+cf: https://bugs.java.com/bugdatabase/view_bug.do?bug_id=4733494
+   (Thanks Paul for this information).
+
+# Contact
+artonx@yahoo.co.jp

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 330
 #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 + 2))
         {
 #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.7.0"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -185,11 +185,16 @@ void rjb_release_string(JNIEnv *jenv, jstring str, const char* chrs)
 static char* java2jniname(char* jnicls)
 {
     char* p;
+    int found_class_separator = isupper(*jnicls) ? 1 : 0;
     for (p = jnicls; *p; p++)
     {
 	if (*p == '.')
 	{
-	    *p = '/';
+	    if (isupper(*(p + 1)))
+	    {
+	        found_class_separator++;
+	    }
+	    *p = (found_class_separator <= 1) ? '/' : '$';
 	}
     }
     return jnicls;

data/test/l.rb

@@ -0,0 +1,11 @@
+require 'rjb'
+require 'rjb/list'
+
+    ja = Rjb::import('java.util.ArrayList')
+    a = ja.new
+    a.add(1)
+    a.add(2)
+    a.add(3)
+    n = 1
+    a.each {|x|p x.intValue}
+p n

data/test/listtest.rb

@@ -4,20 +4,22 @@
   Copyright(c) 2012 arton
 =end
 
+require 'test/unit'
 begin
   require 'rjb/list'
 rescue LoadError 
   require 'rubygems' 
   require 'rjb/list'
 end
-require 'test/unit'
 require 'fileutils'
 
 class ListTest < Test::Unit::TestCase
   include Rjb
   def test_create
     ja = import('java.util.ArrayList')
+p 'imported'
     a = ja.new
+p 'new'
     a.add(1)
     a.add(2)
     a.add(3)
@@ -28,6 +30,7 @@ class ListTest < Test::Unit::TestCase
     end
     assert_equal 4, n
   end
+=begin
   def test_returned_proxy
     ja = import('java.util.Arrays')
     a = ja.as_list([1, 2, 3])
@@ -52,5 +55,6 @@ class ListTest < Test::Unit::TestCase
     ja = import('java.util.Arrays')
     assert_equal 55, ja.as_list((1..10).to_a).inject(0) {|r, e| r + e.intValue}
   end
+=end
 end
 

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
@@ -976,4 +986,15 @@ class TestRjb < Test::Unit::TestCase
       assert_false e.respond_to? :unknown_method
     end
   end
+
+  def test_load_nested_class_as_java_convention
+    tstate = import('java.lang.Thread.State')
+    assert_equal(tstate.BLOCKED.ordinal, 2)
+    assert_equal(tstate.BLOCKED.name, 'BLOCKED')
+  end
+
+  def test_load_inner_class_as_java_convention
+    tes = import('java.util.HashMap.EntrySet')
+    assert_equal(tes._classname, 'java.lang.Class')
+  end
 end

metadata

@@ -1,19 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: rjb
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 1.7.0
 platform: ruby
 authors:
 - arton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-28 00:00:00.000000000 Z
+date: 2024-04-14 00:00:00.000000000 Z
 dependencies: []
-description: 'RJB is a bridge program that connect between Ruby and Java with Java
+description: RJB is a Bridge library which connects Ruby and Java code using the Java
   Native Interface.
-
-  '
 email: artonx@gmail.com
 executables: []
 extensions:
@@ -22,6 +20,7 @@ extra_rdoc_files: []
 files:
 - COPYING
 - ChangeLog
+- README.md
 - data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
 - ext/RBridge.java
 - ext/depend.erb
@@ -61,6 +60,7 @@ files:
 - test/jp/co/infoseek/hp/arton/rjb/Test.class
 - test/jp/co/infoseek/hp/arton/rjb/Two.class
 - test/jp/co/infoseek/hp/arton/rjb/TwoCaller.class
+- test/l.rb
 - test/listtest.rb
 - test/osx_jvmcheck.rb
 - test/rjbtest.jar
@@ -68,7 +68,7 @@ files:
 - test/test_osxjvm.rb
 - test/test_osxload.rb
 - test/test_unload.rb
-homepage: https://www.artonx.org/collabo/backyard/?RubyJavaBridge
+homepage: http://www.artonx.org/collabo/backyard/?RubyJavaBridge
 licenses:
 - LGPL-2.1-or-later
 metadata: {}
@@ -87,11 +87,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- none
 - JDK 5.0
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
-summary: Ruby Java bridge
-test_files:
-- test/test.rb
+summary: Ruby Java Bridge
+test_files: []