rjb 1.3.5 → 1.3.6

data/ChangeLog

@@ -1,3 +1,11 @@
+Wed Nov 09 arton
+ *ext/rjb.c
+	RJB_VERSION -> 1.3.6
+ *ext/rjbexception.c
+	add to_str method into the exception class.
+	ruby internally calls the method when reraising the exception.
+ *test/test.rb (test_reraise_exception)
+	add reraise test
 Mon Jul 18 arton
  *ext/rjb.c
 	fix inhiritance test.

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 159 2010-11-16 16:35:49Z arton $
+ * $Id: load.c 167 2011-07-15 17:40:25Z arton $
  */
 
 #include <stdlib.h>

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 170 2011-07-18 12:45:13Z arton $
+ * $Id: rjb.c 173 2011-11-09 13:46:04Z arton $
  */
 
-#define RJB_VERSION "1.3.5"
+#define RJB_VERSION "1.3.6"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -131,6 +131,7 @@ static jmethodID get_system_classloader;
 static jclass j_url_loader;
 static jobject url_loader;
 static jmethodID url_loader_new;
+static jmethodID url_geturls;
 /* URL global reference */
 static jclass j_url;
 static jmethodID url_new;
@@ -2551,6 +2552,8 @@ static VALUE rjb_s_add_jar(VALUE self, VALUE jarname)
                         "(Ljava/lang/String;)Ljava/lang/Class;");
         RJB_LOAD_METHOD(url_loader_new, j_url_loader, "<init>",
                         "([Ljava/net/URL;Ljava/lang/ClassLoader;)V");
+        RJB_LOAD_METHOD(url_geturls, j_url_loader, "getURLs",
+                        "()[Ljava/net/URL;");
     }
     args[0].l = (*jenv)->NewObjectArray(jenv, (count == 0) ? 1 : count, j_url, NULL);
     rjb_check_exception(jenv, 0);    
@@ -2575,6 +2578,17 @@ static VALUE rjb_s_add_jar(VALUE self, VALUE jarname)
     return Qtrue;
 }
 
+static VALUE rjb_s_urls(VALUE self)
+{
+    JNIEnv* jenv;
+    jvalue ret;
+    if (!url_loader) return Qnil;
+    jenv = rjb_prelude();
+    ret.l = (*jenv)->CallObjectMethod(jenv, url_loader, url_geturls);
+    return jarray2rv(jenv, ret);
+}
+
+
 /*
  * return class name
  */
@@ -3155,6 +3169,7 @@ void Init_rjbcore()
     rb_define_module_function(rjb, "add_classpath", rjb_s_add_classpath, 1);
     rb_define_module_function(rjb, "add_jar", rjb_s_add_jar, 1);
     rb_define_alias(rjb, "add_jars", "add_jar");
+    rb_define_module_function(rjb, "urls", rjb_s_urls, 0);
     rb_define_const(rjb, "VERSION", rb_str_new2(RJB_VERSION));
     rb_define_class_variable(rjb, "@@classpath", rb_ary_new());
     cvar_classpath = rb_intern("@@classpath");

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 126 2010-07-22 13:58:15Z arton $
+ * $Id: rjbexception.c 174 2011-11-09 13:47:43Z arton $
  */
 
 #include "ruby.h"
@@ -32,6 +32,12 @@ 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 exception_to_s(VALUE self)
+{
+    return rb_funcall(rb_ivar_get(self, rb_intern("@cause")),
+                      rb_intern("toString"), 0);
+}
+
 /*
  * handle Java exception
  *  At this time, the Java exception is defined without the package name.
@@ -61,6 +67,7 @@ VALUE rjb_get_exception_class(JNIEnv* jenv, jstring str)
     {
 	rexp = rb_define_class(pcls, rb_eStandardError);
         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)
 	rb_hash_aset(rjb_loaded_classes, cname, rexp);
 #else

data/readme.txt

@@ -1,35 +1,28 @@
-Rjb is Ruby-Java bridge using Java Native Interface.
-
-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 fixed as '/System/Library/Frameworks/JavaVM.framework'.
-
-then,
-
-ruby setup.rb config
-ruby setup.rb setup
-
-(in Unix)
-sudo ruby setup.rb install
-or
-(in win32)
-ruby setup.rb install
-
-How to test
-in Win32
-cd test
-ruby test.rb
-
-in Unix
-see test/readme.unix 
-you must 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.
-ENV['LC_ALL'] = 'en_us.utf8' # or ja_JP.utf8 etc.
- cf: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4733494  
-   (Thanks Paul for this information).
-
-artonx@yahoo.co.jp
+Rjb is Ruby-Java bridge using Java Native Interface.
+
+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 fixed as '/System/Library/Frameworks/JavaVM.framework'.
+
+then,
+
+ruby setup.rb config
+ruby setup.rb setup
+
+(in Unix)
+sudo ruby setup.rb install
+or
+(in win32)
+ruby setup.rb install
+
+How to test
+in Win32
+cd test
+ruby test.rb
+
+in Unix
+see test/readme.unix 
+you must set LD_LIBRARY_PATH environmental variable to run rjb.
+
+artonx@yahoo.co.jp

data/test/test.rb

@@ -1,6 +1,6 @@
 #!/usr/local/env ruby -Ku
 # encoding: utf-8
-# $Id: test.rb 170 2011-07-18 12:45:13Z arton $
+# $Id: test.rb 174 2011-11-09 13:47:43Z arton $
 
 begin
   require 'rjb'
@@ -792,5 +792,22 @@ class TestRjb < Test::Unit::TestCase
     assert_equal 'method1', ret[0]
     assert_equal 'method2', ret[1]
   end
+
+  def cause_exception
+    begin
+      @jInteger.parseInt('blabla')
+    rescue NumberFormatException => e
+      raise
+    end
+  end
+
+  def test_reraise_exception()
+    begin
+      cause_exception
+    rescue
+      assert($!.to_s =~ /NumberFormatException/)
+    end
+  end
+  
 end
 

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rjb
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 3
-  - 5
-  version: 1.3.5
+  prerelease: 
+  version: 1.3.6
 platform: ruby
 authors: 
 - arton
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 +09:00
-default_executable: 
+date: 2011-11-09 00:00:00 Z
 dependencies: []
 
 description: |
@@ -36,7 +31,6 @@ files:
 - ext/rjb.c
 - ext/jp_co_infoseek_hp_arton_rjb_RBridge.h
 - ext/riconv.h
-- ext/extconf.h
 - ext/jniwrap.h
 - ext/rjb.h
 - ext/depend
@@ -63,7 +57,6 @@ files:
 - readme.sj
 - readme.txt
 - ext/extconf.rb
-has_rdoc: true
 homepage: http://rjb.rubyforge.org/
 licenses: []
 
@@ -77,24 +70,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 2
       version: 1.8.2
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: 
 - none
 - JDK 5.0
 rubyforge_project: rjb
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Ruby Java bridge

data/ext/extconf.h

@@ -1,8 +0,0 @@
-#ifndef EXTCONF_H
-#define EXTCONF_H
-#define HAVE_JNI_H 1
-#define HAVE_DL_H 1
-#define HAVE_SETLOCALE 1
-#define HAVE_GETENV 1
-#define RJB_RUBY_VERSION_CODE 187
-#endif