rjb 1.5.5 → 1.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3bd11fadf55c58d28049cbd150cf6b74f8ff0a9a
-  data.tar.gz: b5b308b407d408baa604487c6d2d520d46e3ce65
+SHA256:
+  metadata.gz: b8eddc0f7bf9505a5f48e1098dd18f0133253986978599c40e5c39ce6cc48b90
+  data.tar.gz: 880d819371d1cb1c738c2db0c0395873d86391ecef8b056c7597aacf930598ce
 SHA512:
-  metadata.gz: acad6e9acd24e609195014897eebe87d16bb7a8e11b5a96da77511a158a95b83bb820a1fb70b8a9b76fde457dbfae801589aac5b81027990beff05206318146a
-  data.tar.gz: 88082cd6024ed28ea83cfbd0b6dfce9e9421878af47c734dec5a6d0351dda9d6053e6689bc2a33218b20c6530e37e94479444dec93cf9007d8f4fd91327e40c6
+  metadata.gz: ad9b557b9ff3d9091663df6041b63672ba96a2e192f23deba2dbe6dfe94edf09f36176e8894b2e71c8194f68e6f4e23b1e67c9a7064c52c5dea5ce0723be9e14
+  data.tar.gz: 7da7f62f72373a83ef662ee62cd37c7fdac28a52c6fc059af337970a7249103858442c304b139945118371c2893ac6057404f619016d4cff758a5aabaffd80f2

data/ChangeLog

@@ -1,3 +1,29 @@
+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
+ * ext/rjb.c
+	RJB_VERSION -> 1.5.8
+ * test/test.rb
+	add #60 test
+Fri Dec 28 2018 arton
+ * ext/rjbexception.c
+	fix #60; stable java derived exception class for raise
+ * ext/rjb.c
+	RJB_VERSION -> 1.5.7
+Thu Dec 27 2018 sean-npu
+ * ext/load.c
+	support aarch64
+ * ext/rjb.c
+	RJB_VERSION -> 1.5.6
 Sun Oct 30 arbox, maxberger and arton
  *Rakefile
  *rjb.gemspec

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 240
+#define RJB_RUBY_VERSION_CODE 261
 #endif

data/ext/extconf.rb

@@ -4,6 +4,7 @@
 # $Date: $
 #----------------------------------
 require 'mkmf'
+require 'erb'
 
 class Path
 
@@ -74,4 +75,13 @@ when /mswin32/
 when /cygwin/, /mingw/
   $defs << '-DNONAMELESSUNION'
 end
+
+if find_executable('javah')
+  javah = 'javah -classpath ../data/rjb jp.co.infoseek.hp.arton.rjb.RBridge'
+else
+  javah = 'javac -h . -classpath ../data/rjb RBridge.java'
+end
+File.open('depend', 'w') do |fout|
+  fout.write ERB.new(IO::read('depend.erb')).result
+end
 create_rjb_makefile

data/ext/load.c

@@ -79,6 +79,10 @@
   #define ARCH "i386"
  #elif defined(__arm__)
   #define ARCH "arm"
+ #elif defined(__aarch64__)
+   #define ARCH "aarch64"
+   #undef JVM_TYPE
+   #define JVM_TYPE "server"
  #endif
  #ifndef ARCH
   #include <sys/systeminfo.h>

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 arton
+ * Copyright(c) 2004,2005,2006,2007,2008,2009,2010,2011,2012,2014-2016,2018 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.5.5"
+#define RJB_VERSION "1.5.9"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -601,7 +601,7 @@ static VALUE jv2rv_withprim(JNIEnv* jenv, jobject o)
                 jv.j = (*jenv)->CallLongMethod(jenv, o, jpcvt[i].to_prim_id);
                 break;
 	    default:
-		rb_raise(rb_eRuntimeError, "no convertor defined(%d)", i);
+		rb_raise(rb_eRuntimeError, "no converter defined(%d)", i);
 		break;
 	    }
             (*jenv)->DeleteLocalRef(jenv, o);

data/ext/rjbexception.c

@@ -34,13 +34,16 @@ static VALUE missing_delegate(int argc, VALUE* argv, VALUE self)
 
 static VALUE get_cause(VALUE self)
 {
-  return rb_funcall(rb_ivar_get(self, rb_intern("@cause")), rb_intern("cause"), 0);
+    return rb_funcall(rb_ivar_get(self, rb_intern("@cause")), rb_intern("cause"), 0);
 }
 
-static VALUE exception_to_s(VALUE self)
+static VALUE ex_respond_to(int argc, VALUE* argv, VALUE self)
 {
-    return rb_funcall(rb_ivar_get(self, rb_intern("@cause")),
-                      rb_intern("toString"), 0);
+    if (argc < 1 || argc > 2)
+    {
+        rb_raise(rb_eArgError, "respond_to? require 1 or 2 arguments");
+    }
+    return rb_to_id(argv[0]) == rb_intern("to_str") ? Qfalse : Qtrue;
 }
 
 /*
@@ -70,18 +73,18 @@ VALUE rjb_get_exception_class(JNIEnv* jenv, jstring str)
     rexp = rb_hash_aref(rjb_loaded_classes, cname);
     if (rexp == Qnil)
     {
-	rexp = rb_define_class(pcls, rb_eStandardError);
-	rb_define_method(rexp, "cause", get_cause, 0);
+        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, "to_str", exception_to_s, 0);
+        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
-#ifdef RHASH_TBL
-    st_insert(RHASH_TBL(rjb_loaded_classes), cname, rexp);
-#else
-    st_insert(RHASH(rjb_loaded_classes)->tbl, cname, rexp);
-#endif
+  #ifdef RHASH_TBL
+        st_insert(RHASH_TBL(rjb_loaded_classes), cname, rexp);
+  #else
+        st_insert(RHASH(rjb_loaded_classes)->tbl, cname, rexp);
+  #endif
 #endif
 	
     }
@@ -140,7 +143,7 @@ void rjb_check_exception(JNIEnv* jenv, int t)
 	(*jenv)->ExceptionClear(jenv);
         if(1)
 	{
- 	    char* msg = "unknown exception";
+            char* msg = (char*)"unknown exception";
 	    jclass cls = (*jenv)->GetObjectClass(jenv, exp);
  	    jstring str = (*jenv)->CallObjectMethod(jenv, exp, rjb_throwable_getMessage);
 	    if (str)

data/test/anon-test-50.rb

@@ -0,0 +1,13 @@
+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-test-60.rb

@@ -0,0 +1,17 @@
+require 'rjb'
+Rjb::load
+begin
+  Rjb::import('java.lang.Integer').parseInt('x')
+rescue => e
+  begin
+    raise e
+  rescue => f
+    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/anon.rb

@@ -0,0 +1,23 @@
+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

@@ -0,0 +1,13 @@
+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/test.rb

@@ -933,5 +933,19 @@ class TestRjb < Test::Unit::TestCase
     assert_equal org.size, len
     assert_equal org, buffer[0...len]
   end
+
+  def test_re_raise
+    begin
+      @jInteger.parseInt('blabla')
+      flunk('no exception')
+    rescue NumberFormatException => e
+      begin
+        raise
+      rescue => e
+        assert_equal(NumberFormatException, e.class)
+        # OK
+      end
+    end
+  end
 end
 

data/test/x.rb

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

metadata

@@ -1,17 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: rjb
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.9
 platform: ruby
 authors:
 - arton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-29 00:00:00.000000000 Z
+date: 2019-02-17 00:00:00.000000000 Z
 dependencies: []
-description: RJB is a Bridge library which connects Ruby and Java code using the Java
+description: 'RJB is a bridge program that connect between Ruby and Java with Java
   Native Interface.
+
+'
 email: artonx@gmail.com
 executables: []
 extensions:
@@ -20,10 +22,9 @@ 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
@@ -43,6 +44,10 @@ 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
@@ -66,9 +71,10 @@ files:
 - test/test_osxjvm.rb
 - test/test_osxload.rb
 - test/test_unload.rb
-homepage: http://www.artonx.org/collabo/backyard/?RubyJavaBridge
+- test/x.rb
+homepage: https://www.artonx.org/collabo/backyard/?RubyJavaBridge
 licenses:
-- LGPL-2.1
+- LGPL
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -85,10 +91,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
+- none
 - JDK 5.0
-rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
-summary: Ruby Java Bridge
-test_files: []
+summary: Ruby Java bridge
+test_files:
+- test/test.rb

data/README.md

@@ -1,65 +0,0 @@
-# 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