rjb 1.5.8 → 1.6.3

data/ext/rjbexception.c

@@ -29,7 +29,7 @@
 static VALUE missing_delegate(int argc, VALUE* argv, VALUE self)
 {
     ID rmid = rb_to_id(argv[0]);
-    return rb_funcall(rb_ivar_get(self, rb_intern("@cause")), rmid, argc - 1, argv + 1);
+    return rb_funcallv(rb_ivar_get(self, rb_intern("@cause")), rmid, argc - 1, argv + 1);
 }
 
 static VALUE get_cause(VALUE self)
@@ -37,6 +37,26 @@ static VALUE get_cause(VALUE self)
     return rb_funcall(rb_ivar_get(self, rb_intern("@cause")), rb_intern("cause"), 0);
 }
 
+static VALUE ex_respond_to(int argc, VALUE* argv, VALUE self)
+{
+    if (argc < 1 || argc > 2)
+    {
+        rb_raise(rb_eArgError, "respond_to? require 1 or 2 arguments");
+    }
+    if (rb_to_id(argv[0]) == rb_intern("to_str"))
+    {
+        return  Qfalse;
+    }
+    else  if (rb_to_id(argv[0]) == rb_intern("exception"))
+    {
+        return Qtrue;
+    }
+    else
+    {
+        return rb_funcallv(rb_ivar_get(self, rb_intern("@cause")), rb_intern("respond_to?"), argc, argv);
+    }
+}
+
 /*
  * handle Java exception
  *  At this time, the Java exception is defined without the package name.
@@ -67,6 +87,7 @@ VALUE rjb_get_exception_class(JNIEnv* jenv, jstring str)
         rexp = rb_define_class(pcls, rb_eStandardError);
         rb_define_method(rexp, "cause", get_cause, 0);
         rb_define_method(rexp, "method_missing", missing_delegate, -1);
+        rb_define_method(rexp, "respond_to?", ex_respond_to, -1);
 #if defined(HAVE_RB_HASH_ASET) || defined(RUBINIUS)
 	rb_hash_aset(rjb_loaded_classes, cname, rexp);
 #else
@@ -76,7 +97,7 @@ VALUE rjb_get_exception_class(JNIEnv* jenv, jstring str)
         st_insert(RHASH(rjb_loaded_classes)->tbl, cname, rexp);
   #endif
 #endif
-	
+
     }
     return rexp;
 }
@@ -88,7 +109,7 @@ VALUE rjb_s_throw(int argc, VALUE* argv, VALUE self)
 {
     VALUE klass;
     VALUE message;
-    JNIEnv* jenv = NULL; 
+    JNIEnv* jenv = NULL;
 
     rjb_load_vm_default();
 

data/lib/rjb.rb

@@ -1,5 +1,5 @@
 =begin
-  Copyright(c) 2006-2010,2012 arton
+  Copyright(c) 2006-2010,2012,2020 arton
 =end
 
 require 'rbconfig'
@@ -86,7 +86,7 @@ module Rjb
       (org + klass.getMethods.select do |m|
          blk.call(m)
       end.map do |m|
-        m.name
+        m.name.to_sym
       end).uniq
     end
     def format_sigs(s)
@@ -98,6 +98,19 @@ module Rjb
         "[#{s.map{|m|m.nil? ? 'void' : m}.join(', ')}]"
       end
     end
+    def make_snake(nm)
+      nm.gsub(/(.)([A-Z])/) { "#{$1}_#{$2.downcase}" }
+    end
+    alias :rjb_org_respond_to? :respond_to?
+    def rjb_respond_to?(sym, klass, priv)
+      return true if (klass ? self : getClass).getMethods.select do |m|
+        (klass && !instance_method?(m) && (priv || public_method?(m))) ||
+          (!klass && instance_method?(m) && (priv || public_method?(m)))
+      end.map do |m|
+        [m.name.to_sym, make_snake(m.name).to_sym]
+      end.flatten.include?(sym.to_sym)
+      rjb_org_respond_to?(sym, priv)
+    end
   end
 
   class Rjb_JavaClass
@@ -119,6 +132,9 @@ module Rjb
         "#{m}(#{format_sigs(self.static_sigs(m))})"
       end
     end
+    def respond_to?(sym, priv = false)
+      rjb_respond_to?(sym, true, priv)
+    end
   end
   class Rjb_JavaProxy
     include JMethod
@@ -141,6 +157,9 @@ module Rjb
         "#{m}(#{format_sigs(getClass.sigs(m))})"
       end
     end
+    def respond_to?(sym, priv = false)
+      rjb_respond_to?(sym, false, priv)
+    end
   end
   class Rjb_JavaBridge
     def method_missing(name, *args)

data/test/test.rb

@@ -216,17 +216,28 @@ class TestRjb < Test::Unit::TestCase
   end
 
   def test_combination_charcters
-    teststr = "\xc7\x96\xc3\xbc\xcc\x84\x75\xcc\x88\xcc\x84\xed\xa1\xa9\xed\xba\xb2\xe3\x81\x8b\xe3\x82\x9a"
+    teststr = "\xc7\x96\xc3\xbc\xcc\x84\x75\xcc\x88\xcc\x84𪚲\xe3\x81\x8b\xe3\x82\x9a"
     test = import('jp.co.infoseek.hp.arton.rjb.Test').new
     s = test.getUmlaut()
     if Object::const_defined?(:Encoding) #>=1.9
-      teststr = teststr.force_encoding(Encoding::UTF_8)
-      assert_equal(s, teststr)
+=begin
+      n = [teststr.bytes.length, s.bytes.length].max
+      puts "org:#{teststr.bytes.length}, ret:#{s.bytes.length}"
+      0.upto(n - 1) do |i|
+        b0 = teststr.getbyte(i)
+        b0 = 0 unless b0
+        b1 = s.getbyte(i)
+        b1 = 0 unless b1
+        puts sprintf("%02X - %02X\n", b0, b1)
+      end
+=end
+      assert_equal(teststr.bytes.length, s.bytes.length)
+      assert_equal(teststr, s)
     else
       default_kcode = $KCODE
       begin
 	$KCODE = "utf8"
-	assert_equal(s, teststr)
+	assert_equal(teststr, s)
       ensure
 	$KCODE = default_kcode
       end
@@ -715,19 +726,19 @@ class TestRjb < Test::Unit::TestCase
   end
   def test_methods_extension
     m = @jString.new('').methods
-    assert m.include?('indexOf')
+    assert m.include?(:indexOf)
   end
   def test_class_methods_extension
     m = @jString.methods
-    assert m.include?('format')
+    assert m.include?(:format)
   end
   def test_pmethods_extension
     m = @jString.new('').public_methods
-    assert m.include?('indexOf')
+    assert m.include?(:indexOf)
   end
   def test_class_pmethods_extension
     m = @jString.public_methods
-    assert m.include?('format')
+    assert m.include?(:format)
   end
   def test_java_methods
     indexof = @jString.new('').java_methods.find do |m|
@@ -947,5 +958,22 @@ class TestRjb < Test::Unit::TestCase
       end
     end
   end
-end
 
+  def test_java_utf8
+    y = @jString.new('𠮷野家')
+    assert_equal '𠮷野家', y.toString
+  end
+
+  def test_respond_to
+    str = @jString.new('blabla')
+    assert str.respond_to? :substring
+    assert_false str.respond_to? :unknown_method
+    begin
+      @jInteger.parseInt('blabla')
+    rescue => e
+      assert e.respond_to? :print_stack_trace
+      assert e.respond_to? :printStackTrace
+      assert_false e.respond_to? :unknown_method
+    end
+  end
+end

metadata

@@ -1,19 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: rjb
 version: !ruby/object:Gem::Version
-  version: 1.5.8
+  version: 1.6.3
 platform: ruby
 authors:
 - arton
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2021-02-06 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,9 +20,10 @@ extra_rdoc_files: []
 files:
 - COPYING
 - ChangeLog
+- README.md
 - data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
 - ext/RBridge.java
-- ext/depend
+- ext/depend.erb
 - ext/extconf.h
 - ext/extconf.rb
 - ext/jniwrap.h
@@ -72,11 +71,11 @@ files:
 - test/test_osxload.rb
 - test/test_unload.rb
 - test/x.rb
-homepage: https://www.artonx.org/collabo/backyard/?RubyJavaBridge
+homepage: http://www.artonx.org/collabo/backyard/?RubyJavaBridge
 licenses:
-- LGPL
+- LGPL-2.1-or-later
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -91,11 +90,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- none
 - JDK 5.0
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
-summary: Ruby Java bridge
-test_files:
-- test/test.rb
+summary: Ruby Java Bridge
+test_files: []