dbf 1.6.7 → 1.7.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.7.0
+  - allow DBF::Table to work with dbf data in memory
+  - allow DBF::Table#to_csv to write to STDOUT
+
 # 1.6.7
   - memo columns return nil when no memo file found
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dbf (1.6.6)
+    dbf (1.7.0)
       fastercsv (~> 1.5.4)
 
 GEM

data/README.md

@@ -104,7 +104,7 @@ Create an executable ActiveRecord schema:
     
 Dump all records to a CSV file:
 
-    dbf -c books.dbf
+    dbf -c books.dbf > books.csv
       
 ## dBase version support
 

data/lib/dbf.rb

@@ -11,5 +11,5 @@ require 'dbf/attributes'
 require 'dbf/record'
 require 'dbf/column'
 require 'dbf/foxpro_column'
-require 'dbf/memo'
-require 'dbf/table'
+require 'dbf/table'
+require 'dbf/memo'

data/lib/dbf/memo.rb

@@ -2,6 +2,7 @@ module DBF
   class Memo
     BLOCK_HEADER_SIZE = 8
     FPT_HEADER_SIZE = 512
+    FPT_FORMAT_VERSIONS = DBF::Table::FOXPRO_VERSIONS.keys
     
     def self.open(filename, version)
       self.new File.open(filename, 'rb'), version
@@ -12,7 +13,7 @@ module DBF
     end
     
     def format
-      File.extname(@data.path)        
+      format_fpt? ? 'fpt' : 'dbt'
     end
     
     def get(start_block)
@@ -32,7 +33,7 @@ module DBF
     private
     
     def format_fpt? #nodoc
-      File.extname(@data.path) =~ /fpt/i
+      FPT_FORMAT_VERSIONS.include?(@version)
     end
     
     def build_fpt_memo(start_block) #nodoc

data/lib/dbf/table.rb

@@ -29,14 +29,25 @@ module DBF
     attr_accessor :encoding             # Source encoding (for ex. :cp1251)
 
     # Opens a DBF::Table
-    # Example:
+    # Examples:
+    #   # working with a file stored on the filesystem
     #   table = DBF::Table.new 'data.dbf'
     #
-    # @param [String] path Path to the dbf file
-    def initialize(path)
-      @data = File.open(path, 'rb')
+    #   # working with a misnamed memo file
+    #   table = DBF::Table.new 'data.dbf', 'memo.dbt'
+    #
+    #   # working with a dbf in memory
+    #   table = DBF::Table.new StringIO.new(dbf_data)
+    #
+    #   # working with a dbf and memo in memory
+    #   table = DBF::Table.new StringIO.new(dbf_data), StringIO.new(memo_data)
+    #
+    # @param [String, StringIO] data Path to the dbf file or a StringIO object
+    # @param [optional String, StringIO] memo Path to the memo file or a StringIO object
+    def initialize(data, memo = nil)
+      @data = open_data(data)
       get_header_info
-      @memo = open_memo(path)
+      @memo = open_memo(data, memo)
     end
     
     # @return [TrueClass, FalseClass]
@@ -121,12 +132,11 @@ module DBF
     # Dumps all records to a CSV file.  If no filename is given then CSV is
     # output to STDOUT.
     #
-    # @param [optional String] path Defaults to basename of dbf file
+    # @param [optional String] path Defaults to STDOUT
     def to_csv(path = nil)
-      csv_class.open(path || default_csv_path, 'w', :force_quotes => true) do |csv|
-        csv << columns.map {|c| c.name}
-        each {|record| csv << record.to_a}
-      end
+      csv = csv_class.new((path ? File.open(path, 'w') : $stdout), :force_quotes => true)
+      csv << columns.map {|c| c.name}
+      each {|record| csv << record.to_a}
     end
 
     # Find records using a simple ActiveRecord-like syntax.
@@ -199,11 +209,23 @@ module DBF
       @column_count ||= (@header_length - DBF_HEADER_SIZE + 1) / DBF_HEADER_SIZE
     end
 
-    def open_memo(path) #nodoc
-      dirname = File.dirname(path)
-      basename = File.basename(path, '.*')
-      files = Dir.glob("#{dirname}/#{basename}*.{fpt,FPT,dbt,DBT}")
-      files.any? ? Memo.open(files.first, version) : nil
+    def open_data(data)
+      data.is_a?(StringIO) ? data : File.open(data, 'rb')
+    end
+
+    def open_memo(data, memo = nil) #nodoc
+      if memo.is_a? StringIO
+        DBF::Memo.new(memo, version)
+      elsif memo
+        DBF::Memo.open(memo, version)
+      elsif !data.is_a? StringIO
+        dirname = File.dirname(data)
+        basename = File.basename(data, '.*')
+        files = Dir.glob("#{dirname}/#{basename}*.{fpt,FPT,dbt,DBT}")
+        files.any? ? DBF::Memo.open(files.first, version) : nil
+      else
+        nil
+      end
     end
 
     def find_all(options) #nodoc
@@ -238,10 +260,6 @@ module DBF
       CSV.const_defined?(:Reader) ? FCSV : CSV
     end
 
-    def default_csv_path #nodoc
-      File.basename(@data.path, '.dbf') + '.csv'
-    end
-
     def self.encodings #nodoc
       @encodings ||= YAML.load_file File.expand_path("../encodings.yml", __FILE__)
     end

data/lib/dbf/version.rb

@@ -1,3 +1,3 @@
 module DBF
-  VERSION = '1.6.7'
+  VERSION = '1.7.0'
 end

data/spec/dbf/table_spec.rb

@@ -4,6 +4,27 @@ describe DBF::Table do
   specify 'foxpro versions' do
     DBF::Table::FOXPRO_VERSIONS.keys.should == %w(30 31 f5 fb)
   end
+
+  describe '#initialize' do
+    it 'should accept a DBF filename' do
+      expect { DBF::Table.new "#{DB_PATH}/dbase_83.dbf" }.to_not raise_error
+    end
+
+    it 'should accept a DBF and Memo filename' do
+      expect { DBF::Table.new "#{DB_PATH}/dbase_83.dbf", "#{DB_PATH}/dbase_83.dbt" }.to_not raise_error
+    end
+
+    it 'should accept an io-like data object' do
+      data = StringIO.new File.read("#{DB_PATH}/dbase_83.dbf")
+      expect { DBF::Table.new data }.to_not raise_error
+    end
+
+    it 'should accept an io-like data and memo object' do
+      data = StringIO.new File.read("#{DB_PATH}/dbase_83.dbf")
+      memo = StringIO.new File.read("#{DB_PATH}/dbase_83.dbt")
+      expect { DBF::Table.new data, memo }.to_not raise_error
+    end
+  end
   
   context "when closed" do
     before do
@@ -32,13 +53,19 @@ describe DBF::Table do
     let(:table) { DBF::Table.new "#{DB_PATH}/dbase_83.dbf" }
     
     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
+    describe 'when no path param passed' do
+      it 'should dump to STDOUT' do
+        begin
+          $stdout = StringIO.new
+          table.to_csv
+          $stdout.string.should_not be_empty
+        ensure
+          $stdout = STDOUT
+        end
+      end
     end
 
     describe 'when path param passed' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dbf
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 1.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-23 00:00:00.000000000Z
+date: 2011-12-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &70198302238320 !ruby/object:Gem::Requirement
+  requirement: &70246163177540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70198302238320
+  version_requirements: *70246163177540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70198302237860 !ruby/object:Gem::Requirement
+  requirement: &70246163177080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70198302237860
+  version_requirements: *70246163177080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70198302237300 !ruby/object:Gem::Requirement
+  requirement: &70246163176620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70198302237300
+  version_requirements: *70246163176620
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70198302236780 !ruby/object:Gem::Requirement
+  requirement: &70246163176160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.9.0
   type: :development
   prerelease: false
-  version_requirements: *70198302236780
+  version_requirements: *70246163176160
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70198302236340 !ruby/object:Gem::Requirement
+  requirement: &70246163175760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70198302236340
+  version_requirements: *70246163175760
 description: A small fast library for reading dBase, xBase, Clipper and FoxPro database
   files.
 email: keithm@infused.org