rjb 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8d2fe4f37eb369c29fc25f688dbf8623142a59d
-  data.tar.gz: 0cbd8d8975cbd3292ea1b02e287950412f14bf8f
+  metadata.gz: cb3a393975ffb900a204709a4c3d84520f0d30c0
+  data.tar.gz: e74ce433645a5bbc2cf701659de8a012e2dddc2d
 SHA512:
-  metadata.gz: 0064fb940021e09cd18a5154096eb9abb64ec191b30f1aefccacf57b72a2dd2d8a1d211e99f841235c8bf63173b11fa4f11b2511bb2497f8f0ba5ac7dd543d68
-  data.tar.gz: 6dfc1a8cbc9d11bc9e310186fb5340f3e2b68bcceccd7bf7b1c84a36abdcdd4904f5548fff298acf9e689593b9dcb15b614de50ea3393cd05b07cc5930551405
+  metadata.gz: a1065c8664fd657042733cde7011fe795782ad4fdb9dff29ccec3e0222fda5c7b411393dae203f39d2ff7b608a7e5d1fd156eb18e83e4c38eb662a043aae9886
+  data.tar.gz: f84147dadfeb90e296576d9a3cdfeac81c6726ed3e2047d2551184db6e8adb4a4bb60e08482f45a55868339d213ab118ca74a1c8e31c9713d45fd3789dab7eea

data/ChangeLog

@@ -1,3 +1,13 @@
+Sun Dec 14 2014 arton
+ *lib/rjb.rb
+	FakeDL for Rubinius
+ *ext/riconv.c
+	Change variable name for avoiding conflicion (Runinius)
+ *ext/rjb.
+	RJB_VERSION -> 1.5.2
+	Support Rubinius (Rubinius's block is T_OBJECT instead of T_DATA -> affected to anonclass)
+ *test/test.rb
+	skip fixnum range test if Rubinius
 Tue Sep 23 2014 arton
  *ext/rjb.c
 	RJB_VERSION -> 1.5.1

data/ext/extconf.h

@@ -4,5 +4,5 @@
 #define HAVE_NL_LANGINFO 1
 #define HAVE_SETLOCALE 1
 #define HAVE_GETENV 1
-#define RJB_RUBY_VERSION_CODE 210
+#define RJB_RUBY_VERSION_CODE 220
 #endif

data/ext/riconv.c

@@ -192,10 +192,10 @@ VALUE exticonv_local_to_utf8(VALUE local_string)
         return local_string;
     }
 #else
-    VALUE rb_cEncoding, encoding, utf8;
-    rb_cEncoding = rb_const_get(rb_cObject, rb_intern("Encoding"));
+    VALUE cEncoding, encoding, utf8;
+    cEncoding = rb_const_get(rb_cObject, rb_intern("Encoding"));
     encoding = rb_funcall(local_string, rb_intern("encoding"), 0);
-    utf8 = rb_const_get(rb_cEncoding, rb_intern("UTF_8"));
+    utf8 = rb_const_get(cEncoding, rb_intern("UTF_8"));
     if (encoding != utf8)
     {
         VALUE ret = rb_funcall(local_string, rb_intern("encode"), 2, utf8, encoding);

data/ext/rjb.c

@@ -1,6 +1,6 @@
 /*
  * Rjb - Ruby <-> Java Bridge
- * Copyright(c) 2004,2005,2006,2007,2008,2009,2010,2011,2012 arton
+ * Copyright(c) 2004,2005,2006,2007,2008,2009,2010,2011,2012,2014 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,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjb.c 199 2012-12-17 13:31:18Z arton $
  */
 
-#define RJB_VERSION "1.5.1"
+#define RJB_VERSION "1.5.2"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -847,8 +846,12 @@ static void rv2jobject(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, in
             case T_OBJECT:
             default:
 #if defined(DEBUG)
+              {
+                VALUE v = rb_funcall(val, rb_intern("inspect"), 0);
                 fprintf(stderr, "rtype:%d, sig=%s\n", TYPE(val), psig);
+                fprintf(stderr, "obj:%s\n", StringValueCStr(v));
                 fflush(stderr);
+              }
 #endif
                 rb_raise(rb_eRuntimeError, "can't convert to java type");
                 break;
@@ -2180,6 +2183,7 @@ static int check_rtype(JNIEnv* jenv, VALUE* pv, char* p)
     case T_ARRAY:
         return (*p == '[') ? SOSO : UNMATCHED;
     case T_DATA:
+    case T_OBJECT:
         if (IS_RJB_OBJECT(*pv) && pcls)
 	{
 	    /* imported object */
@@ -2200,8 +2204,6 @@ static int check_rtype(JNIEnv* jenv, VALUE* pv, char* p)
             *pv = rjb_s_bind(rjbb, blockobj, rb_str_new2(pcls));
         }
 	/* fall down to the next case */
-    case T_OBJECT:
-	/* fall down to the next case */
     default:
         if (pcls || *p == '[')
         {

data/lib/rjb.rb

@@ -4,6 +4,35 @@
 
 require 'rbconfig'
 
+begin
+  require 'rubinius/ffi'
+  module DL
+    extend FFI::Library
+    class FakeDL
+      def initialize(lib)
+        @lib = lib
+      end
+      def [](fun)
+        f = @lib.find_function(fun)
+        if f
+          f.to_i
+        else
+          nil
+        end
+      end
+    end
+    def self.dlopen(lib)
+      a = ffi_lib(lib)
+      if Array === a && a.size >= 1
+        FakeDL.new(a[0])
+      else
+        nil
+      end
+    end
+  end
+rescue LoadError
+end
+
 module RjbConf
   if /darwin/ =~ RUBY_PLATFORM
     if ENV['JVM_LIB'].nil? || ENV['JVM_LIB'] == ''

data/test/test.rb

@@ -802,13 +802,12 @@ class TestRjb < Test::Unit::TestCase
   end
 
   def test_reraise_exception()
-   unless /^1\.8/ =~ RUBY_VERSION
-      begin
-        cause_exception
-      rescue
-        assert($!.to_s =~ /NumberFormatException/)
-      end
-   end
+    skip('1.8 does not support reraise') if /^1\.8/ =~ RUBY_VERSION
+    begin
+      cause_exception
+    rescue
+      assert($!.inspect =~ /NumberFormatException/)
+    end
   end
 
 
@@ -874,10 +873,11 @@ class TestRjb < Test::Unit::TestCase
     assert_equal(cons._classname, sys._invoke('console')._classname)    
   end
   def test_longarg
+    skip('rbx can handle 64bits long') if RUBY_ENGINE == 'rbx'
     assert_equal(597899502607411822, @jLong.reverse(0x7654321076543210))
     begin
       @jLong.reverse(0x76543210765432101)
-      fail 'no exception for gibnum it doesn\'t convert Java long'
+      fail 'no exception for bigbnum it doesn\'t convert Java long'
     rescue RangeError
       assert true
     end
@@ -907,7 +907,7 @@ class TestRjb < Test::Unit::TestCase
     e = @jString.new("\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8".force_encoding Encoding::EUC_JP)
     u = @jString.new("\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88".force_encoding Encoding::UTF_8)
     if encoding == 'MS932'
-      s1 = @jString.new_with_sig('[B', "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67".bytes)
+      s1 = @jString.new("\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67".bytes)
     elsif encoding.upcase == 'EUC-JP'
       s1 = @jString.new("\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8".bytes)
     elsif encoding.upcase == 'UTF-8'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rjb
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - arton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-12-14 00:00:00.000000000 Z
 dependencies: []
 description: |
   RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
@@ -18,35 +18,29 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
+- COPYING
+- ChangeLog
+- data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
 - ext/RBridge.java
-- ext/load.c
-- ext/riconv.c
-- ext/rjb.c
-- ext/rjbexception.c
+- ext/depend
 - ext/extconf.h
+- ext/extconf.rb
 - ext/jniwrap.h
 - ext/jp_co_infoseek_hp_arton_rjb_RBridge.h
+- ext/load.c
+- ext/riconv.c
 - ext/riconv.h
+- ext/rjb.c
 - ext/rjb.h
-- ext/depend
-- data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
+- ext/rjbexception.c
 - lib/rjb.rb
-- lib/rjbextension.rb
 - lib/rjb/extension.rb
 - lib/rjb/list.rb
+- lib/rjbextension.rb
+- readme.sj
+- readme.txt
 - samples/filechooser.rb
 - samples/unzip.rb
-- test/exttest.rb
-- test/gctest.rb
-- test/jartest.rb
-- test/jartest2.rb
-- test/jartest3.rb
-- test/listtest.rb
-- test/osx_jvmcheck.rb
-- test/test.rb
-- test/test_osxjvm.rb
-- test/test_osxload.rb
-- test/test_unload.rb
 - test/Base.class
 - test/CallbackTest$Callback.class
 - test/CallbackTest.class
@@ -57,20 +51,26 @@ files:
 - test/Test.class
 - test/Two.class
 - test/TwoCaller.class
+- test/exttest.rb
+- test/gctest.rb
+- test/jartest.jar
+- test/jartest.rb
+- test/jartest2.jar
+- test/jartest2.rb
+- test/jartest3.rb
 - test/jp/co/infoseek/hp/arton/rjb/CallbackTest$Callback.class
 - test/jp/co/infoseek/hp/arton/rjb/CallbackTest.class
 - test/jp/co/infoseek/hp/arton/rjb/IBase.class
 - test/jp/co/infoseek/hp/arton/rjb/JTest.class
 - test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.class
 - test/jp/co/infoseek/hp/arton/rjb/Test.class
-- test/jartest.jar
-- test/jartest2.jar
+- test/listtest.rb
+- test/osx_jvmcheck.rb
 - test/rjbtest.jar
-- COPYING
-- ChangeLog
-- readme.sj
-- readme.txt
-- ext/extconf.rb
+- test/test.rb
+- test/test_osxjvm.rb
+- test/test_osxload.rb
+- test/test_unload.rb
 homepage: http://rjb.rubyforge.org/
 licenses:
 - LGPL
@@ -81,19 +81,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - none
 - JDK 5.0
 rubyforge_project: rjb
-rubygems_version: 2.0.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Ruby Java bridge