@@ -2,6 +2,8 @@ module DataObjects # Abstract class to read rows from a query result class Reader + include Enumerable + # Return the array of field names def fields raise NotImplementedError.new @@ -27,5 +29,23 @@ module DataObjects raise NotImplementedError.new end + # Yield each row to the given block as a struct + def each + begin + while next! + yield struct.new(*values) + end + ensure + close + self + end + end + + private + + def struct + @struct ||= Struct.new(*fields.map {|f| f.to_sym}) + end + end end data_objects/lib/data_objects/reader.rb @@ -153,4 +153,31 @@ share_examples_for 'a Reader' do end + it { @reader.should respond_to(:values) } + + describe 'each' do + + it 'should yield each row to the block' do + rows_yielded = 0 + @reader.each do |row| + row.should respond_to(:[]) + row.should respond_to(:name) + row.should respond_to(:code) + + row.size.should == 2 + + row.name.should be_a(String) + row.code.should be_a(String) + row[:name].should be_a(String) + row[:code].should be_a(String) + row[0].should be_a(String) + row[1].should be_a(String) + + rows_yielded += 1 + end + rows_yielded.should == 15 + end + + end + end data_objects/lib/data_objects/spec/reader_spec.rb @@ -9,10 +9,13 @@ describe DataObjects::Reader do reader = command.execute_reader + reader.should be_a(Enumerable) + reader.should respond_to(:close) reader.should respond_to(:next!) reader.should respond_to(:values) reader.should respond_to(:fields) + reader.should respond_to(:each) connection.close end data_objects/spec/reader_spec.rb @@ -46,10 +46,10 @@ CONFIG = OpenStruct.new CONFIG.scheme = 'postgres' CONFIG.user = ENV['DO_POSTGRES_USER'] || 'postgres' CONFIG.pass = ENV['DO_POSTGRES_PASS'] || '' -CONFIG.user_info = unless CONFIG.user == 'postgres' && CONFIG.pass.empty? +CONFIG.user_info = unless CONFIG.pass.empty? "#{CONFIG.user}:#{CONFIG.pass}@" else - '' + "#{CONFIG.user}@" end CONFIG.host = ENV['DO_POSTGRES_HOST'] || 'localhost' CONFIG.port = ENV['DO_POSTGRES_PORT'] || '5432' do_postgres/spec/spec_helper.rb 2f97433d681fdb5185305c57ae96a41a385d85f2 Dirkjan Bussink d.bussink@gmail.com http://github.com/datamapper/do/commit/d1381d7f09d22ca11341a1adbfbc6f530208fb32 d1381d7f09d22ca11341a1adbfbc6f530208fb32 2009-10-27T13:12:13-07:00 2009-10-27T13:12:13-07:00 Add enumerable support to DO using structs 63598d10d117e2ff4a18a1b057a5bfda69bf2716 Dirkjan Bussink d.bussink@gmail.com