msgpack 0.3.8-mswin32 → 0.3.9-mswin32

data/ext/unpack.c

@@ -389,25 +389,43 @@ static VALUE MessagePack_unpack(VALUE self, VALUE data)
 }
 
 
+static VALUE MessagePack_Unpacker_execute_impl(VALUE self, VALUE data,
+		size_t from, size_t limit)
+{
+	UNPACKER(self, mp);
+
+	if(from >= limit) {
+		rb_raise(eUnpackError, "offset is bigger than data buffer size.");
+	}
+
+	int ret = template_execute_wrap(mp, data, limit, &from);
+
+	if(ret < 0) {
+		rb_raise(eUnpackError, "parse error.");
+	} else if(ret > 0) {
+		mp->user.finished = 1;
+		return ULONG2NUM(from);
+	} else {
+		mp->user.finished = 0;
+		return ULONG2NUM(from);
+	}
+}
+
 /* compat */
 static VALUE MessagePack_Unpacker_execute_limit(VALUE self, VALUE data,
 		VALUE off, VALUE limit)
 {
 	CHECK_STRING_TYPE(data);
-	UNPACKER(self, mp);
-	size_t from = (size_t)NUM2ULONG(off);
-	int ret = template_execute_wrap(mp, data, NUM2ULONG(limit), &from);
-	return INT2FIX(ret);
+	return MessagePack_Unpacker_execute_impl(self, data,
+			(size_t)NUM2ULONG(off), (size_t)NUM2ULONG(limit));
 }
 
 /* compat */
 static VALUE MessagePack_Unpacker_execute(VALUE self, VALUE data, VALUE off)
 {
 	CHECK_STRING_TYPE(data);
-	UNPACKER(self, mp);
-	size_t from = (size_t)NUM2ULONG(off);
-	int ret = template_execute_wrap(mp, data, RSTRING_LEN(data), &from);
-	return INT2FIX(ret);
+	return MessagePack_Unpacker_execute_impl(self, data,
+			(size_t)NUM2ULONG(off), (size_t)RSTRING_LEN(data));
 }
 
 /* compat */

data/test/msgpack_test.rb

@@ -204,9 +204,11 @@ class MessagePackTestFormat < Test::Unit::TestCase
 
 	it "gc mark" do
 		obj = [{["a","b"]=>["c","d"]}, ["e","f"], "d"]
+		num = 4
+		raw = obj.to_msgpack * num
 		pac = MessagePack::Unpacker.new
 		parsed = 0
-		obj.to_msgpack.split(//).each do |b|
+		raw.split(//).each do |b|
 			pac.feed(b)
 			pac.each {|o|
 				GC.start
@@ -215,7 +217,31 @@ class MessagePackTestFormat < Test::Unit::TestCase
 			}
 			GC.start
 		end
-		assert_equal(parsed, 1)
+		assert_equal(parsed, num)
+	end
+
+	it "streaming backward compatibility" do
+		obj = [{["a","b"]=>["c","d"]}, ["e","f"], "d"]
+		num = 4
+		raw = obj.to_msgpack * num
+		pac = MessagePack::Unpacker.new
+		buffer = ""
+		nread  = 0
+		parsed = 0
+		raw.split(//).each do |b|
+			buffer << b
+			nread = pac.execute(buffer, nread)
+			if pac.finished?
+				o = pac.data
+				assert_equal(obj, o)
+				parsed += 1
+				pac.reset
+				buffer.slice!(0, nread)
+				nread = 0
+				next unless buffer.empty?
+			end
+		end
+		assert_equal(parsed, num)
 	end
 
 	private

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 8
-  version: 0.3.8
+  - 9
+  version: 0.3.9
 platform: mswin32
 authors: 
 - FURUHASHI Sadayuki
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-22 00:00:00 +09:00
+date: 2010-04-23 00:00:00 +09:00
 default_executable: 
 dependencies: []