rua 0.3.0 → 0.3.1

data/README.txt

@@ -18,6 +18,8 @@ gem install rua
 
 http://rubyforge.org/frs/?group_id=4845
 
+http://storehouse.sakura.ne.jp/rua/
+
 == Example
 
     require 'rua'
@@ -26,6 +28,8 @@ http://rubyforge.org/frs/?group_id=4845
     
     rua = Rua.new(:all)
     #rua.openlibs(:base, :package, :string)
+    #rua.secure = false
+    rua.abort_by_error = false
     rua.error_handler = lambda do |e, ar|
       p e
       p ar.to_hash

data/ext/rua.c

@@ -16,7 +16,7 @@ __declspec(dllexport) void Init_rua(void);
 
 #include "rua.h"
 
-#define VERSION "0.3.0"
+#define VERSION "0.3.1"
 #define REF_RBOBJ "self"
 
 static const char *insecure_methods[] = {
@@ -94,6 +94,8 @@ 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, "abort_by_error", rua_get_abort_by_error, 0);
+  rb_define_method(Rua, "abort_by_error=", rua_set_abort_by_error, 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);
@@ -138,6 +140,8 @@ static VALUE rua_alloc(VALUE klass) {
   p->R = ALLOC(struct rua_state);
   p->R->rua = Qnil;
   p->R->error_handler = Qnil;
+  p->R->secure = 1;
+  p->R->abort_by_error = 1;
   return Data_Wrap_Struct(klass, rua_mark, rua_free, p);
 }
 
@@ -169,6 +173,7 @@ static VALUE rua_initialize(int argc, VALUE *argv, VALUE self) {
   p->R->rua = self;
   p->R->error_handler = Qnil;
   p->R->secure = 1;
+  p->R->abort_by_error = 1;
 
   if (argc > 0) {
     rua_openlibs(argc, argv, self);
@@ -312,6 +317,34 @@ static VALUE rua_set_secure(VALUE self, VALUE secure) {
   return Qnil;
 }
 
+/**
+ * get abort flag.
+ */
+static VALUE rua_get_abort_by_error(VALUE self) {
+  struct rua *p;
+
+  Data_Get_Struct(self, struct rua, p);
+  return p->R->abort_by_error ? Qtrue : Qfalse;
+}
+
+/**
+ * set abort flag.
+ */
+static VALUE rua_set_abort_by_error(VALUE self, VALUE abort_by_error) {
+  struct rua *p;
+
+  Data_Get_Struct(self, struct rua, p);
+
+  switch (TYPE(abort_by_error)) {
+  case T_TRUE:  p->R->abort_by_error = 1; break;
+  case T_FALSE: p->R->abort_by_error = 0; break;
+  default:
+    rb_raise(rb_eTypeError, "wrong argument type %s (expected TrueClass or FalseClass)", rua_classname_ptr(abort_by_error));
+    break;
+  }
+
+  return Qnil;
+}
 
 /**
  * get error handler.
@@ -847,7 +880,7 @@ static void rua_newtable_from_obj(lua_State *L, VALUE obj, struct rua_state *R)
 
 static int rua_proc_call(lua_State *L) {
   struct rua_state *R;
-  VALUE proc, args, last, retval, errargs;
+  VALUE proc, args, last, retval, errargs, errmsg;
   int i, n, status;
   lua_Debug ar;
 
@@ -870,11 +903,13 @@ static int rua_proc_call(lua_State *L) {
   }
 
   if (status != 0) {
+    errmsg = rb_check_convert_type(ruby_errinfo, T_STRING, "String", "to_s");
+
     if (rua_obj_is_executable(R->error_handler)) {
       errargs = rb_ary_new();
       rb_ary_push(errargs, ruby_errinfo);
 
-      if (lua_getstack(L, 0, &ar) && lua_getinfo(L, "nSlu", &ar)) {
+      if (lua_getstack(L, 1, &ar) && lua_getinfo(L, "nSlu", &ar)) {
         rb_ary_push(errargs, rua_toruadebug(&ar));
       }
 
@@ -887,8 +922,12 @@ static int rua_proc_call(lua_State *L) {
     } else {
       retval = Qnil;
     }
+
+    if (R->abort_by_error) {
+      return luaL_error(L, "%s", StringValuePtr(errmsg));
+    }
   }
-  
+
   rua_pushrbval(L, retval, R);
   return 1;
 }

data/ext/rua.h

@@ -5,6 +5,7 @@ struct rua_state {
   VALUE rua;
   VALUE error_handler;
   int secure;
+  int abort_by_error;
 };
 
 struct rua {
@@ -41,6 +42,8 @@ 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_get_abort_by_error(VALUE self);
+static VALUE rua_set_abort_by_error(VALUE self, VALUE abort_by_error);
 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);

metadata

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