rjb 1.2.6 → 1.2.8

data/ChangeLog

@@ -1,3 +1,19 @@
+Fri Sep 17 arton
+ *test/test.rb
+	sort arguments order for test_java_methods (the order is implement dependent)
+	add fixnum conversion test for 64bit platform (test_64fixnum)
+ *ext/rjb.c
+	RJV_VERSION -> 1.2.8
+	fix rv2jlong bug, the solution was suggested by Ary Borenszweig
+Sun Aug 29 arton
+ *ext/rjb.c
+	ignore no arguments method signature.
+	name base classes under Rjb module.
+ *lib/rjb.rb
+	implements public_methods and methods
+ *test/test.rb
+	add non arguments method sig test
+	add methods, public_methods, java_methods test
 Thu Jul 22 arton
  *ext/rjb.c
 	RJB_VERSION -> 1.2.6

data/ext/extconf.h

@@ -1,9 +1,9 @@
 #ifndef EXTCONF_H
 #define EXTCONF_H
 #define HAVE_JNI_H 1
-#define HAVE_RUBY_DL_H 1
+#define HAVE_DL_H 1
 #define HAVE_NL_LANGINFO 1
 #define HAVE_SETLOCALE 1
 #define HAVE_GETENV 1
-#define RJB_RUBY_VERSION_CODE 191
+#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 126 2010-07-22 13:58:15Z arton $
+ * $Id: rjb.c 131 2010-09-16 15:53:33Z arton $
  */
 
-#define RJB_VERSION "1.2.6"
+#define RJB_VERSION "1.2.8"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -56,10 +56,10 @@
     var = (*jenv)->GetStaticMethodID(jenv, obj, name, sig); \
     rjb_check_exception(jenv, 1)
 #if defined(RUBINIUS)
-#define CLASS_NEW(obj, name) rb_define_class(name, obj)
+#define CLASS_NEW(obj, name) rb_define_class_under(rjb, name, obj)
 #define CLASS_INHERITED(spr, kls) rb_funcall(spr, rb_intern("inherited"), 1, kls)
 #else
-#define CLASS_NEW(obj, name) rb_class_new(obj)
+#define CLASS_NEW(obj, name) rb_define_class_under(rjb, name, obj)
 #define CLASS_INHERITED(spr, kls) rb_class_inherited(spr, kls)
 #endif
 #define IS_RJB_OBJECT(v) (CLASS_INHERITED(rjbi, rb_obj_class(v)) || rb_obj_class(v) == rjb)
@@ -659,7 +659,7 @@ static void rv2jlong(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, int
     switch (TYPE(val))
     {
     case T_FIXNUM:
-	jv->j = NUM2INT(val);
+	jv->j = FIX2LONG(val);
 	break;
     default:
 #if HAVE_LONG_LONG
@@ -672,8 +672,17 @@ static void rv2jlong(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, int
 }
 static void rv2jshort(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, int release)
 {
-    if (!release)
-	jv->s = (short)NUM2INT(val);    
+    if (release) return;
+    if (TYPE(val) == T_FIXNUM)
+    {
+        int n = FIX2INT(val);    
+        if (abs(n) < 0x7fff)
+        {
+            jv->s = (short)n;
+            return;
+        }
+    }
+    rb_raise(rb_eRuntimeError, "can't change to short");
 }
 static void rv2jboolean(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, int release)
 {
@@ -2181,7 +2190,11 @@ static VALUE get_signatures(VALUE mname, st_table* st)
     ret = rb_ary_new();
     for (; pm; pm = pm->next)
     {
-        rb_ary_push(ret, rb_str_new2(pm->basic.method_signature));
+        if (pm->basic.method_signature) {
+            rb_ary_push(ret, rb_str_new2(pm->basic.method_signature));
+        } else {
+            rb_ary_push(ret, Qnil);
+        }
     }
     return ret;
 }

data/lib/rjb.rb

@@ -20,4 +20,72 @@ end
 
 require 'rjbcore'
 
+module Rjb
+  MODIFIER = import('java.lang.reflect.Modifier')
 
+  module JMethod
+    def instance_method?(m)
+      m.modifiers & MODIFIER.STATIC == 0
+    end
+    def public_method?(m)
+      (m.modifiers & MODIFIER.PUBLIC) == MODIFIER.PUBLIC
+    end
+    def jmethods(org, klass, &blk)
+      (org + klass.getMethods.select do |m|
+         blk.call(m)
+      end.map do |m|
+        m.name
+      end).uniq
+    end
+    def format_sigs(s)
+      if s.size < 0
+        ''
+      elsif s.size == 1
+        s[0]
+      else
+        "[#{s.map{|m|m.nil? ? 'void' : m}.join(', ')}]"
+      end
+    end
+  end
+
+  class Rjb_JavaClass
+    include JMethod
+    def public_methods(inh = true)
+      jmethods(super(inh), self) do |m|
+        !instance_method?(m) && public_method?(m)
+      end
+    end
+    def methods(inh = true)
+      jmethods(super(inh), self) do |m|
+        !instance_method?(m) && public_method?(m)
+      end
+    end
+    def java_methods
+      jmethods([], self) do |m|
+        !instance_method?(m) && public_method?(m)
+      end.map do |m|
+        "#{m}(#{format_sigs(self.static_sigs(m))})"
+      end
+    end
+  end
+  class Rjb_JavaProxy
+    include JMethod
+    def public_methods(inh = true)
+      jmethods(super(inh), getClass) do |m|
+        instance_method?(m) && public_method?(m)
+      end
+    end
+    def methods(inh = true)
+      jmethods(super(inh), getClass) do |m|
+        instance_method?(m) && public_method?(m)
+      end
+    end
+    def java_methods
+      jmethods([], getClass) do |m|
+        instance_method?(m) && public_method?(m)
+      end.map do |m|
+        "#{m}(#{format_sigs(getClass.sigs(m))})"
+      end
+    end
+  end
+end

data/test/test.rb

@@ -1,6 +1,6 @@
 #!/usr/local/env ruby -Ku
 # encoding: utf-8
-# $Id: test.rb 126 2010-07-22 13:58:15Z arton $
+# $Id: test.rb 133 2010-09-16 16:01:02Z arton $
 
 begin
   require 'rjb'
@@ -257,7 +257,7 @@ class TestRjb < Test::Unit::TestCase
   def test_unbind()
     it = TestIter.new
     it = bind(it, 'java.util.Iterator')
-    assert(it, unbind(it))
+    assert_equal(it, unbind(it))
   end
 
   class TestComparator
@@ -274,9 +274,9 @@ class TestRjb < Test::Unit::TestCase
     cp = bind(cp, 'java.util.Comparator')
     test = import('jp.co.infoseek.hp.arton.rjb.Test')
     a = test.new
-    assert(0, a.check(cp, 123, 123))
-    assert(5, a.check(cp, 81, 76))
-    assert(-5, a.check(cp, 76, 81))
+    assert_equal(0, a.check(cp, 123, 123))
+    assert_equal(5, a.check(cp, 81, 76))
+    assert_equal(-5, a.check(cp, 76, 81))
   end
 
   # assert_raise is useless in this test, because NumberFormatException may be defined in
@@ -683,6 +683,10 @@ class TestRjb < Test::Unit::TestCase
     sig = @jString.sigs('indexOf').sort
     assert_equal(expected, sig)
   end
+  def test_fetch_method_without_signature
+    sig = 
+    assert_equal([nil], @jString.sigs('toString'))
+  end
   def test_fetch_static_method_signature
     expected = ['Ljava.lang.String;[Ljava.lang.Object;', 
                 'Ljava.util.Locale;Ljava.lang.String;[Ljava.lang.Object;']
@@ -694,5 +698,37 @@ class TestRjb < Test::Unit::TestCase
     sig = @jInteger.ctor_sigs.sort
     assert_equal(expected, sig)
   end
+  def test_methods_extension
+    m = @jString.new('').methods
+    assert m.include?('indexOf')
+  end
+  def test_class_methods_extension
+    m = @jString.methods
+    assert m.include?('format')
+  end
+  def test_pmethods_extension
+    m = @jString.new('').public_methods
+    assert m.include?('indexOf')
+  end
+  def test_class_pmethods_extension
+    m = @jString.public_methods
+    assert m.include?('format')
+  end
+  def test_java_methods
+    indexof = @jString.new('').java_methods.find do |m|
+      m =~ /^indexOf/
+    end
+    args = indexof.match(/\[([^\]]+)\]/)[1]
+    assert_equal('Ljava.lang.String;I, II, I, Ljava.lang.String;'.split(/,\s*/).sort, 
+                 args.split(/,\s*/).sort)
+  end
+  def test_java_class_methods
+    m = @jString.java_methods
+    assert m.include?('format([Ljava.lang.String;[Ljava.lang.Object;, Ljava.util.Locale;Ljava.lang.String;[Ljava.lang.Object;])')
+  end
+  def test_64fixnum
+    big = @jLong.new_with_sig('J', 1230918239495)
+    assert_equal 1230918239495, big.long_value
+  end
 end
 

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rjb
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 6
-  version: 1.2.6
+  version: 1.2.8
 platform: ruby
 authors: 
 - arton
@@ -15,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-22 00:00:00 +09:00
+date: 2010-09-17 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -32,33 +26,32 @@ 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/extconf.h
+- ext/jniwrap.h
 - ext/rjb.h
 - ext/depend
 - data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
 - lib/rjb.rb
 - lib/rjbextension.rb
 - samples/filechooser.rb
+- test/test.rb
 - test/exttest.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/IBase.class
-- test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.class
 - 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/ExtBase.class
 - test/rjbtest.jar
 - COPYING
 - ChangeLog
 - readme.sj
 - readme.txt
-- ext/extconf.rb
 has_rdoc: true
 homepage: http://rjb.rubyforge.org/
 licenses: []
@@ -69,30 +62,22 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 51
-      segments: 
-      - 1
-      - 8
-      - 2
       version: 1.8.2
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: 
 - none
 - JDK 5.0
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Ruby Java bridge