rjb 1.5.8 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2786fa639546b77fac490cfd59ce4b41d52ecb65a45365f73b4e56676f5fef5f
-  data.tar.gz: 97c3c18969a236cb79ea8eadb885245e7e43b99561c878f25bd5da50e2f3433b
+  metadata.gz: 06eaf84ad81cb13f6ae41403c49a861410021b6dc805442325736721a4de2267
+  data.tar.gz: 5b5dfe96970ee79488679d1c9f7e617bd0a4d5155b452f5a60ad408cfa34401d
 SHA512:
-  metadata.gz: c336cae68daa9e4839313bb9f8136d28cbda6cb2e65b921b9e79452b84268ea0e75110841fdbd3947d09602694f480f4d4140ec433dc39fb07cb77f093daaf12
-  data.tar.gz: 70af9504c3bda50cfca5cae4eb0d30910557557b71e5ededddadc7324e215cc7f1fd301eeb3d46885d19f8cbc241491d332b32df6de4fdfaca5b8903f22982b7
+  metadata.gz: 411554c897ddef118a5e6cff0a83fcfe7b4b1b7ff938b41d4f97ac3ba84bc5a6f925f46feaba7fc23a9d7e482238eacf1d475a850074536a54638c0dcd0e873f
+  data.tar.gz: 657db969c323fdfe224fe451c8dafbdf4b0525f8855a1043bd898e3f94f02b9428bdcbc821b5b2ae038876aecb68c1fd6cc5b3f85adb0fe59fbeb766d543c428

data/ChangeLog

@@ -1,3 +1,40 @@
+Sun Feb 7 2021 arton
+ * ext/extconf.rb
+	check javac and javah version
+ * ext/rjb.c
+	RJB_VERSION -> 1.6.3
+Sat Aug 1 2020 arton
+ * ext/rjb.c
+	RJB_VERSION -> 1.6.2
+ * ext/load.c
+	support OpenJDK directory structure (without jre)
+ * lib/rjb.rb
+	change copyright notice
+Wed Jul 17 2019 arton
+ * ext/rjb.c
+	RJB_VERSION -> 1.6.1
+ * lib/rjb.rb
+	java_methods and methods return symbol
+	implements respond_to? for Java methods
+ * ext/rbjexception.c
+	delegate to JavaProxy for respond_to? (except for to_str and exception)
+ * test/test.rb
+	change java_methods test to adjust above change
+	add respond_to? test
+Thu Jul 11 2019 arton
+ * ext/rjb.c
+	RJB_VERSION -> 1.6.0
+ * ext/riconv.c
+	encode/decode between utf-8 and cesu-8 if char was greater than \uffff
+Sun Feb 17 2019 lamby / arton
+ * ext/rjb.c
+	RJB_VERSION -> 1.5.9
+ * ext/depend.erb
+	it set javah line by ERB
+ * ext/extconf.rb
+	change javah to javac -h if it does not exist
+ * ext/depend
+	replaced by depend.erb
 Thu Jan 17 2019 arton
  * ext/rjbexception.c
 	restore method_missing for the exception class

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 you sciprt.
+
+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: http://bugs.sun.com/view_bug.do?bug_id=4733494
+   (Thanks Paul for this information).
+
+# Contact
+artonx@yahoo.co.jp

data/ext/{depend → depend.erb}

@@ -3,7 +3,7 @@ rjb.o : rjb.c jp_co_infoseek_hp_arton_rjb_RBridge.h riconv.h rjb.h
 rjbexception.o : rjbexception.c jp_co_infoseek_hp_arton_rjb_RBridge.h riconv.h rjb.h
 load.o : load.c jp_co_infoseek_hp_arton_rjb_RBridge.h
 jp_co_infoseek_hp_arton_rjb_RBridge.h : jniwrap.h ../data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
-	javah -classpath ../data/rjb jp.co.infoseek.hp.arton.rjb.RBridge
+	<%= javah %>
 ../data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class : RBridge.java
 	mkdir -p ../data/rjb/jp/co/infoseek/hp/arton/rjb
 	javac -d ../data/rjb RBridge.java

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 260
+#define RJB_RUBY_VERSION_CODE 300
 #endif

data/ext/extconf.rb

@@ -4,6 +4,7 @@
 # $Date: $
 #----------------------------------
 require 'mkmf'
+require 'erb'
 
 class Path
 
@@ -74,4 +75,22 @@ when /mswin32/
 when /cygwin/, /mingw/
   $defs << '-DNONAMELESSUNION'
 end
+
+JAVAH_COMMAND = 'javac -h . -classpath ../data/rjb RBridge.java'.freeze
+
+if find_executable('javah')
+  cversion = (`javac -version` =~ /\d+\.\d+\.\d+/ ) ? $& : nil
+  hversion = (`javah -version` =~ /\d+\.\d+\.\d+/ )  ? $& : nil
+  if cversion == hversion
+    javah = 'javah -classpath ../data/rjb jp.co.infoseek.hp.arton.rjb.RBridge'
+  else
+    $stderr.puts "warning: javac and javah version unmatch => javah: #{hversion}, javac: #{cversion}"
+    javah = JAVAH_COMMAND
+  end
+else
+  javah = JAVAH_COMMAND
+end
+File.open('depend', 'w') do |fout|
+  fout.write ERB.new(IO::read('depend.erb')).result
+end
 create_rjb_makefile

data/ext/load.c

@@ -1,6 +1,6 @@
 /*
  * Rjb - Ruby <-> Java Bridge
- * Copyright(c) 2004,2005,2006,2009,2010,2011 arton
+ * Copyright(c) 2004,2005,2006,2009,2010,2011,2020 arton
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -38,9 +38,11 @@
 #if defined(_WIN32) || defined(__CYGWIN__)
  #if defined(__CYGWIN__)
   #define JVMDLL "%s/jre/bin/%s/jvm.dll"
+  #define OPENJDK_JVMDLL "%s/bin/%s/jvm.dll"
   #define DIRSEPARATOR '/'
  #else
   #define JVMDLL "%s\\jre\\bin\\%s\\jvm.dll"
+  #define OPENJDK_JVMDLL "%s\\bin\\%s\\jvm.dll"
   #define DIRSEPARATOR '\\'
   #if defined(_WIN64)
     #undef JVM_TYPE
@@ -61,6 +63,7 @@
   #define JVM_TYPE "j9vm"
 #elif defined(__hpux)
   #define JVMDLL "%s/jre/lib/%s/%s/libjvm.sl"
+  #define OPENJDK_JVMDLL "%s/lib/%s/libjvm.sl"
   #define ARCH "PA_RISC"
   #undef JVM_TYPE
   #define JVM_TYPE "server"
@@ -88,6 +91,7 @@
   #include <sys/systeminfo.h>
  #endif
  #define JVMDLL "%s/jre/lib/%s/%s/libjvm.so"
+ #define OPENJDK_JVMDLL "%s/lib/%s/libjvm.so"
  #define DIRSEPARATOR '/'
  #define CLASSPATH_SEP ':'
 #endif
@@ -123,12 +127,20 @@ static int open_jvm(char* libpath)
     size_t i;
     int state;
 
+    if (rb_funcall(rb_cFile, rb_intern("exist?"), 1, rb_str_new2(libpath)) == RUBY_Qfalse)
+    {
+        if (RTEST(ruby_verbose))
+        {
+            fprintf(stderr, "Rjb::load try to find but not exist %s\n", libpath);
+        }
+        return 0;
+    }
 #if defined(RUBINIUS)
     i = 1;
 #else
     i = 0;
 #endif
-    for (; i < COUNTOF(DLLibs); i++) 
+    for (; i < COUNTOF(DLLibs); i++)
     {
         state = 0;
         rb_protect(safe_require, rb_str_new2(DLLibs[i]), &state);
@@ -137,7 +149,7 @@ static int open_jvm(char* libpath)
         {
             if (i > 0)
             {
-                rb_raise(rb_eRuntimeError, "Constants DL and Fiddle is not defined.");
+                rb_raise(rb_eRuntimeError, "Constants DL or Fiddle is not defined.");
                 return 0;
             }
         }
@@ -163,8 +175,8 @@ static int open_jvm(char* libpath)
     }
     /* get function pointers of JNI */
 #if RJB_RUBY_VERSION_CODE < 190
-    getdefaultjavavminitargsfunc = rb_funcall(rb_funcall(rb_funcall(jvmdll, rb_intern("[]"), 2, rb_str_new2(GETDEFAULTJVMINITARGS), rb_str_new2("IP")), rb_intern("to_ptr"), 0), rb_intern("to_i"), 0); 
-    createjavavmfunc = rb_funcall(rb_funcall(rb_funcall(jvmdll, rb_intern("[]"), 2, rb_str_new2(CREATEJVM), rb_str_new2("IPPP")), rb_intern("to_ptr"), 0), rb_intern("to_i"), 0); 
+    getdefaultjavavminitargsfunc = rb_funcall(rb_funcall(rb_funcall(jvmdll, rb_intern("[]"), 2, rb_str_new2(GETDEFAULTJVMINITARGS), rb_str_new2("IP")), rb_intern("to_ptr"), 0), rb_intern("to_i"), 0);
+    createjavavmfunc = rb_funcall(rb_funcall(rb_funcall(jvmdll, rb_intern("[]"), 2, rb_str_new2(CREATEJVM), rb_str_new2("IPPP")), rb_intern("to_ptr"), 0), rb_intern("to_i"), 0);
 #else
     getdefaultjavavminitargsfunc = rb_funcall(jvmdll, rb_intern("[]"), 1, rb_str_new2(GETDEFAULTJVMINITARGS));
     createjavavmfunc = rb_funcall(jvmdll, rb_intern("[]"), 1, rb_str_new2(CREATEJVM));
@@ -184,6 +196,7 @@ static int file_exist(const char* dir, const char* file)
 
 /*
  * not completed, only valid under some circumstances.
+ * load priority: OpenJDK -> SunJDK
  */
 static int load_jvm(const char* jvmtype)
 {
@@ -236,26 +249,37 @@ static int load_jvm(const char* jvmtype)
         *(p + strlen(p) - 1) = '\0';
         jh = p;
     }
-#endif    
+#endif
     java_home = ALLOCA_N(char, strlen(jh) + 1);
     strcpy(java_home, jh);
     if (*(java_home + strlen(jh) - 1) == DIRSEPARATOR)
     {
 	*(java_home + strlen(jh) - 1) = '\0';
     }
+#if defined(__APPLE__) && defined(__MACH__)
+    libpath = ALLOCA_N(char, sizeof(JVMDLL) + strlen(java_home) + 1);
+    sprintf(libpath, JVMDLL, java_home);
+    return open_jvm(libpath);
+#else
 #if defined(_WIN32) || defined(__CYGWIN__)
     libpath = ALLOCA_N(char, sizeof(JVMDLL) + strlen(java_home)
 		       + strlen(jvmtype) + 1);
-    sprintf(libpath, JVMDLL, java_home, jvmtype);
-#elif defined(__APPLE__) && defined(__MACH__)
-    libpath = ALLOCA_N(char, sizeof(JVMDLL) + strlen(java_home) + 1);
-    sprintf(libpath, JVMDLL, java_home);
 #else /* not Windows / MAC OS-X */
     libpath = ALLOCA_N(char, sizeof(JVMDLL) + strlen(java_home)
-		       + strlen(ARCH) + strlen(jvmtype) + 1);
+                       + strlen(ARCH) + strlen(jvmtype) + 1);
+#endif
+    sprintf(libpath, OPENJDK_JVMDLL, java_home, jvmtype);
+    if (open_jvm(libpath))
+    {
+        return 1;
+    }
+#if defined(_WIN32) || defined(__CYGWIN__)
+    return 0;
+#else /* not Windows / MAC OS-X */
     sprintf(libpath, JVMDLL, java_home, ARCH, jvmtype);
 #endif
     return open_jvm(libpath);
+#endif /* __APPLE__ and __MACH */
 }
 
 static int load_bridge(JNIEnv* jenv)
@@ -269,7 +293,7 @@ static int load_bridge(JNIEnv* jenv)
     VALUE v = rb_const_get(rb_cObject, rb_intern("RjbConf"));
     v = rb_const_get(v, rb_intern("BRIDGE_FILE"));
 #else
-    VALUE v = rb_const_get_at(rb_const_get(rb_cObject, rb_intern("RjbConf")), 
+    VALUE v = rb_const_get_at(rb_const_get(rb_cObject, rb_intern("RjbConf")),
 			      rb_intern("BRIDGE_FILE"));
 #endif
     bridge = StringValuePtr(v);
@@ -352,7 +376,7 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
             *(p + strlen(p) - 1) = '\0';
             libjvm = p;
         }
-#endif    
+#endif
         if (libjvm == NULL || !open_jvm(libjvm))
         {
 #if defined(__APPLE__) && defined(__MACH__)
@@ -370,7 +394,7 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
             }
 #endif
         }
- 
+
 #if RJB_RUBY_VERSION_CODE < 190 && !defined(RUBINIUS)
         ruby_errinfo = Qnil;
 #else

data/ext/riconv.c

@@ -167,6 +167,126 @@ static void check_kcode()
         objIconvR2J = objIconvJ2R = Qnil;
     }
 }
+#else
+VALUE cEncoding = Qnil;
+VALUE encoding_utf8 = Qnil;
+static void init_encoding_vars()
+{
+    cEncoding = rb_const_get(rb_cObject, rb_intern("Encoding"));
+    encoding_utf8 = rb_const_get(cEncoding, rb_intern("UTF_8"));
+}
+static int contains_surrogate_pair(const unsigned char* p)
+{
+    while (*p)
+    {
+        switch (*p & 0xf0)
+        {
+        case 0xf0:
+            return 1;
+        case 0xe0:
+            p += 3;
+            break;
+        default:
+            p += (*p & 0x80) ? 2 : 1;
+        }
+    }
+    return 0;
+}
+static int contains_auxchar(const unsigned char* p)
+{
+    while (*p)
+    {
+      if (*p == 0xed)
+        {
+#if defined(DEBUG)
+          printf("find %02x %02x %02x %02x %02x %02x\n", *p, *(p + 1), *(p + 2), *(p + 3), *(p + 4), *(p + 5));
+#endif
+          return 1;
+        }
+        switch (*p & 0xe0)
+        {
+        case 0xe0:
+            p++;
+        case 0xc0:
+            p++;
+        default:
+            p++;
+        }
+    }
+    return 0;
+}
+
+static VALUE encode_to_cesu8(const unsigned char* p)
+{
+    size_t len = strlen(p);
+    char* newstr = ALLOCA_N(char, len + (len + 1) / 2);
+    char* dest = newstr;
+    int sval, i;
+    while (*p)
+    {
+        switch (*p & 0xf0)
+        {
+        case 0xf0:
+            sval = *p++ & 7;
+            for (i = 0; i < 3; i++)
+            {
+                sval <<= 6;
+                sval |= (*p++ & 0x3f);
+            }
+            *dest++ = '\xed';
+            *dest++ = 0xa0 | (((sval >> 16) - 1) & 0x0f);
+            *dest++ = 0x80 | ((sval >> 10) & 0x3f);
+            *dest++ = '\xed';
+            *dest++ = 0xb0 | ((sval >> 6) & 0x0f);
+            *dest++ = 0x80 | (sval & 0x3f);
+            break;
+        case 0xe0:
+            *dest++ = *p++;
+        case 0xc0:
+        case 0xc1:          
+            *dest++ = *p++;
+        default:
+            *dest++ = *p++;
+        }
+    }
+    return rb_str_new(newstr, dest - newstr);
+}
+static VALUE encode_to_utf8(const unsigned char* p)
+{
+    size_t len = strlen(p);
+    char* newstr = ALLOCA_N(char, len);
+    char* dest = newstr;
+    int sval, i;
+    while (*p)
+    {
+        if (*p == 0xed)
+        {
+            char v = *(p + 1);
+            char w = *(p + 2);
+            char y = *(p + 4);
+            char z = *(p + 5);
+            p += 6;
+            sval = 0x10000 + ((v & 0x0f) << 16) + ((w & 0x3f) << 10) + ((y & 0x0f) << 6) + (z & 0x3f);
+            sval = (((v + 1) & 0x0f) << 16) + ((w & 0x3f) << 10) + ((y & 0x0f) << 6) + (z & 0x3f);
+           *dest++ = 0xf0 | ((sval >> 18));
+           *dest++ = 0x80 | ((sval >> 12) & 0x3f);
+           *dest++ = 0x80 | ((sval >> 6) & 0x3f);
+           *dest++ = 0x80 | (sval & 0x3f);
+           continue;
+        }
+        switch (*p & 0xe0)
+        {
+        case 0xe0:
+            *dest++ = *p++;          
+        case 0xc0:
+        case 0xc1:          
+            *dest++ = *p++;                    
+        default:
+            *dest++ = *p++;                   
+        }
+    }
+    return rb_str_new(newstr, dest - newstr);
+}
 #endif
 
 #if defined(DEBUG)
@@ -177,6 +297,8 @@ static void debug_out(VALUE v)
            strlen(p), p);
     fflush(stdout);
 }
+#else
+#define debug_out(n)
 #endif
 
 VALUE exticonv_local_to_utf8(VALUE local_string)
@@ -192,23 +314,24 @@ VALUE exticonv_local_to_utf8(VALUE local_string)
         return local_string;
     }
 #else
-    VALUE cEncoding, encoding, utf8;
-    cEncoding = rb_const_get(rb_cObject, rb_intern("Encoding"));
+    VALUE encoding;
+    if (NIL_P(cEncoding))
+    {
+      init_encoding_vars();
+    }
     encoding = rb_funcall(local_string, rb_intern("encoding"), 0);
-    utf8 = rb_const_get(cEncoding, rb_intern("UTF_8"));
-    if (encoding != utf8)
+    if (encoding != encoding_utf8)
     {
-        VALUE ret = rb_funcall(local_string, rb_intern("encode"), 2, utf8, encoding);
-#if defined(DEBUG)
+        VALUE ret = rb_funcall(local_string, rb_intern("encode"), 2, encoding_utf8, encoding);
         debug_out(local_string);
         debug_out(ret);
-#endif        
-        return ret;
+        local_string = ret;
     }
-    else
+    if (contains_surrogate_pair(StringValuePtr(local_string)))
     {
-	return local_string;
+        local_string = encode_to_cesu8(StringValuePtr(local_string));
     }
+    return local_string;
 #endif
 }
 
@@ -225,6 +348,14 @@ VALUE exticonv_utf8_to_local(VALUE utf8_string)
         return utf8_string;
     }
 #else
-    return rb_funcall(utf8_string, rb_intern("force_encoding"), 1, rb_const_get(rb_cEncoding, rb_intern("UTF_8")));
+    if (NIL_P(cEncoding))
+    {
+        init_encoding_vars();
+    }
+    if (contains_auxchar(StringValuePtr(utf8_string)))
+    {
+        utf8_string = encode_to_utf8(StringValuePtr(utf8_string));
+    }
+    return rb_funcall(utf8_string, rb_intern("force_encoding"), 1, encoding_utf8);
 #endif
 }