dbf 0.1.0 → 0.2.0

data/lib/dbf/reader.rb

@@ -1,44 +1,42 @@
+require 'rubygems'
+require 'breakpoint'
 module DBF
   
   DBF_HEADER_SIZE = 32
   FPT_HEADER_SIZE = 512
   FPT_BLOCK_HEADER_SIZE = 8
+  DATE_REGEXP = /([\d]{4})([\d]{2})([\d]{2})/
+  VERSION_DESCRIPTIONS = {"02" => "FoxBase", "03" => "dBase III without memo file", "04" => "dBase IV without memo file",
+    "05" => "dBase V without memo file", "30" => "Visual FoxPro", "31" => "Visual FoxPro with AutoIncrement field",
+    "7b" => "dBase IV with memo file", "83" => "dBase III with memo file", "8b" => "dBase IV with memo file",
+    "8e" => "dBase IV with SQL table", "f5" => "FoxPro with memo file", "fb" => "FoxPro without memo file"}
   
   class Reader
     
     attr_reader :field_count
     attr_reader :fields
     attr_reader :record_count
+    attr_reader :version
+    attr_reader :last_updated
     
     def initialize(file)
       @data_file = File.open(file, 'rb')
       @memo_file = File.open(file.gsub(/dbf$/i, 'fpt'), 'rb') rescue File.open(file.gsub(/dbf$/i, 'FPT'), 'rb') rescue nil
+      reload!
+    end
+    
+    def reload!
       get_header_info
       get_memo_header_info if @memo_file
       get_field_descriptors
     end
     
-    def get_header_info
-      @data_file.rewind
-      @record_count, @header_length, @record_length = @data_file.read(DBF_HEADER_SIZE).unpack('xxxxVvv')
-      @field_count = (@header_length - DBF_HEADER_SIZE + 1) / DBF_HEADER_SIZE
-    end
-    
-    def get_memo_header_info
-      @memo_file.rewind
-      @memo_next_available_block, @memo_block_size = @memo_file.read(FPT_HEADER_SIZE).unpack('Nxxn')
-    end
-    
     def has_memo_file?
       @memo_file ? true : false
     end
     
-    def get_field_descriptors
-      @fields = Array.new(@field_count) {|i| Field.new(*@data_file.read(32).unpack('a10xax4ss'))}
-    end
-    
     def field(field_name)
-      @fields.select {|f| f.name == field_name}
+      @fields.detect {|f| f.name == field_name.to_s}
     end
     
     def memo(start_block)
@@ -51,20 +49,28 @@ module DBF
       memo_string
     end
     
-    def unpack_string(field)
-      @data_file.read(field.length).unpack("a#{field.length}")
-    end
-    
     def records
-      seek(0)
-      Array.new(@record_count) {build_record if @data_file.read(1).unpack('c').to_s == '32'}
+      seek_to_record(0)
+      @records ||= Array.new(@record_count) { build_record if active_record? }
     end
     
     alias_method :rows, :records
     
     def record(index)
       seek_to_record(index)
-      build_record if @data_file.read(1).unpack('c').to_s == '32'
+      build_record if active_record?
+    end
+    
+    alias_method :row, :record
+    
+    def version_description
+      VERSION_DESCRIPTIONS[version]
+    end
+    
+    private
+    
+    def active_record?
+      @data_file.read(1).unpack('H2').to_s == '20' rescue false
     end
     
     def build_record
@@ -72,22 +78,41 @@ module DBF
       @fields.each do |field| 
         case field.type
         when 'N' # number
-          record[field.name] = unpack_string(field)[0].to_i
+          if field.decimal == 0
+            record[field.name] = unpack_integer(field) rescue nil
+          else
+            record[field.name] = unpack_float(field) rescue nil
+          end
         when 'D' # date
           raw = unpack_string(field).to_s.strip
-          record[field.name] = raw.strip.empty? ? nil : Date.new(*raw.match(/([\d]{4})([\d]{2})([\d]{2})/).to_a.slice(1,3).map {|n| n.to_i}) rescue nil
+          record[field.name] = raw.empty ? nil : Date.new(*raw.match(DATE_REGEXP).to_a.slice(1,3).map {|n| n.to_i}) rescue nil
         when 'M' # memo
-          starting_block = unpack_string(field).first.to_i
-          record[field.name] = starting_block == 0 ? nil : memo(starting_block)
+          starting_block = unpack_integer(field)
+          record[field.name] = starting_block == 0 ? nil : memo(starting_block) rescue nil
         when 'L' # logical
-          record[field.name] = unpack_string(field) =~ /(y|t)/i ? true : false
+          record[field.name] = unpack_string(field) =~ /(y|t)/i ? true : false rescue false
         else
-          record[field.name] = unpack_string(field).to_s.strip
+          record[field.name] = unpack_string(field)
         end
       end
       record
     end
     
+    def get_header_info
+      @data_file.rewind
+      @version, @record_count, @header_length, @record_length = @data_file.read(DBF_HEADER_SIZE).unpack('H2xxxVvv')
+      @field_count = (@header_length - DBF_HEADER_SIZE + 1) / DBF_HEADER_SIZE
+    end
+    
+    def get_field_descriptors
+      @fields = Array.new(@field_count) {|i| Field.new(*@data_file.read(32).unpack('a10xax4cc'))}
+    end
+    
+    def get_memo_header_info
+      @memo_file.rewind
+      @memo_next_available_block, @memo_block_size = @memo_file.read(FPT_HEADER_SIZE).unpack('Nxxn')
+    end
+    
     def seek(offset)
       @data_file.seek(@header_length + offset)
     end
@@ -96,6 +121,18 @@ module DBF
       seek(@record_length * index)
     end
     
+    def unpack_string(field)
+      @data_file.read(field.length).unpack("a#{field.length}").to_s
+    end
+    
+    def unpack_integer(field)
+      unpack_string(field).to_i
+    end
+    
+    def unpack_float(field)
+      unpack_string(field).to_f
+    end
+    
   end
   
   class Field

data/test/{read_test.rb → foxpro_read_test.rb}

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__) + "/../lib/")
 require 'test/unit'
 require 'dbf'
 
-class ReadTest < Test::Unit::TestCase
+class FoxproReadTest < Test::Unit::TestCase
   
   def setup
     @dbf = DBF::Reader.new(File.join(File.dirname(__FILE__),'databases', 'foxpro.dbf'))
@@ -11,6 +11,9 @@ class ReadTest < Test::Unit::TestCase
   def test_records
     assert_kind_of Array, @dbf.records
     assert_kind_of Array, @dbf.rows
+    @dbf.records.each do |record|
+      assert_kind_of DBF::Record, record
+    end
   end
   
   def test_record
@@ -18,14 +21,23 @@ class ReadTest < Test::Unit::TestCase
     assert_equal @dbf.record(99), @dbf.records[99]
   end
   
+  def test_fields
+    assert_kind_of Array, @dbf.fields
+  end
+  
   def test_field_count
+    assert_equal 59, @dbf.field_count
     assert_equal @dbf.field_count, @dbf.fields.size
   end
   
-  def test_header_info
-    assert_equal 59, @dbf.field_count
+  def test_record_count
     assert_equal 975, @dbf.record_count
-    assert @dbf.has_memo_file?
+    assert_equal @dbf.record_count, @dbf.records.size
+  end
+  
+  def test_record_length
+    assert_equal 969, @dbf.instance_eval {@record_length}
+    assert_equal 969, @dbf.fields.inject(1) {|sum, field| sum + field.length}
   end
   
   def test_character_fields
@@ -62,4 +74,21 @@ class ReadTest < Test::Unit::TestCase
     end
   end
   
+  def test_field
+    assert_kind_of DBF::Field, @dbf.field("NOM")
+    assert_equal "NOM", @dbf.field("NOM").name
+    assert_equal "C", @dbf.field("NOM").type
+    assert_equal 20, @dbf.field(:NOM).length
+    assert_equal 0, @dbf.field("NOM").decimal
+  end
+  
+  def test_version
+    assert_equal "f5", @dbf.version
+    assert_equal "FoxPro with memo file", @dbf.version_description
+  end
+  
+  def test_has_memo_file
+    assert @dbf.has_memo_file?
+  end
+  
 end

metadata

@@ -3,13 +3,13 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: dbf
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2006-08-01 00:00:00 -07:00
+  version: 0.2.0
+date: 2006-08-08 00:00:00 -07:00
 summary: A library for reading DBase (or XBase, Clipper, Foxpro, etc) database files
 require_paths: 
 - lib
 email: keithm@infused.org
-homepage: 
+homepage: http://www.infused.org
 rubyforge_project: 
 description: 
 autorequire: 
@@ -33,7 +33,7 @@ files:
 - lib/dbf.rb
 - lib/dbf/reader.rb
 - test/databases
-- test/read_test.rb
+- test/foxpro_read_test.rb
 - test/databases/foxpro.dbf
 - test/databases/foxpro.fpt
 test_files: []