msgpack 0.2.1 → 0.2.2

data/ext/unpack.c

@@ -21,6 +21,7 @@
 
 typedef struct {
 	int finished;
+	VALUE origstr;
 } msgpack_unpack_context;
 
 
@@ -104,7 +105,7 @@ static inline void template_callback_map_item(msgpack_unpack_context* x, VALUE*
 { rb_hash_aset(*c, k, v); }
 
 static inline VALUE template_callback_raw(msgpack_unpack_context* x, const char* b, const char* p, unsigned int l)
-{ return rb_str_new(p, l); }
+{ return l == 0 ? rb_str_new(0,0) : rb_str_substr(x->origstr, p - b, l); }
 
 
 #include "msgpack/unpack_template.h"
@@ -152,8 +153,9 @@ static VALUE MessagePack_Unpacker_alloc(VALUE klass)
 static VALUE MessagePack_Unpacker_reset(VALUE self)
 {
 	UNPACKER(self, mp);
-	mp->user.finished = 0;
 	msgpack_unpacker_init(mp);
+	msgpack_unpack_context ctx = {0, Qnil};
+	mp->user = ctx;
 	return self;
 }
 
@@ -179,7 +181,9 @@ static VALUE MessagePack_Unpacker_execute_impl(VALUE args)
 		rb_raise(eUnpackError, "offset is bigger than data buffer size.");
 	}
 
+	mp->user.origstr = data;
 	ret = msgpack_unpacker_execute(mp, dptr, (size_t)dlen, &from);
+	mp->user.origstr = Qnil;
 
 	if(ret < 0) {
 		rb_raise(eUnpackError, "parse error.");
@@ -239,7 +243,9 @@ static VALUE MessagePack_unpack_impl(VALUE args)
 	long dlen = RSTRING_LEN(data);
 	int ret;
 
+	mp->user.origstr = data;
 	ret = msgpack_unpacker_execute(mp, dptr, (size_t)dlen, &from);
+	mp->user.origstr = Qnil;
 
 	if(ret < 0) {
 		rb_raise(eUnpackError, "parse error.");
@@ -268,6 +274,9 @@ static VALUE MessagePack_unpack(VALUE self, VALUE data)
 	CHECK_STRING_TYPE(data);
 	msgpack_unpacker mp;
 	msgpack_unpacker_init(&mp);
+	msgpack_unpack_context ctx = {0, Qnil};
+	mp.user = ctx;
+
 	rb_gc_disable();
 	VALUE args[2] = {(VALUE)&mp, data};
 	VALUE ret = rb_rescue(MessagePack_unpack_impl, (VALUE)args,

data/lib/msgpack/version.rb

@@ -2,7 +2,7 @@ module MessagePack
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/msgpack/unpack_define.h

@@ -22,8 +22,10 @@
 #include <stdint.h>
 #include <string.h>
 #include <assert.h>
-#include <arpa/inet.h>
 #include <stdio.h>
+#ifndef __WIN32__
+#include <arpa/inet.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: msgpack
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - FURUHASHI Sadayuki
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-07 00:00:00 +09:00
+date: 2008-12-10 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,5 +87,5 @@ rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: An object-oriented parser generator based on Parser Expression Grammar
-test_files: 
-- test/test_format.rb
+test_files: []
+

data/test/test_format.rb

@@ -1,142 +0,0 @@
-require 'test/unit'
-require 'msgpack'
-
-class MessagePackTestFormat < Test::Unit::TestCase
-	def self.it(name, &block)
-		define_method("test_#{name}", &block)
-	end
-
-	it "nil" do
-		check 1, nil
-	end
-
-	it "true" do
-		check 1, true
-	end
-
-	it "false" do
-		check 1, false
-	end
-
-	it "zero" do
-		check 1, 0
-	end
-
-	it "positive fixnum" do
-		check 1, 1
-		check 1, (1<<6)
-		check 1, (1<<7)-1
-	end
-
-	it "positive int 8" do
-		check 1, -1
-		check 2, (1<<7)
-		check 2, (1<<8)-1
-	end
-
-	it "positive int 16" do
-		check 3, (1<<8)
-		check 3, (1<<16)-1
-	end
-
-	it "positive int 32" do
-		check 5, (1<<16)
-		check 5, (1<<32)-1
-	end
-
-	it "positive int 64" do
-		check 9, (1<<32)
-		check 9, (1<<64)-1
-	end
-
-	it "negative fixnum" do
-		check 1, -1
-		check 1, -((1<<5)-1)
-		check 1, -(1<<5)
-	end
-
-	it "negative int 8" do
-		check 2, -((1<<5)+1)
-		check 2, -(1<<7)
-	end
-
-	it "negative int 16" do
-		check 3, -((1<<7)+1)
-		check 3, -(1<<15)
-	end
-
-	it "negative int 32" do
-		check 5, -((1<<15)+1)
-		check 5, -(1<<31)
-	end
-
-	it "negative int 64" do
-		check 9, -((1<<31)+1)
-		check 9, -(1<<63)
-	end
-
-	it "fixraw" do
-		check_raw 1, 0
-		check_raw 1, (1<<5)-1
-	end
-
-	it "raw 16" do
-		check_raw 3, (1<<5)
-		check_raw 3, (1<<16)-1
-	end
-
-	it "raw 32" do
-		check_raw 5, (1<<16)
-		#check_raw 5, (1<<32)-1  # memory error
-	end
-
-	it "fixarray" do
-		check_array 1, 0
-		check_array 1, (1<<4)-1
-	end
-
-	it "array 16" do
-		check_array 3, (1<<4)
-		check_array 3, (1<<16)-1
-	end
-
-	it "array 32" do
-		check_array 5, (1<<16)
-		#check_array 5, (1<<32)-1  # memory error
-	end
-
-#	it "fixmap" do
-#		check_map 1, 0
-#		check_map 1, (1<<4)-1
-#	end
-#
-#	it "map 16" do
-#		check_map 3, (1<<4)
-#		check_map 3, (1<<16)-1
-#	end
-#
-#	it "map 32" do
-#		check_map 5, (1<<16)
-#		#check_map 5, (1<<32)-1  # memory error
-#	end
-
-	private
-	def check(len, obj)
-		v = obj.to_msgpack
-		assert_equal(v.length, len)
-		assert_equal(MessagePack.unpack(v), obj)
-	end
-
-	def check_raw(overhead, num)
-		check num+overhead, " "*num
-	end
-
-	def check_array(overhead, num)
-		check num+overhead, Array.new(num)
-	end
-
-	def check_map(overhead, num)
-		# FIXME
-	end
-end
-