rjb 1.4.0 → 1.4.1

data/ChangeLog

@@ -1,3 +1,11 @@
+Sun Aug 19 arton
+ *ext/rjb.c
+	export bound object's original ruby object as @wrapped
+	RJB_VERSION -> 1.4.1
+ *lib/rjb.rb
+	define Rjb_JavaBridge class for support @wrapped delegation
+ *test/test.rb
+	add @wrapped object invoking test
 Sun Apr 22 arton
  *ext/rjb.c
 	add Rjb_JavaProxy#initialize_proxy method for preparing proxy instance.

data/ext/extconf.h

@@ -1,9 +1,8 @@
-#ifndef EXTCONF_H
-#define EXTCONF_H
-#define HAVE_JNI_H 1
-#define HAVE_RUBY_DL_H 1
-#define HAVE_NL_LANGINFO 1
-#define HAVE_SETLOCALE 1
-#define HAVE_GETENV 1
-#define RJB_RUBY_VERSION_CODE 193
-#endif
+#ifndef EXTCONF_H
+#define EXTCONF_H
+#define HAVE_JNI_H 1
+#define HAVE_DL_H 1
+#define HAVE_SETLOCALE 1
+#define HAVE_GETENV 1
+#define RJB_RUBY_VERSION_CODE 187
+#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/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 187 2012-04-22 12:35:49Z arton $
+ * $Id: rjb.c 191 2012-08-18 15:04:18Z arton $
  */
 
-#define RJB_VERSION "1.4.0"
+#define RJB_VERSION "1.4.1"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -2390,6 +2390,7 @@ static VALUE rjb_s_bind(VALUE self, VALUE rbobj, VALUE itfname)
 	ptr->wrapped = rbobj;
 	result = Data_Wrap_Struct(rjbb, rj_bridge_mark, rj_bridge_free, ptr);
 	rb_ary_push(proxies, result);
+        rb_ivar_set(result, rb_intern("@wrapped"), rbobj);
     }
     return result;
 }

data/lib/rjb.rb

@@ -97,4 +97,13 @@ module Rjb
       end
     end
   end
+  class Rjb_JavaBridge
+    def method_missing(name, *args)
+      @wrapped.__send__(name, *args)
+    end
+    def respond_to?(name, inc_private = false)
+      @wrapped.respond_to?(name, inc_private)
+    end
+    attr_reader :wrapped
+  end
 end

data/readme.txt

@@ -1,28 +1,35 @@
-Rjb is Ruby-Java bridge using Java Native Interface.
-
-How to install
-
-you need to install Java2 sdk, and setup JAVA_HOME enviromental varible except for OS X.
-I assume that OS X's JAVA_HOME is fixed as '/System/Library/Frameworks/JavaVM.framework'.
-
-then,
-
-ruby setup.rb config
-ruby setup.rb setup
-
-(in Unix)
-sudo ruby setup.rb install
-or
-(in win32)
-ruby setup.rb install
-
-How to test
-in Win32
-cd test
-ruby test.rb
-
-in Unix
-see test/readme.unix 
-you must set LD_LIBRARY_PATH environmental variable to run rjb.
-
-artonx@yahoo.co.jp
+Rjb is Ruby-Java bridge using Java Native Interface.
+
+How to install
+
+you need to install Java2 sdk, and setup JAVA_HOME enviromental varible except for OS X.
+I assume that OS X's JAVA_HOME is fixed as '/System/Library/Frameworks/JavaVM.framework'.
+
+then,
+
+ruby setup.rb config
+ruby setup.rb setup
+
+(in Unix)
+sudo ruby setup.rb install
+or
+(in win32)
+ruby setup.rb install
+
+How to test
+in Win32
+cd test
+ruby test.rb
+
+in Unix
+see test/readme.unix 
+you must set LD_LIBRARY_PATH environmental variable to run rjb.
+
+-- Notice for opening non-ASCII 7bit filename
+If you'll plan to open the non-ascii character named file by Java class through Rjb, it may require to set LC_ALL environment variable in you sciprt.
+For example in Rails, set above line in production.rb as your environment.
+ENV['LC_ALL'] = 'en_us.utf8' # or ja_JP.utf8 etc.
+ cf: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4733494  
+   (Thanks Paul for this information).
+
+artonx@yahoo.co.jp

data/test/test.rb

@@ -1,6 +1,6 @@
 #!/usr/local/env ruby -Ku
 # encoding: utf-8
-# $Id: test.rb 176 2011-11-09 14:27:28Z arton $
+# $Id: test.rb 191 2012-08-18 15:04:18Z arton $
 
 begin
   require 'rjb'
@@ -256,7 +256,7 @@ class TestRjb < Test::Unit::TestCase
     it = bind(it, 'java.util.Iterator')
     test = import('jp.co.infoseek.hp.arton.rjb.Test')
     a = test.new
-    assert("43210", a.concat(it))
+    assert_equal("43210", a.concat(it))
   end
 
   def test_unbind()
@@ -811,5 +811,42 @@ class TestRjb < Test::Unit::TestCase
    end
   end
   
+  class CbTest
+    def method(l, s, i, d, str)
+      "test_ok:#{l}-#{s}-#{i}-#{d}-#{str}"
+    end
+  end
+  def test_longcallback()
+    cb = bind(CbTest.new, 'jp.co.infoseek.hp.arton.rjb.CallbackTest$Callback')
+    test = import('jp.co.infoseek.hp.arton.rjb.CallbackTest')
+    assert_equal 'test_ok:1234-1234-1234-1234.5-1234', test.callCallback(cb)
+  end
+  
+  class TestIterEx < TestIter
+    def initialize()
+      super
+      @strattr = 'strattr'
+      @numattr = 32
+    end
+    attr_accessor :strattr, :numattr
+    def multargs(a, b)
+      a + b
+    end
+  end
+  def test_method_otherthan_bound()
+    it = TestIterEx.new
+    it = bind(it, 'java.util.Iterator')
+    test = import('jp.co.infoseek.hp.arton.rjb.Test')
+    a = test.new
+    assert_equal("43210", a.concat(it))
+    assert(it.respond_to?(:numattr))
+    assert(it.respond_to?(:multargs))    
+    assert_equal(32, it.numattr)
+    assert_equal('strattr', it.strattr)
+    it.numattr += 1
+    assert_equal(33, it.numattr)
+    assert_equal(5, it.multargs(3, 2))
+  end
+  
 end
 

metadata

@@ -1,83 +1,90 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rjb
-version: !ruby/object:Gem::Version
-  version: 1.4.0
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 1.4.1
 platform: ruby
-authors:
+authors: 
 - arton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-22 00:00:00.000000000 Z
+
+date: 2012-08-18 00:00:00 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:
+
+extensions: 
 - ext/extconf.rb
 extra_rdoc_files: []
-files:
+
+files: 
 - ext/RBridge.java
 - ext/rjbexception.c
 - ext/rjb.c
-- ext/riconv.c
 - ext/load.c
-- ext/rjb.h
+- ext/riconv.c
 - ext/extconf.h
-- ext/jp_co_infoseek_hp_arton_rjb_RBridge.h
 - ext/jniwrap.h
+- ext/jp_co_infoseek_hp_arton_rjb_RBridge.h
+- ext/rjb.h
 - ext/riconv.h
 - ext/depend
 - data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
-- lib/rjb.rb
 - lib/rjbextension.rb
+- lib/rjb.rb
 - samples/filechooser.rb
 - samples/unzip.rb
-- test/test.rb
+- test/jartest.rb
+- test/gctest.rb
 - test/test_osxjvm.rb
+- test/test.rb
 - test/exttest.rb
-- test/jartest3.rb
 - test/jartest2.rb
-- test/gctest.rb
-- test/listtest.rb
+- test/jartest3.rb
 - test/test_unload.rb
-- test/jartest.rb
-- test/TwoCaller.class
-- test/Two.class
-- test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.class
+- test/listtest.rb
 - test/jp/co/infoseek/hp/arton/rjb/Test.class
+- test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.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/jartest.jar
 - test/jartest2.jar
 - test/rjbtest.jar
-- test/jartest.jar
 - COPYING
 - ChangeLog
-- readme.txt
 - readme.sj
+- readme.txt
 - ext/extconf.rb
 homepage: http://rjb.rubyforge.org/
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
       version: 1.8.2
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-requirements:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+requirements: 
 - none
 - JDK 5.0
 rubyforge_project: rjb
@@ -85,5 +92,5 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby Java bridge
-test_files:
+test_files: 
 - test/test.rb