rcstorable 0.3.4 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.4.0

data/ext/rcstorable.c

@@ -9,7 +9,7 @@ typedef unsigned char uchar;
 
 VALUE thaw(VALUE, VALUE);
 static VALUE read_object();
-static VALUE read_boolean();
+static VALUE read_number();
 static uint32_t read_32_bit_integer();
 static uint32_t read_compact_size();
 static void read_n_hash_pairs(VALUE, uint32_t);
@@ -18,23 +18,23 @@ static VALUE read_string(bool);
 static void read_magic_numbers();
 static inline void check_pointer(uchar*);
 
-// Perl Storable encodes values with an associated type.
-// There are probably more types than are enumerated here,
-// but I've yet to encounter them.
+/* Perl Storable encodes values with an associated type.
+ * There are probably more types than are enumerated here,
+ * but I've yet to encounter them. */
 
 enum perl_types {
-  PT_HASH_KEY   = 1,
-  PT_ARRAY      = 2,
-  PT_HASH       = 3,
-  PT_VECTOR     = 4,
-  PT_UNDEF      = 5,
-  PT_BOOLEAN    = 8,
-  PT_INT32      = 9,
-  PT_STRING     = 10,
-  PT_STRING_ALT = 23
+  PT_LONG_STRING = 1,
+  PT_ARRAY       = 2,
+  PT_HASH        = 3,
+  PT_VECTOR      = 4,
+  PT_UNDEF       = 5,
+  PT_NUMBER      = 8,
+  PT_INT32       = 9,
+  PT_STRING      = 10,
+  PT_STRING_ALT  = 23
 };
 
-// Used globally. Raptors. I know.
+/* Used globally. Raptors. I know. */
 static uchar *serialized;
 static uchar *serialized_end;
 
@@ -46,7 +46,7 @@ static uchar *error_message = "malformed data";
 VALUE
 thaw(VALUE self, VALUE str)
 {
-  if (str == Qnil) return Qnil; // Do something logical with nil.
+  if (str == Qnil) return Qnil; /* Do something logical with nil. */
   
   Check_Type(str, T_STRING);
   extern uchar *serialized, *serialized_end;
@@ -115,18 +115,18 @@ read_object()
     size = read_32_bit_integer();
     read_n_array_entries(object, size);
     break;
-  case PT_BOOLEAN:
-    object = read_boolean();
+  case PT_NUMBER:
+    object = read_number();
     break;
   case PT_STRING:
   case PT_STRING_ALT:
     object = read_string(false);
     break;
-  case PT_HASH_KEY:
+  case PT_LONG_STRING:
     object = read_string(true);
     break;
   case PT_VECTOR:
-    object = read_object(); // This is a marker we can just ignore...
+    object = read_object(); /* This is a marker we can just ignore... */
     break;
   }
   
@@ -147,12 +147,16 @@ read_n_hash_pairs(VALUE hash, uint32_t num)
   read_n_hash_pairs(hash, num-1);
 }
 
+/*
+ * Numbers below |128| are encoded as a sort of signed byte.
+ * High bit 0 implies negative, high bit 1 implies positive.
+ */ 
 static VALUE
-read_boolean()
+read_number()
 {
   extern uchar *serialized;
   check_pointer(serialized);
-  return (*serialized++ == 128) ? Qfalse : Qtrue;
+  return INT2FIX((signed char)(*serialized++ ^ 0x80));
 }
 
 /*
@@ -187,7 +191,7 @@ read_string(bool extended_size)
   uint32_t actual_size = 0;
   uchar *tp = serialized;
 
-  if (size == 319) { // apparently Storable uses \000\000\001\077 to mean "read until n<7"
+  if (size == 319) { /* apparently Storable uses \000\000\001\077 to mean "read until n<7" */
     while (*tp++ >= 7) {
       check_pointer(tp);
       actual_size++;
@@ -218,7 +222,7 @@ read_32_bit_integer()
 
   check_pointer(serialized+3);
 
-  // I don't want to deal with byte-order. This is just easier. 
+  /* I don't want to deal with byte-order. This is just easier. */
   size += (*serialized++)*16777216;
   size += (*serialized++)*65536;
   size += (*serialized++)*256;

data/spec/rcstorable_spec.rb

@@ -1,9 +1,8 @@
 require 'rcstorable'
 
 describe RCStorable do
-
-
-  it "should correctly decode format A" do
+  
+  it "should understand Format 1286" do
     store = "\005\006\003\000\000\000\005\005\000\000\000\aAaaaaaa\004\003\000\000\000\017\n\fasdjfsadfjfd\000\000\000\tdkjfjaksj\n\00560565\000\000\000\nksdjfksjdf\n\020aksjgjeijpqiwjff\000\000\000\020ksdjfkasjfkjefjj\n\022ewjfklqjkzxjfnvnds\000\000\000\ajfjwjwj\n\nlsakdvnnff\000\000\000\004qpwo\n\002jf\000\000\000\005qwojf\n\bzxemffew\000\000\000\005owjff\n\004zjxf\000\000\000\016jzxmfnfkneoqjf\n\003jas\000\000\000\aowfjjwf\n\003jfw\000\000\000\rjadsnzxfkjfej\n\005oqwfj\000\000\000\bqpwofjff\n\004owjf\000\000\000\njzxnfnqwwf\n\000\000\000\000\nqpwofjfjww\n\000\000\000\000\vpdofjfejqwj\n\002jf\000\000\000\vpwqofjwjqfj\000\000\000\apojsfww\005\000\000\000\005posjf\004\002\000\000\000\001\001\000\000\001?sdlkfjewigjepofjqwpfjsdalkfjqepogjgpojqwfpowejfqpowfjlksdjdslkgjsdflgjerhgi;oerhjgoiprejwgioperjgkl;djglsdk;fgjsdlkf;gjal;gfjerigjergkjarigojaegkl;sdfnga;lksfjwi;eogjieryjkw;ljfa;sdlgkhjaglkajwegf;lkajgaweklfhajklghawejklghawejkhawelurhaewtluiawehtawlkjehfasjkldfnasjklfhsadfjklashfluiewhwlquthqluitqwyeoiuthwefjklasdhfkjlasdfnbasjlkdfhqweuiltqytoeqwieutyqoeto9845yhsjdaghfajkewntewakjlhtawkerhweuirhaweruhewiurahwefljkshdafjhadkf\n\000\000\000\003oje\005\000\000\000\016lsdkfjlkfjqwtr"
 
     expected = {"Aaaaaaa"=>nil, "lsdkfjlkfjqwtr"=>nil, "posjf"=>nil, "oje"=>["sdlkfjewigjepofjqwpfjsdalkfjqepogjgpojqwfpowejfqpowfjlksdjdslkgjsdflgjerhgi;oerhjgoiprejwgioperjgkl;djglsdk;fgjsdlkf;gjal;gfjerigjergkjarigojaegkl;sdfnga;lksfjwi;eogjieryjkw;ljfa;sdlgkhjaglkajwegf;lkajgaweklfhajklghawejklghawejkhawelurhaewtluiawehtawlkjehfasjkldfnasjklfhsadfjklashfluiewhwlquthqluitqwyeoiuthwefjklasdhfkjlasdfnbasjlkdfhqweuiltqytoeqwieutyqoeto9845yhsjdaghfajkewntewakjlhtawkerhweuirhaweruhewiurahwefljkshdafjhadkf\n"], "pojsfww"=>{"jfjwjwj"=>"ewjfklqjkzxjfnvnds", "qpwo"=>"lsakdvnnff", "ksdjfksjdf"=>"60565", "pdofjfejqwj"=>"", "owfjjwf"=>"jas", "owjff"=>"zxemffew", "jzxnfnqwwf"=>"owjf", "qpwofjff"=>"oqwfj", "jadsnzxfkjfej"=>"jfw", "ksdjfkasjfkjefjj"=>"aksjgjeijpqiwjff", "pwqofjwjqfj"=>"jf", "dkjfjaksj"=>"asdjfsadfjfd", "qpwofjfjww"=>"", "jzxmfnfkneoqjf"=>"zjxf", "qwojf"=>"jf"}}
@@ -11,7 +10,7 @@ describe RCStorable do
     RCStorable.thaw(store).should == expected
   end
     
-  it "should correctly decode format B" do
+  it "Should understand Format 1287" do
     store = "\005\a\003\000\000\000\004\004\003\000\000\000\002\n\004blah\000\000\000\001p\001\000\000\002>Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.\000\000\000\001q\000\000\000\001c\n\00229\000\000\000\017longer_key_name\n\020A longish string\000\000\000\001a\n\00235\000\000\000\001b"
 
     expected = {
@@ -27,7 +26,7 @@ describe RCStorable do
     RCStorable.thaw(store).should == expected
   end
 
-  it "arrays should work" do 
+  it "should handle Format 1287 arrays" do 
     store = "\005\a\003\000\000\000\001\004\002\000\000\000\003\n\004asdf\n\004zxcv\n\004qwer\000\000\000\001b" 
     
     expected = {"b" => ["asdf", "zxcv", "qwer"]}
@@ -35,11 +34,24 @@ describe RCStorable do
     RCStorable.thaw(store).should == expected
   end 
 
-  it "empty hash" do
+  it "should handle an empty hash" do
     store = "\005\a\003\000\000\000\001\004\003\000\000\000\000\000\000\000\001a" 
     
     expected = {"a" => {}}
     RCStorable.thaw(store).should == expected
   end 
+
+  it "should understand numbers" do
+    store = "\005\a\003\000\000\000\003\bX\000\000\000\001a\b\200\000\000\000\001b\b\373\000\000\000\001c" 
+    expected = {"a" => -40, "b" => 0, "c" => 123}
+
+    RCStorable.thaw(store).should == expected
+  end 
+
+  it "should understand nil" do
+    store = "\005\a\003\000\000\000\001\005\000\000\000\001a" 
+    expected = {"a" => nil}
+    RCStorable.thaw(store).should == expected
+  end 
   
 end

data/spec/store.pl

@@ -1,11 +1,12 @@
-use strict; 
+#use strict; 
 use warnings; 
 
 use Storable; 
 use Data::Dumper; 
 
 my %blah = (
-            "a" => "asdfjasd;flkasdjf;alsdfkjasd;lfkjasd;flkjasdf;lkajsdf;lkasdjf;alskdjfa;lskfjas;ldfkjasd;lfkjasdf;lkjasdf;lkasdjf;laksdfjas;ldfkjasd;lfkjasd;lfkjasdf;lkajsdf;lkasdjf;laksdfja;sldfkjasd;lfkjasdf;lkajdfasdfgsdfgsdfgsdfgsdfgsdfgsdfgsdfgdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfsafasdfasdfasdfasdfjasd;flkasdjf;alsdfkjasd;lfkjasd;flkjasdf;lkajsdf;lkasdjf;alskdjfa;lskfjas;ldfkjasd;lfkjasdf;lkjasdf;lkasdjf;laksdfjas;ldfkjasd;lfkjasd;lfkjasdf;lkajsdf;lkasdjf;laksdfja;sldfkjasd;lfkjasdf;lkajdfasdfgsdfgsdfgsdfgsdfgsdfgsdfgsdfgdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfsafasdfasdfasdfasdfjasd;flkasdjf;alsdfkjasd;lfkjasd;flkjasdf;lkajsdf;lkasdjf;alskdjfa;lskfjas;ldfkjasd;lfkjasdf;lkjasdf;lkasdjf;laksdfjas;ldfkjasd;lfkjasd;lfkjasdf;lkajsdf;lkasdjf;laksdfja;sldfkjasd;lfkjasdf;lkajdfasdfgsdfgsdfgsdfgsdfgsdfgsdfgsdfgdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfsafasdfasdfasdfasdfjasd;flkasdjf;alsdfkjasd;lfkjasd;flkjasdf;lkajsdf;lkasdjf;alskdjfa;lskfjas;ldfkjasd;lfkjasdf;lkjasdf;lkasdjf;laksdfjas;ldfkjasd;lfkjasd;lfkjasdf;lkajsdf;lkasdjf;laksdfja;sldfkjasd;lfkjasdf;lkajdfasdfgsdfgsdfgsdfgsdfgsdfgsdfgsdfgdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfsafasdfasdfasdf"
+            "a" => 123,
+            "b" => -40
            );
 
 #my $x =  "004\a\b12345678\004\b\b\b\003\004\000\000\000\004\003\002\000\000\000\n\004blah\001\000\000\000p\001>\002\000\000Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.\001\000\000\000q\001\000\000\000c\n\00229\017\000\000\000longer_key_name\n\020A longish string\001\000\000\000a\n\00235\001\000\000\000b";

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
   - 4
-  version: 0.3.4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Burke Libbey