X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=lib%2Feet.rb;h=8a2893ef3b6b631cd44119684879bc0a7fa99dbb;hb=2d2e5afec0ba994e5e06aebe32ba348570623519;hp=16cf90fbbdf06ec710f98dae8388a2bbcb913da8;hpb=b50b7eda959639a4c5c213495899e8d03ee15599;p=ruby-eet.git

diff --git a/lib/eet.rb b/lib/eet.rb
index 16cf90f..8a2893e 100644
--- a/lib/eet.rb
+++ b/lib/eet.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: eet.rb 19 2005-03-29 17:02:30Z tilman $
+# $Id: eet.rb 46 2005-05-25 20:10:37Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -46,7 +46,7 @@ class Object
 
 		props.each_pair do |tag, arg|
 			unless arg.is_a?(Array)
-				raise(Eet::PropertyError, "hash value not an array")
+				raise(Eet::PropertyError, "hash value is not an array")
 			end
 
 			value, type = arg
@@ -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
 
@@ -154,28 +154,31 @@ class Hash # :nodoc:
 end
 
 module Eet
-	VERSION = "0.1.1"
+	VERSION = "0.1.2"
 
 	class EetError < StandardError; end
 	class NameError < EetError; end
 	class PropertyError < EetError; end
 	class ChunkError < EetError; end
 
-	class Stream < Array # :nodoc:
+	class Stream # :nodoc:
 		def initialize(chunk = nil)
 			super(chunk.nil? ? 0 : 1, chunk)
 		end
 
-		def serialize
-			inject("") { |a, c| a << c.serialize }
-		end
-
 		def Stream.deserialize(data)
-			data = data.to_str.dup
+			if data.to_str.empty?
+				raise(ArgumentError, "buffer is empty")
+			end
+
 			s = Stream.new
+			offset = 0
+
+			while offset < data.length
+				c, bytes = Chunk.deserialize(data[offset..-1])
 
-			while data.length > 0
-				s << Chunk.deserialize(data)
+				s << c
+				offset += bytes
 			end
 
 			s
@@ -194,22 +197,18 @@ module Eet
 			@tag = tag.to_str.dup.freeze
 			@data = data.to_str.dup.freeze
 
-			@size = @tag.length + 1 + @data.length
-
 			# libeet uses a signed 32bit integer to store the
 			# chunk size, so make sure we don't overflow it
-			if @size >= (1 << 31)
+			if (@tag.length + 1 + @data.length) >= (1 << 31)
 				raise(ArgumentError, "tag or data too long")
 			end
 		end
 
-		def serialize
-			buf = "CHnK"
-			buf << [@size].pack("V")
-			buf << @tag << "\0" << @data
-		end
-
 		def Chunk.deserialize(data)
+			if data.to_str.empty?
+				raise(ArgumentError, "buffer is empty")
+			end
+
 			if data.length < 8 || data[0, 4] != "CHnK"
 				raise(ChunkError, "invalid data")
 			end
@@ -225,9 +224,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