rua 0.3.3 → 0.3.5

data/README.txt

@@ -27,6 +27,7 @@ http://storehouse.sakura.ne.jp/rua/
     class MyClass; end
     
     rua = Rua.new(:all)
+    #rua.external_charset = Rua::SJIS
     #rua.openlibs(:base, :package, :string)
     #rua.secure = false
     rua.abort_by_error = false
@@ -93,3 +94,7 @@ http://storehouse.sakura.ne.jp/rua/
     p co.resume('x', 'y')
     
     p rua.f.info.to_hash
+
+== Notice
+=== License for Lua 5.0 and later versions
+Copyright (c) 1994-2007 Lua.org, PUC-Rio.

data/ext/extconf.rb

@@ -1,6 +1,6 @@
 require 'mkmf'
 
 dir_config('lua', '/usr/include/lua5.1', '/usr/lib')
-if have_header('lua.h') and have_header('lualib.h') and have_header('lauxlib.h') and have_library('lua5.1')
+if have_header('lua.h') and have_header('lualib.h') and have_header('lauxlib.h') and have_library('lua5.1') and have_header('iconv.h') and have_header('errno.h')
   create_makefile('rua')
 end

data/ext/rua.c

@@ -7,6 +7,8 @@ __declspec(dllexport) void Init_rua(void);
 
 #include <stddef.h>
 #include <string.h>
+#include <malloc.h>
+#include <errno.h>
 
 #include "ruby.h"
 
@@ -14,11 +16,18 @@ __declspec(dllexport) void Init_rua(void);
 #include "lualib.h"
 #include "lauxlib.h"
 
+#include "iconv.h"
+
 #include "rua.h"
 
-#define VERSION "0.3.3"
+#define VERSION   "0.3.5"
 #define REF_RBOBJ "self"
 
+#define ICONV_JIS   "ISO-2022-JP"
+#define ICONV_SJIS  "SJIS"
+#define ICONV_EUC   "eucJP"
+#define ICONV_UTF8  "UTF-8"
+
 static const char *insecure_methods[] = {
   "__id__",
   "__send__",
@@ -87,6 +96,10 @@ void Init_rua() {
 
   rb_define_alloc_func(Rua, rua_alloc);
   rb_define_const(Rua, "VERSION", rb_str_new2(VERSION));
+  rb_define_const(Rua, "JIS", rb_str_new2(ICONV_JIS));
+  rb_define_const(Rua, "SJIS", rb_str_new2(ICONV_SJIS));
+  rb_define_const(Rua, "EUC", rb_str_new2(ICONV_EUC));
+  //rb_define_const(Rua, "UTF8", rb_str_new2(ICONV_UTF8));
   rb_define_private_method(Rua, "initialize", rua_initialize, -1);
   rb_define_method(Rua, "openlibs", rua_openlibs, -1);
   rb_define_method(Rua, "eval", rua_eval, 1);
@@ -98,6 +111,8 @@ void Init_rua() {
   rb_define_method(Rua, "abort_by_error=", rua_set_abort_by_error, 1);
   rb_define_method(Rua, "wrap_error", rua_get_wrap_error, 0);
   rb_define_method(Rua, "wrap_error=", rua_set_wrap_error, 1);
+  rb_define_method(Rua, "external_charset", rua_get_external_charset, 0);
+  rb_define_method(Rua, "external_charset=", rua_set_external_charset, 1);
   rb_define_method(Rua, "error_handler", rua_get_error_handler, 0);
   rb_define_method(Rua, "error_handler=", rua_set_error_handler, 1);
   rb_define_method(Rua, "method_missing", rua_method_missing, -1);
@@ -147,6 +162,7 @@ static VALUE rua_alloc(VALUE klass) {
   p->R->rua = Qnil;
   p->R->refs = Qnil;
   p->R->error_handler = Qnil;
+  p->R->external_charset = Qnil;
   p->R->secure = 1;
   p->R->abort_by_error = 1;
   p->R->wrap_error = 1;
@@ -157,6 +173,7 @@ static void rua_mark(struct rua *p) {
   rb_gc_mark(p->R->rua);
   rb_gc_mark(p->R->refs);
   rb_gc_mark(p->R->error_handler);
+  rb_gc_mark(p->R->external_charset);
 }
 
 static void rua_free(struct rua *p) {
@@ -182,6 +199,7 @@ static VALUE rua_initialize(int argc, VALUE *argv, VALUE self) {
   p->R->rua = self;
   p->R->refs = rb_hash_new();
   p->R->error_handler = Qnil;
+  p->R->external_charset = Qnil;
   p->R->secure = 1;
   p->R->abort_by_error = 1;
   p->R->wrap_error = 1;
@@ -257,6 +275,11 @@ static VALUE rua_eval(VALUE self, VALUE str) {
 
   Check_Type(str, T_STRING);
   Data_Get_Struct(self, struct rua, p);
+
+  if (!NIL_P(p->R->external_charset)) {
+    str = rua_iconv(ICONV_UTF8, StringValuePtr(p->R->external_charset), str);
+  }
+
   pretop = lua_gettop(p->L);
   luaL_loadstring(p->L, StringValuePtr(str));
 
@@ -396,6 +419,34 @@ static VALUE rua_set_wrap_error(VALUE self, VALUE wrap_error) {
   return Qnil;
 }
 
+/**
+ * get external character set.
+ */
+static VALUE rua_get_external_charset(VALUE self) {
+  struct rua *p;
+
+  Data_Get_Struct(self, struct rua, p);
+  return p->R->external_charset;
+}
+
+/**
+ * set external character set.
+ */
+static VALUE rua_set_external_charset(VALUE self, VALUE external_charset) {
+  struct rua *p;
+
+  Data_Get_Struct(self, struct rua, p);
+
+  if (NIL_P(external_charset)) {
+    p->R->external_charset = Qnil;
+  } else {
+    Check_Type(external_charset, T_STRING);
+    p->R->external_charset = external_charset;
+  }
+
+  return Qnil;
+}
+
 /**
  * get error handler.
  */
@@ -458,6 +509,7 @@ static void rua_ref_mark(struct rua_ref *p) {
   rb_gc_mark(p->R->rua);
   rb_gc_mark(p->R->refs);
   rb_gc_mark(p->R->error_handler);
+  rb_gc_mark(p->R->external_charset);
 }
 
 static void rua_ref_free(struct rua_ref *p) {
@@ -797,6 +849,11 @@ static VALUE rua_torbval(lua_State *L, int idx, struct rua_state *R) {
 
   case LUA_TSTRING:
     rbval = rb_str_new2(lua_tostring(L, idx));
+
+    if (!NIL_P(R->external_charset)) {
+      rbval = rua_iconv(StringValuePtr(R->external_charset), ICONV_UTF8, rbval);
+    }
+
     break;
 
   case LUA_TTABLE:
@@ -884,6 +941,10 @@ static void rua_pushrbval(lua_State *L, VALUE rbval, struct rua_state *R) {
     break;
 
   case T_STRING:
+    if (!NIL_P(R->external_charset)) {
+      rbval = rua_iconv(ICONV_UTF8, StringValuePtr(R->external_charset), rbval);
+    }
+
     lua_pushstring(L, StringValuePtr(rbval));
     break;
 
@@ -917,6 +978,7 @@ static void rua_pushrbval(lua_State *L, VALUE rbval, struct rua_state *R) {
       lua_pushlightuserdata(L, (void *) rbval);
       lua_pushlightuserdata(L, R);
       lua_pushcclosure(L, rua_proc_call, 2);
+      rua_set_finalizer(L, -1, rbval, R);
     } else {
       rua_newtable_from_obj(L, rbval, R);
     }
@@ -967,6 +1029,7 @@ static void rua_newtable_from_obj(lua_State *L, VALUE obj, struct rua_state *R)
 
   lua_pushstring(L, REF_RBOBJ);
   lua_pushlightuserdata(L, (void *) obj);
+  rua_set_finalizer(L, -1, obj, R);
   lua_rawset(L, tblidx);
   rb_hash_aset(R->refs, obj, Qtrue);
 
@@ -1149,3 +1212,77 @@ static const char *rua_classname_ptr(VALUE v) {
 
   return StringValuePtr(klassname);
 }
+
+static void rua_set_finalizer(lua_State *L, int idx, VALUE rbobj, struct rua_state *R) {
+  int pretop, objidx, tblidx;
+
+  pretop = lua_gettop(L);
+  lua_pushvalue(L, idx);
+  objidx = lua_gettop(L);
+
+  if (!lua_getmetatable(L, objidx)) {
+    lua_newtable(L);
+    lua_setmetatable(L, objidx);
+    lua_getmetatable(L, objidx);
+  }
+
+  tblidx = lua_gettop(L);
+  lua_pushstring(L, "__gc");
+
+  lua_pushlightuserdata(L, (void *) rbobj);
+  lua_pushlightuserdata(L, R);
+  lua_pushcclosure(L, rua_finalize_rbobj, 2);
+
+  lua_rawset(L, tblidx);
+  lua_pop(L, lua_gettop(L) - pretop);
+}
+
+static int rua_finalize_rbobj(lua_State *L) {
+  struct rua_state *R;
+  VALUE rbobj;
+
+  if (lua_gettop(L) > 0) {
+    rbobj = (VALUE) lua_touserdata(L, lua_upvalueindex(1));  
+    R = (struct rua_state *) lua_touserdata(L, lua_upvalueindex(2));
+
+    if (rbobj) {
+      rb_hash_delete(R->refs, rbobj);
+    }
+  }
+
+  return 0;
+}
+
+static VALUE rua_iconv(const char *to, const char *from, VALUE in) {
+  VALUE out;
+  iconv_t cd;
+  char *cin, *cout, *pcout;
+  size_t cin_len, cout_len;
+
+  cd = iconv_open(to, from);
+
+  if ((int) cd == -1) {
+    rb_warn("%s (%s, %s)", to, from, strerror(errno));
+    return Qnil;
+  }
+
+  cin = StringValuePtr(in);
+  cin_len = strlen(cin);
+  cout_len = cin_len * 3 + 1;
+  cout = pcout = alloca(sizeof(char) * cout_len);
+
+  if (iconv(cd, &cin, &cin_len, &pcout, &cout_len) == -1) {
+    rb_warn("%s (%s, %s)", to, from, strerror(errno));
+    iconv_close(cd);
+    return Qnil;
+  }
+
+  *pcout = '\0';
+  out = rb_str_new2(cout);
+
+  if (iconv_close(cd) != 0) {
+    rb_warn("%s (%s, %s)", to, from, strerror(errno));
+  }
+
+  return out;
+}

data/ext/rua.h

@@ -5,6 +5,7 @@ struct rua_state {
   VALUE rua;
   VALUE refs;
   VALUE error_handler;
+  VALUE external_charset;
   int secure;
   int abort_by_error;
   int wrap_error;
@@ -53,6 +54,8 @@ static VALUE rua_get_abort_by_error(VALUE self);
 static VALUE rua_set_abort_by_error(VALUE self, VALUE abort_by_error);
 static VALUE rua_get_wrap_error(VALUE self);
 static VALUE rua_set_wrap_error(VALUE self, VALUE wrap_error);
+static VALUE rua_get_external_charset(VALUE self);
+static VALUE rua_set_external_charset(VALUE self, VALUE external_charset);
 static VALUE rua_get_error_handler(VALUE self);
 static VALUE rua_set_error_handler(VALUE self, VALUE error_handler);
 static VALUE rua_method_missing(int argc, VALUE *argv, VALUE self);
@@ -109,5 +112,8 @@ static VALUE rua_to_s(VALUE v);
 static const char *rua_to_sptr(VALUE v);
 static VALUE rua_classname(VALUE v);
 static const char *rua_classname_ptr(VALUE v);
+static int rua_finalize_rbobj(lua_State *L);
+static void rua_set_finalizer(lua_State *L, int idx, VALUE rbobj, struct rua_state *R);
+static VALUE rua_iconv(const char *to, const char *from, VALUE in);
 
 #endif

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: rua
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
-date: 2007-11-29 00:00:00 +09:00
+  version: 0.3.5
+date: 2007-12-10 00:00:00 +09:00
 summary: Rua is a library for using Lua under Ruby.
 require_paths: 
 - lib