sereal 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64ff27261d48f5ecf93ef19adb89cd126590c397
-  data.tar.gz: c2a9ecfb806d3dd559bc0b18e9aea7b26128c44a
+  metadata.gz: d8a56a6cb7a2ba50f8301e8f4d86ed041e86b72c
+  data.tar.gz: 19a41dd12c2323163ad7b2020fe77b6fbe7dcd88
 SHA512:
-  metadata.gz: 02e40c40cb0a9f151ff59fa257037986519fadd6c68d6733db37c35fe41cd72b0b5b7958317e8732c40a24cc6df9bb0af8a9f1c12442d379eaabc486c6c2203a
-  data.tar.gz: edfc06b878c2516420f7358cba6ea478b053ae5b0c1dad802e6634eccd96dc0dfaab6726060ea1b8721621f4275537a3a77ea320b636893f954a1a81922dc715
+  metadata.gz: 5f876f0f313862a4fc5ebc71953e0fe0a734d244912314ac0363b045aa845b29ca56b8b82ccee28ed46da727112490f9327e890f591c0e4b883a8a87e695080e
+  data.tar.gz: b611d10133aaef4f6a5e9a69ba02249b3f97013a5de53237b38078a4e61028665aae044e23e2af6793942be52a7e2a8ace26596f0536ffb30db50ef489f966cc

data/ext/sereal/buffer.h

@@ -1,6 +1,8 @@
 #include "sereal.h"
 #include <errno.h>
-
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <unistd.h>
 static inline void s_free_data_if_not_mine(sereal_t *s) {
     if (!(s->flags & __NOT_MINE)) {
         if (s->data)
@@ -190,21 +192,3 @@ static inline void s_set_flag_at_pos(sereal_t *s, u32 pos, u8 flag) {
     u8 *p = s_get_p_at_pos(s,pos,0);
     *p |= flag;
 }
-
-static void b_dump(u8 *p, u32 len, u32 pos) {
-    u32 i;
-
-    fprintf(stderr,"\n-----------\n");
-    for (i = 0; i < len; i++) {
-        if (i == pos) 
-            fprintf(stderr," [%c %d] ",p[i],p[i]);
-        else
-            fprintf(stderr," (%c %d) ",p[i],p[i]);
-    }
-    fprintf(stderr,"\n-----------\n");
-}
-
-static void s_dump(sereal_t *s) {
-    E("[ pos: %d, size: %d, rsize: %d ]\n",s->pos,s->size,s->rsize);
-    b_dump(s->data,s->size,s->pos);
-}

data/ext/sereal/decode.c

@@ -127,6 +127,7 @@ static VALUE s_read_rb_string_bang(sereal_t *s,u8 t) {
     }
 #undef RETURN_STRING
     s_raise(s,rb_eTypeError, "undefined string type %d",t);
+    return Qnil;
 }
 
 static VALUE s_read_next_rb_string_bang(sereal_t *s) {
@@ -173,6 +174,7 @@ static VALUE s_read_pad(sereal_t *s, u8 tag) {
 
 static VALUE s_read_extend(sereal_t *s, u8 tag) {
     s_raise(s,rb_eArgError,"extend tags are not supported");
+    return Qnil;
 }
 
 static VALUE s_read_ref(sereal_t *s, u8 tag) {
@@ -180,7 +182,7 @@ static VALUE s_read_ref(sereal_t *s, u8 tag) {
         s_raise(s,rb_eArgError,"there are no references stored");
     u64 off = s_get_varint_bang(s);
     VALUE object = rb_hash_lookup(s->tracked,INT2FIX(off + s->hdr_end));
-    SD(s,"reading reference from offset: %llu, id: %d",off + s->hdr_end,FIX2INT(rb_obj_id(object)));
+    SD(s,"reading reference from offset: %" PRIu64 ", id: %d",off + s->hdr_end,FIX2INT(rb_obj_id(object)));
     return object;
 }
 
@@ -338,7 +340,7 @@ again:
             return Qnil;
         }
         if (size < __MIN_SIZE)
-            s_raise(s,rb_eTypeError,"size(%d) is less then min packet size %d, offset: %llu",size,__MIN_SIZE,offset);
+            s_raise(s,rb_eTypeError,"size(%d) is less then min packet size %d, offset: %" PRIu64,size,__MIN_SIZE,offset);
 
         s->flags |= __NOT_MINE;
         s->data = (u8 *) RSTRING_PTR(payload) + offset;
@@ -351,6 +353,9 @@ again:
 
     u8 version = s_get_u8_bang(s);
     u8 suffix = s_get_varint_bang(s);
+    if (suffix > 0)
+        s_raise(s,rb_eTypeError,"HEADER-SUFFIX-SIZE is not supported yet");
+
     u8 is_compressed;
 
     if ((version & SRL_PROTOCOL_ENCODING_MASK) == SRL_PROTOCOL_ENCODING_SNAPPY) {

data/ext/sereal/encode.c

@@ -433,7 +433,7 @@ method_sereal_encode(VALUE self, VALUE args) {
         s->size = compressed_len + s_header_len + compressed_len_varint + un_compressed_len_varint;
         s->pos = s->size;
     }
-    VALUE ret = rb_str_new(s->data,s->size);
+    VALUE ret = rb_str_new((char *) s->data,s->size);
     s_destroy(s);
     return ret;
 }

data/ext/sereal/extconf.rb

@@ -2,6 +2,8 @@ require 'mkmf'
 
 have_func("rb_intern_str", ["ruby.h"])
 have_func("rb_sym_to_s", ["ruby.h"])
+have_func("rb_hash_clear", ["ruby.h"])
+$CFLAGS << ' -Wall -Wno-unknown-warning-option -Wno-variadic-macros -Wno-gnu-zero-variadic-macro-arguments -Wno-declaration-after-statement -Wno-c99-extensions -O3 '
 
 extension_name = 'sereal'
 dir_config(extension_name)

data/ext/sereal/sereal.h

@@ -112,7 +112,9 @@ extern VALUE SerealPerlObject;
 #ifndef HAVE_RB_SYM_TO_S
 #define rb_sym_to_s(object) rb_funcall(object,rb_intern("to_s"),0)
 #endif
-
+#ifndef HAVE_RB_HASH_CLEAR
+#define rb_hash_clear(object) rb_funcall(object,rb_intern("clear"),0)
+#endif
 #define __RAW           0
 #define __SNAPPY        1
 #define __SNAPPY_INCR   2

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: sereal
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Borislav Nikolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-10-11 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/sereal.c
+- ext/sereal/snappy/csnappy_compress.c
+- ext/sereal/snappy/csnappy_decompress.c
+- ext/sereal/buffer.h
+- ext/sereal/decode.h
 - ext/sereal/encode.h
-- ext/sereal/extconf.rb
 - ext/sereal/proto.h
-- ext/sereal/sereal.c
 - ext/sereal/sereal.h
 - ext/sereal/snappy/csnappy.h
 - ext/sereal/snappy/csnappy_compat.h
-- 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
+- ext/sereal/extconf.rb
+- bin/rsrl
 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.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Sereal encoder/decoder