X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=lib%2Feet.rb;h=d178e237c35c69b85f5b91eb7ad5ca45aefd322f;hb=4c7878f377ebdbd92914b94aa9bb0c20bfa0505f;hp=fa9f090e851672f5430c6dacb2731824c5f35f78;hpb=fbf70483cddd77fc0c680c4bae75c8b8f5b9f7be;p=ruby-eet.git

diff --git a/lib/eet.rb b/lib/eet.rb
index fa9f090..d178e23 100644
--- a/lib/eet.rb
+++ b/lib/eet.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: eet.rb 44 2005-05-25 19:51:25Z tilman $
+# $Id: eet.rb 53 2005-06-02 20:01:45Z 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 is 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
@@ -154,11 +120,8 @@ class Hash # :nodoc:
 end
 
 module Eet
-	VERSION = "0.1.2"
+	VERSION = "0.1.3"
 
-	class EetError < StandardError; end
-	class NameError < EetError; end
-	class PropertyError < EetError; end
 	class ChunkError < EetError; end
 
 	class Stream # :nodoc:
@@ -167,7 +130,10 @@ module Eet
 		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
 
@@ -183,25 +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
-
-			# 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