rjb 1.3.2-x86-mswin32-60 → 1.3.4-x86-mswin32-60

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 148 2010-10-23 08:38:44Z arton $
+ * $Id: load.c 159 2010-11-16 16:35:49Z arton $
  */
 
 #include <stdlib.h>
@@ -131,10 +131,21 @@ static int open_jvm(char* libpath)
 #endif
     return 1;
 }
+
+#if defined(__APPLE__) && defined(__MACH__)
+static int file_exist(const char* dir, const char* file)
+{
+    VALUE path = rb_funcall(rb_cFile, rb_intern("join"), 2,
+                            rb_str_new2(dir), rb_str_new2(file));
+    VALUE ret = rb_funcall(rb_cFile, rb_intern("exist?"), 1, path);
+    return RTEST(ret);
+}
+#endif
+
 /*
  * not completed, only valid under some circumstances.
  */
-static int load_jvm(char* jvmtype)
+static int load_jvm(const char* jvmtype)
 {
     char* libpath;
     char* java_home;
@@ -150,7 +161,7 @@ static int load_jvm(char* jvmtype)
     {
         if (strlen(jh) > HOME_NAME_LEN)
         {
-            int len = strlen(jh);
+            size_t len = strlen(jh);
             char* p = ALLOCA_N(char, len + 8);
             jh = strcpy(p, jh);
             if (*(jh + len - 1) == '/')
@@ -163,6 +174,10 @@ static int load_jvm(char* jvmtype)
                 strcpy(p + len, "/..");
             }
         }
+        if (!jvmtype && !file_exist(jh, "JavaVM"))
+        {
+            jh = DEFAULT_HOME;
+        }
     }
 #endif
     if (!jh)
@@ -208,7 +223,7 @@ static int load_bridge(JNIEnv* jenv)
     JNINativeMethod nmethod[1];
     jbyte buff[8192];
     char* bridge;
-    int len;
+    size_t len;
     FILE* f;
 #if defined(RUBINIUS)
     VALUE v = rb_const_get(rb_cObject, rb_intern("RjbConf"));
@@ -268,12 +283,12 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
       { "DUMMY", NULL },   /* for classpath count */
     };
     char* newpath;
-    int len;
+    size_t len;
     int result;
     GETDEFAULTJAVAVMINITARGS initargs;
     CREATEJAVAVM createjavavm;
     JavaVMOption* options;
-    int optlen;
+    size_t optlen;
     int i;
     VALUE optval;
 
@@ -292,7 +307,7 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
         if (libjvm == NULL || !open_jvm(libjvm))
         {
 #if defined(__APPLE__) && defined(__MACH__)
-            if (!(load_jvm(JVM_TYPE) || load_jvm(ALT_JVM_TYPE)))
+            if (!(load_jvm(NULL)))
             {
                 JVMDLL = "%s/Libraries/libjvm.dylib";
                 CREATEJVM = "JNI_CreateJavaVM_Impl";
@@ -359,7 +374,7 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
 	(options + i)->optionString = StringValueCStr(optval);
 	(options + i)->extraInfo = NULL;
     }
-    vm_args->nOptions = optlen;
+    vm_args->nOptions = (int)optlen;
     vm_args->options = options;
     vm_args->ignoreUnrecognized = JNI_TRUE;
     if (NIL_P(createjavavmfunc))

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 156 2010-10-30 14:58:33Z arton $
+ * $Id: rjb.c 163 2010-11-22 07:31:27Z arton $
  */
 
-#define RJB_VERSION "1.3.2"
+#define RJB_VERSION "1.3.4"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -75,6 +75,7 @@ static VALUE jarray2rv(JNIEnv* jenv, jvalue val);
 static jarray r2objarray(JNIEnv* jenv, VALUE v, const char* cls);
 static VALUE jv2rv_withprim(JNIEnv* jenv, jobject o);
 static J2R get_arrayconv(const char* cname, char* depth);
+static jarray r2barray(JNIEnv* jenv, VALUE v, const char* cls);
 
 static VALUE rjb;
 static VALUE jklass;
@@ -748,7 +749,7 @@ static void rv2jstring(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, in
 		    return; /* never delete at this time */
 		}
 	    }
-	}
+        }
 	(*jenv)->DeleteLocalRef(jenv, jv->l);
     }
 }
@@ -814,7 +815,11 @@ static void rv2jobject(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, in
 		}
 		break;
 	    case T_STRING:
-		rv2jstring(jenv, val, jv, NULL, 0);
+                if (psig && *psig == '[' && *(psig + 1) == 'B') {
+                    jv->l = r2barray(jenv, val, NULL);
+                } else {
+                    rv2jstring(jenv, val, jv, NULL, 0);
+                }
 		break;
 	    case T_FLOAT:
 		arg.d = NUM2DBL(val);
@@ -1115,6 +1120,22 @@ static void rv2jarray(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, int
     }
     if (release)
     {
+        if (TYPE(val) == T_STRING && *(psig + 1) == 'B')
+        {
+            // copy array's contents into arg string
+            jsize len = (*jenv)->GetArrayLength(jenv, jv->l);
+            jbyte* p = (*jenv)->GetByteArrayElements(jenv, jv->l, NULL);
+            if (len <= RSTRING_LEN(val))
+            {
+                memcpy(StringValuePtr(val), p, len);
+            }
+            else
+            {
+                VALUE src = rb_str_new(p, len);
+                rb_str_set_len(val, 0);
+                rb_str_append(val, src);
+            }
+        }
 	(*jenv)->DeleteLocalRef(jenv, jv->l);
     }
     else
@@ -2099,7 +2120,7 @@ static int check_rtype(JNIEnv* jenv, VALUE v, char* p)
     case T_FLOAT:
 	return strchr("DF", *p) != NULL;
     case T_STRING:
-      return pcls && !strcmp("java.lang.String", pcls);
+        return pcls && !strcmp("java.lang.String", pcls) || *p == '[' && *(p + 1) == 'B';
     case T_TRUE:
     case T_FALSE:
         return *p == 'Z';
@@ -3057,11 +3078,13 @@ static VALUE rjb_class_forname(int argc, VALUE* argv, VALUE self)
  */
 void Init_rjbcore()
 {
-#if defined(RUBINIUS)
+#if RJB_RUBY_VERSION_CODE < 190
+  #if defined(RUBINIUS)
     rb_require("iconv");
-#else
+  #else
     rb_protect((VALUE(*)(VALUE))rb_require, (VALUE)"iconv", NULL);
-#endif
+  #endif
+#endif    
     rjb_loaded_classes = rb_hash_new();
 #ifndef RUBINIUS
     OBJ_FREEZE(rjb_loaded_classes);

data/test/test.rb

@@ -1,6 +1,6 @@
 #!/usr/local/env ruby -Ku
 # encoding: utf-8
-# $Id: test.rb 147 2010-10-23 05:10:33Z arton $
+# $Id: test.rb 161 2010-11-22 07:18:00Z arton $
 
 begin
   require 'rjb'
@@ -750,5 +750,15 @@ class TestRjb < Test::Unit::TestCase
     jt = import('jp.co.infoseek.hp.arton.rjb.JarTest')
     assert_equal 'abcd', jt.new.add('ab', 'cd')
   end
+  def test_bothdirection_buffer
+    org = "abcdefghijklmn"
+    baip = import('java.io.ByteArrayInputStream')
+    ba = baip.new(org)
+    buff = "\0" * org.size
+    assert_equal org.size, ba.read(buff)
+    assert_equal -1, ba.read(buff)
+    ba.close
+    assert_equal org, buff
+  end
 end
 

data/test/test_osxjvm.rb

@@ -0,0 +1,23 @@
+#!/usr/local/env ruby -Ku
+# encoding: utf-8
+# $Id:$
+
+begin
+  require 'rjb'
+rescue LoadError 
+  require 'rubygems' 
+  require 'rjb'
+end
+require 'test/unit'
+
+if RUBY_PLATFORM =~ /darwin/
+  class TestOsxJvm < Test::Unit::TestCase
+    def test_with_javahome
+      ENV['JAVA_HOME'] = `/usr/libexec/java_home`
+      assert_nothing_raised do
+        Rjb::load
+      end
+    end
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rjb
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 3
-  - 2
-  version: 1.3.2
+  - 4
+  version: 1.3.4
 platform: x86-mswin32-60
 authors: 
 - arton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-31 00:00:00 +09:00
+date: 2010-11-22 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -32,36 +32,28 @@ 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/jp_co_infoseek_hp_arton_rjb_RBridge.h
 - ext/riconv.h
+- ext/extconf.h
+- ext/jniwrap.h
 - ext/rjb.h
 - ext/depend
 - data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
 - lib/rjb.rb
 - lib/rjbextension.rb
 - samples/filechooser.rb
+- test/test.rb
 - test/exttest.rb
+- test/test_osxjvm.rb
 - test/gctest.rb
-- test/m.rb
-- test/test.rb
-- test/tx.rb
-- test/Base.class
-- 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
-- test/JTest.class
-- test/jartest.jar
+- test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.class
 - test/rjbtest.jar
+- test/jartest.jar
 - COPYING
 - ChangeLog
 - readme.sj

data/test/m.rb

@@ -1,20 +0,0 @@
-puts RUBY_VERSION
-class X
-  module Y
-    def hello
-      puts 'hello'
-    end
-  end
-  def make_proc(&block)
-    block
-  end
-  def test
-    Proc.new do
-      extend Y
-    end
-  end
-end
-x = X.new
-a = Object.new
-a.instance_eval &x.test
-a.hello

data/test/tx.rb

@@ -1,52 +0,0 @@
-#!/usr/local/env ruby -Ku
-# encoding: utf-8
-# $Id: test.rb 87 2009-02-15 12:25:36Z arton $
-
-begin
-  require 'rjb'
-rescue LoadError 
-  require 'rubygems' 
-  require 'rjb'
-end
-require 'test/unit'
-
-puts "start RJB(#{Rjb::VERSION}) test"
-class TestRjb < Test::Unit::TestCase
-  include Rjb
-  def setup
-    Rjb::load('.')
-    @jString = import('java.lang.String')
-    @jInteger = Rjb::import('java.lang.Integer')
-    @jShort = Rjb::import('java.lang.Short')
-    @jDouble = Rjb::import('java.lang.Double')
-    @jFloat = Rjb::import('java.lang.Float')
-    @jBoolean = Rjb::import('java.lang.Boolean')
-    @jByte = Rjb::import('java.lang.Byte')
-    @jLong = Rjb::import('java.lang.Long')
-    @jChar = Rjb::import('java.lang.Character')
-  end
-
-  def teardown
-  end
-
-  def test_scalar
-    str = @jString.new_with_sig('Ljava.lang.String;', "abcde")
-    p str
-    p str.class    
-    # rjb object (String)
-    str2 = @jString.new_with_sig('Ljava.lang.String;', 'fghijk')
-    p str2
-    p str2.class    
-    a = str.concat(str2)
-    p a
-    p a.class
-    p str2
-    p str2.class    
-    a = str.concat(str2)
-    p a
-    p a.class
-    assert_equal('abcdefghijk', str.concat(str2))
-  end
-
-end
-