udat 1.1.1 → 1.1.2

data/lib/udat.rb

@@ -316,40 +316,49 @@ class Udat
   # The object must be enclosed in square brackets.
   def self.read_from_stream(io)
     begin
-      char = io.read(1)
-      return nil if char.nil? or char.length < 1
-      if char == "\\"
+      begin
         char = io.read(1)
         return nil if char.nil? or char.length < 1
-      end
-    end while char != "["
-    buffer = ""
-    level = 1
-    while true
-      char = io.read(1)
-      if char.nil? or char.length < 1
-        return EOFError, "Unexpected end of file in UDAT stream."
-      end
-      if char == "\\"
-        buffer << char
+        if char == "\\"
+          char = io.read(1)
+          return nil if char.nil? or char.length < 1
+        end
+      end while char != "[" and char != "<"
+      buffer = (char == "[") ? "" : nil
+      level = 1
+      while true
         char = io.read(1)
         if char.nil? or char.length < 1
           return EOFError, "Unexpected end of file in UDAT stream."
         end
-      elsif char == "[" or char == "<"
-        level += 1
-      elsif char == "]" or char == ">"
-        level -= 1
-      end
-      if level > 0
-        buffer << char
-      else
-        break
+        if char == "\\"
+          buffer << char if buffer
+          char = io.read(1)
+          if char.nil? or char.length < 1
+            return EOFError, "Unexpected end of file in UDAT stream."
+          end
+        elsif char == "[" or char == "<"
+          level += 1
+        elsif char == "]" or char == ">"
+          level -= 1
+        end
+        if level > 0
+          buffer << char if buffer
+        else
+          break
+        end
       end
-    end
+    end while buffer.nil?
     return parse(buffer)
   end
 
+  # Encodes an UDAT object and writes it enclosed by square brackets to a
+  # stream.
+  def write_to_stream(io)
+    io << "[#{self.to_udat}]"
+    return self
+  end
+
 end
 
 
@@ -566,14 +575,13 @@ class UdatCollection < Udat
   end
 
   # Behaves differently depending on the type of the argument. If the
-  # argument is an Array (responds to 'to_ary') with 2 elements, a new
-  # key/value pair is added, with the key being the first element of the
-  # array, and the value being the second argument of the array. Arrays
-  # with any other number of elements cause an error. If the argument is
-  # not an array, then it is added as a value without a key.
+  # argument is an Array with 2 elements, a new key/value pair is added,
+  # with the key being the first element of the array, and the value being
+  # the second argument of the array. Arrays with any other number of
+  # elements cause an error. If the argument is not an array, then it is
+  # added as a value without a key.
   def <<(value)
-    if value.respond_to? :to_ary
-      value = value.to_ary
+    if value.kind_of? Array
       unless value.length == 2
         raise ArgumentError,
           "#{value.length} array elements found where 2 were expected."
@@ -959,5 +967,9 @@ class IO
   def read_udat
     Udat.read_from_stream(self)
   end
+  # Calls object.write_to_stream(self).
+  def write_udat(object)
+    object.write_to_stream(self)
+  end
 end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: udat
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
-date: 2007-05-23 00:00:00 +00:00
+  version: 1.1.2
+date: 2007-05-24 00:00:00 +00:00
 summary: Parser and generator for UDAT documents, a generic data format similar to XML or YAML.
 require_paths: 
 - lib/