ext/swift.cc in swift-0.10.0 vs ext/swift.cc in swift-0.11.0

@@ -5,31 +5,76 @@
 VALUE eSwiftError;
 VALUE eSwiftArgumentError;
 VALUE eSwiftRuntimeError;
 VALUE eSwiftConnectionError;
 
+/*
+  Initialize Swift with a non standard dbic++ path.
+
+  @note
+    By default Swift looks in '/usr/lib/dbic++/'. Not normally required unless you install dbic++ somewhere funny.
+
+  @overload init(path)
+    @param [path] path Non standard dbic++ path.
+*/
 VALUE swift_init(VALUE self, VALUE path) {
   try { dbi::dbiInitialize(CSTRING(path)); } CATCH_DBI_EXCEPTIONS();
   return Qtrue;
 }
 
+/*
+  Trace statement execution.
+
+  @example Toggle tracing.
+    Swift.trace true
+    Swift.db.execute 'select * from users'
+    Swift.trace false
+  @example Block form.
+    Swift.trace true do
+      Swift.db.execute 'select * from users'
+    end
+
+  @overload trace(show = true, output = $stderr)
+    @param [true, false] show   Optional trace toggle boolean.
+    @param [IO]          output Optional output. Defaults to stderr.
+*/
 VALUE swift_trace(int argc, VALUE *argv, VALUE self) {
     VALUE flag, io;
     rb_io_t *fptr;
-    int fd = 2; // defaults to stderr
+    int status, fd = 2; // defaults to stderr
 
-    rb_scan_args(argc, argv, "11", &flag, &io);
+    rb_scan_args(argc, argv, "02", &flag, &io);
 
+    if (NIL_P(flag))
+      flag = Qtrue;
+
     if (TYPE(flag) != T_TRUE && TYPE(flag) != T_FALSE)
         rb_raise(eSwiftArgumentError, "Swift#trace expects a boolean flag, got %s", CSTRING(flag));
 
     if (!NIL_P(io)) {
         GetOpenFile(rb_convert_type(io, T_FILE, "IO", "to_io"), fptr);
         fd = fptr->fd;
     }
 
-    dbi::trace(flag == Qtrue ? true : false, fd);
-    return flag;
+    // block form trace
+    if (rb_block_given_p()) {
+      // orig values
+      bool orig_trace    = dbi::_trace;
+      int  orig_trace_fd = dbi::_trace_fd;
+
+      dbi::trace(flag == Qtrue ? true : false, fd);
+      VALUE block_result = rb_protect(rb_yield, Qnil, &status);
+      dbi::trace(orig_trace, orig_trace_fd);
+
+      if (status)
+        rb_jump_tag(status);
+      else
+        return block_result;
+    }
+    else {
+      dbi::trace(flag == Qtrue ? true : false, fd);
+      return flag;
+    }
 }
 
 VALUE atexit_gc(...) {
   rb_gc();
   return Qnil;