dbf 1.0.8 → 1.0.9

data/History.txt

@@ -1,3 +1,8 @@
+== 1.0.9
+
+* Fix incorrect integer column values (only affecting some dbf files)
+* Add CSV export
+
 == 1.0.8
 
 * Truncate column names on NULL

data/Rakefile

@@ -2,20 +2,22 @@ require 'hoe'
 require 'spec/rake/spectask'
 
 PKG_NAME = "dbf"
-PKG_VERSION = "1.0.8"
+PKG_VERSION = "1.0.9"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
-Hoe.new PKG_NAME, PKG_VERSION do |p|
-  p.rubyforge_name = PKG_NAME
-  p.author = "Keith Morrison"
-  p.email = "keithm@infused.org"
-  p.summary = "A small fast library for reading dBase, xBase, Clipper and FoxPro database files."
-  p.description = p.paragraphs_of("README.txt", 1..3).join("\n\n")
-  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.url = "http://github.com/infused/dm-dbf/tree/master"
-  p.need_tar = true
-  p.need_zip = true
-  p.extra_deps << ['activesupport', '>= 2.1.0']
+Hoe.spec PKG_NAME do |s|
+  s.version = PKG_VERSION
+  s.rubyforge_name = PKG_NAME
+  s.author = "Keith Morrison"
+  s.email = "keithm@infused.org"
+  s.summary = "A small fast library for reading dBase, xBase, Clipper and FoxPro database files."
+  s.description = s.paragraphs_of("README.txt", 1..3).join("\n\n")
+  s.changes = s.paragraphs_of("History.txt", 0..1).join("\n\n")
+  s.url = "http://github.com/infused/dm-dbf/tree/master"
+  s.need_tar = true
+  s.need_zip = true
+  s.extra_deps << ['activesupport', '>= 2.1.0']
+  s.extra_deps << ['fastercsv', '>= 1.4.0']
 end
 
 task :default => :spec

data/dbf.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = %q{dbf}
-  s.version = "1.0.8"
+  s.version = "1.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Keith Morrison"]
-  s.date = %q{2009-01-02}
+  s.date = %q{2009-01-15}
   s.default_executable = %q{dbf}
   s.description = %q{DBF is a small fast library for reading dBase, xBase, Clipper and FoxPro database files  Copyright (c) 2006-2009 Keith Morrison <keithm@infused.org, www.infused.org>  * Official project page: http://rubyforge.org/projects/dbf * API Documentation: http://dbf.rubyforge.org/docs * To report bugs: http://www.rubyforge.org/tracker/?group_id=2009 * Questions: Email keithm@infused.org and put DBF somewhere in the subject line}
   s.email = %q{keithm@infused.org}
@@ -25,13 +25,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.1.0"])
+      s.add_runtime_dependency(%q<fastercsv>, [">= 1.4.0"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.2"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.1.0"])
+      s.add_dependency(%q<fastercsv>, [">= 1.4.0"])
       s.add_dependency(%q<hoe>, [">= 1.8.2"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.1.0"])
+    s.add_dependency(%q<fastercsv>, [">= 1.4.0"])
     s.add_dependency(%q<hoe>, [">= 1.8.2"])
   end
 end

data/lib/dbf.rb

@@ -1,6 +1,18 @@
 require 'date'
 require 'activesupport'
 
+if RUBY_VERSION > '1.9'    
+ require 'csv'  
+ unless defined? FCSV
+   class Object  
+     FCSV = CSV 
+     alias_method :FCSV, :CSV
+   end  
+ end
+else
+ require 'fastercsv'
+end
+
 require 'dbf/globals'
 require 'dbf/record'
 require 'dbf/column'

data/lib/dbf/column.rb

@@ -38,7 +38,7 @@ module DBF
     end
     
     def unpack_integer(value)
-      value.unpack('v').first.to_i
+      value.to_i
     end
     
     def schema_definition

data/lib/dbf/record.rb

@@ -1,10 +1,11 @@
 module DBF
   class Record
     attr_reader :attributes
+    delegate :columns, :to => :@table
     
     def initialize(table)
       @table, @data, @memo = table, table.data, table.memo
-      initialize_values(table.columns)
+      initialize_values
       define_accessors
     end
     
@@ -12,10 +13,19 @@ module DBF
       other.respond_to?(:attributes) && other.attributes == attributes
     end
     
+    def to_a
+      columns.map do |column|
+        underscored_column_name = column.name.underscore
+        value = @attributes[column.name.underscore]
+        
+        value.is_a?(String) ? value.strip : value
+      end
+    end
+    
     private
     
     def define_accessors
-      @table.columns.each do |column|
+      columns.each do |column|
         underscored_column_name = column.name.underscore
         unless respond_to?(underscored_column_name)
           self.class.send :define_method, underscored_column_name do
@@ -25,7 +35,7 @@ module DBF
       end
     end
     
-    def initialize_values(columns)
+    def initialize_values
       @attributes = columns.inject({}) do |hash, column|
         if column.type == 'M'
           starting_block = unpack_string(column).to_i

data/lib/dbf/table.rb

@@ -65,11 +65,6 @@ module DBF
       end
     end
     
-    # def get_record_from_file(index)
-    #   seek_to_record(@db_index[index])
-    #   Record.new(self)
-    # end
-    
     # Returns a DBF::Record (or nil if the record has been marked for deletion) for the record at <tt>index</tt>.
     def record(index)
       records[index]
@@ -157,6 +152,16 @@ module DBF
       Record.new(self)
     end
     
+    # Dumps all records into a CSV file
+    def to_csv(filename = nil)
+      filename = File.basename(@data.path, '.dbf') + '.csv' if filename.nil?
+      FCSV.open(filename, 'w', :force_quotes => true) do |csv|
+        records.each do |record|
+          csv << record.to_a
+        end
+      end
+    end
+    
     private
     
       def open_memo(file)

data/spec/spec_helper.rb

@@ -7,4 +7,6 @@ DB_PATH = File.dirname(__FILE__) + '/fixtures' unless defined?(DB_PATH)
 
 Spec::Runner.configure do |config|
   
-end
+end
+
+self.class.send :remove_const, "Test" if defined? Test

data/spec/unit/column_spec.rb

@@ -43,13 +43,13 @@ describe DBF::Column do
     it "should cast numbers with no decimals to Integer" do
       value = "135"
       column = DBF::Column.new "ColumnName", "N", 3, 0
-      column.type_cast(value).should == 13105
+      column.type_cast(value).should == 135
     end
     
     it "should cast :integer to Integer" do
       value = "135"
       column = DBF::Column.new "ColumnName", "I", 3, 0
-      column.type_cast(value).should == 13105
+      column.type_cast(value).should == 135
     end
     
     it "should cast boolean to True" do

data/spec/unit/record_spec.rb

@@ -3,18 +3,19 @@ require File.dirname(__FILE__) + "/../spec_helper"
 describe DBF::Record do
   
   def example_record(data = '')
-    DBF::Record.new(mock_table(data))
+    table = mock_table(data)
+    DBF::Record.new(table)
   end
   
   def mock_table(data = '')
-    table = mock('table')
-    table.stub!(:memo_block_size).and_return(8)
-    table.stub!(:memo).and_return(nil)
-    table.stub!(:columns).and_return([])
-    table.stub!(:data)
-    table.stub!(:has_memo_file?).and_return(true)
-    table.data.stub!(:read).and_return(data)
-    table
+    returning mock('table') do |table|
+      table.stub!(:memo_block_size).and_return(8)
+      table.stub!(:memo).and_return(nil)
+      table.stub!(:columns).and_return([])
+      table.stub!(:data)
+      table.stub!(:has_memo_file?).and_return(true)
+      table.data.stub!(:read).and_return(data)
+    end
   end
   
   context "when initialized" do
@@ -43,20 +44,6 @@ describe DBF::Record do
       table.column("WEBINCLUDE").type.should == "L"
       table.records.all? {|record| record.attributes["webinclude"].should satisfy {|v| v == true || v == false}}
     end
-  
-    # it "should typecast datetime columns to DateTime" do
-    #   record = example_record("Nl%\000\300Z\252\003")
-    #   column = mock('column', :length => 8)
-    #   
-    #   record.instance_eval {unpack_datetime(column)}.to_s.should == "2002-10-10T17:04:56+00:00"
-    # end
-    #   
-    # it "should typecast integers to Fixnum" do
-    #   record = example_record("\017\020\000\000")
-    #   column = mock('column', :length => 4)
-    #   
-    #   record.instance_eval {unpack_integer(column)}.should == 4111
-    # end
   end
   
   describe '#memo_block_content_size' do
@@ -95,5 +82,13 @@ describe DBF::Record do
       record.send(:read_memo, 5).should be_nil
     end
   end
+  
+  describe '#to_a' do
+    it 'should return an ordered array of attribute values' do
+      table = DBF::Table.new "#{DB_PATH}/dbase_8b.dbf"
+      record = table.records[9]
+      record.to_a.should == ["Ten records stored in this database", 10.0, nil, false, "0.100000000000000000", nil]
+    end
+  end
 
 end

data/spec/unit/table_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + "/../spec_helper"
+require 'fileutils'
 
 describe DBF::Table do
   
@@ -155,7 +156,27 @@ describe DBF::Table do
       records.map! { |r| r.attributes }
       records.should == table.records.map {|r| r.attributes}
     end
-
+  end
+  
+  describe '#to_csv' do
+    before do
+      @table = DBF::Table.new "#{DB_PATH}/dbase_83.dbf"
+    end
+    
+    after do
+      FileUtils.rm_f 'dbase_83.csv'
+      FileUtils.rm_f 'test.csv'
+    end
+    
+    it 'should create default dump.csv' do
+      @table.to_csv
+      File.exists?('dbase_83.csv').should be_true
+    end
+    
+    it 'should create custom csv file' do
+      @table.to_csv('test.csv')
+      File.exists?('test.csv').should be_true
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dbf
 version: !ruby/object:Gem::Version 
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors: 
 - Keith Morrison
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-02 00:00:00 -08:00
-default_executable: 
+date: 2009-01-15 00:00:00 -08:00
+default_executable: dbf
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.1.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: fastercsv
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.4.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -40,9 +50,7 @@ extensions: []
 
 extra_rdoc_files: 
 - History.txt
-- Manifest.txt
 - README.txt
-- spec/fixtures/dbase_83_schema.txt
 files: 
 - History.txt
 - Manifest.txt
@@ -77,6 +85,8 @@ files:
 - spec/unit/table_spec.rb
 has_rdoc: true
 homepage: http://github.com/infused/dm-dbf/tree/master
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -98,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: dbf
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: A small fast library for reading dBase, xBase, Clipper and FoxPro database files.