X-Git-Url: http://git.code-monkey.de/?p=ruby-eet.git;a=blobdiff_plain;f=lib%2Feet.rb;h=266a9e3b86572224c9d18d5f7713b43172a00b92;hp=ddac645d5404945b4a11379c30a2a35568aa7075;hb=1bf8db372e456e41404ee3670db6efef574cc442;hpb=47d547c6a7bff822ae2cab01c81f50b7cc132b99

diff --git a/lib/eet.rb b/lib/eet.rb
index ddac645..266a9e3 100644
--- a/lib/eet.rb
+++ b/lib/eet.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: eet.rb 33 2005-04-30 11:10:16Z tilman $
+# $Id: eet.rb 40 2005-05-18 19:04:52Z 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
 
@@ -161,15 +161,11 @@ module Eet
 	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
-			map { |c| c.serialize }.join
-		end
-
 		def Stream.deserialize(data)
 			data = data.to_str.dup
 			s = Stream.new
@@ -194,21 +190,13 @@ 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.length < 8 || data[0, 4] != "CHnK"
 				raise(ChunkError, "invalid data")