msgpack 0.3.3 → 0.3.4

data/ext/pack.c

@@ -1,7 +1,7 @@
 /*
  * MessagePack for Ruby packing routine
  *
- * Copyright (C) 2008-2009 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2010 FURUHASHI Sadayuki
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -18,6 +18,9 @@
 #include "ruby.h"
 #include "msgpack/pack_define.h"
 
+static ID s_to_msgpack;
+static ID s_append;
+
 #define msgpack_pack_inline_func(name) \
 	static inline void msgpack_pack ## name
 
@@ -27,7 +30,9 @@
 #define msgpack_pack_user VALUE
 
 #define msgpack_pack_append_buffer(user, buf, len) \
-	rb_str_buf_cat(user, (const void*)buf, len)
+	((TYPE(user) == T_STRING) ? \
+		rb_str_buf_cat(user, (const void*)buf, len) : \
+		rb_funcall(user, s_append, 1, rb_str_new((const void*)buf,len)))
 
 #include "msgpack/pack_template.h"
 
@@ -36,8 +41,6 @@
 #include "st.h"  // ruby hash
 #endif
 
-static ID s_to_msgpack;
-
 #define ARG_BUFFER(name, argc, argv) \
 	VALUE name; \
 	if(argc == 1) { \
@@ -142,15 +145,24 @@ static VALUE MessagePack_Hash_to_msgpack(int argc, VALUE *argv, VALUE self)
 }
 
 
-static VALUE MessagePack_pack(VALUE self, VALUE data)
+static VALUE MessagePack_pack(int argc, VALUE* argv, VALUE self)
 {
-	return rb_funcall(data, s_to_msgpack, 0);
+	VALUE out;
+	if(argc == 1) {
+		out = rb_str_buf_new(0);
+	} else if(argc == 2) {
+		out = argv[1];
+	} else {
+		rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
+	}
+	return rb_funcall(argv[0], s_to_msgpack, 1, out);
 }
 
 
 void Init_msgpack_pack(VALUE mMessagePack)
 {
 	s_to_msgpack = rb_intern("to_msgpack");
+	s_append = rb_intern("<<");
 	rb_define_method_id(rb_cNilClass,   s_to_msgpack, MessagePack_NilClass_to_msgpack, -1);
 	rb_define_method_id(rb_cTrueClass,  s_to_msgpack, MessagePack_TrueClass_to_msgpack, -1);
 	rb_define_method_id(rb_cFalseClass, s_to_msgpack, MessagePack_FalseClass_to_msgpack, -1);
@@ -160,6 +172,6 @@ void Init_msgpack_pack(VALUE mMessagePack)
 	rb_define_method_id(rb_cString, s_to_msgpack, MessagePack_String_to_msgpack, -1);
 	rb_define_method_id(rb_cArray,  s_to_msgpack, MessagePack_Array_to_msgpack, -1);
 	rb_define_method_id(rb_cHash,   s_to_msgpack, MessagePack_Hash_to_msgpack, -1);
-	rb_define_module_function(mMessagePack, "pack", MessagePack_pack, 1);
+	rb_define_module_function(mMessagePack, "pack", MessagePack_pack, -1);
 }
 

data/ext/unpack.c

@@ -1,7 +1,7 @@
 /*
  * MessagePack for Ruby unpacking routine
  *
- * Copyright (C) 2008-2009 FURUHASHI Sadayuki
+ * Copyright (C) 2008-2010 FURUHASHI Sadayuki
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 #include "msgpack/unpack_define.h"
 
 static ID s_sysread;
+static ID s_readpartial;
 
 typedef struct {
 	int finished;
@@ -28,6 +29,7 @@ typedef struct {
 	VALUE buffer;
 	VALUE stream;
 	VALUE streambuf;
+	ID stream_append_method;
 } unpack_user;
 
 
@@ -110,8 +112,14 @@ static inline int template_callback_map(unpack_user* u, unsigned int n, VALUE* o
 static inline int template_callback_map_item(unpack_user* u, VALUE* c, VALUE k, VALUE v)
 { rb_hash_aset(*c, k, v); return 0; }
 
+#ifdef RSTRING_EMBED_LEN_MAX
+#define COW_MIN_SIZE RSTRING_EMBED_LEN_MAX
+#else
+#define COW_MIN_SIZE ((sizeof(VALUE)*3)/sizeof(char)-1)
+#endif
+
 static inline int template_callback_raw(unpack_user* u, const char* b, const char* p, unsigned int l, VALUE* o)
-{ *o = (l == 0) ? rb_str_new(0,0) : rb_str_substr(u->source, p - b, l); return 0; }
+{ *o = (l <= COW_MIN_SIZE) ? rb_str_new(p, l) : rb_str_substr(u->source, p - b, l); return 0; }
 
 
 #include "msgpack/unpack_template.h"
@@ -177,6 +185,15 @@ static VALUE MessagePack_Unpacker_reset(VALUE self)
 	return self;
 }
 
+static ID append_method_of(VALUE stream)
+{
+	if(rb_respond_to(stream, s_sysread)) {
+		return s_sysread;
+	} else {
+		return s_readpartial;
+	}
+}
+
 static VALUE MessagePack_Unpacker_initialize(int argc, VALUE *argv, VALUE self)
 {
 	VALUE stream;
@@ -198,6 +215,7 @@ static VALUE MessagePack_Unpacker_initialize(int argc, VALUE *argv, VALUE self)
 	mp->user.buffer = rb_str_new("",0);
 	mp->user.stream = stream;
 	mp->user.streambuf = rb_str_new("",0);
+	mp->user.stream_append_method = append_method_of(stream);
 	return self;
 }
 
@@ -293,7 +311,9 @@ static VALUE MessagePack_Unpacker_stream_get(VALUE self)
 static VALUE MessagePack_Unpacker_stream_set(VALUE self, VALUE val)
 {
 	UNPACKER(self, mp);
-	return mp->user.stream = val;
+	mp->user.stream = val;
+	mp->user.stream_append_method = append_method_of(val);
+	return val;
 }
 
 static VALUE MessagePack_Unpacker_fill(VALUE self)
@@ -306,10 +326,12 @@ static VALUE MessagePack_Unpacker_fill(VALUE self)
 
 	size_t len;
 	if(RSTRING_LEN(mp->user.buffer) == 0) {
-		rb_funcall(mp->user.stream, s_sysread, 2, LONG2FIX(64*1024), mp->user.buffer);
+		rb_funcall(mp->user.stream, mp->user.stream_append_method, 2,
+				LONG2FIX(64*1024), mp->user.buffer);
 		len = RSTRING_LEN(mp->user.buffer);
 	} else {
-		rb_funcall(mp->user.stream, s_sysread, 2, LONG2FIX(64*1024), mp->user.streambuf);
+		rb_funcall(mp->user.stream, mp->user.stream_append_method, 2,
+				LONG2FIX(64*1024), mp->user.streambuf);
 		len = RSTRING_LEN(mp->user.streambuf);
 		rb_str_cat(mp->user.buffer, RSTRING_PTR(mp->user.streambuf), RSTRING_LEN(mp->user.streambuf));
 	}
@@ -422,6 +444,7 @@ static VALUE MessagePack_unpack(VALUE self, VALUE data)
 void Init_msgpack_unpack(VALUE mMessagePack)
 {
 	s_sysread = rb_intern("sysread");
+	s_readpartial = rb_intern("readpartial");
 	eUnpackError = rb_define_class_under(mMessagePack, "UnpackError", rb_eStandardError);
 	cUnpacker = rb_define_class_under(mMessagePack, "Unpacker", rb_cObject);
 	rb_define_alloc_func(cUnpacker, MessagePack_Unpacker_alloc);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: msgpack
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - FURUHASHI Sadayuki
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-02 00:00:00 +09:00
+date: 2010-03-31 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -41,7 +41,7 @@ files:
 - ChangeLog
 - AUTHORS
 has_rdoc: true
-homepage: http://msgpack.sourceforge.jp/
+homepage: http://msgpack.sourceforge.net/
 licenses: []
 
 post_install_message: