Chunk.deserialize doesn't modify its argument any more.

[ruby-eet.git] / lib / eet.rb

diff --git a/lib/eet.rb b/lib/eet.rb
index 69bd9b8a894757e6903bbb9b9f8715d0e03df71c..fa9f090e851672f5430c6dacb2731824c5f35f78 100644 (file)
--- a/lib/eet.rb
+++ b/lib/eet.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: eet.rb 39 2005-05-18 18:54:31Z tilman $
+# $Id: eet.rb 44 2005-05-25 19:51:25Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -124,13 +124,13 @@ end
 
 class TrueClass # :nodoc:
        def to_eet_chunks(tag, type = nil)
-               [Eet::Chunk.new(tag, [1].pack("c"))]
+               [Eet::Chunk.new(tag, "\1")]
        end
 end
 
 class FalseClass # :nodoc:
        def to_eet_chunks(tag, type = nil)
-               [Eet::Chunk.new(tag, [0].pack("c"))]
+               [Eet::Chunk.new(tag, "\0")]
        end
 end
 
@@ -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