#--
-# $Id: eet.rb 34 2005-04-30 13:15:19Z tilman $
+# $Id: eet.rb 46 2005-05-25 20:10:37Z tilman $
#
# Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
#
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
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
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 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
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
c = Chunk.new(*data[8, size].split("\0", 2))
- data.replace(data[8 + size..-1] || "")
-
- c
+ [c, 8 + size]
end
end
end