lib/tracksperanto/accumulator.rb in tracksperanto-2.1.0 vs lib/tracksperanto/accumulator.rb in tracksperanto-2.1.1

@@ -1,41 +1,42 @@
 # An accumulator buffer for Ruby objects. Use it to sequentially store a shitload
 # of objects on disk and then retreive them one by one. Make sure to call #close! when done with it to
 # discard the stored blob. This object is intended to be used as a Tracksperanto::Import::Base#receiver
-class Tracksperanto::Accumulator < DelegateClass(IO)
+class Tracksperanto::Accumulator
   
   # Stores the number of objects stored so far
   attr_reader :num_objects
+  alias_method :length, :num_objects
   
   def initialize
-    __setobj__(Tracksperanto::BufferIO.new)
+    @store = Tracksperanto::BufferIO.new
     @num_objects = 0
+    super
   end
   
   # Store an object
   def push(object_to_store)
-    
     @num_objects += 1
-    
     d = Marshal.dump(object_to_store)
-    bytelen = d.size
-    write(bytelen)
-    write("\t")
-    write(d)
-    write("\n")
+    [d.size, "\t", d, "\n"].map(&@store.method(:write))
   end
   
   # Retreive each stored object in succession and unlink the buffer
   def each_object_with_index
-    rewind
-    @num_objects.times { |i| yield(recover_object, i - 1) }
+    begin
+      @store.rewind
+      @num_objects.times { |i| yield(recover_object, i - 1) }
+    ensure
+      @store.close!
+    end
   end
+
   
   private
   
   def recover_object
     # Up to the tab is the amount of bytes to read
-    demarshal_bytes = gets("\t").strip.to_i
+    demarshal_bytes = @store.gets("\t").strip.to_i
     # Then read the bytes and unmarshal it
-    Marshal.load(read(demarshal_bytes))
+    Marshal.load(@store.read(demarshal_bytes))
   end
-end
\ No newline at end of file
+end