rua 0.1.2 → 0.1.3

data/README.txt

@@ -19,22 +19,23 @@ Rua is a library for using Lua under Ruby.
     #rua.openlibs(:base, :package, :string)
     #rua.secure = false
     
-    rua[:str] = 'xxx'
-    rua[:num] = 100
-    rua[:proc] = lambda do
+    rua.str = 'xxx'
+    rua.num = 100
+    rua.proc = lambda do
       puts 'proc called.'
     end
-    rua[:err] = lambda do
+    rua.err = lambda do
       raise 'err called.'
     end
-    
+    rua.Time = Time
     puts rua.eval(<<-EOS)
       print('hello Rua!')
       print(str)
       print(num)
       proc()
       err()
-      
+      print(Time.new().to_s())
+    
       f = function()
         print('f() called.')
       end
@@ -42,5 +43,5 @@ Rua is a library for using Lua under Ruby.
       return true
     EOS
     
-    f = rua[:f]
-    f.call
+    rua.f.call
+    p rua.eval('return 1, 2, 3')

data/ext/rua.c

@@ -80,7 +80,7 @@ void Init_rua() {
   RuaError = rb_define_class("RuaError", rb_eStandardError);
 
   rb_define_alloc_func(Rua, rua_alloc);
-  rb_define_const(Rua, "VERSION", rb_str_new2("0.1.2"));
+  rb_define_const(Rua, "VERSION", rb_str_new2("0.1.3"));
   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);
@@ -88,6 +88,7 @@ void Init_rua() {
   rb_define_method(Rua, "[]=", rua_set, 2);
   rb_define_method(Rua, "secure", rua_get_secure, 0);
   rb_define_method(Rua, "secure=", rua_set_secure, 1);
+  rb_define_method(Rua, "method_missing", rua_method_missing, -1);
 
   rb_define_alloc_func(RuaFunc, rua_func_alloc);
   rb_define_private_method(RuaFunc, "initialize", rua_func_initialize, 0);
@@ -191,21 +192,38 @@ static VALUE rua_eval(VALUE self, VALUE str) {
   struct rua *p;
   VALUE retval;
   const char *errmsg;
+  int pretop, nresults, i;
 
   Data_Get_Struct(self, struct rua, p);
   Check_Type(str, T_STRING);
+  pretop = lua_gettop(p->L);
   luaL_loadstring(p->L, StringValuePtr(str));
 
-  if (lua_pcall(p->L, 0, 1, 0) != 0) {
+  if (lua_pcall(p->L, 0, LUA_MULTRET, 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);
   }
 
-  retval = rua_torbval(p->L, -1, p->error_handler, p->secure);
-  lua_pop(p->L, 1);
-  return retval;
+  nresults = lua_gettop(p->L) - pretop;
+
+  if (nresults == 0) {
+    return Qnil;
+  } else if (nresults == 1) {
+    retval = rua_torbval(p->L, -1, p->error_handler, p->secure);
+    lua_pop(p->L, 1);
+    return retval;
+  } else {
+    retval = rb_ary_new();
+
+    for (i = nresults; i > 0; i--) {
+      rb_ary_push(retval, rua_torbval(p->L, -i, p->error_handler, p->secure));
+    }
+
+    lua_pop(p->L, nresults);
+    return retval;
+  }
 }
 
 static VALUE rua_get(VALUE self, VALUE key) {
@@ -256,6 +274,28 @@ static VALUE rua_set_secure(VALUE self, VALUE secure) {
   return Qnil;
 }
 
+static VALUE rua_method_missing(int argc, VALUE *argv, VALUE self) {
+  const char *name;
+  size_t len;
+
+  name = rb_id2name(rb_to_id(argv[0]));
+
+  if (!name) {
+    rb_raise(rb_eRuntimeError, "fail: unknown method or property");
+  }
+
+  len = strlen(name);
+
+  if (argc = 2 && name[len - 1] == '=') {
+    argv[0] = rb_str_new(name, (long) len - 1);
+    return rua_set(self, argv[0], argv[1]);
+  } else if(argc = 1) {
+    return rua_get(self, argv[0]);
+  } else {
+    return rb_call_super(argc, argv);
+  }
+}
+
 // ------------------------------------------------------------------
 
 static VALUE rua_func_alloc(VALUE klass) {
@@ -271,25 +311,41 @@ static VALUE rua_func_initialize(VALUE self) {
 static VALUE rua_func_call(int argc, VALUE *argv, VALUE self) {
   struct rua_func *p;
   VALUE retval;
-  int i;
+  int pretop, nresults, i;
   const char *errmsg;
 
   Data_Get_Struct(self, struct rua_func, p);
+  pretop = lua_gettop(p->L);
   lua_rawgeti(p->L, LUA_REGISTRYINDEX, p->ref);
 
   for (i = 0; i < argc; i ++) {
     rua_pushrbval(p->L, argv[i], p->error_handler, p->secure);
   }
 
-  if (lua_pcall(p->L, argc, 1, 0) != 0) {
+  if (lua_pcall(p->L, argc, LUA_MULTRET, 0) != 0) {
     errmsg = lua_tostring(p->L, -1);
     lua_pop(p->L, 1);
     rb_raise(RuaError, "%s", errmsg);
   }
 
-  retval = rua_torbval(p->L, -1, p->error_handler, p->secure);
-  lua_pop(p->L, 1);
-  return retval;
+  nresults = lua_gettop(p->L) - pretop;
+
+  if (nresults == 0) {
+    return Qnil;
+  } else if (nresults == 1) {
+    retval = rua_torbval(p->L, -1, p->error_handler, p->secure);
+    lua_pop(p->L, 1);
+    return retval;
+  } else {
+    retval = rb_ary_new();
+
+    for (i = nresults; i > 0; i--) {
+      rb_ary_push(retval, rua_torbval(p->L, -i, p->error_handler, p->secure));
+    }
+
+    lua_pop(p->L, nresults);
+    return retval;
+  }
 }
 
 // ------------------------------------------------------------------

data/ext/rua.h

@@ -24,6 +24,7 @@ static VALUE rua_get(VALUE self, VALUE key);
 static VALUE rua_set(VALUE self, VALUE key, VALUE val);
 static VALUE rua_get_secure(VALUE self);
 static VALUE rua_set_secure(VALUE self, VALUE secure);
+static VALUE rua_method_missing(int argc, VALUE *argv, VALUE self);
 
 static VALUE rua_func_alloc(VALUE klass);
 static VALUE rua_func_initialize(VALUE self);

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: rua
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 date: 2007-11-14 00:00:00 +09:00
 summary: rua is a library for using Lua under Ruby.
 require_paths: