@@ -38,7 +38,7 @@ module DBF def initialize_values @attributes = columns.inject({}) do |hash, column| if column.type == 'M' - starting_block = unpack_string(column).to_i + starting_block = unpack_data(column.length).to_i hash[column.name.underscore] = read_memo(starting_block) else value = unpack_data(column.length) @@ -52,10 +52,6 @@ module DBF @data.read(length).unpack("a#{length}").first end - def unpack_string(column) - unpack_data(column.length).to_s - end - def read_memo(start_block) return nil if !@table.has_memo_file? || start_block < 1 lib/dbf/record.rb @@ -120,16 +120,5 @@ describe DBF::Record do @record.send(:unpack_data, 3).should == 'abc' end end - - describe 'unpack_string' do - before do - @record = example_record('abc') - end - - it 'should unpack the data and convert it to a String' do - column = DBF::Column.new 'ColumnName', 'C', 3, 0 - @record.send(:unpack_string, column).should == 'abc' - end - end end spec/unit/record_spec.rb b0f261ffa5c149e33c7172e1e8d0c9d7b8183d13 Keith Morrison keithm@infused.org http://github.com/infused/dbf/commit/356fd7e59927b04b69bc47c6070c1358f325f4c8 356fd7e59927b04b69bc47c6070c1358f325f4c8 2009-10-30T00:18:17-07:00 2009-10-30T00:18:17-07:00 Factor out unpack_string 54a7462e8ac1e6cb851ee7aaeef2c8f9e116508a Keith Morrison keithm@infused.org