rjb 1.1.2 → 1.1.3

data/ChangeLog

@@ -1,3 +1,29 @@
+Tue Mar 5 Kuwashima
+ *ext/rjb.c
+ *ext/rjb.h
+ *ext/rjbexception.c
+ 	add auto load method.
+Tue Mar  4 Kuwashima
+ *ext/rjbexception.c
+ *ext/rjb.c
+ *test/test.rb
+ 	clear(ignore) exception in current java thread, before some operation.
+ *ext/rjbexception.c
+ *ext/rjb.c
+	add auto load for Rjb::bind, Rjb::throw
+ *ext/rjb.c
+ *test/test.rb
+	add Rjb::unbind
+ *test/test.rb
+ 	add loading rubygems 
+Sat Feb 23 arton
+ *test/test.rb
+	let test_field metod use Test.class instead of Point.class
+ *test/Test.java
+	add a public field for testing
+Fri Feb 22 arton
+ *ext/rjb.c
+	mark version 1.1.3 for the next release.
 Fri Feb 22 arton
  *ext/rjb.c
 	fix field reference (bug# 18238)

data/ext/load.c

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: load.c 43 2007-12-26 18:55:04Z kuwa1 $
+ * $Id: load.c 65 2008-03-26 13:19:29Z arton $
  */
 
 #include <stdlib.h>
@@ -93,6 +93,10 @@ static int load_jvm(char* jvmtype)
 #endif
     if (!jh)
     {
+        if (RTEST(ruby_verbose))
+        {
+            fprintf(stderr, "no JAVA_HOME environment\n");
+        }
         return 0;
     }
 #if defined(_WIN32)
@@ -132,6 +136,7 @@ static int load_jvm(char* jvmtype)
     
     jvmdll = rb_funcall(rb_const_get(rb_cObject, rb_intern("DL")), rb_intern("dlopen"), 1, rb_str_new2(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("JNI_GetDefaultJavaVMInitArgs"), 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("JNI_CreateJavaVM"), rb_str_new2("IPPP")), rb_intern("to_ptr"), 0), rb_intern("to_i"), 0); 
@@ -281,6 +286,10 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
     if (!result)
     {
 	result = load_bridge(*pjenv);
+        if (RTEST(ruby_verbose) && result < 0)
+        {
+            fprintf(stderr, "failed to load the bridge class\n");
+        }
     }
     return result;
 }

data/ext/riconv.c

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: riconv.c 58 2008-01-14 08:25:07Z kuwa1 $
+ * $Id: riconv.c 65 2008-03-26 13:19:29Z arton $
  */
 
 #include "ruby.h"
@@ -30,10 +30,10 @@ static const char* const NL_SJIS_TABLE[] = { "SHIFT_JIS", "SHIFT_JISX0213", "WIN
 
 #if defined HAVE_SETLOCALE
 #include <locale.h>
+#endif
 static const char* const LOCALE_EUC_TABLE[] = { "japanese", "ja_JP.eucJP", "japanese.euc", "ja_JP", "ja_JP.ujis" };
 static const char* const LOCALE_SJIS_TABLE[] = { "japanese.sjis", "ja_JP.SJIS" };
 static const char* const LOCALE_UTF8_TABLE[] = { "ja_JP.UTF-8", "ja_JP.utf8" };
-#endif
 
 #include "riconv.h"
 
@@ -108,7 +108,6 @@ static const char* get_charcode_name()
         setlocale(LC_ALL, ""); //initialize
         result = get_charcode_name_by_locale(setlocale(LC_ALL, NULL));
 #elif defined HAVE_GETENV
-        printf("HAVE_GETENV\n");
         if (result = get_charcode_name_by_locale(getenv("LC_ALL")))
                 ;
         else if (result = get_charcode_name_by_locale(getenv("LC_CTYPE")))

data/ext/rjb.c

@@ -12,10 +12,10 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjb.c 59 2008-02-21 19:37:15Z arton $
+ * $Id: rjb.c 64 2008-03-05 14:24:22Z kuwa1 $
  */
 
-#define RJB_VERSION "1.1.2"
+#define RJB_VERSION "1.1.3"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -126,7 +126,6 @@ JNIEnv* rjb_attach_current_thread(void)
   return env;
 }
 
-
 void rjb_release_string(JNIEnv *jenv, jstring str, const char* chrs)
 {
     (*jenv)->ReleaseStringUTFChars(jenv, str, chrs);
@@ -1745,6 +1744,14 @@ static VALUE rjb_s_load(int argc, VALUE* argv, VALUE self)
     return Qnil;
 }
 
+/*
+ * load Java Virtual Machine with default arguments.
+ */
+VALUE rjb_load_vm_default()
+{
+    return rjb_s_load(0, NULL, 0);
+}
+
 /*
  * unload Java Virtual Machine
  *
@@ -1762,6 +1769,8 @@ static VALUE rjb_s_unload(int argc, VALUE* argv, VALUE self)
     st_foreach(RHASH_TBL(rjb_loaded_classes), clear_classes, 0);
     if (rjb_jvm)
     {
+        JNIEnv* jenv = rjb_attach_current_thread();
+	(*jenv)->ExceptionClear(jenv);
 	(*rjb_jvm)->DestroyJavaVM(rjb_jvm);
 	rjb_jvm = NULL;
     }
@@ -2022,8 +2031,12 @@ static VALUE rjb_newinstance_s(int argc, VALUE* argv, VALUE self)
     char* sig;
     VALUE ret = Qnil;
     struct jv_data* ptr;
-    JNIEnv* jenv = rjb_attach_current_thread();
     int found = 0;
+    JNIEnv* jenv = NULL;
+
+    rjb_load_vm_default();
+    jenv = rjb_attach_current_thread();
+    (*jenv)->ExceptionClear(jenv);
 
     rb_scan_args(argc, argv, "1*", &vsig, &rest);
     sig = StringValueCStr(vsig);
@@ -2053,8 +2066,12 @@ static VALUE rjb_newinstance(int argc, VALUE* argv, VALUE self)
     VALUE ret = Qnil;
     struct jv_data* ptr;
     struct cls_constructor** pc;
-    JNIEnv* jenv = rjb_attach_current_thread();
     int found = 0;
+    JNIEnv* jenv = NULL;
+    
+    rjb_load_vm_default();
+    jenv = rjb_attach_current_thread();
+    (*jenv)->ExceptionClear(jenv);
 
     Data_Get_Struct(self, struct jv_data, ptr);
 
@@ -2111,8 +2128,11 @@ jclass rjb_find_class(JNIEnv* jenv, VALUE name)
 static VALUE rjb_s_bind(VALUE self, VALUE rbobj, VALUE itfname)
 {
     VALUE result = Qnil;
-    JNIEnv* jenv = rjb_attach_current_thread();
-    
+    JNIEnv* jenv = NULL;
+
+    rjb_load_vm_default();
+    jenv = rjb_attach_current_thread();
+    (*jenv)->ExceptionClear(jenv);
     jclass itf = rjb_find_class(jenv, itfname); 
     rjb_check_exception(jenv, 1);
     if (itf)
@@ -2137,6 +2157,18 @@ static VALUE rjb_s_bind(VALUE self, VALUE rbobj, VALUE itfname)
     return result;
 }
 
+/*
+ * jclass Rjb::bind(rbobj, interface_name)
+ */
+static VALUE rjb_s_unbind(VALUE self, VALUE rbobj)
+{
+    JNIEnv* jenv;
+    rjb_load_vm_default();
+    jenv = rjb_attach_current_thread();
+    (*jenv)->ExceptionClear(jenv);
+    return rb_ary_delete(proxies, rbobj);
+}
+
 /*
  * Jclass Rjb::import(classname)
  */
@@ -2150,12 +2182,9 @@ static VALUE rjb_s_import(VALUE self, VALUE clsname)
 	return v;
     }
 
-    if (!rjb_jvm) 
-    {
-        /* auto-load with default setting */
-        rjb_s_load(0, NULL, 0);
-    }
+    rjb_load_vm_default();
     jenv = rjb_attach_current_thread();
+    (*jenv)->ExceptionClear(jenv);
     jcls = rjb_find_class(jenv, clsname);
     if (!jcls)
     {
@@ -2725,6 +2754,7 @@ void Init_rjbcore()
     rb_define_module_function(rjb, "unload", rjb_s_unload, -1);
     rb_define_module_function(rjb, "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);
     rb_define_module_function(rjb, "throw", rjb_s_throw, -1);
     rb_define_module_function(rjb, "primitive_conversion=", rjb_s_set_pconversion, 1);

data/ext/rjb.h

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjb.h 53 2008-01-09 11:13:33Z arton $
+ * $Id: rjb.h 64 2008-03-05 14:24:22Z kuwa1 $
  * $Log: rjb.h,v $
  * Revision 1.1  2005/01/16 17:36:10  arton
  * Initial revision
@@ -68,6 +68,7 @@ extern jmethodID rjb_throwable_getMessage;
 extern JNIEnv* rjb_attach_current_thread(void);
 extern jclass rjb_find_class(JNIEnv* jenv, VALUE name);
 extern void rjb_release_string(JNIEnv *jenv, jstring str, const char* chrs);
+extern VALUE rjb_load_vm_default();
 
 /* in rjbexception.c */
 extern VALUE rjb_get_exception_class(JNIEnv* jenv, jstring str);

data/ext/rjbexception.c

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjbexception.c 47 2007-12-28 06:39:43Z arton $
+ * $Id: rjbexception.c 64 2008-03-05 14:24:22Z kuwa1 $
  */
 
 #include "ruby.h"
@@ -66,7 +66,13 @@ VALUE rjb_s_throw(int argc, VALUE* argv, VALUE self)
 {
     VALUE klass;
     VALUE message;
-    JNIEnv* jenv = rjb_attach_current_thread();
+    JNIEnv* jenv = NULL; 
+
+    rjb_load_vm_default();
+
+    jenv = rjb_attach_current_thread();
+    (*jenv)->ExceptionClear(jenv);
+
     if (rb_scan_args(argc, argv, "11", &klass, &message) == 2)
     {
         jclass excep = rjb_find_class(jenv, klass);

data/test/test.rb

@@ -1,8 +1,13 @@
 #!/usr/local/env ruby
-# $Id: test.rb 58 2008-01-14 08:25:07Z kuwa1 $
+# $Id: test.rb 63 2008-03-04 15:34:24Z kuwa1 $
 
+begin
+  require 'rjb'
+rescue LoadError 
+  require 'rubygems' 
+  require 'rjb'
+end
 require 'test/unit'
-require 'rjb'
 
 puts "start RJB(#{Rjb::VERSION}) test"
 class TestRjb < Test::Unit::TestCase
@@ -226,6 +231,12 @@ class TestRjb < Test::Unit::TestCase
     assert("43210", a.concat(it))
   end
 
+  def test_unbind()
+    it = TestIter.new
+    it = bind(it, 'java.util.Iterator')
+    assert(it, unbind(it))
+  end
+
   class TestComparator
     def compare(o1, o2)
       o1.to_i - o2.to_i
@@ -330,13 +341,46 @@ class TestRjb < Test::Unit::TestCase
     end
   end
 
+  def test_throw_clear()
+    assert_nothing_raised {
+      begin
+	Rjb::throw('java.util.NoSuchElementException', 'test exception')
+      rescue #drop ruby exception
+      end
+      test = import('jp.co.infoseek.hp.arton.rjb.Test')
+      begin
+	Rjb::throw('java.util.NoSuchElementException', 'test exception')
+      rescue #drop ruby exception
+      end
+      test.new
+      begin
+	Rjb::throw('java.util.NoSuchElementException', 'test exception')
+      rescue #drop ruby exception
+      end
+      @jString.new_with_sig('Ljava.lang.String;', "abcde")
+      begin
+	Rjb::throw('java.util.NoSuchElementException', 'test exception')
+      rescue #drop ruby exception
+      end
+      it = TestIterator.new(0)
+      it = bind(it, 'java.util.Iterator')
+      begin
+	Rjb::throw('java.util.NoSuchElementException', 'test exception')
+      rescue NoSuchElementException
+      end
+      begin
+	Rjb::throw('java.lang.IllegalAccessException', 'test exception')
+      rescue IllegalAccessException
+      end
+      unbind(it)
+    }
+  end
+
   def test_field()
-    point = import('java.awt.Point')
-    pnt = point.new(11, 13)
-    assert_equal(11, pnt.x)
-    assert_equal(13, pnt.y)
-    pnt.x = 32
-    assert_equal(32, pnt.x)
+    test = import('jp.co.infoseek.hp.arton.rjb.Test').new
+    assert_equal('Hello World !!', test.helloData)
+    test.helloData = 'Goodby World !'
+    assert_equal('Goodby World !', test.helloData)
   end
 
   def test_instancemethod_from_class()

metadata

@@ -1,71 +1,78 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: rjb
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
-date: 2008-02-22 00:00:00 +09:00
-summary: Ruby Java bridge
-require_paths: 
-- lib
-email: artonx@gmail.com
-homepage: http://rjb.rubyforge.org/
-rubyforge_project: 
-description: RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.8.2
-  version: 
+  version: 1.1.3
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - arton
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-03-26 00:00:00 +09:00
+default_executable: 
+dependencies: []
+
+description: RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
+email: artonx@gmail.com
+executables: []
+
+extensions: 
+- ext/extconf.rb
+extra_rdoc_files: []
+
 files: 
 - ext/RBridge.java
 - ext/load.c
-- ext/rjbexception.c
 - ext/riconv.c
 - ext/rjb.c
+- ext/rjbexception.c
+- ext/extconf.h
 - ext/jniwrap.h
-- ext/rjb.h
-- ext/riconv.h
 - ext/jp_co_infoseek_hp_arton_rjb_RBridge.h
-- ext/extconf.h
+- ext/riconv.h
+- ext/rjb.h
 - ext/depend
 - data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
 - lib/rjb.rb
 - samples/filechooser.rb
 - test/gctest.rb
 - test/test.rb
+- test/jp/co/infoseek/hp/arton/rjb/Base.class
 - test/jp/co/infoseek/hp/arton/rjb/ExtBase.class
-- test/jp/co/infoseek/hp/arton/rjb/Test.class
 - test/jp/co/infoseek/hp/arton/rjb/IBase.class
-- test/jp/co/infoseek/hp/arton/rjb/Base.class
 - test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.class
+- test/jp/co/infoseek/hp/arton/rjb/Test.class
 - COPYING
 - ChangeLog
 - readme.sj
 - readme.txt
-test_files: 
-- test/test.rb
+has_rdoc: false
+homepage: http://rjb.rubyforge.org/
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: []
-
-executables: []
-
-extensions: 
-- ext/extconf.rb
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.8.2
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: 
 - none
 - JDK 5.0
-dependencies: []
-
+rubyforge_project: 
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Ruby Java bridge
+test_files: 
+- test/test.rb