rua 0.1.0 → 0.1.1

data/README.txt

@@ -0,0 +1,38 @@
+= rua
+
+Copyright (c) 2007 SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+
+== Description
+
+Rua is a library for using Lua under Ruby.
+
+== Example
+
+    require 'rua'
+    
+    rua = Rua.new
+    rua.openlibs(:all)
+    #rua.openlibs(:base, :package, :string)
+    #rua.secure = false
+    
+    rua[:str] = 'xxx'
+    rua[:num] = 100
+    rua[:proc] = lambda do
+      puts 'Proc called.'
+    end
+    
+    puts rua.eval(<<EOS)
+      print('hello Rua!')
+      print(str)
+      print(num)
+      proc()
+    
+      f = function()
+        print('f() called.')
+      end
+    
+      return true
+    EOS
+    
+    f = rua[:f]
+    f.call

data/ext/rua.c

@@ -46,15 +46,16 @@ static const char *insecure_methods[] = {
 };
 
 static const int insecure_method_num = sizeof(insecure_methods) / sizeof(char*);
+static VALUE Rua, RuaFunc, RuaError;
+static VALUE s_all, s_base, s_package, s_string, s_table, s_math, s_io, s_debug;
 
 void Init_rua() {
-  VALUE Rua, RuaFunc, RuaError;
-
   Rua = rb_define_class("Rua", rb_cObject);
   RuaFunc = rb_define_class("RuaFunc", rb_cObject);
   RuaError = rb_define_class("RuaError", rb_eStandardError);
 
   rb_define_alloc_func(Rua, rua_alloc);
+  rb_define_const(Rua, "VERSION", rb_str_new2("0.1.1"));
   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);
@@ -66,6 +67,15 @@ void Init_rua() {
   rb_define_alloc_func(RuaFunc, rua_func_alloc);
   rb_define_private_method(RuaFunc, "initialize", rua_func_initialize, 0);
   rb_define_method(RuaFunc, "call", rua_func_call, -1);
+
+  s_all     = ID2SYM(rb_intern("all"));
+  s_base    = ID2SYM(rb_intern("base"));
+  s_package = ID2SYM(rb_intern("package"));
+  s_string  = ID2SYM(rb_intern("string"));
+  s_table   = ID2SYM(rb_intern("table"));
+  s_math    = ID2SYM(rb_intern("math"));
+  s_io      = ID2SYM(rb_intern("io"));
+  s_debug   = ID2SYM(rb_intern("debug"));
 }
 
 // ------------------------------------------------------------------
@@ -86,7 +96,7 @@ static void rua_free(struct rua *p) {
 
 static VALUE rua_initialize(int argc, VALUE *argv, VALUE self) {
   struct rua *p;
-  VALUE error_handler, klass, klassname;
+  VALUE error_handler;
 
   Data_Get_Struct(self, struct rua, p);
   p->L = NULL;
@@ -94,9 +104,7 @@ static VALUE rua_initialize(int argc, VALUE *argv, VALUE self) {
   if (rb_scan_args(argc, argv, "01", &error_handler) < 1) {
     error_handler = Qnil;
   } else if (!rua_obj_is_executable(error_handler)) {
-    klass = rb_obj_class(error_handler);
-    klassname = rb_class_name(klass);
-    rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc or Method)", StringValuePtr(klassname));
+    rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc or Method)", rua_classname_ptr(error_handler));
   }
 
   p->L = lua_open();
@@ -107,7 +115,7 @@ static VALUE rua_initialize(int argc, VALUE *argv, VALUE self) {
 
 static VALUE rua_openlibs(int argc, VALUE *argv, VALUE self) {
   struct rua *p;
-  VALUE arg, s_all, s_base, s_package, s_string, s_table, s_math, s_io, s_debug;
+  VALUE arg;
   int i;
 
   if (argc < 1) {
@@ -120,15 +128,6 @@ static VALUE rua_openlibs(int argc, VALUE *argv, VALUE self) {
 
   Data_Get_Struct(self, struct rua, p);
 
-  s_all     = ID2SYM(rb_intern("all"));
-  s_base    = ID2SYM(rb_intern("base"));
-  s_package = ID2SYM(rb_intern("package"));
-  s_string  = ID2SYM(rb_intern("string"));
-  s_table   = ID2SYM(rb_intern("table"));
-  s_math    = ID2SYM(rb_intern("math"));
-  s_io      = ID2SYM(rb_intern("io"));
-  s_debug   = ID2SYM(rb_intern("debug"));
-
   for (i = 0; i < argc; i++) {
     arg = argv[i];
 
@@ -156,8 +155,7 @@ static VALUE rua_openlibs(int argc, VALUE *argv, VALUE self) {
       lua_pushcfunction(p->L, luaopen_debug);
       lua_call(p->L, 0, 0);
     } else {
-      arg = rb_check_convert_type(arg, T_STRING, "String", "to_s");
-      rb_raise(rb_eArgError, "unknown library '%s' (available: base, package, table, math, io, debug, all)", StringValuePtr(arg));
+      rb_raise(rb_eArgError, "unknown library '%s' (available: base, package, table, math, io, debug, all)", rua_to_sptr(arg));
     }
   }
 
@@ -166,7 +164,7 @@ static VALUE rua_openlibs(int argc, VALUE *argv, VALUE self) {
 
 static VALUE rua_eval(VALUE self, VALUE str) {
   struct rua *p;
-  VALUE retval, RuaError;
+  VALUE retval;
   const char *errmsg;
 
   Data_Get_Struct(self, struct rua, p);
@@ -190,8 +188,7 @@ static VALUE rua_get(VALUE self, VALUE key) {
   VALUE retval;
 
   Data_Get_Struct(self, struct rua, p);
-  key = rb_check_convert_type(key, T_STRING, "String", "to_s");
-  lua_getglobal(p->L, StringValuePtr(key));
+  lua_getglobal(p->L, rua_to_sptr(key));
   retval = rua_torbval(p->L, -1, p->error_handler, p->secure);
   lua_pop(p->L, 1);
   return retval;
@@ -199,21 +196,15 @@ static VALUE rua_get(VALUE self, VALUE key) {
 
 static VALUE rua_set(VALUE self, VALUE key, VALUE val) {
   struct rua *p;
-  VALUE RuaError, inspect, klass, klassname;
 
   Data_Get_Struct(self, struct rua, p);
 
-  if (p->secure && rb_obj_is_kind_of(val, rb_cModule)) {
-    RuaError = rb_const_get(rb_cObject, rb_intern("RuaError"));
-    inspect = rb_check_convert_type(val, T_STRING, "String", "inspect");
-    klass = rb_obj_class(val);
-    klassname = rb_class_name(klass);
-    rb_raise(RuaError, "set insecure value %s (%s)", StringValuePtr(inspect), StringValuePtr(klassname));
+  if (p->secure && (rb_equal(rb_cModule, val) || rb_equal(rb_cClass, val))) {
+    rb_raise(RuaError, "set insecure value %s", rua_to_sptr(val));
   }
 
-  key = rb_check_convert_type(key, T_STRING, "String", "to_s");
   rua_pushrbval(p->L, val, p->error_handler, p->secure);
-  lua_setglobal(p->L, StringValuePtr(key));
+  lua_setglobal(p->L, rua_to_sptr(key));
   return Qnil;
 }
 
@@ -226,7 +217,6 @@ static VALUE rua_get_secure(VALUE self) {
 
 static VALUE rua_set_secure(VALUE self, VALUE secure) {
   struct rua *p;
-  VALUE klass, klassname;
 
   Data_Get_Struct(self, struct rua, p);
 
@@ -234,9 +224,7 @@ static VALUE rua_set_secure(VALUE self, VALUE secure) {
   case T_TRUE:  p->secure = 1; break;
   case T_FALSE: p->secure = 0; break;
   default:
-    klass = rb_obj_class(secure);
-    klassname = rb_class_name(klass);
-    rb_raise(rb_eTypeError, "wrong argument type %s (expected TrueClass or FalseClass)", StringValuePtr(klassname));
+    rb_raise(rb_eTypeError, "wrong argument type %s (expected TrueClass or FalseClass)", rua_classname_ptr(secure));
     break;
   }
 
@@ -257,7 +245,7 @@ static VALUE rua_func_initialize(VALUE self) {
 
 static VALUE rua_func_call(int argc, VALUE *argv, VALUE self) {
   struct rua_func *p;
-  VALUE retval, RuaError;
+  VALUE retval;
   int i;
   const char *errmsg;
 
@@ -269,7 +257,6 @@ static VALUE rua_func_call(int argc, VALUE *argv, VALUE self) {
   }
 
   if (lua_pcall(p->L, argc, 1, 0) != 0) {
-    RuaError = rb_const_get(rb_cObject, rb_intern("RuaError"));
     errmsg = lua_tostring(p->L, -1);
     lua_pop(p->L, 1);
     rb_raise(RuaError, "%s", errmsg);
@@ -336,7 +323,6 @@ static VALUE rua_tohash(lua_State *L, int idx, VALUE error_handler, int secure)
 
 static void rua_pushrbval(lua_State *L, VALUE rbval, VALUE error_handler, int secure) {
   struct rua_func *p;
-  VALUE RuaFunc, inspect, klass, klassname;
 
   switch (TYPE(rbval)) {
   case T_NIL:
@@ -370,13 +356,9 @@ static void rua_pushrbval(lua_State *L, VALUE rbval, VALUE error_handler, int se
     break;
 
   default:
-    RuaFunc = rb_const_get(rb_cObject, rb_intern("RuaFunc"));
-
-    if (secure && rb_obj_is_kind_of(rbval, rb_cModule)) {
-      inspect = rb_check_convert_type(rbval, T_STRING, "String", "inspect");
-      klass = rb_obj_class(rbval);
-      klassname = rb_class_name(klass);
-      rb_fatal("convert insecure value %s (%s)", StringValuePtr(inspect), StringValuePtr(klassname));
+    if (secure && (rb_equal(rb_cModule, rbval) || rb_equal(rb_cClass, rbval))) {
+      fprintf(stderr, "warning: convert insecure value %s", rua_to_sptr(rbval));
+      lua_pushnil(L);
     } else if (rb_obj_is_kind_of(rbval, RuaFunc)) {
       Data_Get_Struct(rbval, struct rua_func, p);
       lua_rawgeti(L, LUA_REGISTRYINDEX, p->ref);
@@ -448,7 +430,7 @@ static void rua_newtable_from_obj(lua_State *L, VALUE obj, VALUE error_handler,
 }
 
 static int rua_proc_call(lua_State *L) {
-  VALUE proc, args, retval, error_handler, errargs, errmsg;
+  VALUE proc, args, retval, error_handler, errargs;
   int i, n, status, secure;
 
   proc = (VALUE) lua_touserdata(L, lua_upvalueindex(1));
@@ -472,8 +454,7 @@ static int rua_proc_call(lua_State *L) {
       retval = rb_protect(_rua_proc_call, errargs, &status);
 
       if (status != 0) {
-        errmsg = rb_check_convert_type(ruby_errinfo, T_STRING, "String", "to_s");
-        fprintf(stderr, "warning: %s\n", StringValuePtr(errmsg));
+        fprintf(stderr, "warning: %s\n", rua_to_sptr(ruby_errinfo));
       }
     } else {
       retval = Qnil;
@@ -492,9 +473,8 @@ static VALUE _rua_proc_call(VALUE args) {
 
 static VALUE rua_toruafunc(lua_State *L, int idx, VALUE error_handler, int secure) {
   struct rua_func *p;
-  VALUE RuaFunc, f;
+  VALUE f;
 
-  RuaFunc = rb_const_get(rb_cObject, rb_intern("RuaFunc"));
   f = rb_funcall(RuaFunc, rb_intern("new"), 0);
   Data_Get_Struct(f, struct rua_func, p);
   p->L = L;
@@ -521,3 +501,25 @@ static int rua_name_is_insecure_method(const char *name) {
 
   return 0;
 }
+
+static VALUE rua_to_s(VALUE v) {
+  return rb_check_convert_type(v, T_STRING, "String", "to_s");
+}
+
+static const char *rua_to_sptr(VALUE v) {
+  VALUE str = rua_to_s(v);
+
+  return StringValuePtr(str);
+}
+
+static VALUE rua_classname(VALUE v) {
+  VALUE klass = rb_obj_class(v);
+
+  return rb_class_name(klass);
+}
+
+static const char *rua_classname_ptr(VALUE v) {
+  VALUE klassname = rua_classname(v);
+
+  return StringValuePtr(klassname);
+}

data/ext/rua.h

@@ -40,5 +40,9 @@ static VALUE _rua_proc_call(VALUE args);
 static VALUE rua_toruafunc(lua_State *L, int idx, VALUE error_handler, int secure);
 static VALUE rua_obj_is_executable(VALUE obj);
 static int rua_name_is_insecure_method(const char *name);
+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);
 
 #endif

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
+rubygems_version: 0.9.2
 specification_version: 1
 name: rua
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-11-13 00:00:00 +09:00
+  version: 0.1.1
+date: 2007-11-14 00:00:00 +09:00
 summary: rua is a library for using Lua under Ruby.
 require_paths: 
 - lib
@@ -29,6 +29,7 @@ post_install_message:
 authors: 
 - winebarrel
 files: 
+- README.txt
 - ext/rua.c
 - ext/rua.h
 - ext/extconf.rb