rjb 1.2.9-x86-mswin32-60 → 1.3.0-x86-mswin32-60

data/ChangeLog

@@ -1,3 +1,22 @@
+Sat Oct 23 arton	
+ *ext/rjb.c
+	RJV_VERSION -> 1.3.0
+	add loaded? class method.
+	add add_classpath method (add jars without invoking load method)
+ *ext/load.c
+	OSX default jvm name changes to "JavaVM"
+ *ext/extconf.rb
+	OSX javahome set to /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK
+ *lib/rjbextension.rb
+	use Rjb::add_classpath method instead of Kernel's class vars.
+ *test/test.rb, test/exttest.rb
+	fix add_jar test, previous version load them from jp directory.
+Tue Sep 22 arton
+ *ext/rjb.c
+	RJV_VERSION -> 1.2.10
+	add add_jars method. add_jar and add_jars can take an array of jars.
+ *test/test.rb
+	add calling add_jar with an array test.
 Tue Sep 21 arton
  *ext/rjb.h
 	export ClassLoader methods

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 139 2010-09-21 17:32:57Z arton $
+ * $Id: load.c 148 2010-10-23 08:38:44Z arton $
  */
 
 #include <stdlib.h>
@@ -45,7 +45,7 @@
  #endif
  #define CLASSPATH_SEP  ';'
 #elif defined(__APPLE__) && defined(__MACH__)
-  static char* JVMDLL = "%s/Libraries/libjvm_compat.dylib";
+  static char* JVMDLL = "%s/JavaVM";
   #define DIRSEPARATOR '/'
   #define CLASSPATH_SEP ':'
   #define HOME_NAME "/Home"

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 139 2010-09-21 17:32:57Z arton $
+ * $Id: rjb.c 147 2010-10-23 05:10:33Z arton $
  */
 
-#define RJB_VERSION "1.2.9"
+#define RJB_VERSION "1.3.0"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -83,6 +83,7 @@ static VALUE rjbi;
 static VALUE rjbb;
 
 static ID user_initialize;
+static ID cvar_classpath;
 
 VALUE rjb_loaded_classes;
 static VALUE proxies;
@@ -1679,9 +1680,12 @@ static VALUE rjb_s_load(int argc, VALUE* argv, VALUE self)
     JNIEnv* jenv;
     JavaVMInitArgs vm_args;
     jint res;
+    VALUE classpath;
     VALUE user_path;
     VALUE vm_argv;
     char* userpath;
+    ID stradd = rb_intern("<<");
+    ID pathsep = rb_intern("PATH_SEPARATOR");
     int i;
     jclass jmethod;
     jclass jfield;
@@ -1698,12 +1702,19 @@ static VALUE rjb_s_load(int argc, VALUE* argv, VALUE self)
     if (!NIL_P(user_path))
     {
         Check_Type(user_path, T_STRING);
-	userpath = StringValueCStr(user_path);
     }
     else
     {
-	userpath = ".";
+	user_path = rb_str_new2(".");
     }
+    classpath = rb_cvar_get(rjb, cvar_classpath);
+    for (i = 0; i < RARRAY_LEN(classpath); i++)
+    {
+        rb_funcall(user_path, stradd, 1, rb_const_get(rb_cFile, pathsep));
+        rb_funcall(user_path, stradd, 1, rb_ary_entry(classpath, 0));
+    }
+    userpath = StringValueCStr(user_path);
+    
     if (!NIL_P(vm_argv))
     {
         Check_Type(vm_argv, T_ARRAY);
@@ -1772,7 +1783,7 @@ static VALUE rjb_s_load(int argc, VALUE* argv, VALUE self)
 
     jklass = import_class(jenv, j_class, rb_str_new2("java.lang.Class"));
     rb_define_method(rb_singleton_class(jklass), "forName", rjb_class_forname, -1);
-    rb_define_method(rb_singleton_class(jklass), "for_name", rjb_class_forname, -1);    
+    rb_define_alias(rb_singleton_class(jklass), "for_name", "forName");
     rb_gc_register_address(&jklass);
     
     return Qnil;
@@ -1813,6 +1824,11 @@ jobject get_systemloader(JNIEnv* jenv)
     return (*jenv)->CallStaticObjectMethod(jenv, j_classloader, get_system_classloader);
 }
 
+static jobject get_class_loader(JNIEnv* jenv)
+{
+    return (url_loader) ? url_loader : get_systemloader(jenv);
+}
+
 /*
  * unload Java Virtual Machine
  *
@@ -1848,6 +1864,11 @@ static VALUE rjb_s_unload(int argc, VALUE* argv, VALUE self)
     return INT2NUM(result);
 }
 
+static VALUE rjb_s_loaded(VALUE self)
+{
+    return (rjb_jvm) ? Qtrue : Qfalse;
+}
+
 /*
  * return all classes that were already loaded.
  * this method simply returns the global hash,
@@ -1859,7 +1880,7 @@ static VALUE rjb_s_classes(VALUE self)
 }
 
 /**
- * For JRuby conpatible optsion
+ * For JRuby conpatible option
  */
 static VALUE rjb_s_set_pconversion(VALUE self, VALUE val)
 {
@@ -1868,7 +1889,7 @@ static VALUE rjb_s_set_pconversion(VALUE self, VALUE val)
 }
 
 /**
- * For JRuby conpatible optsion
+ * For JRuby conpatible option
  */
 static VALUE rjb_s_get_pconversion(VALUE self)
 {
@@ -2026,7 +2047,7 @@ static VALUE import_class(JNIEnv* jenv, jclass jcls, VALUE clsname)
 static VALUE rjb_i_prepare_proxy(VALUE self)
 {
     return rb_funcall(self, rb_intern("instance_eval"), 1, 
-               rb_str_new2("instance_eval &" USER_INITIALIZE));
+                      rb_str_new2("instance_eval(&" USER_INITIALIZE ")"));
 }
 
 static VALUE register_instance(JNIEnv* jenv, VALUE klass, struct jv_data* org, jobject obj)
@@ -2204,6 +2225,7 @@ jclass rjb_find_class_by_name(JNIEnv* jenv, const char* name)
         strcpy(binname, name);
         v.l = (*jenv)->NewStringUTF(jenv, jniname2java(binname));
         cls = (*jenv)->CallObjectMethod(jenv, url_loader, rjb_load_class, v);
+        (*jenv)->DeleteLocalRef(jenv, v.l);
     }
     else
     {
@@ -2376,6 +2398,7 @@ static void register_class(VALUE self, VALUE clsname)
     rb_define_singleton_method(self, "sigs", rjb_get_signatures, 1);
     rb_define_singleton_method(self, "static_sigs", rjb_get_static_signatures, 1);
     rb_define_singleton_method(self, "ctor_sigs", rjb_get_ctor_signatures, 0);
+    rb_ivar_set(self, user_initialize, Qnil);
     /*
      * the hash was frozen, so it need to call st_ func directly.
      */
@@ -2391,30 +2414,15 @@ static void register_class(VALUE self, VALUE clsname)
 #endif
 }
 
-/*
- * Rjb::add_jar(jarname)
- */
-static VALUE rjb_s_add_jar(VALUE self, VALUE jarname)
+static jobject conv_jarname_to_url(JNIEnv* jenv, VALUE jarname)
 {
-    JNIEnv* jenv;
+    jvalue arg;
+    jobject url;
+    size_t len;
     char* jarp;
     char* urlp;
-    size_t len;
-    jvalue urlarg;
-    jvalue args[2];
-    jobject url;
-    
+
     SafeStringValue(jarname);
-    jenv = rjb_prelude();
-    if (!j_url_loader)
-    {
-        j_url_loader = (*jenv)->NewGlobalRef(jenv,
-                                             (*jenv)->FindClass(jenv, "java/net/URLClassLoader"));
-        RJB_LOAD_METHOD(rjb_load_class, j_url_loader, "loadClass",
-                        "(Ljava/lang/String;)Ljava/lang/Class;");
-        RJB_LOAD_METHOD(url_loader_new, j_url_loader, "<init>",
-                        "([Ljava/net/URL;Ljava/lang/ClassLoader;)V");
-    }
     jarp = StringValueCStr(jarname);
     urlp = ALLOCA_N(char, strlen(jarp) + 32);
     if (strncmp(jarp, "http:", 5) && strncmp(jarp, "https:", 6))
@@ -2443,22 +2451,73 @@ static VALUE rjb_s_add_jar(VALUE self, VALUE jarname)
         }
     }
 #endif
-    urlarg.l = (*jenv)->NewStringUTF(jenv, urlp);
-    rjb_check_exception(jenv, 0);        
-    url = (*jenv)->NewObject(jenv, j_url, url_new, urlarg);
+    arg.l = (*jenv)->NewStringUTF(jenv, urlp);
     rjb_check_exception(jenv, 0);        
-    args[0].l = (*jenv)->NewObjectArray(jenv, 1, j_url, url);
+    url = (*jenv)->NewObject(jenv, j_url, url_new, arg);
+    rjb_check_exception(jenv, 0);
+    return url;
+}
+
+/*
+ * Rjb::add_classpath(jarname)
+ */
+static VALUE rjb_s_add_classpath(VALUE self, VALUE jarname)
+{
+    VALUE cpath = rb_cvar_get(self, cvar_classpath);
+    SafeStringValue(jarname);
+    rb_ary_push(cpath, jarname);
+    return cpath;
+}
+
+/*
+ * Rjb::add_jar(jarname)
+ */
+static VALUE rjb_s_add_jar(VALUE self, VALUE jarname)
+{
+    size_t i;
+    JNIEnv* jenv;
+    size_t count;
+    jvalue args[2];
+
+    if (rb_type(jarname) != T_ARRAY)
+    {
+        SafeStringValue(jarname);
+        count = 0;
+    }
+    else
+    {
+        count = RARRAY_LEN(jarname);
+    }
+    jenv = rjb_prelude();
+    if (!j_url_loader)
+    {
+        j_url_loader = (*jenv)->NewGlobalRef(jenv,
+                                             (*jenv)->FindClass(jenv, "java/net/URLClassLoader"));
+        RJB_LOAD_METHOD(rjb_load_class, j_url_loader, "loadClass",
+                        "(Ljava/lang/String;)Ljava/lang/Class;");
+        RJB_LOAD_METHOD(url_loader_new, j_url_loader, "<init>",
+                        "([Ljava/net/URL;Ljava/lang/ClassLoader;)V");
+    }
+    args[0].l = (*jenv)->NewObjectArray(jenv, (count == 0) ? 1 : count, j_url, NULL);
     rjb_check_exception(jenv, 0);    
-    if (url_loader)
+    if (!count)
     {
-        args[1].l = url_loader;
+        (*jenv)->SetObjectArrayElement(jenv, args[0].l, 0,
+                                       conv_jarname_to_url(jenv, jarname));
     }
     else
     {
-        args[1].l = get_systemloader(jenv);
+        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);
     return Qtrue;
 }
 
@@ -3015,6 +3074,7 @@ void Init_rjbcore()
     rjb = rb_define_module("Rjb");
     rb_define_module_function(rjb, "load", rjb_s_load, -1);
     rb_define_module_function(rjb, "unload", rjb_s_unload, -1);
+    rb_define_module_function(rjb, "loaded?", rjb_s_loaded, 0);
     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);
@@ -3022,8 +3082,12 @@ void Init_rjbcore()
     rb_define_module_function(rjb, "throw", rjb_s_throw, -1);
     rb_define_module_function(rjb, "primitive_conversion=", rjb_s_set_pconversion, 1);
     rb_define_module_function(rjb, "primitive_conversion", rjb_s_get_pconversion, 0);
-    rb_define_module_function(rjb, "add_jar", rjb_s_add_jar, 1);    
+    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_const(rjb, "VERSION", rb_str_new2(RJB_VERSION));
+    rb_define_class_variable(rjb, "@@classpath", rb_ary_new());
+    cvar_classpath = rb_intern("@@classpath");
 
     /* Java class object */    
     rjbc = CLASS_NEW(rb_cObject, "Rjb_JavaClass");

data/lib/rjbextension.rb

@@ -11,7 +11,7 @@ Copyright(c) 2010 arton
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
-$Id: rjbextension.rb 116 2010-05-30 14:23:07Z arton $
+$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
@@ -59,23 +59,16 @@ module Kernel
     raise unless  File.exist?(abs_path)
 
     # try to load it using RJB
-    @@rjb_jars ||= []
-    @@rjb_jars << abs_path unless @@rjb_jars.include?(abs_path)
-    # TODO
+    if Rjb::loaded?
+      Rjb::add_jar abs_path
+    else
+      Rjb::add_classpath abs_path
+    end
   end
 
-  @@jvm_loaded = false
-
   def load_jvm(jargs = [])
-    # avoid starting the JVM twice
-    return if @@jvm_loaded
-    
-    @@jvm_loaded = true
+    return if Rjb::loaded?
     classpath = ENV['CLASSPATH'] ||= ''
-    @@rjb_jars.each do |jar|
-      classpath += File::PATH_SEPARATOR unless classpath.empty?
-      classpath += jar
-    end
     Rjb::load(classpath, jargs)
   end
 end

data/test/exttest.rb

@@ -16,6 +16,9 @@ end
 
 require 'rjbextension'
 require 'test/unit'
+require 'fileutils'
+
+FileUtils.rm_f 'jp/co/infoseek/hp/arton/rjb/Base.class'
 
 puts "start RJB(#{Rjb::VERSION}) test"
 class ExtTestRjb < Test::Unit::TestCase
@@ -25,9 +28,11 @@ class ExtTestRjb < Test::Unit::TestCase
   end
   
   def test_require_extension
+    assert !Rjb::loaded?
+    $LOAD_PATH << '.'
     require 'rjbtest.jar'
-    load_jvm
-    
+    Rjb::load
+    assert Rjb::loaded?
     base = jp.co.infoseek.hp.arton.rjb.Base.new
     assert_equal('hello', base.instance_var)
   end

data/test/test.rb

@@ -1,6 +1,6 @@
 #!/usr/local/env ruby -Ku
 # encoding: utf-8
-# $Id: test.rb 142 2010-09-21 17:59:30Z arton $
+# $Id: test.rb 147 2010-10-23 05:10:33Z arton $
 
 begin
   require 'rjb'
@@ -9,12 +9,17 @@ rescue LoadError
   require 'rjb'
 end
 require 'test/unit'
+require 'fileutils'
+
+FileUtils.rm_f 'jp/co/infoseek/hp/arton/rjb/Base.class'
+FileUtils.rm_f 'jp/co/infoseek/hp/arton/rjb/ExtBase.class'
 
 puts "start RJB(#{Rjb::VERSION}) test"
 class TestRjb < Test::Unit::TestCase
   include Rjb
   def setup
-    load('.')
+    Rjb::load('.')
+    Rjb::add_jar(File.expand_path('rjbtest.jar'))
     Rjb::primitive_conversion = false
 
     @jString = import('java.lang.String')
@@ -463,10 +468,8 @@ class TestRjb < Test::Unit::TestCase
     bs = import('jp.co.infoseek.hp.arton.rjb.Base')
     b = cls.forName('jp.co.infoseek.hp.arton.rjb.Base')
     assert_equal(bs, b)
-    # class java's Class#forName and convert result to imported class
+    # check class that was loaded from classpath
     loader = Rjb::import('java.lang.ClassLoader')
-    b = cls.forName('jp.co.infoseek.hp.arton.rjb.Base', true, loader.getSystemClassLoader)
-    assert_equal(bs, b)
     b = cls.forName('jp.co.infoseek.hp.arton.rjb.IBase', true, loader.getSystemClassLoader)
     assert(b.isInterface)
   end
@@ -739,5 +742,13 @@ class TestRjb < Test::Unit::TestCase
     assert jt
     assert_equal 'abcd', jt.new.add('ab', 'cd')
   end
+  def test_add_jars
+    arg = ['./jartest.jar', './jartest.jar'].map do |e|
+      File.expand_path(e)
+    end
+    add_jar(arg)
+    jt = import('jp.co.infoseek.hp.arton.rjb.JarTest')
+    assert_equal 'abcd', jt.new.add('ab', 'cd')
+  end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rjb
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 27
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 9
-  version: 1.2.9
+  - 3
+  - 0
+  version: 1.3.0
 platform: x86-mswin32-60
 authors: 
 - arton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-22 00:00:00 +09:00
+date: 2010-10-23 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -54,8 +54,6 @@ files:
 - test/ExtBase.class
 - test/IBase.class
 - test/jar/jp/co/infoseek/hp/arton/rjb/JarTest.class
-- 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/IBase.class
 - test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.class
 - test/jp/co/infoseek/hp/arton/rjb/Test.class