rjb 1.4.7-x86-mswin32-100 → 1.4.9-x86-mswin32-100

data/ext/extconf.h

@@ -3,5 +3,5 @@
 #define HAVE_JNI_H 1
 #define HAVE_SETLOCALE 1
 #define HAVE_GETENV 1
-#define RJB_RUBY_VERSION_CODE 193
+#define RJB_RUBY_VERSION_CODE 210
 #endif

data/ext/rjb.c

@@ -15,7 +15,7 @@
  * $Id: rjb.c 199 2012-12-17 13:31:18Z arton $
  */
 
-#define RJB_VERSION "1.4.7"
+#define RJB_VERSION "1.4.9"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -1066,7 +1066,14 @@ static jarray r2objarray(JNIEnv* jenv, VALUE v, const char* cls)
     if (TYPE(v) == T_ARRAY)
     {
 	int i;
-	ary = (*jenv)->NewObjectArray(jenv, (jint)RARRAY_LEN(v), j_object, NULL);
+        jclass jcls = NULL;
+        char* p = strchr(cls, ';');
+        if (p)
+        {
+            volatile VALUE clsname = rb_str_new(cls + 1, p - cls - 1); // skip first 'L'
+            jcls = rjb_find_class(jenv, clsname);
+        }
+        ary = (*jenv)->NewObjectArray(jenv, (jint)RARRAY_LEN(v), (jcls) ? jcls : j_object, NULL);
 	rjb_check_exception(jenv, 0);
 	for (i = 0; i < RARRAY_LEN(v); i++)
 	{

data/ext/rjbexception.c

@@ -32,6 +32,11 @@ static VALUE missing_delegate(int argc, VALUE* argv, VALUE self)
     return rb_funcall(rb_ivar_get(self, rb_intern("@cause")), rmid, argc - 1, argv + 1);
 }
 
+static VALUE get_cause(VALUE self)
+{
+  return rb_funcall(rb_ivar_get(self, rb_intern("@cause")), rb_intern("cause"), 0);
+}
+
 static VALUE exception_to_s(VALUE self)
 {
     return rb_funcall(rb_ivar_get(self, rb_intern("@cause")),
@@ -66,6 +71,7 @@ VALUE rjb_get_exception_class(JNIEnv* jenv, jstring str)
     if (rexp == Qnil)
     {
 	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);
 #if defined(HAVE_RB_HASH_ASET) || defined(RUBINIUS)

data/readme.txt

@@ -29,7 +29,7 @@ you must set LD_LIBRARY_PATH environmental variable to run rjb.
 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.
 ENV['LC_ALL'] = 'en_us.utf8' # or ja_JP.utf8 etc.
- cf: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4733494  
+ cf: http://bugs.sun.com/view_bug.do?bug_id=4733494
    (Thanks Paul for this information).
 
 artonx@yahoo.co.jp

data/test/test.rb

@@ -810,6 +810,19 @@ class TestRjb < Test::Unit::TestCase
       end
    end
   end
+
+
+  def test_inner_exception
+    test = import('jp.co.infoseek.hp.arton.rjb.Test').new
+    begin
+      test.cause_exception
+      flunk("no exception")
+    rescue IllegalStateException => e
+      ia = e.cause
+      assert_equal('bad argument', ia.message)
+      assert_equal('java.lang.IllegalArgumentException', ia._classname)
+    end
+  end
   
   class CbTest
     def method(l, s, i, d, str)
@@ -878,5 +891,13 @@ class TestRjb < Test::Unit::TestCase
     assert_equal(32, b.int_value)
     assert b.compareTo(@jByte._invoke(:valueOf, 'B', 32))
   end
+  def test_typedarray
+    test = import('jp.co.infoseek.hp.arton.rjb.Test').new
+    uri = import('java.net.URI')
+    ret = test.java_typed_array(['a', 'b', 'c'], [1, 2, 3], [uri.new('http://www.artonx.org')])
+    assert_equal '[Ljava.lang.String;', ret[0]
+    assert_equal '[Ljava.lang.Integer;', ret[1]
+    assert_equal '[Ljava.net.URI;', ret[2]    
+  end
 end
 

metadata

@@ -1,93 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: rjb
 version: !ruby/object:Gem::Version
-  version: 1.4.7
-  prerelease: 
+  version: 1.4.9
 platform: x86-mswin32-100
 authors:
 - arton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies: []
-description: ! 'RJB is a bridge program that connect between Ruby and Java with Java
-  Native Interface.
-
-'
+description: |
+  RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
 email: artonx@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- COPYING
+- ChangeLog
+- data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
 - ext/RBridge.java
-- ext/rjbexception.c
-- ext/rjb.c
-- ext/load.c
-- ext/riconv.c
+- ext/depend
 - ext/extconf.h
 - ext/jniwrap.h
 - ext/jp_co_infoseek_hp_arton_rjb_RBridge.h
-- ext/rjb.h
+- ext/load.c
+- ext/riconv.c
 - ext/riconv.h
-- ext/depend
-- data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
-- lib/rjbextension.rb
+- ext/rjb.c
+- ext/rjb.h
+- ext/rjbexception.c
 - lib/rjb.rb
+- lib/rjbcore.so
+- lib/rjbextension.rb
+- readme.sj
+- readme.txt
 - samples/filechooser.rb
 - samples/unzip.rb
-- test/jartest.rb
-- test/gctest.rb
-- test/test_osxjvm.rb
-- test/test.rb
+- test/Base.class
+- test/CallbackTest$Callback.class
+- test/CallbackTest.class
+- test/ExtBase.class
+- test/IBase.class
+- test/JTest.class
+- test/Test$TestTypes.class
+- test/Test.class
+- test/Two.class
+- test/TwoCaller.class
 - test/exttest.rb
-- test/test_osxload.rb
-- test/osx_jvmcheck.rb
+- test/gctest.rb
+- test/jartest.jar
+- test/jartest.rb
+- test/jartest2.jar
 - test/jartest2.rb
 - test/jartest3.rb
-- test/test_unload.rb
-- test/listtest.rb
-- test/jp/co/infoseek/hp/arton/rjb/Test.class
-- test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.class
 - test/jp/co/infoseek/hp/arton/rjb/CallbackTest$Callback.class
 - test/jp/co/infoseek/hp/arton/rjb/CallbackTest.class
 - test/jp/co/infoseek/hp/arton/rjb/IBase.class
-- test/Two.class
-- test/TwoCaller.class
-- test/jartest.jar
-- test/jartest2.jar
+- test/jp/co/infoseek/hp/arton/rjb/JTest.class
+- test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.class
+- test/jp/co/infoseek/hp/arton/rjb/Test.class
+- test/listtest.rb
+- test/osx_jvmcheck.rb
 - test/rjbtest.jar
-- COPYING
-- ChangeLog
-- readme.sj
-- readme.txt
-- lib/rjbcore.so
+- test/test.rb
+- test/test_osxjvm.rb
+- test/test_osxload.rb
+- test/test_unload.rb
 homepage: http://rjb.rubyforge.org/
-licenses: []
+licenses:
+- LGPL
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - none
 - JDK 5.0
-- ! ' VC6 version of Ruby'
+- " VC6 version of Ruby"
 rubyforge_project: rjb
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby Java bridge
 test_files:
 - test/test.rb