sereal 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93b2d3dcf39684fbf9fd094b94b4d78227bc0877
-  data.tar.gz: ce21c8d417fcf323d316e3364fdabb3f4d35def5
+  metadata.gz: 50eec33dee006e2986b5ef0bb2b5c8b0718dd8da
+  data.tar.gz: 495d916c5921970104274bb1f156f7e63551de53
 SHA512:
-  metadata.gz: fc1d1ff34c241d8d9a31a4e3d9bf97683e0517cac457e97cb385d5656f0f07e436c029d09691736fd8909948ad2e85fcd285b7d27e6b3773e81fbbad783a5787
-  data.tar.gz: c3e9c73be0841b2beb34958b2972701604bbd7d3d014f1fdbcdd56612aef46614d6cf8b9d474a080a78f0b52dbcdb0fb27033bfce0caf9a3c06815fda4fefc85
+  metadata.gz: db64209177c66c89f9d81ccd1feb2375e5b5bc2f4e09aef1b8aa2312f31d63cc129170f3ef90489797c8efe660c83410c152694b8e990f2c71d255197871ca1c
+  data.tar.gz: e596221d097d6187a92edfc0321287d32d28dbc67e04d3bd76298285d7a4a4a65675fc8661528dd640696194dead242a3dbdc0089956d00c93e7d863c7128aa9

data/ext/sereal/buffer.h

@@ -14,7 +14,7 @@ static inline void s_init_tracker(sereal_t *s) {
     if (s->tracked == Qnil) {
         SD(s,"initializing tracker");
         s->tracked = rb_hash_new();
-        rb_gc_mark(s->tracked);
+        rb_gc_register_address(&s->tracked);
     }
 }
 
@@ -27,7 +27,7 @@ static inline void s_reset_tracker(sereal_t *s) {
 static inline void s_init_copy(sereal_t *s) {
     if (s->copy == Qnil) {
         s->copy = rb_hash_new();
-        rb_gc_mark(s->copy);
+        rb_gc_register_address(&s->tracked);
     }
 }
 
@@ -35,6 +35,12 @@ static inline void s_destroy(sereal_t *s) {
     if (!s)
         return;
     s_reset_tracker(s);
+    if (s->tracked != Qnil)
+        rb_gc_unregister_address(&s->tracked);
+
+    if (s->copy != Qnil)
+        rb_gc_unregister_address(&s->copy);
+
     s_free_data_if_not_mine(s);
     free(s);
 }

data/ext/sereal/decode.c

@@ -245,7 +245,7 @@ static VALUE s_read_object_freeze(sereal_t *s, u8 tag) {
     MUST_BE_SOMETHING(s_klass,T_STRING);
 
     // hash it?
-    VALUE klass = rb_const_get(rb_cObject, rb_intern(RSTRING_PTR(s_klass)));
+    VALUE klass = rb_path_to_class(s_klass);
     if (!rb_obj_respond_to(klass,THAW,0))
         s_raise(s,rb_eTypeError,"class: %s does not respond to THAW",
                 rb_obj_classname(s_klass));

data/ext/sereal/encode.c

@@ -27,13 +27,16 @@
 	#define W_SIZE T_FALSE
 #elif T_NIL > W_SIZE
 	#define W_SIZE T_NIL
+#elif T_DATA > W_SIZE
+    #define W_SIZE T_DATA
 #endif
 #define COMPLEX(object)                         \
     (TYPE(object) == T_ARRAY  ||                \
      TYPE(object) == T_HASH   ||                \
      TYPE(object) == T_SYMBOL ||                \
      TYPE(object) == T_OBJECT ||                \
-     TYPE(object) == T_STRING)
+     TYPE(object) == T_STRING ||                \
+     TYPE(object) == T_DATA)
 
 /* function pointer array */
 void (*WRITER[W_SIZE])(sereal_t *,VALUE);
@@ -74,6 +77,7 @@ void s_init_writers(void) {
     WRITER[T_TRUE]   = s_append_true;
     WRITER[T_FALSE]  = s_append_false;
     WRITER[T_NIL]    = s_append_nil;
+    WRITER[T_DATA]   = s_append_object;
 }
 
 static void s_default_writer(sereal_t *s, VALUE object) {
@@ -180,14 +184,14 @@ 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_name(CLASS_OF(object));
+        VALUE klass = rb_class_path(CLASS_OF(object));
         VALUE copy = s_copy_or_keep_in_mind(s,klass);
         if (copy != Qnil) {
             s_append_u8(s,SRL_HDR_OBJECTV_FREEZE);
             s_append_copy(s,copy);
         } else {
             s_append_u8(s,SRL_HDR_OBJECT_FREEZE);
-            s_append_rb_string(s,rb_class_name(CLASS_OF(object)));
+            s_append_rb_string(s,klass);
         }
         VALUE frozen = rb_funcall(object,FREEZE,1,ID2SYM(SEREAL));
         if (TYPE(frozen) != T_ARRAY)
@@ -289,15 +293,13 @@ static void rb_object_to_sereal(sereal_t *s, VALUE object) {
     if (COMPLEX(object)) {
         VALUE stored;
         if (s->tracked != Qnil) {
-            if (s->tracked != Qnil) {
-                VALUE id = rb_obj_id(object);
-                stored = rb_hash_lookup(s->tracked,id);
-                if (stored != Qnil) {
-                    s_append_refp(s,stored);
-                    goto out;
-                }
-                rb_hash_aset(s->tracked,id,INT2FIX(pos));
+            VALUE id = rb_obj_id(object);
+            stored = rb_hash_lookup(s->tracked,id);
+            if (stored != Qnil) {
+                s_append_refp(s,stored);
+                goto out;
             }
+            rb_hash_aset(s->tracked,id,INT2FIX(pos));
         }
         stored = s_copy_or_keep_in_mind(s,object);
         if (stored != Qnil) {

data/ext/sereal/sereal.c

@@ -270,7 +270,8 @@ void Init_sereal() {
      *      object: String: john { p: 14, s: 14, l: 2, h: 6 }  sereal_to_rb_object()
      *     object: Array: ["john", "john"] { p: 14, s: 14, l: 1, h: 6 }  sereal_to_rb_object()
      *
-     */ 
+     */
+    rb_define_const(Sereal, "DEBUG",INT2NUM(__DEBUG));
     rb_define_const(Sereal, "DEBUG",INT2NUM(__DEBUG));
 
     s_init_writers();

data/ext/sereal/sereal.h

@@ -114,7 +114,7 @@ extern VALUE SerealPerlObject;
 #define __NOT_MINE      16
 #define __STREAM        32
 #define __THAW          64
-#define __COPY          64
+#define __COPY          128
 #define __ARGUMENT_FLAGS (__DEBUG|__THAW|__REF|__COPY)
 
 #define __MIN_SIZE      6

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: sereal
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Borislav Nikolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Sereal encoder/decoder (https://github.com/Sereal/Sereal)
@@ -33,44 +33,44 @@ extensions:
 extra_rdoc_files:
 - ext/sereal/sereal.c
 files:
+- bin/rsrl
+- ext/sereal/buffer.h
 - ext/sereal/decode.c
+- ext/sereal/decode.h
 - ext/sereal/encode.c
-- ext/sereal/snappy/csnappy_compress.c
-- ext/sereal/snappy/csnappy_decompress.c
+- ext/sereal/encode.h
+- ext/sereal/extconf.rb
+- ext/sereal/proto.h
 - ext/sereal/sereal.c
 - ext/sereal/sereal.h
-- ext/sereal/buffer.h
-- ext/sereal/snappy/csnappy_internal.h
 - ext/sereal/snappy/csnappy.h
-- ext/sereal/snappy/csnappy_internal_userspace.h
 - ext/sereal/snappy/csnappy_compat.h
-- ext/sereal/decode.h
-- ext/sereal/proto.h
-- ext/sereal/encode.h
-- ext/sereal/extconf.rb
-- bin/rsrl
+- ext/sereal/snappy/csnappy_compress.c
+- ext/sereal/snappy/csnappy_decompress.c
+- ext/sereal/snappy/csnappy_internal.h
+- ext/sereal/snappy/csnappy_internal_userspace.h
 homepage: https://github.com/Sereal/Sereal
 licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --exclude
-- .*\.so
+- "--exclude"
+- ".*\\.so"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Sereal encoder/decoder