rjb 1.0.6-mswin32 → 1.0.7-mswin32

data/ChangeLog

@@ -1,3 +1,18 @@
+Fri Sep 14 arton
+ *rjb.c
+	version 1.0.7
+	add auto primitive conversion toggled by Rjb::primitive_conversion
+ *test.rb
+	add test_auto_conv
+Sun Jun 17 arton
+ *rjb.c
+        add method aliases.
+	setXxYy -> xx_yy=
+	getXxYy -> xx_yy
+	isXxYy  -> xx_yy?
+	xxYyZz  -> xx_yy_zz
+ *test.rb
+	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. 

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 15 2007-06-16 18:00:13Z arton $
+ * $Id: rjb.c 19 2007-09-14 14:59:29Z arton $
  */
 
-#define RJB_VERSION "1.0.6"
+#define RJB_VERSION "1.0.7"
 
 #include "ruby.h"
 #include "st.h"
@@ -44,6 +44,7 @@ static VALUE rjb_class_forname(int argc, VALUE* argv, VALUE self);
 static void setup_metadata(JNIEnv* jenv, VALUE self, struct jv_data*, VALUE classname);
 static VALUE jarray2rv(JNIEnv* jenv, jvalue val);
 static jarray r2objarray(JNIEnv* jenv, VALUE v, const char* cls);
+static VALUE jv2rv_withprim(JNIEnv* jenv, jobject o);
 
 static VALUE rjb;
 static VALUE jklass;
@@ -57,6 +58,7 @@ JavaVM* rjb_jvm;
 jclass rjb_rbridge;
 jmethodID rjb_register_bridge;
 static JNIEnv* main_jenv;
+static VALUE primitive_conversion = Qfalse;
 
 /*
  * Object cache, never destroyed
@@ -224,7 +226,7 @@ static VALUE jv2rclass(JNIEnv* jenv, jclass jc)
     return v;
 }
 
-static VALUE jv2rv(JNIEnv* jenv, jvalue val)
+static VALUE jv2rv_r(JNIEnv* jenv, jvalue val)
 {
     const char* cname;
     jstring nm;
@@ -262,6 +264,15 @@ static VALUE jv2rv(JNIEnv* jenv, jvalue val)
     return v;
 }
 
+static VALUE jv2rv(JNIEnv* jenv, jvalue val)
+{
+    if (primitive_conversion == Qfalse)
+    {
+        return jv2rv_r(jenv, val);
+    }
+    return jv2rv_withprim(jenv, val.l);
+}
+
 static VALUE jvoid2rv(JNIEnv* jenv, jvalue val)
 {
     return Qnil;
@@ -535,7 +546,7 @@ static VALUE jv2rv_withprim(JNIEnv* jenv, jobject o)
 	}
     }
     jv.l = o;
-    return jv2rv(jenv, jv);
+    return jv2rv_r(jenv, jv);
 }
 
 /*
@@ -1730,6 +1741,24 @@ static VALUE rjb_s_classes(VALUE self)
     return rjb_loaded_classes;
 }
 
+/**
+ * For JRuby conpatible optsion
+ */
+static VALUE rjb_s_set_pconversion(VALUE self, VALUE val)
+{
+    primitive_conversion = (val == Qnil || val == Qfalse) ? Qfalse : Qtrue;
+    return val;
+}
+
+/**
+ * For JRuby conpatible optsion
+ */
+static VALUE rjb_s_get_pconversion(VALUE self)
+{
+    return primitive_conversion;
+}
+
+
 /*
  * free java class
  */
@@ -2657,6 +2686,8 @@ void Init_rjbcore()
     rb_define_module_function(rjb, "bind", rjb_s_bind, 2);
     rb_define_module_function(rjb, "classes", rjb_s_classes, 0);
     rb_define_module_function(rjb, "throw", rjb_s_throw, -1);
+    rb_define_module_function(rjb, "primitive_conversion=", rjb_s_set_pconversion, 1);
+    rb_define_module_function(rjb, "primitive_conversion", rjb_s_get_pconversion, 0);
     rb_define_const(rjb, "VERSION", rb_str_new2(RJB_VERSION));
 
     /* Java class object */    

data/test/test.rb

@@ -1,5 +1,5 @@
 #!/usr/local/env ruby
-# $Id: test.rb 16 2007-06-16 18:00:49Z arton $
+# $Id: test.rb 19 2007-09-14 14:59:29Z arton $
 
 require 'test/unit'
 require 'rjb'
@@ -9,6 +9,7 @@ class TestRjb < Test::Unit::TestCase
   include Rjb
   def setup
     load('.')
+    Rjb::primitive_conversion = false
   end
 
   def tearDown
@@ -435,5 +436,26 @@ class TestRjb < Test::Unit::TestCase
     sb.length = 2
     assert_equal('aB', sb.to_string)
   end
+
+  def test_auto_conv
+    assert_equal(false, Rjb::primitive_conversion)
+    Rjb::primitive_conversion = true
+    assert_equal(true, Rjb::primitive_conversion)
+    jInteger = Rjb::import('java.lang.Integer')
+    assert_equal(1, jInteger.valueOf('1'))
+    assert_equal(-1, jInteger.valueOf('-1'))
+    jShort = Rjb::import('java.lang.Short')
+    assert_equal(2, jShort.valueOf('2'))
+    assert_equal(-2, jShort.valueOf('-2'))
+    jDouble = Rjb::import('java.lang.Double')
+    assert_equal(3.1, jDouble.valueOf('3.1'))
+    jFloat = Rjb::import('java.lang.Float')
+    assert_equal(4.5, jFloat.valueOf('4.5'))
+    jBoolean = Rjb::import('java.lang.Boolean')
+    assert(jBoolean.TRUE)
+    jByte = Rjb::import('java.lang.Byte')
+    assert_equal(5, jByte.valueOf('5'))
+    assert_equal(-6, jByte.valueOf('-6'))
+  end
 end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: rjb
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
-date: 2007-06-17 00:00:00 +09:00
+  version: 1.0.7
+date: 2007-09-14 00:00:00 +09:00
 summary: Ruby Java bridge
 require_paths: 
 - lib
@@ -32,22 +32,22 @@ files:
 - ext/RBridge.java
 - ext/load.c
 - ext/riconv.c
-- ext/rjbexception.c
 - ext/rjb.c
+- ext/rjbexception.c
 - ext/jniwrap.h
-- ext/rjb.h
-- ext/riconv.h
 - ext/jp_co_infoseek_hp_arton_rjb_RBridge.h
+- ext/riconv.h
+- ext/rjb.h
 - ext/depend
 - data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
 - lib/rjb.rb
 - samples/filechooser.rb
-- test/test.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.class
 - COPYING
 - ChangeLog
 - readme.sj