ninjudd-tuple 0.0.6 → 0.0.7

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 0
-:patch: 6
+:patch: 7
 :major: 0

data/ext/tuple.c

@@ -2,7 +2,8 @@
 
 VALUE mTuple;
 
-#define TRUE_SORT  128 // TrueClass
+#define TRUE_SORT  255 // TrueClass
+#define TIME_SORT  128 // Time
 #define SYM_SORT    64 // Symbol
 #define STR_SORT    32 // String
 #define INTP_SORT   16 // Integer (Positive)
@@ -14,6 +15,16 @@ VALUE mTuple;
 
 #define BDIGITS(x) ((BDIGIT*)RBIGNUM(x)->digits)
 
+static void null_pad(VALUE data, int len) {
+  static u_int8_t null = 0;
+
+  // Pad with null bytes so subsequent fields will be aligned.
+  while (len % 4 != 0) {
+    rb_str_cat(data, (char*)&null, 1);
+    len++;
+  }
+}
+
 /*
  * call-seq:
  * Tuple.dump(tuple) -> string
@@ -64,11 +75,17 @@ static VALUE tuple_dump(VALUE self, VALUE tuple) {
       len = RSTRING_LEN(item);
       rb_str_cat(data, RSTRING_PTR(item), len);
       
-      // Pad with null bytes so subsequent fields will be aligned.
-      while (len % 4 != 0) {
-        rb_str_cat(data, (char*)&header, 1);
-        len++;
-      }
+      null_pad(data, len);
+    } else if (rb_obj_class(item) == rb_cTime) {
+      header[2] = TIME_SORT;
+      rb_str_cat(data, (char*)&header, sizeof(header));
+
+      item = rb_funcall(item, rb_intern("getgm"), 0);
+      item = rb_funcall(item, rb_intern("strftime"), 1, rb_str_new2("%Y/%m/%d %H:%M:%S +0000"));
+      len  = RSTRING_LEN(item);
+      rb_str_cat(data, RSTRING_PTR(item), len);
+
+      null_pad(data, len);
     } else {        
       if      (item == Qnil)   header[2] = NIL_SORT;
       else if (item == Qtrue)  header[2] = TRUE_SORT;
@@ -134,12 +151,23 @@ static VALUE tuple_load(VALUE self, VALUE data) {
     case STR_SORT:
     case SYM_SORT:
       item = rb_str_new2(ptr);
-      len = RSTRING_LEN(item);
+      len  = RSTRING_LEN(item);
       while (len % 4 != 0) len++;
       ptr += len;
       if (header[2] == SYM_SORT) item = rb_funcall(item, rb_intern("to_sym"), 0);
       rb_ary_push(tuple, item);
       break;
+    case TIME_SORT:
+      item = rb_str_new2(ptr);
+      len  = RSTRING_LEN(item);
+      while (len % 4 != 0) len++;
+      ptr += len;
+      item = rb_funcall(rb_cTime, rb_intern("parse"), 1, item);
+      rb_ary_push(tuple, item);
+      break;
+    default:
+      rb_raise(rb_eTypeError, "invalid type code %d in tuple", header[2]);
+      break;
     }
   }  
   return tuple;
@@ -147,6 +175,8 @@ static VALUE tuple_load(VALUE self, VALUE data) {
 
 VALUE mTuple;
 void Init_tuple() {
+  rb_require("time");
+
   mTuple = rb_define_module("Tuple");
   rb_define_module_function(mTuple, "dump", tuple_dump, 1);
   rb_define_module_function(mTuple, "load", tuple_load, 1);

data/test/tuple_test.rb

@@ -1,8 +1,15 @@
 require File.dirname(__FILE__) + '/test_helper'
 
+class Time
+  def ==(other)
+    # Ignore microseconds for testing.
+    to_i == other.to_i
+  end
+end
+
 class TupleTest < Test::Unit::TestCase
   should "dump and load arrays of simple types" do
-    t = [1, true, :foo, "foo", -1001, false, nil]
+    t = [1, true, :foo, "foo", -1001, false, nil, Time.now]
     assert_equal t, Tuple.load(Tuple.dump(t))
   end
   
@@ -17,6 +24,8 @@ class TupleTest < Test::Unit::TestCase
   end
 
   should "sort tuples using binary" do
+    now = Time.now
+
     tuples = [
       [1, "foo"],
       [1, true],
@@ -35,6 +44,9 @@ class TupleTest < Test::Unit::TestCase
       ["charles", "atlas jr."],
       ["charles", "atlas", "world's", "strongest", "man"],
       ["charles", "atlas", 5],
+      [now, "foo"],
+      [now, "bar"],
+      [now - 24 * 60 * 60],
     ]
 
     expected = [
@@ -54,6 +66,9 @@ class TupleTest < Test::Unit::TestCase
       [:foo, -18446744073709551616],
       [:foo, -1],
       [:foo, 18446744073709551616],
+      [now - 24 * 60 * 60],
+      [now, "bar"],
+      [now, "foo"],
       [true]
     ]  
     assert_equal expected, tuples.sort_by {|t| Tuple.dump(t)}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ninjudd-tuple
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-18 00:00:00 -07:00
+date: 2009-08-22 00:00:00 -07:00
 default_executable: 
 dependencies: []