rjb 1.3.9 → 1.4.0

data/ChangeLog

@@ -1,3 +1,27 @@
+Sun Apr 22 arton
+ *ext/rjb.c
+	add Rjb_JavaProxy#initialize_proxy method for preparing proxy instance.
+	RJB_VERSION -> 1.4.0
+ *lib/rjb
+	add rjb own directory
+ *lib/rjbextension.rb
+	move contents into rjb/extension.rb
+ *lib/rjb/extension.rb
+	extension library to handle package name easily.
+ *lib/rjb/list.rb
+	implements each method for Iterable and Iterator.
+Sun Apr 22 arton
+ *ext/rjb.c
+	use URLClassLoader#addJar for Rjb::add_jar method.
+	It accepts unhierarchic load order.
+ *test/jartest2.jar
+	for test Rjb::add_jar. this jar contains a class that extends class in jartest.jar
+ *test/jartest.rb
+	testing Rjb::add_jar, first jartest2.jar then jartest.jar
+ *test/jartest2.rb
+	testing Rjb::add_jar for an array.
+ *test/jartest3.rb
+	testing Rjb::add_jar in NoClassDefError condition.
 Sat Jan 28 arton
  *ext/rjb.c
 	RJB_VERSION -> 1.3.9

data/ext/jp_co_infoseek_hp_arton_rjb_RBridge.h

@@ -1,21 +1,21 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class jp_co_infoseek_hp_arton_rjb_RBridge */
-
-#ifndef _Included_jp_co_infoseek_hp_arton_rjb_RBridge
-#define _Included_jp_co_infoseek_hp_arton_rjb_RBridge
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     jp_co_infoseek_hp_arton_rjb_RBridge
- * Method:    call
- * Signature: (Ljava/lang/String;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_jp_co_infoseek_hp_arton_rjb_RBridge_call
-  (JNIEnv *, jobject, jstring, jobject, jobjectArray);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class jp_co_infoseek_hp_arton_rjb_RBridge */
+
+#ifndef _Included_jp_co_infoseek_hp_arton_rjb_RBridge
+#define _Included_jp_co_infoseek_hp_arton_rjb_RBridge
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     jp_co_infoseek_hp_arton_rjb_RBridge
+ * Method:    call
+ * Signature: (Ljava/lang/String;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_jp_co_infoseek_hp_arton_rjb_RBridge_call
+  (JNIEnv *, jobject, jstring, jobject, jobjectArray);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

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 181 2012-01-28 05:28:41Z arton $
+ * $Id: rjb.c 187 2012-04-22 12:35:49Z arton $
  */
 
-#define RJB_VERSION "1.3.9"
+#define RJB_VERSION "1.4.0"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -86,6 +86,7 @@ static VALUE rjbb;
 static VALUE rjba;
 
 static ID user_initialize;
+static ID initialize_proxy;
 static ID cvar_classpath;
 static ID anonymousblock;
 static ID id_call;
@@ -132,6 +133,7 @@ static jclass j_url_loader;
 static jobject url_loader;
 static jmethodID url_loader_new;
 static jmethodID url_geturls;
+static jmethodID url_add_url;
 /* URL global reference */
 static jclass j_url;
 static jmethodID url_new;
@@ -2099,7 +2101,7 @@ static VALUE rjb_i_prepare_proxy(VALUE self)
 
 static VALUE register_instance(JNIEnv* jenv, VALUE klass, struct jv_data* org, jobject obj)
 {
-    VALUE v;
+    volatile VALUE v;
     VALUE iproc;
     struct jvi_data* ptr = ALLOC(struct jvi_data);
     memset(ptr, 0, sizeof(struct jvi_data));
@@ -2114,6 +2116,7 @@ static VALUE register_instance(JNIEnv* jenv, VALUE klass, struct jv_data* org, j
         rb_ivar_set(v, user_initialize, iproc);
         rb_funcall(v, rb_intern("_prepare_proxy"), 0, 0);
     }
+    rb_funcall(v, initialize_proxy, 0, 0);
     return v;
 }
 
@@ -2559,27 +2562,53 @@ static VALUE rjb_s_add_jar(VALUE self, VALUE jarname)
                         "([Ljava/net/URL;Ljava/lang/ClassLoader;)V");
         RJB_LOAD_METHOD(url_geturls, j_url_loader, "getURLs",
                         "()[Ljava/net/URL;");
+        RJB_LOAD_METHOD(url_add_url, j_url_loader, "addURL",
+                        "(Ljava/net/URL;)V");
     }
-    args[0].l = (*jenv)->NewObjectArray(jenv, (count == 0) ? 1 : count, j_url, NULL);
-    rjb_check_exception(jenv, 0);    
-    if (!count)
+    if (!url_loader)
     {
-        (*jenv)->SetObjectArrayElement(jenv, args[0].l, 0,
+        args[0].l = (*jenv)->NewObjectArray(jenv, (count == 0) ? 1 : count, j_url, NULL);
+        rjb_check_exception(jenv, 0);    
+        if (!count)
+        {
+            (*jenv)->SetObjectArrayElement(jenv, args[0].l, 0,
                                        conv_jarname_to_url(jenv, jarname));
+        }
+        else
+        {
+            for (i = 0; i < count; i++) {
+                (*jenv)->SetObjectArrayElement(jenv, args[0].l, i,
+                                       conv_jarname_to_url(jenv, rb_ary_entry(jarname, i)));
+            }
+        }
+        rjb_check_exception(jenv, 0);
+        args[1].l = get_class_loader(jenv);
+        url_loader = (*jenv)->NewObjectA(jenv, j_url_loader, url_loader_new, args);
+        rjb_check_exception(jenv, 0);
+        (*jenv)->NewGlobalRef(jenv, url_loader);
+        (*jenv)->DeleteLocalRef(jenv, args[0].l);
     }
     else
     {
-        for (i = 0; i < count; i++) {
-            (*jenv)->SetObjectArrayElement(jenv, args[0].l, i,
-                                       conv_jarname_to_url(jenv, rb_ary_entry(jarname, i)));
+        jvalue v;
+        if (count)
+        {
+            for (i = 0; i < count; i++)
+            {
+                v.l = conv_jarname_to_url(jenv, rb_ary_entry(jarname, i));
+                (*jenv)->CallObjectMethod(jenv, url_loader, url_add_url, v);
+                rjb_check_exception(jenv, 0);
+                (*jenv)->DeleteLocalRef(jenv, v.l);
+            }
+        }
+        else
+        {
+            v.l = conv_jarname_to_url(jenv, jarname);
+            (*jenv)->CallObjectMethod(jenv, url_loader, url_add_url, v);
+            rjb_check_exception(jenv, 0);
+            (*jenv)->DeleteLocalRef(jenv, v.l);
         }
     }
-    rjb_check_exception(jenv, 0);
-    args[1].l = get_class_loader(jenv);
-    url_loader = (*jenv)->NewObjectA(jenv, j_url_loader, url_loader_new, args);
-    rjb_check_exception(jenv, 0);
-    (*jenv)->NewGlobalRef(jenv, url_loader);
-    (*jenv)->DeleteLocalRef(jenv, args[0].l);
     return Qtrue;
 }
 
@@ -3159,6 +3188,7 @@ void Init_rjbcore()
     proxies = rb_ary_new();
     rb_global_variable(&proxies);
     user_initialize = rb_intern(USER_INITIALIZE);
+    initialize_proxy = rb_intern("initialize_proxy");
 
     rjb = rb_define_module("Rjb");
     rb_define_module_function(rjb, "load", rjb_s_load, -1);

data/lib/rjb.rb

@@ -77,6 +77,8 @@ module Rjb
   end
   class Rjb_JavaProxy
     include JMethod
+    def initialize_proxy
+    end
     def public_methods(inh = true)
       jmethods(super(inh), getClass) do |m|
         instance_method?(m) && public_method?(m)

data/lib/rjbextension.rb

@@ -1,128 +1 @@
-=begin
-Copyright(c) 2010 arton
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
-
-$Id: rjbextension.rb 147 2010-10-23 05:10:33Z arton $
-
- This file is from Andreas Ronge project neo4j
-   http://github.com/andreasronge/neo4j/blob/rjb/lib/rjb_ext.rb
-
-Copyright (c) 2008 Andreas Ronge
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
-=end
-
-# Loads the JVM with the given <tt>classpath</tt> and arguments to the jre.
-# All needed .jars should be included in <tt>classpath</tt>.
-
-module Kernel
-  alias rjb_original_require require
-
-  def require(path)
-    rjb_original_require(path)
-  rescue LoadError
-    # check that it's not a jar file
-    raise unless path =~ /\.jar/
-
-    # This will maybe use the wrong jar file from a previous version of the GEM
-    # puts "LOAD PATH #{$LOAD_PATH}" 
-    found_path = $LOAD_PATH.reverse.find{|p| File.exist?(File.join(p,path))}
-    raise unless found_path
-
-    abs_path = File.join(found_path, path)
-    # check that the file exists
-    raise unless  File.exist?(abs_path)
-
-    # try to load it using RJB
-    if Rjb::loaded?
-      Rjb::add_jar abs_path
-    else
-      Rjb::add_classpath abs_path
-    end
-  end
-
-  def load_jvm(jargs = [])
-    return if Rjb::loaded?
-    classpath = ENV['CLASSPATH'] ||= ''
-    Rjb::load(classpath, jargs)
-  end
-end
-
-class JavaPackage
-
-  def initialize(pack_name, parent_pack = nil)
-    @pack_name = pack_name
-    @parent_pack = parent_pack
-    @cache = {}
-  end
-
-  def method_missing(m, *args)
-    # return if possible old module/class
-    @cache[m] ||= create_package_or_class(m)
-  end
-  def create_package_or_class(m)
-    method = m.to_s
-    if class?(method)
-      Rjb::import("#{self}.#{method}")
-    else
-      JavaPackage.new(method, self)
-    end
-  end
-
-  def to_s
-    if @parent_pack
-      "#{@parent_pack.to_s}.#@pack_name"
-    else
-      "#@pack_name"
-    end
-  end
-
-  def class?(a)
-    first_letter = a[0,1]
-    first_letter >= 'A' && first_letter <= 'Z'
-  end
-
-  @@cache = {}
-  def self.new(pack_name, parent_pack = nil)
-    @@cache[pack_name] ||= super
-  end
-end
-
-module RjbConf
-  # make them as singleton
-  ORG = JavaPackage.new('org')
-  JAVA = JavaPackage.new('java')
-end
-
-def org
-  RjbConf::ORG
-end
-
-def java
-  RjbConf::JAVA
-end
+require 'rjb/extension'

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/jartest.rb

@@ -0,0 +1,24 @@
+#!/usr/local/env ruby -Ku
+# encoding: utf-8
+
+begin
+  require 'rjb'
+rescue LoadError 
+  require 'rubygems' 
+  require 'rjb'
+end
+require 'test/unit'
+
+class JarTest < Test::Unit::TestCase
+  include Rjb
+  
+  def setup
+    Rjb::load()
+  end
+  
+  def test_depends
+    add_jar(File.expand_path('./jartest2.jar'))    
+    add_jar(File.expand_path('./jartest.jar'))
+    assert Rjb::import('jp.co.infoseek.hp.arton.rjb.JarTest2')
+  end
+end

data/test/jartest2.rb

@@ -0,0 +1,23 @@
+#!/usr/local/env ruby -Ku
+# encoding: utf-8
+
+begin
+  require 'rjb'
+rescue LoadError 
+  require 'rubygems' 
+  require 'rjb'
+end
+require 'test/unit'
+
+class JarTest < Test::Unit::TestCase
+  include Rjb
+  
+  def setup
+    Rjb::load()
+  end
+  
+  def test_depends
+    add_jar([File.expand_path('./jartest2.jar'), File.expand_path('./jartest.jar')])
+    assert Rjb::import('jp.co.infoseek.hp.arton.rjb.JarTest2')
+  end
+end

data/test/jartest3.rb

@@ -0,0 +1,28 @@
+#!/usr/local/env ruby -Ku
+# encoding: utf-8
+
+begin
+  require 'rjb'
+rescue LoadError 
+  require 'rubygems' 
+  require 'rjb'
+end
+require 'test/unit'
+
+class JarTest < Test::Unit::TestCase
+  include Rjb
+  
+  def setup
+    Rjb::load()
+  end
+  
+  def test_depends
+    add_jar(File.expand_path('./jartest2.jar'))    
+    begin
+      Rjb::import('jp.co.infoseek.hp.arton.rjb.JarTest2')
+      fail 'no exception'
+    rescue NoClassDefFoundError
+      assert true
+    end
+  end
+end

data/test/listtest.rb

@@ -0,0 +1,56 @@
+#!/usr/local/env ruby -Ku
+# encoding: utf-8
+=begin
+  Copyright(c) 2012 arton
+=end
+
+begin
+  require 'rjb/list'
+rescue LoadError 
+  require 'rubygems' 
+  require 'rjb/list'
+end
+require 'test/unit'
+require 'fileutils'
+
+class ListTest < Test::Unit::TestCase
+  include Rjb
+  def test_create
+    ja = import('java.util.ArrayList')
+    a = ja.new
+    a.add(1)
+    a.add(2)
+    a.add(3)
+    n = 1
+    a.each do |x|
+      assert_equal n, x.intValue
+      n += 1
+    end
+    assert_equal 4, n
+  end
+  def test_returned_proxy
+    ja = import('java.util.Arrays')
+    a = ja.as_list([1, 2, 3])
+    n = 1
+    a.each do |x|
+      assert_equal n, x.intValue
+      n += 1
+    end
+    assert_equal 4, n
+  end
+  def test_iterator
+    ja = import('java.util.Arrays')
+    it = ja.as_list([1, 2, 3]).iterator
+    n = 1
+    it.each do |x|
+      assert_equal n, x.intValue
+      n += 1
+    end
+    assert_equal 4, n
+  end
+  def test_enumerable
+    ja = import('java.util.Arrays')
+    assert_equal 55, ja.as_list((1..10).to_a).inject(0) {|r, e| r + e.intValue}
+  end
+end
+

metadata

@@ -1,39 +1,36 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rjb
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.4.0
   prerelease: 
-  version: 1.3.9
 platform: ruby
-authors: 
+authors:
 - arton
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-28 00:00:00 Z
+date: 2012-04-22 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: 
+extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - ext/RBridge.java
-- ext/load.c
 - ext/rjbexception.c
-- ext/riconv.c
 - ext/rjb.c
-- ext/jp_co_infoseek_hp_arton_rjb_RBridge.h
-- ext/riconv.h
+- ext/riconv.c
+- ext/load.c
+- ext/rjb.h
 - ext/extconf.h
+- ext/jp_co_infoseek_hp_arton_rjb_RBridge.h
 - ext/jniwrap.h
-- ext/rjb.h
+- ext/riconv.h
 - ext/depend
 - data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
 - lib/rjb.rb
@@ -41,49 +38,52 @@ files:
 - samples/filechooser.rb
 - samples/unzip.rb
 - test/test.rb
-- test/exttest.rb
-- test/test_unload.rb
 - test/test_osxjvm.rb
+- test/exttest.rb
+- test/jartest3.rb
+- test/jartest2.rb
 - test/gctest.rb
-- test/jp/co/infoseek/hp/arton/rjb/IBase.class
-- test/jp/co/infoseek/hp/arton/rjb/Test.class
-- test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.class
+- test/listtest.rb
+- test/test_unload.rb
+- test/jartest.rb
 - test/TwoCaller.class
 - test/Two.class
+- test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.class
+- test/jp/co/infoseek/hp/arton/rjb/Test.class
+- test/jp/co/infoseek/hp/arton/rjb/IBase.class
+- test/jartest2.jar
 - test/rjbtest.jar
 - test/jartest.jar
 - COPYING
 - ChangeLog
-- readme.sj
 - readme.txt
+- readme.sj
 - ext/extconf.rb
 homepage: http://rjb.rubyforge.org/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.2
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - none
 - JDK 5.0
 rubyforge_project: rjb
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby Java bridge
-test_files: 
+test_files:
 - test/test.rb