msgpack 0.5.3-x86-mingw32 → 0.5.4-x86-mingw32

data/ChangeLog

@@ -1,4 +1,9 @@
 
+2012-03-15 version 0.5.4:
+
+* Added missing MessagePack::Unpacker#reset method
+
+
 2012-02-14 version 0.5.3:
 
 * Fixed segfault problem on Buffer#clear (reuse rmem internal fragment optimization)

data/doclib/msgpack/unpacker.rb

@@ -78,7 +78,7 @@ module MessagePack
     end
 
     #
-    # Read a header of an map and returns its size.
+    # Reads a header of an map and returns its size.
     # It converts a serialized map into a stream of key-value pairs.
     #
     # If the serialized object is not a map, it raises MessagePack::TypeError.
@@ -125,6 +125,14 @@ module MessagePack
     #
     def feed_each(data, &block)
     end
+
+    #
+    # Resets deserialization state of the unpacker and clears the internal buffer.
+    #
+    # @return nil
+    #
+    def reset
+    end
   end
 
 end

data/ext/msgpack/unpacker_class.c

@@ -276,6 +276,15 @@ static VALUE Unpacker_feed_each(VALUE self, VALUE data)
     return Unpacker_each(self);
 }
 
+static VALUE Unpacker_reset(VALUE self)
+{
+    UNPACKER(self, uk);
+
+    msgpack_unpacker_reset(uk);
+
+    return Qnil;
+}
+
 VALUE MessagePack_unpack(int argc, VALUE* argv)
 {
     VALUE src;
@@ -362,6 +371,7 @@ void MessagePack_Unpacker_module_init(VALUE mMessagePack)
     rb_define_method(cMessagePack_Unpacker, "feed", Unpacker_feed, 1);
     rb_define_method(cMessagePack_Unpacker, "each", Unpacker_each, 0);
     rb_define_method(cMessagePack_Unpacker, "feed_each", Unpacker_feed_each, 1);
+    rb_define_method(cMessagePack_Unpacker, "reset", Unpacker_reset, 0);
 
     s_unpacker_value = Unpacker_alloc(cMessagePack_Unpacker);
     rb_gc_register_address(&s_unpacker_value);

data/lib/msgpack/version.rb

@@ -1,3 +1,3 @@
 module MessagePack
-	VERSION = "0.5.3"
+	VERSION = "0.5.4"
 end

data/spec/unpacker_spec.rb

@@ -6,6 +6,10 @@ describe Unpacker do
     Unpacker.new
   end
 
+  let :packer do
+    Packer.new
+  end
+
   # TODO initialize
 
   it 'read_array_header succeeds' do
@@ -42,16 +46,90 @@ describe Unpacker do
     unpacker.skip_nil.should == false
   end
 
+  it 'skip skips objects' do
+    packer.write(1)
+    packer.write(2)
+    packer.write(3)
+    packer.write(4)
+    packer.write(5)
+
+    unpacker = Unpacker.new(packer.buffer)
+
+    unpacker.read.should == 1
+    unpacker.skip
+    unpacker.read.should == 3
+    unpacker.skip
+    unpacker.read.should == 5
+  end
+
+  it 'read raises EOFError' do
+    lambda {
+      unpacker.read
+    }.should raise_error(EOFError)
+  end
+
+  it 'skip raises EOFError' do
+    lambda {
+      unpacker.skip
+    }.should raise_error(EOFError)
+  end
+
   it 'skip_nil raises EOFError' do
     lambda {
       unpacker.skip_nil
     }.should raise_error(EOFError)
   end
 
-  # TODO skip methods
-  # TODO feed
-  # TODO each
-  # TODO feed_each
+  let :sample_object do
+    [1024, {["a","b"]=>["c","d"]}, ["e","f"], "d", 70000, 4.12, 1.5, 1.5, 1.5]
+  end
+
+  it 'feed and each continue internal state' do
+    raw = sample_object.to_msgpack.to_s * 4
+    objects = []
+
+    raw.split(//).each do |b|
+      unpacker.feed(b)
+      unpacker.each {|c|
+        objects << c
+      }
+    end
+
+    objects.should == [sample_object] * 4
+  end
+
+  it 'feed_each continues internal state' do
+    raw = sample_object.to_msgpack.to_s * 4
+    objects = []
+
+    raw.split(//).each do |b|
+      unpacker.feed_each(b) {|c|
+        objects << c
+      }
+    end
+
+    objects.should == [sample_object] * 4
+  end
+
+  it 'reset clears internal buffer' do
+    # 1-element array
+    unpacker.feed("\x91")
+    unpacker.reset
+    unpacker.feed("\x01")
+
+    unpacker.each.map {|x| x }.should == [1]
+  end
+
+  it 'reset clears internal state' do
+    # 1-element array
+    unpacker.feed("\x91")
+    unpacker.each.map {|x| x }.should == []
+
+    unpacker.reset
+
+    unpacker.feed("\x01")
+    unpacker.each.map {|x| x }.should == [1]
+  end
 
   it 'buffer' do
     o1 = unpacker.buffer.object_id
@@ -60,11 +138,8 @@ describe Unpacker do
     unpacker.buffer.object_id.should == o1
   end
 
-  it 'raises level stack too deep error' do
-    packer = Packer.new
-    512.times do
-      packer.write_array_header(1)
-    end
+  it 'read raises level stack too deep error' do
+    512.times { packer.write_array_header(1) }
     packer.write(nil)
 
     unpacker = Unpacker.new(packer.buffer)
@@ -73,23 +148,39 @@ describe Unpacker do
     }.should raise_error(MessagePack::StackError)
   end
 
-  it 'raises invalid byte error' do
+  it 'skip raises level stack too deep error' do
+    512.times { packer.write_array_header(1) }
+    packer.write(nil)
+
+    unpacker = Unpacker.new(packer.buffer)
+    lambda {
+      unpacker.skip
+    }.should raise_error(MessagePack::StackError)
+  end
+
+  it 'read raises invalid byte error' do
     unpacker.feed("\xc6")
     lambda {
       unpacker.read
     }.should raise_error(MessagePack::MalformedFormatError)
   end
 
+  it 'skip raises invalid byte error' do
+    unpacker.feed("\xc6")
+    lambda {
+      unpacker.skip
+    }.should raise_error(MessagePack::MalformedFormatError)
+  end
+
   it "gc mark" do
-    obj = [1024, {["a","b"]=>["c","d"]}, ["e","f"], "d", 70000, 4.12, 1.5, 1.5, 1.5]
-    raw = obj.to_msgpack.to_s * 4
+    raw = sample_object.to_msgpack.to_s * 4
 
     n = 0
     raw.split(//).each do |b|
       GC.start
       unpacker.feed_each(b) {|o|
         GC.start
-        o.should == obj
+        o.should == sample_object
         n += 1
       }
       GC.start

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: msgpack
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: x86-mingw32
 authors: 
 - FURUHASHI Sadayuki
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-14 00:00:00 +09:00
+date: 2013-03-16 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency