rjb 1.4.6 → 1.4.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8aa00e04a681cc120889e76d4fd3510f7d5a2623
+  data.tar.gz: 0dc99b76f4d14ae46237cf3efe853954ffd2ae44
+SHA512:
+  metadata.gz: 8f5432b1983b8e6a1d316026b3d18bb63c250fb54e12c42f58fba1a2366e9af359e24ff7b50e71e5cb38f8eb2dc387c8d433c3d240592499a165a1c6e35db848
+  data.tar.gz: 1a49b468b18692ce79da777498bee35f7b0d88e5996f36adae942df91a19b90a28e7fc6b672ec4930eef0d33e15bf4053853d787b255132c96c04890c5a5de7d

data/ChangeLog

@@ -1,3 +1,19 @@
+Tue Jun 18 2013 arton
+ *ext/load.c
+	check fiddler has dlopen (after ruby 2.0).
+Tue Jun 18 2013 arton
+ *ext/rjb.c
+	RJB_VERSION -> 1.4.7
+ *ext/load.c
+	rqeuire fiddle first, then dl. the patch originally created by Victor Lellis.
+Fri May 17 2013 arton
+ *test/test.rb
+	add Byte test
+Sun Apr 48 2013 arton
+ *ext/rjb.o
+	remove binary
+ *ext/rjb.obj
+	remove binary
 Sat Jan 26 2013 arton
  *ext/rjb.c
 	RJB_VERSION -> 1.4.6 for new gem
@@ -7,7 +23,7 @@ Sun Jan 13 2013 arton
  *test/test.rb
 	add bignum argument test
  *ext/rjb.c
-	accept bignum argument for 'J' 
+	accept bignum argument for 'J'
 	this bug(or at least mis spec.) was pointed by janroesner. Thanks janroesner !
 Tue Dec 17 arton
  *test/test.rb
@@ -92,7 +108,7 @@ Mon Jul 18 arton
  *test/test.rb
 	add anonymous inner class test
  *test/Two.java
-	for anonymous inner class test	
+	for anonymous inner class test
  *test/TwoCaller.java
 	for anonymous inner class test
 Sat Jul 16 arton
@@ -133,7 +149,7 @@ Tue Oct 26 arton
 Sun Oct 24 arton
  *sample/filechooser.rb
 	omit Thread use (cause JVM crush with 1.9 and StackOverflow with 1.8)
-Sat Oct 23 arton	
+Sat Oct 23 arton
  *ext/rjb.c
 	RJV_VERSION -> 1.3.0
 	add loaded? class method.
@@ -200,22 +216,22 @@ Wed Jun 9 arton
 	accept JAVA_HOME having an extra slash at the end
  *ext/rjb.c
 	RJB_VERSION -> 1.2.5
-Fri Jun 5 arton	
+Fri Jun 5 arton
  *ext/rjb.h
 	defin HAVE_LONG_LONG if no HAVE_LONG_LONG but LP64
  *ext/rjb.c
 	remove unused variables
-	RJB_VERSION -> 1.2.4	
+	RJB_VERSION -> 1.2.4
 Fri Jun 4 arton
  *ext/riconv.c
 	remove unused function if build with Ruby 1.9
  *ext/rjb.c
-	RJB_VERSION -> 1.2.3	
-	to accomodate with rubinius	
- *ext/load.c	
-	to accomodate with rubinius	
+	RJB_VERSION -> 1.2.3
+	to accomodate with rubinius
+ *ext/load.c
+	to accomodate with rubinius
  *ext/rjbexception.c
-	to accomodate with rubinius	
+	to accomodate with rubinius
 Sun May 30 arton
  *lib/rjbextension.rb
 	Rjb extension from Andreas Ronge's neo4j
@@ -226,8 +242,8 @@ Sun May 30 arton
  *test/rjbtest.jar
 	test file for rjbextension.rb
 Sat May 29 arton on behalf of atoulme
- *ext/rjb.c	
- *ext/load.c	
+ *ext/rjb.c
+ *ext/load.c
  *ext/rjbexception.c
 	to accomodate with rubinius
 	thanks atoulme !
@@ -251,7 +267,7 @@ Tue Mar 16 arton
  *ext/riconv.c
 	change locale setting "" to "C", fixed by Fabien Sartor (rjb-Bugs-27968)
  *ext/rjb.c
-	RJB_VERSION -> 1.2.1	
+	RJB_VERSION -> 1.2.1
 Sun Nov 1 arton
  *ext/load.c
 	load jvm pointed by JVM_LIB environment variable first (suggested by Ittay Dror).
@@ -289,7 +305,7 @@ Thu Feb 5 kuwa1
  *ext/load.c
  	fix for ruby19
 Sun Nov 16 arton
- *ext/load.c	
+ *ext/load.c
 	apply hpux patch, contributed by Ittay Dror. thanks
 Tue Aug 26 arton
  *ext/load.c, rjb.c, rjb.h
@@ -314,13 +330,13 @@ Mon May 26 arton
 	use macroes for loading classes
  *ext/load.c
 	adjust OS X's directory
- *ext/extconf.rb	
-	adjust OS X's directory if Home exists	
+ *ext/extconf.rb
+	adjust OS X's directory if Home exists
 Thu Mar 27 arton
  *ext/rjb.c
 	mark version 1.1.4 for the next release.
  *test/test.rb
-	remove unload, because it fails. 
+	remove unload, because it fails.
 	It's more important to assert each functions.
 Thu Mar 27 arton
  *ext/riconv.c
@@ -342,7 +358,7 @@ Tue Mar  4 Kuwashima
  *test/test.rb
 	add Rjb::unbind
  *test/test.rb
- 	add loading rubygems 
+ 	add loading rubygems
 Sat Feb 23 arton
  *test/test.rb
 	let test_field metod use Test.class instead of Point.class
@@ -358,8 +374,8 @@ 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	
+ *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
@@ -424,17 +440,15 @@ Sun Jun 17 arton
 	add a test for the method alias feature.
 Tue Nov 21 arton
  *rjb.c
-       Skip the constant registering process, if the constant was already defined. 
+       Skip the constant registering process, if the constant was already defined.
  *load.c
  *rjb.c
  *rjbexception.c
- *rjb.h	 
+ *rjb.h
 	add prefix 'rjb' for externed symbol names to avoid confliction.
-	
 Sun Oct 08 arton (on behalf of richard apodaca)
  *load.c
 	support AMD64
-	
 Mon Sep 11 arton
  *test.rb
 	add a test of arguments types are various array.
@@ -457,13 +471,12 @@ Tue Aug 1 arton
 	add for remove previous installed rjb.so.
  *rjb.rake
 	add for build Gem.
- *rjb.rb	
+ *rjb.rb
 	for preparing the pathname constant of the bridge class.
  *depend
 	chage binary name from rjb.so to rjbcore.so
  *extconf.rb
 	chage binary name from rjb.so to rjbcore.so
-	
 Mon Jul 31 arton
  *load.c
 	fix buffer allocation
@@ -472,14 +485,13 @@ Sun Jul 16 (Jun 22) Kuwashima and arton
  *rjb.c
 	version 0.2.8
  *MANIFEST
- *depend	
+ *depend
  *load.c
  *rjbexception.c
 	change jni.h to jniwrap.h.
 	change the bridge class's header according to JDK 5.0's javah.
  *jniwrap.h
 	wrap jni.h for Cygin
-	
 Sat Jun 10 14:10:05 2006 arton
  *rjb.c
    	version 0.2.7
@@ -495,19 +507,19 @@ Wed Apr 12 03:57:12 2006 arton
  *rjb.c
 	version 0.2.6
 	support an array of arrays.
- *test.rb	
+ *test.rb
 	add an array of arrays test, some tests are contributed by Darren Day.
  *Test.java
 	add a test method that returns an array of arrays, some tests are
          contributed by Darren Day.
-	
+
 Sat Dec 24 18:56:38 2005 arton
  *rjb.c
 	version 0.2.5
 	release String, Float, Array object after method call.
  *gctest.rb
 	add for String object gc test
-	
+
 Mon Sep 19 01:09:30 2005 arton
  *rjb.c
 	version 0.2.4
@@ -515,7 +527,7 @@ Mon Sep 19 01:09:30 2005 arton
 	omit unused local variable from jstring2val
  *test.rb
 	add null string test (bug since utf-8 support)
-	
+
 Tue Jun 28 01:57:07 2005 arton
  *rjb.c
 	version 0.2.3
@@ -523,7 +535,7 @@ Tue Jun 28 01:57:07 2005 arton
 	call Class#forName if argument count is 1
  *test.rb
 	add test_importobj contributed by Mr. Kuwashima, thanks.
-	
+
 Mon Jun 27 20:30:50 2005 arton
 	treat Class.forName as Rjb::import
  *rjb.c
@@ -532,7 +544,7 @@ Mon Jun 27 20:30:50 2005 arton
 	if pass imported object to JVM, extract Class object from ruby object
  *test.rb
 	add above tests
-	
+
 Sat Jun 25 05:58:36 2005 arton
 	most bugs were reported by Mr. Micael Weller, thanks.
  *rjb.c
@@ -540,12 +552,12 @@ Sat Jun 25 05:58:36 2005 arton
 	correct derived static method search
 	search class methods then class's instance methods when called by class
 	avoid register non capitalized named constants into constants table
-	correct capitalized named method search 
+	correct capitalized named method search
  *riconv.c
 	never call iconv if $KCODE is nil
  *load.c
 	using path separator ; for cygwin (by Ryugate)
-	
+
 Sun Apr 24 05:26:16 2005 arton
  *rb.c
 	version 0.2.0
@@ -553,7 +565,7 @@ Sun Apr 24 05:26:16 2005 arton
 	load can take the second argument for jvm
  *load.c
 	load can take the second argument for jvm
-	
+
 Mon Jan 17 02:40:21 2005 arton
  *rjb.c
 	add 'throw' module function.
@@ -564,7 +576,7 @@ Mon Jan 17 02:40:21 2005 arton
 	java exception handling functions, and 'throw' module function.
  *test.rb
 	adding throw test.
-	
+
 Wed Jan 12 00:01:08 2005 Kaspar Schiess and arton
  *rjb.c
 	correct Rjb::load parameter evaluation (classpath).
@@ -585,12 +597,12 @@ Sun Nov 21 02:51:43 2004 Kuwashima and arton
 Tue Oct 5 23:08:59 2004 Kuwashima and arton
  *test.rb
 	add kanji conversion test
- *rjb.c	
+ *rjb.c
 	add dbcs(sjis and euc-jp) - utf-8 auto conversion feature.
 	the patch was contributed by Mr.Kuwashima, many thanks.
-	
+
 Sun Oct 3 18:24:42 2004 arton
- *load.c	
+ *load.c
 	JNIEnv* now using local variable instead of global one.
 	Because AWT event use a worker thread, and JNI need thread's owned JNIEnv.
  *rjb.c
@@ -600,24 +612,24 @@ Sun Oct 3 18:24:42 2004 arton
 	 and gave me some test codes.
 	and attach_current_thread is from Mr.Kuwashima's patch.
 	Many thanks to Mr.Kuwashima.
-	
+
 Sat Sep 25 03:25:45 2004 arton
- *rjb.c		
+ *rjb.c
 	implements interface's method argument conversion.
  *test.rb
 	add Comparable test (interface with method arguments)
- *Test.java	
+ *Test.java
 	add Comparable test method.
 
-Wed Sep 22 02:30:15 2004 arton	
- *rjb.c	
+Wed Sep 22 02:30:15 2004 arton
+ *rjb.c
 	correct constants load, using mid-class.
 	convert null string to nil
-	
-Wed Sep 22 00:05:32 2004 arton	
- *rjb.c	
+
+Wed Sep 22 00:05:32 2004 arton
+ *rjb.c
 	correct ruby type checking. If the parameter type is java.lang.String, rjb instance is always accepted.
-	
+
 Mon Sep 20 22:02:53 2004 arton
  *rjb.c
 	checking method/constructor signature with class when the argument is rjb's instance.
@@ -626,9 +638,9 @@ Sun Sep 19 00:54:35 2004 arton
 	convert Java exception to Ruby's StandardError derived class.
 	checking method/constructor signature when invoking if no signatur argument is supplied.
 	adding field accessor.
-	
+
 Sun Sep 12 21:42:00 2004 arton
- *rjb.c	
+ *rjb.c
 	call exception description when verbose = true.
 	correct recursive import call (for Boolean).
 	corrent method not found message creation.

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 193
+#define RJB_RUBY_VERSION_CODE 200
 #endif

data/ext/jp_co_infoseek_hp_arton_rjb_RBridge.h

@@ -1,21 +1,21 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class jp_co_infoseek_hp_arton_rjb_RBridge */
-
-#ifndef _Included_jp_co_infoseek_hp_arton_rjb_RBridge
-#define _Included_jp_co_infoseek_hp_arton_rjb_RBridge
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     jp_co_infoseek_hp_arton_rjb_RBridge
- * Method:    call
- * Signature: (Ljava/lang/String;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_jp_co_infoseek_hp_arton_rjb_RBridge_call
-  (JNIEnv *, jobject, jstring, jobject, jobjectArray);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class jp_co_infoseek_hp_arton_rjb_RBridge */
+
+#ifndef _Included_jp_co_infoseek_hp_arton_rjb_RBridge
+#define _Included_jp_co_infoseek_hp_arton_rjb_RBridge
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     jp_co_infoseek_hp_arton_rjb_RBridge
+ * Method:    call
+ * Signature: (Ljava/lang/String;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_jp_co_infoseek_hp_arton_rjb_RBridge_call
+  (JNIEnv *, jobject, jstring, jobject, jobjectArray);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

data/ext/load.c

@@ -102,28 +102,58 @@ static VALUE jvmdll = Qnil;
 static VALUE getdefaultjavavminitargsfunc;
 static VALUE createjavavmfunc;
 
+static const char* DLLibs[] = { "fiddle", "dl" };
+static const char* DLNames[] = { "Fiddle", "DL" };
+
+static VALUE safe_require(VALUE args)
+{
+    return rb_require(StringValueCStr(args));
+}
+
 static int open_jvm(char* libpath)
 {
     int sstat;
     VALUE* argv;
+    size_t i;
+    int state;
 
-    rb_require("dl");
-#if !defined(RUBINIUS)
-    if (!rb_const_defined_at(rb_cObject, rb_intern("DL")))
-    {
-	rb_raise(rb_eRuntimeError, "Constants DL is not defined.");
-	return 0;
-    }
+#if defined(RUBINIUS)
+    i = 1;
+#else
+    i = 0;
 #endif
-    argv = ALLOCA_N(VALUE, 4);
-    *argv = rb_const_get(rb_cObject, rb_intern("DL"));
-    *(argv + 1) = rb_intern("dlopen");
-    *(argv + 2) = 1;
-    *(argv + 3) = rb_str_new2(libpath);
-    jvmdll = rb_protect(rjb_safe_funcall, (VALUE)argv, &sstat);
-    if (sstat)
+    for (; i < COUNTOF(DLLibs); i++) 
     {
-        return 0;
+        state = 0;
+        rb_protect(safe_require, rb_str_new2(DLLibs[i]), &state);
+#if !defined(RUBINIUS)
+        if (state || !rb_const_defined_at(rb_cObject, rb_intern(DLNames[i])))
+        {
+            if (i > 0)
+            {
+                rb_raise(rb_eRuntimeError, "Constants DL and Fiddle is not defined.");
+                return 0;
+            }
+        }
+        else
+#endif
+        {
+            sstat = 0;
+            argv = ALLOCA_N(VALUE, 4);
+            *argv = rb_const_get(rb_cObject, rb_intern(DLNames[i]));
+            *(argv + 1) = rb_intern("dlopen");
+            *(argv + 2) = 1;
+            *(argv + 3) = rb_str_new2(libpath);
+            jvmdll = rb_protect(rjb_safe_funcall, (VALUE)argv, &sstat);
+            if (!sstat)
+            {
+                break;
+            }
+            else if (i > 0)
+            {
+                return 0;
+            }
+        }
     }
     /* get function pointers of JNI */
 #if RJB_RUBY_VERSION_CODE < 190
@@ -302,7 +332,7 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
     CREATEJAVAVM createjavavm;
     JavaVMOption* options;
     size_t optlen;
-    int i;
+    size_t i;
     VALUE optval;
 
     if (!RTEST(jvmdll))

data/ext/rjb.c

@@ -15,7 +15,7 @@
  * $Id: rjb.c 199 2012-12-17 13:31:18Z arton $
  */
 
-#define RJB_VERSION "1.4.6"
+#define RJB_VERSION "1.4.7"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -1144,7 +1144,7 @@ static void rv2jarray(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, int
             }
             else
             {
-                VALUE src = rb_str_new(p, len);
+                VALUE src = rb_str_new((char*)p, len);
                 rb_str_set_len(val, 0);
                 rb_str_append(val, src);
             }
@@ -2084,7 +2084,7 @@ static VALUE import_class(JNIEnv* jenv, jclass jcls, VALUE clsname)
 
 static VALUE rjb_a_initialize(VALUE self, VALUE proc)
 {
-    rb_ivar_set(self, anonymousblock, proc);
+    return rb_ivar_set(self, anonymousblock, proc);
 }
 
 static VALUE rjb_a_missing(int argc, VALUE* argv, VALUE self)
@@ -2484,7 +2484,9 @@ static jobject conv_jarname_to_url(JNIEnv* jenv, VALUE jarname)
 {
     jvalue arg;
     jobject url;
+#if defined(DOSISH)
     size_t len;
+#endif
     char* jarp;
     char* urlp;
 
@@ -3141,11 +3143,6 @@ static VALUE find_const(VALUE pv)
     return rb_const_get(*p, (ID)*(p + 1));
 }
 
-static VALUE call_blcock(int argc, VALUE* argv)
-{
-    return rb_yield_values2(argc, argv);
-}
-
 static VALUE rjb_missing(int argc, VALUE* argv, VALUE self)
 {
     struct jv_data* ptr;

data/test/test.rb

@@ -869,5 +869,14 @@ class TestRjb < Test::Unit::TestCase
       assert true
     end
   end
+  def test_bytearg
+    b = @jByte.new(32)
+    assert_equal(32, b.int_value)
+    assert b.compareTo(@jByte.new(32))
+    assert b.compareTo(@jByte.value_of(32))
+    b = @jByte.new_with_sig('B', 32)
+    assert_equal(32, b.int_value)
+    assert b.compareTo(@jByte._invoke(:valueOf, 'B', 32))
+  end
 end
 

metadata

@@ -1,20 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: rjb
 version: !ruby/object:Gem::Version
-  version: 1.4.6
-  prerelease: 
+  version: 1.4.7
 platform: ruby
 authors:
 - arton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies: []
-description: ! 'RJB is a bridge program that connect between Ruby and Java with Java
-  Native Interface.
-
-'
+description: |
+  RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
 email: artonx@gmail.com
 executables: []
 extensions:
@@ -22,39 +19,39 @@ extensions:
 extra_rdoc_files: []
 files:
 - ext/RBridge.java
-- ext/rjbexception.c
-- ext/rjb.c
 - ext/load.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/rjb.h
 - ext/riconv.h
+- ext/rjb.h
 - ext/depend
 - data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
-- lib/rjbextension.rb
 - lib/rjb.rb
+- lib/rjbextension.rb
 - samples/filechooser.rb
 - samples/unzip.rb
-- test/jartest.rb
-- test/gctest.rb
-- test/test_osxjvm.rb
-- test/test.rb
 - test/exttest.rb
-- test/test_osxload.rb
-- test/osx_jvmcheck.rb
+- test/gctest.rb
+- test/jartest.rb
 - test/jartest2.rb
 - test/jartest3.rb
-- test/test_unload.rb
 - test/listtest.rb
-- test/jp/co/infoseek/hp/arton/rjb/Test.class
-- test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.class
+- test/osx_jvmcheck.rb
+- test/test.rb
+- test/test_osxjvm.rb
+- test/test_osxload.rb
+- test/test_unload.rb
+- test/Two.class
+- test/TwoCaller.class
 - 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/Two.class
-- test/TwoCaller.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/rjbtest.jar
@@ -65,29 +62,28 @@ files:
 - ext/extconf.rb
 homepage: http://rjb.rubyforge.org/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - none
 - JDK 5.0
 rubyforge_project: rjb
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby Java bridge
 test_files:
 - test/test.rb