rjb 1.2.2 → 1.2.3

data/ChangeLog

@@ -1,3 +1,13 @@
+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	
+ *ext/rjbexception.c
+	to accomodate with rubinius	
 Sun May 30 arton
  *lib/rjbextension.rb
 	Rjb extension from Andreas Ronge's neo4j

data/ext/extconf.h

@@ -0,0 +1,9 @@
+#ifndef EXTCONF_H
+#define EXTCONF_H
+#define HAVE_JNI_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 187
+#endif

data/ext/load.c

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: load.c 112 2010-05-29 03:09:11Z arton $
+ * $Id: load.c 119 2010-06-04 12:51:34Z arton $
  */
 
 #include <stdlib.h>
@@ -104,11 +104,13 @@ static int open_jvm(char* libpath)
     VALUE* argv;
 
     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;
     }
+#endif
     argv = ALLOCA_N(VALUE, 4);
     *argv = rb_const_get(rb_cObject, rb_intern("DL"));
     *(argv + 1) = rb_intern("dlopen");
@@ -204,8 +206,13 @@ static int load_bridge(JNIEnv* jenv)
     jmethodID getSysLoader = (*jenv)->GetStaticMethodID(jenv, loader,
 		   "getSystemClassLoader", "()Ljava/lang/ClassLoader;");
     jobject iloader = (*jenv)->CallStaticObjectMethod(jenv, loader, getSysLoader);
+#if defined(RUBINIUS)
+    VALUE v = rb_const_get(rb_cObject, rb_intern("RjbConf"));
+    v = rb_const_get(v, rb_intern("BRIDGE_FILE"));
+#else
     VALUE v = rb_const_get_at(rb_const_get(rb_cObject, rb_intern("RjbConf")), 
 			      rb_intern("BRIDGE_FILE"));
+#endif
     bridge = StringValuePtr(v);
 #if defined(DOSISH)
     bridge = ALLOCA_N(char, strlen(bridge) + 8);

data/ext/riconv.c

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: riconv.c 104 2010-03-16 12:19:18Z arton $
+ * $Id: riconv.c 117 2010-06-04 12:16:25Z arton $
  */
 
 #include "ruby.h"
@@ -43,6 +43,7 @@ static const char* const CS_SJIS = "SHIFT_JIS";
 static const char* const CS_UTF8 = "UTF-8";
 
 
+#if RJB_RUBY_VERSION_CODE < 190
 static VALUE objIconvJ2R;
 static VALUE objIconvR2J;
 static const char* charcode; //is this necessary?
@@ -58,7 +59,9 @@ static int find_table(const char* const str, const char* const table[])
     }
     return 0;
 }
+#endif
 
+#if RJB_RUBY_VERSION_CODE < 190
 static const char* get_charcode_name_by_locale(const char* const name)
 {
     if (find_table(name, LOCALE_UTF8_TABLE))
@@ -119,8 +122,9 @@ static const char* get_charcode_name()
     }
     return result;
 }
+#endif
 
-
+#if RJB_RUBY_VERSION_CODE < 190
 static void reinit()
 {
     charcode = get_charcode_name();
@@ -142,7 +146,9 @@ static void reinit()
         objIconvR2J = objIconvJ2R = Qnil;
     }
 }
+#endif
 
+#if RJB_RUBY_VERSION_CODE < 190
 static void check_kcode()
 {
     VALUE rb_iconv_klass = rb_const_get(rb_cObject, rb_intern("Iconv"));
@@ -161,6 +167,7 @@ static void check_kcode()
         objIconvR2J = objIconvJ2R = Qnil;
     }
 }
+#endif
 
 VALUE exticonv_local_to_utf8(VALUE local_string)
 {

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 112 2010-05-29 03:09:11Z arton $
+ * $Id: rjb.c 119 2010-06-04 12:51:34Z arton $
  */
 
-#define RJB_VERSION "1.2.2"
+#define RJB_VERSION "1.2.3"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -55,7 +55,14 @@
 #define RJB_LOAD_STATIC_METHOD(var, obj, name, sig) \
     var = (*jenv)->GetStaticMethodID(jenv, obj, name, sig); \
     rjb_check_exception(jenv, 1)
-#define IS_RJB_OBJECT(v) (rb_class_inherited(rjbi, rb_obj_class(v)) || rb_obj_class(v) == rjb)
+#if defined(RUBINIUS)
+#define CLASS_NEW(obj, name) rb_define_class(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_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)
 #define USER_INITIALIZE "@user_initialize"
 
 static void register_class(VALUE, VALUE);
@@ -780,7 +787,7 @@ static void rv2jobject(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, in
 		    Data_Get_Struct(val, struct rj_bridge, ptr);
 		    jv->l = ptr->proxy;
 		}
-		else if (rb_class_inherited(rjbc, rb_obj_class(val))) 
+		else if (CLASS_INHERITED(rjbc, rb_obj_class(val))) 
 		{
 		    struct jv_data* ptr;
 		    Data_Get_Struct(val, struct jv_data, ptr);
@@ -1780,10 +1787,10 @@ static int clear_classes(VALUE key, VALUE val, VALUE dummy)
 static VALUE rjb_s_unload(int argc, VALUE* argv, VALUE self)
 {
     int result = 0;
-#ifdef HAVE_RB_HASH_FOREACH
+#if defined(HAVE_RB_HASH_FOREACH) || defined(RUBINIUS)
 	rb_hash_foreach(rjb_loaded_classes, clear_classes, 0);
 #else
-#ifdef RHASH_TBL
+#if defined(RHASH_TBL)
     st_foreach(RHASH_TBL(rjb_loaded_classes), clear_classes, 0);
 #else
     st_foreach(RHASH(rjb_loaded_classes)->tbl, clear_classes, 0);
@@ -2264,7 +2271,11 @@ static VALUE rjb_class_eval(int argc, VALUE* argv, VALUE self)
 static VALUE rjb_s_unbind(VALUE self, VALUE rbobj)
 {
     JNIEnv* jenv = rjb_prelude();
+#if defined(RUBINIUS)
+    return rb_funcall(proxies, rb_intern("delete"), 1, rbobj);
+#else
     return rb_ary_delete(proxies, rbobj);
+#endif
 }
 
 /*
@@ -2303,7 +2314,7 @@ static void register_class(VALUE self, VALUE clsname)
      * the hash was frozen, so it need to call st_ func directly.
      */
 
-#ifdef HAVE_RB_HASH_ASET
+#if defined(HAVE_RB_HASH_ASET) || defined(RUBINIUS)
 	rb_hash_aset(rjb_loaded_classes, clsname, self);
 #else
 #ifdef RHASH_TBL
@@ -2850,8 +2861,11 @@ static VALUE rjb_class_forname(int argc, VALUE* argv, VALUE self)
  */
 void Init_rjbcore()
 {
+#if defined(RUBINIUS)
+    rb_require("iconv");
+#else
     rb_protect((VALUE(*)(VALUE))rb_require, (VALUE)"iconv", NULL);
-
+#endif
     rjb_loaded_classes = rb_hash_new();
 #ifndef RUBINIUS
     OBJ_FREEZE(rjb_loaded_classes);
@@ -2860,7 +2874,7 @@ void Init_rjbcore()
     proxies = rb_ary_new();
     rb_global_variable(&proxies);
     user_initialize = rb_intern(USER_INITIALIZE);
-    
+
     rjb = rb_define_module("Rjb");
     rb_define_module_function(rjb, "load", rjb_s_load, -1);
     rb_define_module_function(rjb, "unload", rjb_s_unload, -1);
@@ -2874,14 +2888,14 @@ void Init_rjbcore()
     rb_define_const(rjb, "VERSION", rb_str_new2(RJB_VERSION));
 
     /* Java class object */    
-    rjbc = rb_class_new(rb_cObject);
+    rjbc = CLASS_NEW(rb_cObject, "Rjb_JavaClass");
     rb_gc_register_address(&rjbc);
     rb_define_method(rjbc, "method_missing", rjb_missing, -1);
     rb_define_method(rjbc, "_invoke", rjb_invoke, -1);
     rb_define_method(rjbc, "_classname", rjb_i_class, 0);
 
     /* Java instance object */
-    rjbi = rb_class_new(rb_cObject);
+    rjbi = CLASS_NEW(rb_cObject, "Rjb_JavaProxy");
     rb_gc_register_address(&rjbi);
     rb_define_method(rjbi, "method_missing", rjb_i_missing, -1);    
     rb_define_method(rjbi, "_invoke", rjb_i_invoke, -1);
@@ -2890,7 +2904,7 @@ void Init_rjbcore()
     rb_define_alias(rjbi, "include", "extend");
 
     /* Ruby-Java Bridge object */
-    rjbb = rb_class_new(rb_cObject);
+    rjbb = CLASS_NEW(rb_cObject, "Rjb_JavaBridge");
     rb_gc_register_address(&rjbb);
 }
 

data/ext/rjbexception.c

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjbexception.c 112 2010-05-29 03:09:11Z arton $
+ * $Id: rjbexception.c 119 2010-06-04 12:51:34Z arton $
  */
 
 #include "ruby.h"
@@ -54,7 +54,7 @@ VALUE rjb_get_exception_class(JNIEnv* jenv, jstring str)
     if (rexp == Qnil)
     {
 	rexp = rb_define_class(pcls, rb_eStandardError);
-#ifdef HAVE_RB_HASH_ASET
+#if defined(HAVE_RB_HASH_ASET) || defined(RUBINIUS)
 	rb_hash_aset(rjb_loaded_classes, cname, rexp);
 #else
 #ifdef RHASH_TBL

data/lib/rjbextension.rb

@@ -11,7 +11,7 @@ Copyright(c) 2010 arton
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
-$Id:$
+$Id: rjbextension.rb 116 2010-05-30 14:23:07Z arton $
 
  This file is from Andreas Ronge project neo4j
    http://github.com/andreasronge/neo4j/blob/rjb/lib/rjb_ext.rb

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rjb
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
+  hash: 25
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - arton
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-30 00:00:00 +09:00
+date: 2010-06-05 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -26,31 +32,33 @@ 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/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.class
 - test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.class
-- test/jp/co/infoseek/hp/arton/rjb/ExtBase.class
+- test/jp/co/infoseek/hp/arton/rjb/Test.class
 - test/rjbtest.jar
 - COPYING
 - ChangeLog
 - readme.sj
 - readme.txt
+- ext/extconf.rb
 has_rdoc: true
 homepage: http://rjb.rubyforge.org/
 licenses: []
@@ -61,22 +69,30 @@ 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.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby Java bridge