plugins/dataobjects/do.rb in datamapper-0.2.0 vs plugins/dataobjects/do.rb in datamapper-0.2.1

@@ -85,29 +85,39 @@
   end
   
   class Reader
     include Enumerable
     
-    attr_reader :field_count, :has_rows, :records_affected, :fields
-    alias_method :has_rows?, :has_rows
+    attr_reader :field_count, :records_affected, :fields
     
     def each
-      return nil unless has_rows
-      while(true) do
-        yield
-        break unless self.next
-      end
+      raise NotImplementedError
     end
     
+    def has_rows?
+      @has_rows
+    end
+    
     def current_row
       ret = []
       field_count.times do |i|
         ret[i] = item(i)
       end
       ret
     end
     
-    def close
+    def open?
+      @state != STATE_CLOSED
+    end
+    
+    def close        
+      real_close
+      @reader = nil
+      @state = STATE_CLOSED
+      true
+    end
+    
+    def real_close
       raise NotImplementedError
     end
     
     # retrieves the Ruby data type for a particular column number
     def data_type_name(col)
\ No newline at end of file