Re-implemented Object#to_eet in C.

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

diff --git a/lib/eet.rb b/lib/eet.rb
index 16cf90fbbdf06ec710f98dae8388a2bbcb913da8..3976032d12bf25852f925d6dca2e25eb61a1beb9 100644 (file)
--- 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 49 2005-05-30 19:52:36Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -25,40 +25,6 @@
 require "eet_ext"
 
 class Object
-       # :call-seq:
-       #  object.to_eet -> string
-       #
-       # Serializes the receiver to EET format.
-       def to_eet
-               props = to_eet_properties
-
-               unless props.is_a?(Hash) && !props.empty?
-                       raise(Eet::PropertyError, "invalid EET properties")
-               end
-
-               eet_name = to_eet_name
-
-               if eet_name.to_str.length < 1 || eet_name.to_str.include?(0)
-                       raise(Eet::NameError, "invalid EET name")
-               end
-
-               stream = Eet::Stream.new
-
-               props.each_pair do |tag, arg|
-                       unless arg.is_a?(Array)
-                               raise(Eet::PropertyError, "hash value not an array")
-                       end
-
-                       value, type = arg
-                       next if value.nil?
-
-                       stream.push(*value.to_eet_chunks(tag, type))
-               end
-
-               chunk = Eet::Chunk.new(eet_name, stream.serialize)
-               Eet::Stream.new(chunk).serialize
-       end
-
        def to_eet_chunks(tag, type = nil) # :nodoc:
                [Eet::Chunk.new(tag, to_eet)]
        end
@@ -124,13 +90,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 +120,28 @@ 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 data.length > 0
-                               s << Chunk.deserialize(data)
+                       while offset < data.length
+                               c, bytes = Chunk.deserialize(data[offset..-1])
+
+                               s << c
+                               offset += bytes
                        end
 
                        s
@@ -183,33 +149,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
-
-                       @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)
-                               raise(ArgumentError, "tag or data too long")
+               def Chunk.deserialize(data)
+                       if data.to_str.empty?
+                               raise(ArgumentError, "buffer is empty")
                        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")
                        end
@@ -225,9 +169,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