kuro7-gas 1.0.0 → 1.0.1

data/lib/gas.rb

@@ -16,6 +16,10 @@
 
 module Gas
 
+  # Gas::Error
+  class Error < StandardError
+  end
+
   def encode_num (value)
     buf = String.new
 
@@ -63,7 +67,7 @@ module Gas
     zero_byte_count = 0
     loop do
       byte = io.read(1)
-      fail 'failed to read 1 byte' unless byte
+      raise Gas::Error, 'failed to read 1 byte', caller unless byte
       byte = byte[0]
       break if byte != 0x00
       zero_byte_count += 1
@@ -84,7 +88,7 @@ module Gas
     retval = mask & byte
     additional_bytes_to_read.times do
       byte = io.read(1)
-      fail 'failed to read 1 byte' unless byte
+      raise Gas::Error, 'failed to read 1 byte', caller unless byte
       byte = byte[0]
       retval = (retval << 8) | byte
     end
@@ -96,6 +100,10 @@ module Gas
 
     attr_accessor :parent, :size, :id, :attributes, :payload, :children
 
+    def self.parse (io)
+      Chunk.new.parse(io)
+    end
+
     def initialize (arg = nil)
       @parent = nil
       @size = 0
@@ -123,7 +131,7 @@ module Gas
       when IO, StringIO
         parse(arg)
       else
-        fail "invalid type: #{arg.class}"
+        raise Gas::Error, "invalid type: #{arg.class}", caller
       end
     end
     def parse (io)
@@ -135,7 +143,7 @@ module Gas
       id_size = decode_num(io)
       @id = io.read(id_size)
       unless @id and @id.size == id_size
-        fail "failed to read #{'0x%x' % id_size} bytes"
+        raise Gas::Error, "failed to read #{'0x%x' % id_size} bytes", caller
       end
       nb_attributes = decode_num(io)
       @attributes = Hash.new
@@ -143,19 +151,19 @@ module Gas
         key_size = decode_num(io)
         key = io.read(key_size)
         unless key and key.size == key_size
-          fail "failed to read #{'0x%x' % key_size} bytes" 
+          raise Gas::Error, "failed to read #{'0x%x' % key_size} bytes" , caller
         end
         value_size = decode_num(io)
         value = io.read(value_size)
         unless value and value.size == value_size
-          fail "failed to read #{'0x%x' % value_size} bytes"
+          raise Gas::Error, "failed to read #{'0x%x' % value_size} bytes", caller
         end
         @attributes[key] = value
       end
       payload_size = decode_num(io)
       @payload = io.read(payload_size)
       unless @payload and @payload.size == payload_size
-        fail "failed to read #{'0x%x' % payload_size} bytes"
+        raise Gas::Error, "failed to read #{'0x%x' % payload_size} bytes", caller
       end
       nb_children = decode_num(io)
       @children = Array.new
@@ -165,7 +173,8 @@ module Gas
       end
       self
     end
-    def write (io)
+    def write (io, updated = false)
+      update unless updated
       io << encode_num(@size)
       io << encode_num(id.size)
       io << id
@@ -182,7 +191,7 @@ module Gas
       io << @payload
       io << encode_num(@children.size)
       @children.each do |child|
-        child.write(io)
+        child.write(io, true)
       end
       io
     end
@@ -232,7 +241,7 @@ module Gas
         chunk.parent = self
         @children << chunk
       else
-        raise GasError, 'invalid type for appending'
+        raise Gas::Error, 'invalid type for appending', caller
       end
       self
     end
@@ -264,7 +273,7 @@ module Gas
       case meth.to_s
       when /=\Z/
         key = meth.to_s[0..-2]
-        raise GasError, 'invalid arg count' unless args.size == 1
+        raise Gas::Error, 'invalid arg count', caller unless args.size == 1
         self[key] = args.first
       else
         return self[meth]
@@ -272,10 +281,10 @@ module Gas
       self
     end
 
-    def test (depth = 0)
+    def test (io = $stderr, depth = 0)
       pi = proc do |data|
-        print('    ' * depth)
-        puts data
+        io.print('    ' * depth)
+        io.puts data
       end
       pi.call '---'
       pi.call "id: #{id}"
@@ -292,15 +301,15 @@ module Gas
         #lines = lines.map {|l|l.strip}
         m = lines.collect{|l|l.size}.max
         m = m > 78 ? 78 : m
-        puts "+" << ('-' * m)
+        io.puts "+" << ('-' * m)
         lines.each do |line|
-          puts "| " << line
-          #puts "| " << line.inspect[1..-2]
+          io.puts "| " << line
+          #io.puts "| " << line.inspect[1..-2]
         end
-        puts "+" << ('-' * m)
+        io.puts "+" << ('-' * m)
       end
       @children.each do |child|
-        child.test(depth+1)
+        child.test(io, depth+1)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kuro7-gas
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Blanton Black
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-10 00:00:00 -07:00
+date: 2008-07-29 00:00:00 -07:00
 default_executable: 
 dependencies: []