From fbf70483cddd77fc0c680c4bae75c8b8f5b9f7be Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Wed, 25 May 2005 19:51:25 +0000
Subject: [PATCH] Chunk.deserialize doesn't modify its argument any more.

Instead, the number of bytes consumed is now returned, too.
---
 ChangeLog          |  5 ++++-
 lib/eet.rb         | 14 ++++++++------
 test/test_chunk.rb |  4 ++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6ef4872..e663504 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,13 @@
 --
-$Id: ChangeLog 43 2005-05-25 19:44:06Z tilman $
+$Id: ChangeLog 44 2005-05-25 19:51:25Z tilman $
 ++
 
 2005-05-25 Tilman Sauerbeck (tilman at code-monkey de)
         * test/test_array_sub.rb: Added a test for the :sub format
           specifier
+        * lib/eet.rb, test/test_chunk.rb: Chunk.deserialize doesn't
+          modify its argument any more, instead, the number of bytes
+          consumed is now returned, too.
 
 2005-05-19 Tilman Sauerbeck (tilman at code-monkey de)
         * Rakefile: Code cleanup
diff --git a/lib/eet.rb b/lib/eet.rb
index 266a9e3..fa9f090 100644
--- a/lib/eet.rb
+++ b/lib/eet.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: eet.rb 40 2005-05-18 19:04:52Z tilman $
+# $Id: eet.rb 44 2005-05-25 19:51:25Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -169,9 +169,13 @@ module Eet
 		def Stream.deserialize(data)
 			data = data.to_str.dup
 			s = Stream.new
+			offset = 0
 
-			while data.length > 0
-				s << Chunk.deserialize(data)
+			while offset < data.length
+				c, bytes = Chunk.deserialize(data[offset..-1])
+
+				s << c
+				offset += bytes
 			end
 
 			s
@@ -213,9 +217,7 @@ module Eet
 
 			c = Chunk.new(*data[8, size].split("\0", 2))
 
-			data.replace(data[8 + size..-1] || "")
-
-			c
+			[c, 8 + size]
 		end
 	end
 end
diff --git a/test/test_chunk.rb b/test/test_chunk.rb
index 2891dba..6f73e4f 100644
--- a/test/test_chunk.rb
+++ b/test/test_chunk.rb
@@ -1,4 +1,4 @@
-# $Id: test_chunk.rb 1 2005-03-26 01:45:38Z tilman $
+# $Id: test_chunk.rb 44 2005-05-25 19:51:25Z tilman $
 
 require "eet"
 require "test/unit"
@@ -16,7 +16,7 @@ class ChunkTest < Test::Unit::TestCase
 		chunk = nil
 
 		assert_nothing_raised do
-			chunk = Eet::Chunk.deserialize(@data)
+			chunk, = Eet::Chunk.deserialize(@data)
 		end
 
 		assert_equal("tag", chunk.tag)
-- 
2.30.2