dbf 1.2.2 → 1.2.4

data/History.txt

@@ -1,3 +1,13 @@
+== 1.2.4
+
+* Add csv output option to dbf command-line utility
+* Read Visual FoxPro memos
+
+== 1.2.3
+
+* Small performance gain when unpacking values from the dbf file
+* Correctly handle FoxPro's integer data type
+
 == 1.2.2
 
 * Handle invalid date fields

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 1
 :minor: 2
 :build: 
-:patch: 2
+:patch: 4

data/bin/dbf

@@ -5,12 +5,14 @@ require 'dbf'
 
 $a ||= false
 $s ||= false
+$c ||= false
 
 if defined? $h then
-  puts "usage: #{File.basename(__FILE__)} [-h|-s|-a] filename"
+  puts "usage: #{File.basename(__FILE__)} [-h|-s|-a|-c] filename"
   puts "  -h = print this message"
   puts "  -s = print summary information"
   puts "  -a = create an ActiveRecord::Schema"
+  puts "  -c = create a csv file"
 else
 
   filename = ARGV.shift
@@ -37,4 +39,10 @@ else
       puts "%-16s %-10s %-10s %-10s" % [f.name, f.type, f.length, f.decimal]
     end
   end
-end
+
+  if $c
+   table = DBF::Table.new filename
+   table.to_csv
+  end
+
+end

data/dbf.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dbf}
-  s.version = "1.2.2"
+  s.version = "1.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Keith Morrison"]
-  s.date = %q{2010-04-01}
+  s.date = %q{2010-04-06}
   s.default_executable = %q{dbf}
   s.description = %q{A small fast library for reading dBase, xBase, Clipper and FoxPro database files.}
   s.email = %q{keithm@infused.org}
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
      "spec/fixtures/dbase_03.dbf",
      "spec/fixtures/dbase_30.dbf",
      "spec/fixtures/dbase_30.fpt",
+     "spec/fixtures/dbase_31.dbf",
      "spec/fixtures/dbase_83.dbf",
      "spec/fixtures/dbase_83.dbt",
      "spec/fixtures/dbase_83_schema.txt",
@@ -44,6 +45,7 @@ Gem::Specification.new do |s|
      "spec/functional/dbf_shared.rb",
      "spec/functional/format_03_spec.rb",
      "spec/functional/format_30_spec.rb",
+     "spec/functional/format_31_spec.rb",
      "spec/functional/format_83_spec.rb",
      "spec/functional/format_8b_spec.rb",
      "spec/functional/format_f5_spec.rb",
@@ -61,6 +63,7 @@ Gem::Specification.new do |s|
     "spec/functional/dbf_shared.rb",
      "spec/functional/format_03_spec.rb",
      "spec/functional/format_30_spec.rb",
+     "spec/functional/format_31_spec.rb",
      "spec/functional/format_83_spec.rb",
      "spec/functional/format_8b_spec.rb",
      "spec/functional/format_f5_spec.rb",

data/lib/dbf/column.rb

@@ -29,7 +29,7 @@ module DBF
       when 'N' # number
         unpack_number(value)
       when 'I' # integer
-        unpack_integer(value)
+        unpack_unsigned_long(value)
       when 'F' # float
         unpack_float(value)
       when 'D' # date
@@ -87,6 +87,14 @@ module DBF
       value.to_i
     end
     
+    # Decode an unsigned long
+    #
+    # @param [String] value
+    # @return [Fixnum]
+    def unpack_unsigned_long(value)
+      value.unpack('V')[0]
+    end
+    
     # Decode a boolean value
     #
     # @param [String] value

data/lib/dbf/record.rb

@@ -50,18 +50,30 @@ module DBF
     def initialize_values
       @attributes = columns.inject({}) do |hash, column|
         if column.type == 'M'
-          starting_block = unpack_data(column.length).to_i
-          hash[column.name] = read_memo(starting_block)
-          hash[column.name.underscore] = read_memo(starting_block)
+          memo = read_memo(get_starting_block(column))
+          hash[column.name] = memo
+          hash[column.name.underscore] = memo
         else
           value = unpack_data(column.length)
-          hash[column.name] = column.type_cast(value)
-          hash[column.name.underscore] = column.type_cast(value)
+          type_cast_value = column.type_cast(value)
+          hash[column.name] = type_cast_value
+          hash[column.name.underscore] = type_cast_value
         end
         hash
       end
     end
-    
+   
+    # Unpack starting block from database
+    #
+    # @param [Fixnum] length
+    def get_starting_block(column)
+      if %w(30 31).include?(@table.version)
+        @data.read(column.length).unpack('V')[0]
+      else
+        unpack_data(column.length).to_i
+      end
+    end
+
     # Unpack raw data from database
     # 
     # @param [Fixnum] length
@@ -93,7 +105,7 @@ module DBF
       else
         memo_string = memo_string[0, memo_size]
       end
-      memo_string
+      memo_string.strip
     end
     
     # Reconstucts a memo from an DBT memo file

data/lib/dbf/table.rb

@@ -135,6 +135,7 @@ module DBF
     def to_csv(path = nil)
       path = File.basename(@data.path, '.dbf') + '.csv' if path.nil?
       FCSV.open(path, 'w', :force_quotes => true) do |csv|
+        csv << columns.map {|c| c.name}
         each do |record|
           csv << record.to_a
         end
@@ -188,7 +189,7 @@ module DBF
     def find_all(options, &block)
       results = []
       each do |record|
-        if all_values_match?(record, options)
+        if record && all_values_match?(record, options)
           if block_given?
             yield(record)
           else
@@ -205,7 +206,7 @@ module DBF
     # @return [DBF::Record, nil]
     def find_first(options)
       each do |record|
-        return record if all_values_match?(record, options)
+        return record if record && all_values_match?(record, options)
       end
       nil
     end

data/spec/functional/dbf_shared.rb

@@ -21,7 +21,7 @@ describe DBF, :shared => true do
   end
   
   specify "column types should be valid" do
-    valid_column_types = %w(C N L D M F B G P Y T I V X @ O +)
+    valid_column_types = %w(C N L D M F B G P Y T I V X @ O + 0)
     @table.columns.all? {|column| valid_column_types.should include(column.type)}
   end
   

data/spec/functional/format_03_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + "/../spec_helper"
 require File.dirname(__FILE__) + "/dbf_shared"
 
 describe DBF, "of type 03 (dBase III without memo file)" do
-  before(:each) do
+  before do
     @table = DBF::Table.new "#{DB_PATH}/dbase_03.dbf"
   end
   
@@ -16,7 +16,7 @@ describe DBF, "of type 03 (dBase III without memo file)" do
     @table.should_not have_memo_file
   end
   
-  it "should report the correct memo type" do
+  it "should have a nil memo_file_format" do
     @table.memo_file_format.should be_nil
   end
   

data/spec/functional/format_30_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + "/../spec_helper"
 require File.dirname(__FILE__) + "/dbf_shared"
 
 describe DBF, "of type 30 (Visual FoxPro)" do
-  before(:each) do
+  before do
     @table = DBF::Table.new "#{DB_PATH}/dbase_30.dbf"
   end
   

data/spec/functional/format_31_spec.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + "/../spec_helper"
+require File.dirname(__FILE__) + "/dbf_shared"
+
+describe DBF, "of type 31 (Visual FoxPro with AutoIncrement field)" do
+  before do
+    @table = DBF::Table.new "#{DB_PATH}/dbase_31.dbf"
+  end
+  
+  it_should_behave_like "DBF"
+  
+  it "should have a dBase version of 31" do
+    @table.version.should == "31"
+  end
+  
+  it "should have a memo file" do
+    @table.should_not have_memo_file
+  end
+  
+  it "should have a nil memo_file_format" do
+    @table.memo_file_format.should be_nil
+  end
+  
+end

data/spec/functional/format_83_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + "/../spec_helper"
 require File.dirname(__FILE__) + "/dbf_shared"
 
 describe DBF, "of type 83 (dBase III with memo file)" do
-  before(:each) do
+  before do
     @table = DBF::Table.new "#{DB_PATH}/dbase_83.dbf"
   end
   

data/spec/functional/format_8b_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + "/../spec_helper"
 require File.dirname(__FILE__) + "/dbf_shared"
 
 describe DBF, "of type 8b (dBase IV with memo file)" do
-  before(:each) do
+  before do
     @table = DBF::Table.new "#{DB_PATH}/dbase_8b.dbf"
   end
   

data/spec/functional/format_f5_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + "/../spec_helper"
 require File.dirname(__FILE__) + "/dbf_shared"
 
 describe DBF, "of type f5 (FoxPro with memo file)" do
-  before(:each) do
+  before do
     @table = DBF::Table.new "#{DB_PATH}/dbase_f5.dbf"
   end
   

data/spec/unit/column_spec.rb

@@ -10,15 +10,15 @@ describe DBF::Column do
     it "should set the #name accessor" do
       @column.name.should == "ColumnName"
     end
-  
+    
     it "should set the #type accessor" do
       @column.type.should == "N"
     end
-  
+    
     it "should set the #length accessor" do
       @column.length.should == 1
     end
-  
+    
     it "should set the #decimal accessor" do
       @column.decimal.should == 0
     end
@@ -39,9 +39,10 @@ describe DBF::Column do
   context "#type_cast" do
     context 'with type N (number)' do
       context 'with 0 decimals' do
-        it "should cast value to Integer" do
+        it 'should cast value to Fixnum' do
           value = "135"
           column = DBF::Column.new "ColumnName", "N", 3, 0
+          column.type_cast(value).should be_a Fixnum
           column.type_cast(value).should == 135
         end
       end
@@ -50,6 +51,7 @@ describe DBF::Column do
         it "should cast value to Float" do
           value = "13.5"
           column = DBF::Column.new "ColumnName", "N", 2, 1
+          column.type_cast(value).should be_a Float
           column.type_cast(value).should == 13.5
         end
       end
@@ -59,15 +61,17 @@ describe DBF::Column do
       it "should cast value to Float" do
         value = "135"
         column = DBF::Column.new "ColumnName", "F", 3, 0
+        column.type_cast(value).should be_a Float
         column.type_cast(value).should == 135.0
       end
     end
     
     context 'with type I (integer)' do
-      it "should cast value to Integer" do
-        value = "135"
+      it "should cast value to Fixnum" do
+        value = "\203\171\001\000"
         column = DBF::Column.new "ColumnName", "I", 3, 0
-        column.type_cast(value).should == 135
+        column.type_cast(value).should be_a Fixnum
+        column.type_cast(value).should == 96643
       end
     end
     
@@ -75,12 +79,14 @@ describe DBF::Column do
       it "should cast 'y' to true" do
         value = "y"
         column = DBF::Column.new "ColumnName", "L", 1, 0
+        column.type_cast(value).should be_a TrueClass
         column.type_cast(value).should == true
       end
       
       it "should cast 'n' to false" do
         value = "n"
         column = DBF::Column.new "ColumnName", "L", 1, 0
+        column.type_cast(value).should be_a FalseClass
         column.type_cast(value).should == false
       end
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 2
-  version: 1.2.2
+  - 4
+  version: 1.2.4
 platform: ruby
 authors: 
 - Keith Morrison
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 -07:00
+date: 2010-04-06 00:00:00 -07:00
 default_executable: dbf
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,6 +70,7 @@ files:
 - spec/fixtures/dbase_03.dbf
 - spec/fixtures/dbase_30.dbf
 - spec/fixtures/dbase_30.fpt
+- spec/fixtures/dbase_31.dbf
 - spec/fixtures/dbase_83.dbf
 - spec/fixtures/dbase_83.dbt
 - spec/fixtures/dbase_83_schema.txt
@@ -80,6 +81,7 @@ files:
 - spec/functional/dbf_shared.rb
 - spec/functional/format_03_spec.rb
 - spec/functional/format_30_spec.rb
+- spec/functional/format_31_spec.rb
 - spec/functional/format_83_spec.rb
 - spec/functional/format_8b_spec.rb
 - spec/functional/format_f5_spec.rb
@@ -121,6 +123,7 @@ test_files:
 - spec/functional/dbf_shared.rb
 - spec/functional/format_03_spec.rb
 - spec/functional/format_30_spec.rb
+- spec/functional/format_31_spec.rb
 - spec/functional/format_83_spec.rb
 - spec/functional/format_8b_spec.rb
 - spec/functional/format_f5_spec.rb