rjb 1.1.1 → 1.1.2

data/ChangeLog

@@ -1,9 +1,14 @@
+Fri Feb 22 arton
+ *ext/rjb.c
+	fix field reference (bug# 18238)
 Wed Jan 9 arton
  *ext/rjb.h
 	add some ruby macros that defined after 1.8.6 for compatibility
 	Change RBridge.class by 1.4.2
  *data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class 
 	compiled by 1.4.2 version of Java	
+ *rjb.c
+        mark version 1.1.2 for the next release.
 Tue Dec 27 Kuwashima
  *test/Test.java
  *test/test.rb

data/ext/extconf.h

@@ -5,5 +5,5 @@
 #define HAVE_NL_LANGINFO 1
 #define HAVE_SETLOCALE 1
 #define HAVE_GETENV 1
-#define RJB_RUBY_VERSION_CODE 185
+#define RJB_RUBY_VERSION_CODE 186
 #endif

data/ext/extconf.rb

@@ -30,6 +30,7 @@ end
 
 javahome = ENV['JAVA_HOME']
 if !javahome.nil?
+  raise "JAVA_HOME is not directory." unless File.directory?(javahome)
   p = Path.new
   inc = p.include(javahome, 'include')
   Dir.open(inc).each do |d|
@@ -39,10 +40,13 @@ if !javahome.nil?
       break
     end
   end
+else
+	raise "JAVA_HOME is not setted."
 end
 
+
 def create_rjb_makefile
-  if have_header("jni.h") && have_header("dl.h") || have_header("ruby/dl.h")
+  if have_header("jni.h") && (have_header("dl.h") || have_header("ruby/dl.h")) #for ruby_1_9
     have_func("locale_charset", "iconv.h")
     have_func("nl_langinfo", "langinfo.h")
     have_func("setlocale", "locale.h")

data/ext/riconv.c

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: riconv.c 45 2007-12-26 20:03:21Z kuwa1 $
+ * $Id: riconv.c 58 2008-01-14 08:25:07Z kuwa1 $
  */
 
 #include "ruby.h"
@@ -176,21 +176,21 @@ VALUE exticonv_local_to_utf8(VALUE local_string)
         return local_string;
     }
 #else
-    VALUE rb_cEncoding, default_external, encoding, ascii8bit;
+    VALUE rb_cEncoding, encoding, sjis, eucjp, iso2022jp;
     rb_cEncoding = rb_const_get(rb_cObject, rb_intern("Encoding"));
-    default_external = rb_funcall(rb_cEncoding, rb_intern("default_external"), 0);
-    ascii8bit = rb_const_get(rb_cEncoding, rb_intern("ASCII_8BIT"));
+    sjis = rb_const_get(rb_cEncoding, rb_intern("SHIFT_JIS"));
+    eucjp = rb_const_get(rb_cEncoding, rb_intern("EUC_JP"));
+    iso2022jp = rb_const_get(rb_cEncoding, rb_intern("ISO_2022_JP"));
     encoding = rb_funcall(local_string, rb_intern("encoding"), 0);
 
-    if (ascii8bit == encoding && ascii8bit == default_external)
+    if (encoding == sjis || encoding == eucjp || encoding == iso2022jp)
     {
-	return local_string; //don't know default encoding
+        return rb_funcall(local_string, rb_intern("encode"), 1, rb_str_new2("utf-8"));
     }
-    else if (encoding == ascii8bit)
+    else
     {
-	local_string = rb_funcall(local_string, rb_intern("force_encoding"), 1, default_external);
+	return local_string;
     }
-    return rb_funcall(local_string, rb_intern("encode"), 1, rb_str_new2("utf-8"));
 #endif
 }
 
@@ -207,19 +207,6 @@ VALUE exticonv_utf8_to_local(VALUE utf8_string)
         return utf8_string;
     }
 #else
-    VALUE rb_cEncoding, encoding, ascii8bit;
-    rb_cEncoding = rb_const_get(rb_cObject, rb_intern("Encoding"));
-    encoding = rb_funcall(rb_cEncoding, rb_intern("default_external"), 0);
-    ascii8bit = rb_const_get(rb_cEncoding, rb_intern("ASCII_8BIT"));
-
-    utf8_string = rb_funcall(utf8_string, rb_intern("force_encoding"), 1, rb_str_new2("utf-8"));
-    if (ascii8bit == encoding)
-    {
-	return utf8_string; //don't know default encoding
-    }
-    else
-    {
-        return rb_funcall(utf8_string, rb_intern("encode"), 1, encoding);
-    }
+    return rb_funcall(utf8_string, rb_intern("force_encoding"), 1, rb_str_new2("utf-8"));
 #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 52 2007-12-28 07:44:41Z arton $
+ * $Id: rjb.c 59 2008-02-21 19:37:15Z arton $
  */
 
-#define RJB_VERSION "1.1.1"
+#define RJB_VERSION "1.1.2"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -2534,25 +2534,28 @@ static VALUE invoke_by_instance(ID rmid, int argc, VALUE* argv,
     {
         ret = getter(jenv, pf, ptr);
     }
-    else if (argc == 1 && *(tname + strlen(tname) - 1) == '=')
+    else 
     {
-        char* fname = ALLOCA_N(char, strlen(tname) + 1);
-	strcpy(fname, tname);
-	fname[strlen(tname) - 1] = '\0';
-	if (st_lookup(ptr->fields, rb_intern(fname), (st_data_t*)&pf))
-	{
-	    setter(jenv, pf, ptr, *argv);
-            return ret;
+        if (argc == 1 && *(tname + strlen(tname) - 1) == '=')
+        {
+            char* fname = ALLOCA_N(char, strlen(tname) + 1);
+            strcpy(fname, tname);
+            fname[strlen(tname) - 1] = '\0';
+            if (st_lookup(ptr->fields, rb_intern(fname), (st_data_t*)&pf))
+            {
+                setter(jenv, pf, ptr, *argv);
+                return ret;
+            }
+            // fall through for the setter alias name
+        }
+        if (st_lookup(ptr->methods, rmid, (st_data_t*)&pm))
+        {
+            ret = invoke(jenv, pm, ptr, argc, argv, sig);
+        }
+        else
+        {
+            rb_raise(rb_eRuntimeError, "Fail: unknown method name `%s'", tname);
         }
-        // fall through for the setter alias name
-    }
-    if (st_lookup(ptr->methods, rmid, (st_data_t*)&pm))
-    {
-	ret = invoke(jenv, pm, ptr, argc, argv, sig);
-    }
-    else
-    {
-	rb_raise(rb_eRuntimeError, "Fail: unknown method name `%s'", tname);
     }
     return ret;
 }

data/test/test.rb

@@ -1,5 +1,5 @@
 #!/usr/local/env ruby
-# $Id: test.rb 45 2007-12-26 20:03:21Z kuwa1 $
+# $Id: test.rb 58 2008-01-14 08:25:07Z kuwa1 $
 
 require 'test/unit'
 require 'rjb'
@@ -135,27 +135,33 @@ class TestRjb < Test::Unit::TestCase
 
   def test_kjconv()
     if Object::const_defined?(:Encoding)
-      euc_kj = "\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8".force_encoding "euc-jp"
+      test = import('jp.co.infoseek.hp.arton.rjb.Test').new
+      euc_kj = "\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8".force_encoding Encoding::EUC_JP
       s = @jString.new(euc_kj)
       assert_equal(s.toString().encoding, Encoding::UTF_8)
-      assert_equal(s.toString().encode("euc-jp"), euc_kj)
-      sjis_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67".force_encoding "shift_jis"
+      assert(test.isSameString(s))
+      assert(test.isSameString(euc_kj))
+      assert_equal(s.toString().encode(Encoding::EUC_JP), euc_kj)
+      sjis_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67".force_encoding Encoding::SHIFT_JIS
       s = @jString.new(sjis_kj)
-      assert_equal(s.toString().encode("shift_jis"), sjis_kj)
-      utf8_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88".force_encoding "utf-8"
-      s = @jString.new(utf8_kj.encode("utf-8"))
-      assert_equal(s.toString(), utf8_kj)
-      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" #.force_encoding "shift_jis"
-        s = @jString.new(none_kj)
-        assert_equal(s.toString().encode("shift_jis"), none_kj)
-      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".force_encoding "utf-8"
-        s = @jString.new(none_kj)
-        assert_equal(s.toString(), none_kj)
-      end
+      assert_equal(s.toString().encoding, Encoding::UTF_8)
+      assert(test.isSameString(s))
+      assert(test.isSameString(sjis_kj))
+      assert_equal(s.toString().encode(Encoding::SHIFT_JIS), sjis_kj)
+      utf8_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88".force_encoding Encoding::UTF_8
+      s = @jString.new(utf8_kj)
+      assert_equal(s.toString().encoding, Encoding::UTF_8)
+      assert(test.isSameString(s))
+      assert(test.isSameString(utf8_kj))
+      assert_equal(s.toString().encode(Encoding::UTF_8), utf8_kj)
+      iso2022jp_kj = "\x1b\x24\x42\x34\x41\x3b\x7a\x25\x46\x25\x2d\x25\x39\x25\x48\x1b\x28\x42".force_encoding Encoding::ISO_2022_JP
+      s = @jString.new(iso2022jp_kj)
+      assert_equal(s.toString().encoding, Encoding::UTF_8)
+      assert(test.isSameString(s))
+      assert(test.isSameString(iso2022jp_kj))
+      assert_equal(s.toString().encode(Encoding::ISO_2022_JP), iso2022jp_kj)
+      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"

metadata

@@ -1,78 +1,71 @@
 --- !ruby/object:Gem::Specification 
+rubygems_version: 0.9.0
+specification_version: 1
 name: rjb
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.2
+date: 2008-02-22 00:00:00 +09:00
+summary: Ruby Java bridge
+require_paths: 
+- lib
+email: artonx@gmail.com
+homepage: http://rjb.rubyforge.org/
+rubyforge_project: 
+description: RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
+autorequire: 
+default_executable: 
+bindir: bin
+has_rdoc: false
+required_ruby_version: !ruby/object:Gem::Version::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.8.2
+  version: 
 platform: ruby
+signing_key: 
+cert_chain: 
+post_install_message: 
 authors: 
 - arton
-autorequire: 
-bindir: bin
-cert_chain: []
-
-date: 2008-01-09 00:00:00 +09:00
-default_executable: 
-dependencies: []
-
-description: RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
-email: artonx@gmail.com
-executables: []
-
-extensions: 
-- ext/extconf.rb
-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/rjb.h
+- ext/riconv.h
+- ext/jp_co_infoseek_hp_arton_rjb_RBridge.h
+- ext/extconf.h
 - ext/depend
 - data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
 - lib/rjb.rb
 - samples/filechooser.rb
 - test/gctest.rb
 - test/test.rb
-- 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/Test.class
 - test/jp/co/infoseek/hp/arton/rjb/IBase.class
+- test/jp/co/infoseek/hp/arton/rjb/Base.class
 - test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.class
-- test/jp/co/infoseek/hp/arton/rjb/Test.class
 - COPYING
 - ChangeLog
 - readme.sj
 - readme.txt
-has_rdoc: false
-homepage: http://rjb.rubyforge.org/
-post_install_message: 
+test_files: 
+- test/test.rb
 rdoc_options: []
 
-require_paths: 
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.8.2
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+extra_rdoc_files: []
+
+executables: []
+
+extensions: 
+- ext/extconf.rb
 requirements: 
 - none
 - JDK 5.0
-rubyforge_project: 
-rubygems_version: 1.0.1
-signing_key: 
-specification_version: 2
-summary: Ruby Java bridge
-test_files: 
-- test/test.rb
+dependencies: []
+