dbf 0.2.0 → 0.3.0

data/lib/dbf.rb

@@ -1,2 +1,2 @@
 require 'date'
-require 'dbf/reader'
+require 'dbf/reader'

data/lib/dbf/reader.rb

@@ -10,6 +10,9 @@ module DBF
     "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 DBFError < StandardError; end
+  class UnpackError < DBFError; end
   
   class Reader
     
@@ -85,12 +88,12 @@ module DBF
           end
         when 'D' # date
           raw = unpack_string(field).to_s.strip
-          record[field.name] = raw.empty ? nil : Date.new(*raw.match(DATE_REGEXP).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_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 rescue false
+          record[field.name] = unpack_string(field) =~ /^(y|t)$/i ? true : false rescue false
         else
           record[field.name] = unpack_string(field)
         end
@@ -121,8 +124,12 @@ module DBF
       seek(@record_length * index)
     end
     
+    def unpack_field(field)
+      @data_file.read(field.length).unpack("a#{field.length}")
+    end
+    
     def unpack_string(field)
-      @data_file.read(field.length).unpack("a#{field.length}").to_s
+      unpack_field(field).to_s
     end
     
     def unpack_integer(field)
@@ -135,10 +142,13 @@ module DBF
     
   end
   
+  class FieldError < StandardError; end
+  
   class Field
     attr_accessor :name, :type, :length, :decimal
 
     def initialize(name, type, length, decimal)
+      raise FieldError, "field length must be greater than 0" unless length > 0
       self.name, self.type, self.length, self.decimal = name, type, length, decimal
     end
 

data/test/common.rb

@@ -0,0 +1,90 @@
+module CommonTests
+  module Read
+    
+    def test_version
+      assert_equal @controls[:version], @dbf.version
+      assert_equal @dbf.instance_eval("DBF::VERSION_DESCRIPTIONS['#{@dbf.version}']"), @dbf.version_description
+    end
+    
+    def test_has_memo_file
+      assert_equal @controls[:has_memo_file], @dbf.has_memo_file?
+    end
+    
+    def test_records
+      assert_kind_of Array, @dbf.records
+      assert_kind_of Array, @dbf.rows
+      assert(@dbf.records.all? {|record| record.is_a?(DBF::Record)})
+    end
+    
+    # Does the header info match the actual fields found?
+    def test_field_count
+      assert_equal @controls[:field_count], @dbf.field_count
+      assert_equal @dbf.field_count, @dbf.fields.size, "header field_count does not equal actual field count"
+    end
+    
+    # Does the header info match the actual number of records found?
+    def test_record_count
+      assert_equal @controls[:record_count], @dbf.record_count
+      assert_equal @dbf.record_count, @dbf.records.size, "header record_count does not equal actual record count"
+    end
+    
+    def test_record_length
+      assert_equal @controls[:record_length], @dbf.instance_eval {@record_length}
+      assert_equal @controls[:record_length], @dbf.fields.inject(1) {|sum, field| sum + field.length}
+    end
+    
+    def test_field_attributes
+      @dbf.fields.each do |field|
+        assert_kind_of DBF::Field, field
+        assert field.name.is_a?(String) && !field.name.empty?
+        assert %w(C N L D M F B G P Y T I V X @ O +).include?(field.type)
+        assert_kind_of Fixnum, field.length
+        assert field.length > 0
+        assert_kind_of Fixnum, field.decimal
+      end
+    end
+    
+    def test_random_records
+      10.times do
+        record_num = rand(@controls[:record_count])
+        assert_equal @dbf.records[record_num], @dbf.record(record_num)
+      end
+    end
+    
+    def test_character_fields
+      @controls[:testable_character_field_names].each do |name|
+        assert(@dbf.records.any? {|record| record[name].is_a?(String)})
+      end
+    end
+    
+    def test_date_fields
+      @controls[:testable_date_field_names].each do |name|
+        assert(@dbf.records.any? {|record| record[name].is_a?(Date)})
+      end
+    end
+    
+    def test_integer_numeric_fields
+      @controls[:testable_integer_field_names].each do |name|
+        assert(@dbf.records.any? {|record| record[name].is_a?(Fixnum)})
+      end
+    end
+    
+    def test_float_numeric_fields
+      @controls[:testable_float_field_names].each do |name|
+        assert(@dbf.records.any? {|record| record[name].is_a?(Float)})
+      end
+    end
+    
+    def test_logical_fields
+      # need a test database that has a logical field
+    end
+
+    def test_memo_fields
+      @controls[:testable_memo_field_names].each do |name|
+        assert(@dbf.records.any? {|record| record[name].is_a?(String)})
+      end
+    end
+  
+  end
+  
+end

data/test/dbase_iii_read_test.rb

@@ -0,0 +1,26 @@
+$:.unshift(File.dirname(__FILE__) + "/../lib/")
+require 'test/unit'
+require 'dbf'
+require 'common'
+
+class DBaseIIIReadTest < Test::Unit::TestCase
+  include CommonTests::Read
+  
+  def setup
+    @controls = {
+      :version => "03",
+      :has_memo_file => false,
+      :field_count => 31,
+      :record_count => 14,
+      :record_length => 590,
+      :testable_character_field_names => ["Shape"],
+      :testable_date_field_names => ["Date_Visit"],
+      :testable_integer_field_names => ["Filt_Pos"],
+      :testable_float_field_names => ["Max_PDOP"],
+      :testable_logical_field_names => [],
+      :testable_memo_field_names => []
+    }
+    @dbf = DBF::Reader.new(File.join(File.dirname(__FILE__),'databases', 'dbase_iii.dbf'))
+  end
+  
+end

data/test/foxpro_read_test.rb

@@ -1,94 +1,26 @@
 $:.unshift(File.dirname(__FILE__) + "/../lib/")
 require 'test/unit'
 require 'dbf'
+require 'common'
 
 class FoxproReadTest < Test::Unit::TestCase
+  include CommonTests::Read
   
   def setup
+    @controls = {
+      :version => "f5",
+      :has_memo_file => true,
+      :field_count => 59,
+      :record_count => 975,
+      :record_length => 969,
+      :testable_character_field_names => ["NOM"],
+      :testable_date_field_names => ["DATN"],
+      :testable_integer_field_names => ["NF"],
+      :testable_float_field_names => [],
+      :testable_logical_field_names => [],
+      :testable_memo_field_names => ["OBSE"]
+    }
     @dbf = DBF::Reader.new(File.join(File.dirname(__FILE__),'databases', 'foxpro.dbf'))
   end
   
-  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
-    assert_equal @dbf.record(0), @dbf.records[0]
-    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_record_count
-    assert_equal 975, @dbf.record_count
-    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
-    @dbf.records.each do |record| 
-      assert record['NOM'].is_a?(String)
-    end
-  end
-  
-  def test_date_fields
-    @dbf.records.each do |record| 
-      assert record['DATN'].is_a?(Date) || record['DATN'].nil?
-    end
-  end
-  
-  def test_numeric_fields
-    @dbf.records.each do |record|
-      assert record['NF'].is_a?(Fixnum)
-    end
-  end
-  
-  def test_logical_fields
-    # need a test database that has a logical field
-  end
-  
-  def test_memo_fields
-    @dbf.records.each_with_index do |record, index|
-      if [1,3,5].include?(index)
-        assert record['OBSE'].is_a?(String)
-      elsif [2].include?(index)
-        assert record['OBSE'].nil?
-      else
-        assert record['OBSE'].is_a?(String) || record['OBSE'].nil?
-      end
-    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,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: dbf
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2006-08-08 00:00:00 -07:00
+  version: 0.3.0
+date: 2006-08-12 00:00:00 -07:00
 summary: A library for reading DBase (or XBase, Clipper, Foxpro, etc) database files
 require_paths: 
 - lib
@@ -32,8 +32,11 @@ files:
 - lib/dbf
 - lib/dbf.rb
 - lib/dbf/reader.rb
+- test/common.rb
 - test/databases
+- test/dbase_iii_read_test.rb
 - test/foxpro_read_test.rb
+- test/databases/dbase_iii.dbf
 - test/databases/foxpro.dbf
 - test/databases/foxpro.fpt
 test_files: []