sereal 0.0.7 → 0.0.8

data/ext/sereal/sereal.c

@@ -19,13 +19,29 @@ void Init_sereal();
  *   
  * If the blob contains multiple compressed
  * sub-blobs you should call it with:
- *       
+ *
  *    Sereal.decode(blob) do |decoded|
- *       # do something with the decoded object 
+ *       # do something with the decoded object
  *    end
+ *
  * otherwise only the first decoded object will be returned
+ * there is also streaming support which takes any kind of IO object
+ * like socket, or just regular File, and it is really easy to use:
+ *
+ *    Sereal.decode(STDIN) do |decoded|
+ *      # do something with the decoded object
+ *    end
+ *
+ * it works both with `incremental snappy` and with just combined sereal packets.
+ * another example but with TCPSocket:
+ *
+ *    s = TCPSocket.new 'localhost', 2000
+ *    Sereal.decode(s) do |decoded|
+ *      # do something with the decoded object
+ *    end
  *
  */
+
 void Init_sereal() {
         Sereal = rb_define_class("Sereal", rb_cObject);
         rb_define_singleton_method(Sereal, "encode", method_sereal_encode, -2);

data/ext/sereal/sereal.h

@@ -2,6 +2,7 @@
 #define _MAIN_H
 #include <ruby.h>
 #include <ruby/encoding.h>
+#include <ruby/io.h>
 #include <ruby/st.h>
 #include <string.h>     /* memcpy,memset */
 #include "proto.h"
@@ -29,17 +30,21 @@ typedef struct _track_entry     track_t;
 
 #define SRL_HDR_SYM SRL_HDR_RESERVED_LOW
 #define SRL_HDR_RB_OBJ (SRL_HDR_RESERVED_LOW+1)
-#define _D(fmt,arg...) fprintf(stderr,"%s(): " fmt "\n",__func__,##arg)
 
 #ifdef ONIGURUMA_H
-	#define IGNORECASE ONIG_OPTION_IGNORECASE
-	#define MULTILINE ONIG_OPTION_MULTILINE
-	#define EXTENDED ONIG_OPTION_EXTEND
+#define IGNORECASE ONIG_OPTION_IGNORECASE
+#define MULTILINE ONIG_OPTION_MULTILINE
+#define EXTENDED ONIG_OPTION_EXTEND
 #else
-	#define IGNORECASE RE_OPTION_IGNORECASE
-	#define MULTILINE RE_OPTION_MULTILINE
-	#define EXTENDED RE_OPTION_EXTENDED
+#define IGNORECASE RE_OPTION_IGNORECASE
+#define MULTILINE RE_OPTION_MULTILINE
+#define EXTENDED RE_OPTION_EXTENDED
 #endif
+
+#define FORMAT(fmt,arg...) fmt " [%s():%s:%d @ %u]\n",##arg,__func__,__FILE__,__LINE__,(unsigned int) time(NULL)
+#define E(fmt,arg...) fprintf(stderr,FORMAT(fmt,##arg))
+#define D(fmt,arg...) printf(FORMAT(fmt,##arg))
+
 #define s_raise(what,ex,arg...)         \
 do {                                    \
     s_destroy(what);                    \
@@ -47,30 +52,36 @@ do {                                    \
 } while(0);
 
 #define FLAG_NOT_MINE 1
+#define FLAG_STREAM   2
 struct _sereal {
-        u8 *data;
-        u32 size;
+    u8 *data;
+    u32 size;
+    u32 pos;
+    u32 rsize;
+    u32 level;
+    u8 flags;
+    VALUE tracked;
+    u32 hdr_end;
+    int fd;
+    struct buffer {
+        u8 data[BUFSIZ];
         u32 pos;
-        u32 rsize;
-        u32 level;
-        u8 flags;
-        VALUE tracked;
-        u32 hdr_end;
+        u32 size;
+    } buffer;
 };
 
 VALUE method_sereal_encode(VALUE self, VALUE args);
 VALUE method_sereal_decode(VALUE self, VALUE payload);
 
-#define S_RECURSE_INC(s)                                          \
-do {                                                              \
-        if((s)->level++ > MAX_RECURSION_DEPTH)                    \
-            s_raise((s),rb_eArgError,                             \
-                    "max recursion depth reached: %d (level: %d)",\
-                    MAX_RECURSION_DEPTH, s->level);               \
-} while(0);
+#define S_RECURSE_INC(s)                                        \
+    do {                                                        \
+        if((s)->level++ > MAX_RECURSION_DEPTH)                  \
+        s_raise((s),rb_eArgError,                               \
+                "max recursion depth reached: %d (level: %d)",  \
+                MAX_RECURSION_DEPTH, s->level);                 \
+    } while(0);
 
 #define S_RECURSE_DEC(s) ((s)->level--)
-
 #ifndef HAVE_RB_INTERN_STR
 #define rb_intern_str(string) SYM2ID(rb_str_intern(string))
 #endif
@@ -81,5 +92,5 @@ do {                                                              \
 #define __RAW           0
 #define __SNAPPY        1
 #define __SNAPPY_INCR   2
-
+#define __MIN_SIZE      6
 #endif

metadata

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