rjb 1.7.1 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f7c998ac143e7b5e4bbdc1aa2e74801684f2b3b9921a45bf121c5e5c59b9692
-  data.tar.gz: 137e9ee1214fcfadd9c797aff35877a19f3e2c8aa6be9d22ea1a2cdaac9ddfc5
+  metadata.gz: cf18c1b6b1e6b35fcd568d56c8185e00c26041e1b84afbc97b36071523daab40
+  data.tar.gz: 7af7cbd1a3c6a8d7538bf3e0c06ed17e42ce01b3eb487a834612876bedadb837
 SHA512:
-  metadata.gz: 54efe3ce4191e7d64cadd2945dd6aec9445fbdb728f00ca6ae3c8f2ef82a5c256f7f452917b08528d06821ef6df906eea29bf152e886863b5ddf271291d903ce
-  data.tar.gz: ca5e74ae621c4531e188c10e3b502b07eb4f0ce3d1c9fb5abcff52390040bc999ad0429ca950e29694ee83c3a10bb0cc86a9bcecf2bb2420780ba73d7d4b36ea
+  metadata.gz: c37493cbabd35c53cf0ebf94e2cfbc961110e6d983b7c103893592a9dfe6381f1c0f4ad6abbb5af876edba47518fe63b90a7739e7c044d715450191682a9233a
+  data.tar.gz: bbcadae2f7ad325f451b8d909f4a0fb4723b264418052fda0a37b9ea0beb9b1108041e019855168085409ff03e81580b4dbe79b289a90a7d24f46c67528dc30f

data/ChangeLog

@@ -1,3 +1,29 @@
+Wed May 1 2024 arton (reported and designed by uvlad7)
+ * test/Test105.java
+	add for test #105 (uvald7)
+ * test/test105.rb
+	add for test #105 (uvald7)
+ * ext/rjb.c
+	RJV_VERSION -> 1.7.3
+	invoke_by_instance takes six parameters. six is called by method_missing or _invoke
+Wed May 1 2024 arton
+ * test/jartest3.rb
+	accept ClassNotFoundException for test
+ * ext/load.c
+	clear ruby error
+ * ext/rjb.c
+	change import => s_import for delegate. call Rjb::import instead of internal C fund.
+ * lib/rjb.rb
+	Rjb::import retry to import for NoSuchFieldException
+Fri Apr 26 2024 arton
+ * ext/rjb.c
+	RJB_VERSION -> 1.7.2
+ * ext/extconf.rb
+	change javah and javac console encoding according to the locale (reported by winezer0)
+ * ext/load.c
+	fix win32 and cygwin JVM path detection (reported by winezer0)
+ * setup.rb
+	remove duplicate line
 Sun Apr 14 2024 arton
  * ext/rjb.c
 	RJB_VERSION -> 1.7.1

data/ext/extconf.rb

@@ -79,8 +79,13 @@ 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 defined?(Encoding) && ''.respond_to?(:force_encoding)
+    cversion = (`javac -version`.force_encoding(Encoding.locale_charmap).encode('utf-8') =~ /\d+\.\d+\.\d+/ ) ? $& : nil
+    hversion = (`javah -version`.force_encoding(Encoding.locale_charmap).encode('utf-8') =~ /\d+\.\d+\.\d+/ )  ? $& : nil
+  else
+    cversion = (`javac -version` =~ /\d+\.\d+\.\d+/ ) ? $& : nil
+    hversion = (`javah -version` =~ /\d+\.\d+\.\d+/ )  ? $& : nil
+  end
   if cversion == hversion || cversion.nil?
     javah = 'javah -classpath ../data/rjb jp.co.infoseek.hp.arton.rjb.RBridge'
   else

data/ext/load.c

@@ -95,7 +95,6 @@
  #define DIRSEPARATOR '/'
  #define CLASSPATH_SEP ':'
 #endif
-
 #if defined(__APPLE__) && defined(__MACH__)
  static char* CREATEJVM = "JNI_CreateJavaVM";
  static char* GETDEFAULTJVMINITARGS = "JNI_GetDefaultJavaVMInitArgs";
@@ -107,7 +106,6 @@
 typedef int (JNICALL *GETDEFAULTJAVAVMINITARGS)(void*);
 typedef int (JNICALL *CREATEJAVAVM)(JavaVM**, JNIEnv**, void*);
 
-
 static VALUE jvmdll = Qnil;
 static VALUE getdefaultjavavminitargsfunc;
 static VALUE createjavavmfunc;
@@ -147,13 +145,14 @@ static int open_jvm(char* libpath)
 #if !defined(RUBINIUS)
         if (state || !rb_const_defined_at(rb_cObject, rb_intern(DLNames[i])))
         {
-            if (i > 0)
-            {
-                rb_raise(rb_eRuntimeError, "Constants DL or Fiddle is not defined.");
-                return 0;
-            }
-        }
-        else
+	    rb_set_errinfo(Qnil);
+	    if (i > 0)
+	    {
+		rb_raise(rb_eRuntimeError, "Constants DL or Fiddle is not defined.");
+		return 0;
+	    }
+	}
+	else
 #endif
         {
             sstat = 0;
@@ -167,9 +166,13 @@ static int open_jvm(char* libpath)
             {
                 break;
             }
-            else if (i > 0)
-            {
-                return 0;
+            else
+	    {
+	        rb_set_errinfo(Qnil);
+		if (i > 0)
+		{
+		    return 0;
+		}
             }
         }
     }
@@ -274,7 +277,7 @@ static int load_jvm(const char* jvmtype)
         return 1;
     }
 #if defined(_WIN32) || defined(__CYGWIN__)
-    return 0;
+    sprintf(libpath, JVMDLL, java_home, jvmtype);
 #else /* not Windows / MAC OS-X */
     sprintf(libpath, JVMDLL, java_home, ARCH, jvmtype);
 #endif

data/ext/rjb.c

@@ -1,6 +1,6 @@
 /*
  * Rjb - Ruby <-> Java Bridge
- * Copyright(c) 2004,2005,2006,2007,2008,2009,2010,2011,2012,2014-2016,2018 arton
+ * Copyright(c) 2004,2005,2006,2007,2008,2009,2010,2011,2012,2014-2016,2018,2024 arton
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -14,7 +14,7 @@
  *
  */
 
-#define RJB_VERSION "1.7.1"
+#define RJB_VERSION "1.7.3"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -93,6 +93,8 @@ static ID initialize_proxy;
 static ID cvar_classpath;
 static ID anonymousblock;
 static ID id_call;
+static ID id_import;
+
 
 VALUE rjb_loaded_classes;
 static VALUE proxies;
@@ -280,7 +282,7 @@ static VALUE jv2rclass(JNIEnv* jenv, jclass jc)
     v = rb_hash_aref(rjb_loaded_classes, clsname);
     if (v == Qnil)
     {
-        v = import_class(jenv, jc, clsname);
+	v = rb_funcall(rjb, id_import, 1, clsname);
     }
     (*jenv)->DeleteLocalRef(jenv, jc);
     return v;
@@ -321,7 +323,7 @@ static VALUE jv2rv_r(JNIEnv* jenv, jvalue val)
     v = rb_hash_aref(rjb_loaded_classes, clsname);
     if (v == Qnil)
     {
-        v = import_class(jenv, klass, clsname);
+	v = rb_funcall(rjb, id_import, 1, clsname);
     }
     Data_Get_Struct(v, struct jv_data, ptr);
     v = register_instance(jenv, v, (struct jv_data*)ptr, val.l);
@@ -3091,14 +3093,14 @@ static VALUE invoke(JNIEnv* jenv, struct cls_method* pm, struct jvi_data* ptr,
  * Object invocation
  */
 static VALUE invoke_by_instance(ID rmid, int argc, VALUE* argv,
-				struct jvi_data* ptr, char* sig)
+				struct jvi_data* ptr, char* sig, int called_by_invoke)
 {
     VALUE ret = Qnil;
     JNIEnv* jenv = rjb_attach_current_thread();
     struct cls_field* pf;
     struct cls_method* pm;
     const char* tname = rb_id2name(rmid);
-    if (argc == 0 && st_lookup(ptr->fields, rmid, (st_data_t*)&pf))
+    if (!called_by_invoke && argc == 0 && st_lookup(ptr->fields, rmid, (st_data_t*)&pf))
     {
         ret = getter(jenv, pf, ptr);
     }
@@ -3155,7 +3157,7 @@ static VALUE rjb_i_invoke(int argc, VALUE* argv, VALUE self)
     sig = NIL_P(vsig) ? NULL :  StringValueCStr(vsig);
     Data_Get_Struct(self, struct jvi_data, ptr);
 
-    return invoke_by_instance(rmid, argc - 2, argv + 2, ptr, sig);
+    return invoke_by_instance(rmid, argc - 2, argv + 2, ptr, sig, 1);
 }
 
 static VALUE rjb_i_missing(int argc, VALUE* argv, VALUE self)
@@ -3165,7 +3167,7 @@ static VALUE rjb_i_missing(int argc, VALUE* argv, VALUE self)
 
     Data_Get_Struct(self, struct jvi_data, ptr);
 
-    return invoke_by_instance(rmid, argc -1, argv + 1, ptr, NULL);
+    return invoke_by_instance(rmid, argc -1, argv + 1, ptr, NULL, 0);
 }
 
 /*
@@ -3268,6 +3270,7 @@ static VALUE rjb_missing(int argc, VALUE* argv, VALUE self)
         {
 	    return r;
 	}
+	rb_set_errinfo(Qnil);
     }
 
     Data_Get_Struct(self, struct jv_data, ptr);
@@ -3281,7 +3284,7 @@ static VALUE rjb_class_forname(int argc, VALUE* argv, VALUE self)
 {
     if (argc == 1)
     {
-        return rjb_s_import(self, *argv);
+	return rjb_s_import(self, *argv);
     }
     else
     {
@@ -3318,7 +3321,7 @@ void Init_rjbcore()
     rb_define_module_function(rjb, "load", rjb_s_load, -1);
     rb_define_module_function(rjb, "unload", rjb_s_unload, -1);
     rb_define_module_function(rjb, "loaded?", rjb_s_loaded, 0);
-    rb_define_module_function(rjb, "import", rjb_s_import, 1);
+    rb_define_module_function(rjb, "s_import", rjb_s_import, 1);
     rb_define_module_function(rjb, "bind", rjb_s_bind, 2);
     rb_define_module_function(rjb, "unbind", rjb_s_unbind, 1);
     rb_define_module_function(rjb, "classes", rjb_s_classes, 0);
@@ -3363,6 +3366,7 @@ void Init_rjbcore()
     rb_define_method(rjba, "method_missing", rjb_a_missing, -1);
     anonymousblock = rb_intern("@anon_block");
     id_call = rb_intern("call");
+    id_import = rb_intern("import");
 }
 
 VALUE rjb_safe_funcall(VALUE args)

data/lib/rjb/extension.rb

@@ -58,7 +58,7 @@ module Kernel
     end
     raise unless found_path
 
-    abs_path = File.join(found_path, path)
+    abs_path = found_path.length == 0 ? path : File.join(found_path, path)
     # check that the file exists
     raise unless  File.exist?(abs_path)
 

data/lib/rjb.rb

@@ -66,6 +66,20 @@ end
 require 'rjbcore'
 
 module Rjb
+  def self.import(cls)
+    s_import(cls)
+  rescue NoSuchFieldError => e
+    puts "#{cls}: #{e.inspect}" if $VERBOSE
+    s_import(cls)
+  end
+
+  def import(cls)
+    s_import(cls)
+  rescue NoSuchFieldError => e
+    puts "#{cls}: #{e.inspect}" if $VERBOSE
+    s_import(cls)
+  end
+
   module MODIFIER
     def self.STATIC
       8

data/test/jartest3.rb

@@ -21,7 +21,8 @@ class JarTest < Test::Unit::TestCase
     begin
       Rjb::import('jp.co.infoseek.hp.arton.rjb.JarTest2')
       fail 'no exception'
-    rescue NoClassDefFoundError
+    rescue => e
+      ['NoClassDefFoundError', 'ClassNotFoundException'].any? {|nm| e.class == nm}
       assert true
     end
   end

data/test/test105.rb

@@ -0,0 +1,28 @@
+begin
+  require 'rjb'
+rescue LoadError
+  require 'rubygems'
+  require 'rjb'
+end
+require 'test/unit'
+
+class Test105 < Test::Unit::TestCase
+  include Rjb
+  def setup
+    Rjb::load('.')
+    @test105 = import('jp.co.infoseek.hp.arton.rjb.Test105')
+  end
+
+  def test_field
+    test = @test105.new('xyz')
+    assert_equal('xyz', test.test)
+  end
+
+  def test_method
+    test = @test105.new('xyz')
+    ret = test._invoke('test')
+    assert_equal('method_xyz', ret)
+  end
+end
+
+    

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rjb
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.3
 platform: ruby
 authors:
 - arton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-14 00:00:00.000000000 Z
+date: 2024-05-01 00:00:00.000000000 Z
 dependencies: []
 description: RJB is a Bridge library which connects Ruby and Java code using the Java
   Native Interface.
@@ -58,6 +58,7 @@ files:
 - test/jp/co/infoseek/hp/arton/rjb/JarTest2.class
 - test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.class
 - test/jp/co/infoseek/hp/arton/rjb/Test.class
+- test/jp/co/infoseek/hp/arton/rjb/Test105.class
 - test/jp/co/infoseek/hp/arton/rjb/Two.class
 - test/jp/co/infoseek/hp/arton/rjb/TwoCaller.class
 - test/l.rb
@@ -65,6 +66,7 @@ files:
 - test/osx_jvmcheck.rb
 - test/rjbtest.jar
 - test/test.rb
+- test/test105.rb
 - test/test_osxjvm.rb
 - test/test_osxload.rb
 - test/test_unload.rb