sereal 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50eec33dee006e2986b5ef0bb2b5c8b0718dd8da
-  data.tar.gz: 495d916c5921970104274bb1f156f7e63551de53
+  metadata.gz: be6217bfe2c81f0f7d3629fa097268a8f2c6733d
+  data.tar.gz: 9fe57e2249069b77131d74a804690bb1c7c552b3
 SHA512:
-  metadata.gz: db64209177c66c89f9d81ccd1feb2375e5b5bc2f4e09aef1b8aa2312f31d63cc129170f3ef90489797c8efe660c83410c152694b8e990f2c71d255197871ca1c
-  data.tar.gz: e596221d097d6187a92edfc0321287d32d28dbc67e04d3bd76298285d7a4a4a65675fc8661528dd640696194dead242a3dbdc0089956d00c93e7d863c7128aa9
+  metadata.gz: cc6658e1080248464d912bfc794c7d0d42a1e825ff25f5ef513b39a9b1e00861278fec81089c2d0a940afd446f827ada673c906b5e4c1628d6b2d5c3d96efe68
+  data.tar.gz: 220da226733dcb0ef43a96f5505d0de35165468685a3cbf592a8df523cc035b2ce106117cd3f3026451019fff249587551d579ba12d97f0868af04504ac25ca7

data/ext/sereal/decode.c

@@ -189,7 +189,7 @@ static VALUE s_read_ref(sereal_t *s, u8 tag) {
         u32 offset = s_get_varint_bang(s) - 1;                          \
         __stored = s->pos;                                              \
         s->pos = offset + s->hdr_end;                                   \
-        SD(s,"going back offset: %d, stored position: %d (tag: %d)",offset,stored_pos,tag); \
+        SD(s,"going back offset: %d, stored position: %d (tag: %d) new pos: %d",offset,stored_pos,tag,s->pos); \
     } while(0)
 #define BACK(s,__stored)                                \
     do {                                                \
@@ -237,9 +237,9 @@ static VALUE s_read_object_freeze(sereal_t *s, u8 tag) {
         s_raise(s,rb_eTypeError,"object_freeze received, but decoder is initialized without Sereal::THAW option");
 
     u32 stored_pos = 0;
-    if (tag == SRL_HDR_OBJECTV_FREEZE)
+    if (tag == SRL_HDR_OBJECTV_FREEZE) {
         TRAVEL(s,stored_pos);
-
+    }
     VALUE s_klass = sereal_to_rb_object(s);
     BACK(s,stored_pos);
     MUST_BE_SOMETHING(s_klass,T_STRING);

data/ext/sereal/encode.c

@@ -160,18 +160,18 @@ static void s_append_symbol(sereal_t *s, VALUE object) {
     s_append_rb_string(s,string);
 }
 
-static void s_append_copy(sereal_t *s, VALUE object) {
+static void s_append_copy(sereal_t *s, u8 tag,VALUE object) {
     u32 pos = FIX2LONG(object);
-    s_append_hdr_with_varint(s,SRL_HDR_COPY,pos - s->hdr_end + 1);
+    s_append_hdr_with_varint(s,tag,pos - s->hdr_end + 1);
 }
 
-static VALUE s_copy_or_keep_in_mind(sereal_t *s, VALUE object) {
+static VALUE s_copy_or_keep_in_mind(sereal_t *s, VALUE object, u8 offset) {
     if (s->copy == Qnil)
         return Qnil;
 
     VALUE stored_position = rb_hash_lookup(s->copy,object);
     if (stored_position == Qnil)
-        rb_hash_aset(s->copy,object,INT2FIX(s->pos));    
+        rb_hash_aset(s->copy,object,INT2FIX(s->pos + offset));
     return stored_position;
 }
 
@@ -185,10 +185,12 @@ static VALUE s_copy_or_keep_in_mind(sereal_t *s, VALUE object) {
 static void s_append_object(sereal_t *s, VALUE object) {
     if (s->flags & __THAW && rb_obj_respond_to(object,FREEZE,0)) {
         VALUE klass = rb_class_path(CLASS_OF(object));
-        VALUE copy = s_copy_or_keep_in_mind(s,klass);
+        // keep in mind with offset + 1
+        // because of the SRL_HDR_OBJECT_FREEZE header taking 1 byte
+        // and we want to point to the next string
+        VALUE copy = s_copy_or_keep_in_mind(s,klass,1);
         if (copy != Qnil) {
-            s_append_u8(s,SRL_HDR_OBJECTV_FREEZE);
-            s_append_copy(s,copy);
+            s_append_copy(s,SRL_HDR_OBJECTV_FREEZE,copy);
         } else {
             s_append_u8(s,SRL_HDR_OBJECT_FREEZE);
             s_append_rb_string(s,klass);
@@ -301,9 +303,9 @@ static void rb_object_to_sereal(sereal_t *s, VALUE object) {
             }
             rb_hash_aset(s->tracked,id,INT2FIX(pos));
         }
-        stored = s_copy_or_keep_in_mind(s,object);
+        stored = s_copy_or_keep_in_mind(s,object,0);
         if (stored != Qnil) {
-            s_append_copy(s,stored);
+            s_append_copy(s,SRL_HDR_COPY,stored);
             goto out;
         }
     }

data/ext/sereal/sereal.c

@@ -272,7 +272,6 @@ void Init_sereal() {
      *
      */
     rb_define_const(Sereal, "DEBUG",INT2NUM(__DEBUG));
-    rb_define_const(Sereal, "DEBUG",INT2NUM(__DEBUG));
 
     s_init_writers();
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sereal
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Borislav Nikolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-02 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler