rjb 1.1.6 → 1.1.7

data/ChangeLog

@@ -1,3 +1,18 @@
+Sun Feb 15 arton
+ *test/test/rb
+	add $KCODE and magic comment for iconv
+ *ext/rjb.c
+	RJB_VERSION -> 1.1.7
+Thu Feb 5 kuwa1
+ *test/Test.java
+ *test/test.rb
+	add tests(Umlaut)
+ *ext/rjb.c
+ *ext/load.c
+ 	fix for ruby19
+Sun Nov 16 arton
+ *ext/load.c	
+	apply hpux patch, contributed by Ittay Dror. thanks
 Tue Aug 26 arton
  *ext/load.c, rjb.c, rjb.h
 	export safe_funcall under the prefix 'rjb'.

data/ext/extconf.rb

@@ -29,7 +29,7 @@ class Path
 end
 
 javahome = ENV['JAVA_HOME']
-if !javahome.nil?
+unless javahome.nil?
   raise "JAVA_HOME is not directory." unless File.directory?(javahome)
   p = Path.new
   inc = p.include(javahome, 'include')
@@ -42,7 +42,7 @@ if !javahome.nil?
     end
   end
 else
-	raise "JAVA_HOME is not setted."
+	raise "JAVA_HOME is not set."
 end
 
 

data/ext/jniwrap.h

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: jniwrap.h 82 2008-08-26 12:51:51Z arton $
+ * $Id: jniwrap.h 4 2006-09-11 15:21:38Z arton $
  */
 #ifndef _Included_jniwrap
 #define _Included_jniwrap

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 82 2008-08-26 12:51:51Z arton $
+ * $Id: load.c 85 2009-02-04 16:14:22Z kuwa1 $
  */
 
 #include <stdlib.h>
@@ -53,7 +53,15 @@
   #define DEFAULT_HOME "/System/Library/Frameworks/JavaVM.framework"
 #elif defined(_AIX)
   #define ARCH "ppc"
+  #undef JVM_TYPE
   #define JVM_TYPE "j9vm"
+#elif defined(__hpux)
+  #define JVMDLL "%s/jre/lib/%s/%s/libjvm.sl"
+  #define ARCH "PA_RISC"
+  #undef JVM_TYPE
+  #define JVM_TYPE "server"
+  #define DIRSEPARATOR '/'
+  #define CLASSPATH_SEP ':'
 #else /* defined(_WIN32) || defined(__CYGWIN__) */
  #if defined(__sparc_v9__)
    #define ARCH "sparcv9"
@@ -282,7 +290,7 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
     optlen = 0;
     if (!NIL_P(argv))
     {
-        optlen += RARRAY(argv)->len;
+        optlen += RARRAY_LEN(argv);
     }
     optlen += COUNTOF(soptions);
     options = ALLOCA_N(JavaVMOption, optlen);

data/ext/rjb.c

@@ -1,6 +1,6 @@
 /*
  * Rjb - Ruby <-> Java Bridge
- * Copyright(c) 2004,2005,2006,2007,2008 arton
+ * Copyright(c) 2004,2005,2006,2007,2008,2009 arton
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -12,10 +12,10 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjb.c 82 2008-08-26 12:51:51Z arton $
+ * $Id: rjb.c 89 2009-02-15 12:31:40Z arton $
  */
 
-#define RJB_VERSION "1.1.6"
+#define RJB_VERSION "1.1.7"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -447,11 +447,9 @@ static VALUE call_conv(JNIEnv* jenv, jvalue val, size_t sz, void* p, CONV conv,
     char* cp = (char*)p;
     jsize len = (*jenv)->GetArrayLength(jenv, val.l);
     VALUE v = rb_ary_new2(len);
-    VALUE* pv = RARRAY_PTR(v);
-    RARRAY_LEN(v) = len;
     for (i = 0; i < len; i++)
     {
-        *pv++ =conv(jenv, cp);
+        rb_ary_push(v, conv(jenv, cp));
 	cp += sz;
     }
     (*(RELEASEARRAY*)(((char*)*jenv) + fnc))(jenv, val.l, p, JNI_ABORT);

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 82 2008-08-26 12:51:51Z arton $
+ * $Id: rjb.h 81 2008-08-26 12:44:44Z arton $
  * $Log: rjb.h,v $
  * Revision 1.1  2005/01/16 17:36:10  arton
  * Initial revision

data/test/test.rb

@@ -1,5 +1,6 @@
-#!/usr/local/env ruby
-# $Id: test.rb 70 2008-05-26 12:31:35Z arton $
+#!/usr/local/env ruby -Ku
+# encoding: utf-8
+# $Id: test.rb 87 2009-02-15 12:25:36Z arton $
 
 begin
   require 'rjb'
@@ -167,40 +168,63 @@ class TestRjb < Test::Unit::TestCase
       assert_equal(@jString.new("abcdef".force_encoding(Encoding::ASCII_8BIT)).toString(), "abcdef")
       assert_equal(@jString.new("abcdef".force_encoding(Encoding::find("us-ascii"))).toString(), "abcdef")
     else
-      $KCODE = 'euc'
-      euc_kj = "\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8"
-      s = @jString.new(euc_kj)
-      assert_equal(s.toString(), euc_kj)
-      $KCODE = 'sjis'
-      sjis_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
-      s = @jString.new(sjis_kj)
-      assert_equal(s.toString(), sjis_kj)
-      $KCODE = 'utf8'
-      utf8_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
-      s = @jString.new(utf8_kj)
-      assert_equal(s.toString(), utf8_kj)
-      $KCODE = 'none'
-      if /mswin(?!ce)|mingw|cygwin|bccwin/ =~ RUBY_PLATFORM
-	#expecting shift_jis on windows
-	none_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
-      else
-	#expecting utf-8 unless windows
-	none_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
+      default_kcode = $KCODE
+      begin
+	$KCODE = 'euc'
+	euc_kj = "\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8"
+	s = @jString.new(euc_kj)
+	assert_equal(s.toString(), euc_kj)
+	$KCODE = 'sjis'
+	sjis_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
+	s = @jString.new(sjis_kj)
+	assert_equal(s.toString(), sjis_kj)
+	$KCODE = 'utf8'
+	utf8_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
+	s = @jString.new(utf8_kj)
+	assert_equal(s.toString(), utf8_kj)
+	$KCODE = 'none'
+	if /mswin(?!ce)|mingw|cygwin|bccwin/ =~ RUBY_PLATFORM
+	  #expecting shift_jis on windows
+	  none_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
+	else
+	  #expecting utf-8 unless windows
+	  none_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
+	end
+	s = @jString.new(none_kj)
+	assert_equal(s.toString(), none_kj)
+	$KCODE = 'utf8'
+	utf8_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
+	s = @jString.new(utf8_kj)
+	assert_equal(s.toString(), utf8_kj)
+	$KCODE = 'sjis'
+	sjis_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
+	s = @jString.new(sjis_kj)
+	assert_equal(s.toString(), sjis_kj)
+	$KCODE = 'euc'
+	euc_kj = "\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8"
+	s = @jString.new(euc_kj)
+	assert_equal(s.toString(), euc_kj)
+      ensure
+	$KCODE = default_kcode
+      end
+    end
+  end
+
+  def test_combination_charcters
+    teststr = "\xc7\x96\xc3\xbc\xcc\x84\x75\xcc\x88\xcc\x84\xed\xa1\xa9\xed\xba\xb2\xe3\x81\x8b\xe3\x82\x9a"
+    test = import('jp.co.infoseek.hp.arton.rjb.Test').new
+    s = test.getUmlaut()
+    if Object::const_defined?(:Encoding) #>=1.9
+      teststr = teststr.force_encoding(Encoding::UTF_8)
+      assert_equal(s, teststr)
+    else
+      default_kcode = $KCODE
+      begin
+	$KCODE = "utf8"
+	assert_equal(s, teststr)
+      ensure
+	$KCODE = default_kcode
       end
-      s = @jString.new(none_kj)
-      assert_equal(s.toString(), none_kj)
-      $KCODE = 'utf8'
-      utf8_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
-      s = @jString.new(utf8_kj)
-      assert_equal(s.toString(), utf8_kj)
-      $KCODE = 'sjis'
-      sjis_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
-      s = @jString.new(sjis_kj)
-      assert_equal(s.toString(), sjis_kj)
-      $KCODE = 'euc'
-      euc_kj = "\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8"
-      s = @jString.new(euc_kj)
-      assert_equal(s.toString(), euc_kj)
     end
   end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: rjb
 version: !ruby/object:Gem::Version 
-  version: 1.1.6
-date: 2008-08-26 00:00:00 +09:00
+  version: 1.1.7
+date: 2009-02-15 00:00:00 +09:00
 summary: Ruby Java bridge
 require_paths: 
 - lib
@@ -30,26 +30,26 @@ authors:
 - arton
 files: 
 - ext/RBridge.java
-- ext/load.c
-- ext/riconv.c
 - ext/rjbexception.c
+- ext/riconv.c
+- ext/load.c
 - ext/rjb.c
 - ext/jniwrap.h
-- ext/rjb.h
 - ext/riconv.h
 - ext/jp_co_infoseek_hp_arton_rjb_RBridge.h
 - ext/extconf.h
+- ext/rjb.h
 - ext/depend
 - data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
 - lib/rjb.rb
 - samples/filechooser.rb
-- test/test.rb
 - test/gctest.rb
+- test/test.rb
 - 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/Test$TestTypes.class
 - test/jp/co/infoseek/hp/arton/rjb/Base.class
+- test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.class
 - COPYING
 - ChangeLog
 - readme.sj