Re-implemented Chunk#initialize in C.

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

diff --git a/lib/eet.rb b/lib/eet.rb
index 8a949845063a5baf1ef8e0c75fa3ec7b9741dcfa..194409e4df9cbe8bf191f86e2812ee7f0adb2459 100644 (file)
--- a/lib/eet.rb
+++ b/lib/eet.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: eet.rb 34 2005-04-30 13:15:19Z tilman $
+# $Id: eet.rb 47 2005-05-30 19:19:07Z 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,17 +161,24 @@ 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 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
@@ -179,25 +186,11 @@ module Eet
        end
 
        class Chunk # :nodoc:
-               attr_reader :tag, :data
-
-               def initialize(tag, data)
-                       if tag.to_str.include?(0)
-                               raise(ArgumentError,
-                                     "tag must not contain binary zeroes")
-                       end
-
-                       @tag = tag.to_str.dup.freeze
-                       @data = data.to_str.dup.freeze
-
-                       # libeet uses a signed 32bit integer to store the
-                       # chunk size, so make sure we don't overflow it
-                       if (@tag.length + 1 + @data.length) >= (1 << 31)
-                               raise(ArgumentError, "tag or data too long")
+               def Chunk.deserialize(data)
+                       if data.to_str.empty?
+                               raise(ArgumentError, "buffer is empty")
                        end
-               end
 
-               def Chunk.deserialize(data)
                        if data.length < 8 || data[0, 4] != "CHnK"
                                raise(ChunkError, "invalid data")
                        end
@@ -213,9 +206,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