dbf 1.6.6 → 1.6.7

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.6.7
+  - memo columns return nil when no memo file found
+
 # 1.6.6
   - add binary data type support to ActiveRecord schema output
   

data/Gemfile.lock

@@ -1,82 +1,28 @@
 PATH
   remote: .
   specs:
-    dbf (1.6.5)
+    dbf (1.6.6)
       fastercsv (~> 1.5.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    Saikuro (1.1.0)
-    activesupport (3.1.1)
-      multi_json (~> 1.0)
     archive-tar-minitar (0.5.2)
-    arrayfields (4.7.4)
-    chronic (0.3.0)
-    churn (0.0.13)
-      chronic (>= 0.2.3)
-      hirb
-      json_pure
-      main
-      ruby_parser (~> 2.0.4)
-      sexp_processor (~> 3.0.3)
-    colored (1.2)
     columnize (0.3.4)
     diff-lcs (1.1.3)
-    erubis (2.7.0)
     fastercsv (1.5.4)
-    fattr (2.2.0)
-    flay (1.4.3)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    flog (2.5.3)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    hirb (0.5.0)
-    i18n (0.6.0)
-    json_pure (1.6.1)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
-    main (4.7.1)
-    map (4.7.1)
-    metric_fu (2.1.1)
-      Saikuro (>= 1.1.0)
-      activesupport (>= 2.0.0)
-      chronic (~> 0.3.0)
-      churn (>= 0.0.7)
-      flay (>= 1.2.1)
-      flog (>= 2.3.0)
-      rails_best_practices (>= 0.6.4)
-      rcov (>= 0.8.3.3)
-      reek (>= 1.2.6)
-      roodi (>= 2.1.0)
-      syntax
-    multi_json (1.0.3)
-    progressbar (0.9.1)
-    rails_best_practices (1.2.0)
-      activesupport
-      colored
-      erubis
-      i18n
-      progressbar
-      sexp_processor
-    rake (0.9.2)
-    rcov (0.9.11)
+    rake (0.9.2.2)
     rdoc (3.9.4)
-    reek (1.2.8)
-      ruby2ruby (~> 1.2)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    roodi (2.1.0)
-      ruby_parser
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    rspec-mocks (2.7.0)
     ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -85,26 +31,15 @@ GEM
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby-debug-base19 (>= 0.11.19)
-    ruby2ruby (1.3.1)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    ruby_parser (2.0.6)
-      sexp_processor (~> 3.0)
-    sexp_processor (3.0.7)
-    syntax (1.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  arrayfields
   dbf!
-  fattr
-  map
-  metric_fu
   rake (~> 0.9.2)
   rdoc (~> 3.9.0)
-  rspec (~> 2.6.0)
+  rspec (~> 2.7.0)
   ruby-debug19

data/Rakefile

@@ -26,8 +26,8 @@ task :console do
   sh "irb -rubygems -I lib -r dbf.rb"
 end
 
-require 'metric_fu'
-MetricFu::Configuration.run do |config|
-  config.rcov[:test_files] = ['spec/**/*_spec.rb']  
-  config.rcov[:rcov_opts] << "-Ispec"
-end
+# require 'metric_fu'
+# MetricFu::Configuration.run do |config|
+#   config.rcov[:test_files] = ['spec/**/*_spec.rb']  
+#   config.rcov[:rcov_opts] << "-Ispec"
+# end

data/lib/dbf/column.rb

@@ -101,7 +101,7 @@ module DBF
       when "M"
         ":text"
       when "B"
-        if DBF::Table::FOXPRO_VERSIONS.include?(@version)
+        if DBF::Table::FOXPRO_VERSIONS.keys.include?(@version)
           decimal > 0 ? ":float" : ":integer"
         else
           ":text"

data/lib/dbf/record.rb

@@ -5,7 +5,9 @@ module DBF
     # 
     # @param [DBF::Table] table
     def initialize(data, columns, version, memo)
-      @data, @columns, @version, @memo = StringIO.new(data), columns, version, memo
+      @data = StringIO.new(data)
+      @columns, @version, @memo = columns, version, memo
+      @column_names = @columns.map {|column| column.underscored_name}
       define_accessors
     end
     
@@ -21,7 +23,7 @@ module DBF
     # 
     # @return [Array]
     def to_a
-      @columns.map { |column| attributes[Util.underscore(column.name)] }
+      @column_names.map { |name| attributes[name] }
     end
     
     # Do all search parameters match?
@@ -32,6 +34,7 @@ module DBF
       options.all? {|key, value| attributes[Util.underscore(key.to_s)] == value}
     end
     
+    # @return [Hash]
     def attributes
       return @attributes if @attributes
       
@@ -45,20 +48,22 @@ module DBF
     private
     
     def define_accessors #nodoc
-      @columns.each do |column|
-        name = column.underscored_name
-        unless respond_to? name
-          self.class.class_eval <<-END
-            def #{name}
-              @#{name} ||= attributes['#{name}']
-            end
-          END
-        end
+      @column_names.each do |name|
+        next if respond_to? name
+        self.class.class_eval <<-END
+          def #{name}
+            @#{name} ||= attributes['#{name}']
+          end
+        END
       end
     end
     
     def init_attribute(column) #nodoc
-      column.memo? ? @memo.get(get_memo_start_block(column)) : column.type_cast(unpack_data(column))
+      if column.memo?
+        @memo.get get_memo_start_block(column) if @memo
+      else
+        column.type_cast unpack_data(column)
+      end
     end
    
     def get_memo_start_block(column) #nodoc

data/lib/dbf/table.rb

@@ -7,7 +7,7 @@ module DBF
 
     DBF_HEADER_SIZE = 32
 
-    VERSION_DESCRIPTIONS = {
+    VERSIONS = {
       "02" => "FoxBase",
       "03" => "dBase III without memo file",
       "04" => "dBase IV without memo file",
@@ -22,9 +22,7 @@ module DBF
       "fb" => "FoxPro without memo file"
     }
     
-    FOXPRO_VERSIONS = VERSION_DESCRIPTIONS.map do |version, description| 
-      version if description =~ /FoxPro/
-    end.compact
+    FOXPRO_VERSIONS = VERSIONS.select {|k,v| v =~ /FoxPro/}
 
     attr_reader   :version              # Internal dBase version number
     attr_reader   :record_count         # Total number of records
@@ -41,20 +39,20 @@ module DBF
       @memo = open_memo(path)
     end
     
+    # @return [TrueClass, FalseClass]
     def has_memo_file?
-      @memo && memo_file_format
-    end
-    
-    def memo_file_format
-      @memo.format if has_memo_file?
+      !!@memo
     end
 
     # Closes the table and memo file
+    #
+    # @return [TrueClass, FalseClass]
     def close
       @memo && @memo.close
-      @data.close
+      @data.close && @data.closed?
     end
     
+    # @return String
     def filename
       File.basename @data.path
     end
@@ -75,7 +73,9 @@ module DBF
     # @return [DBF::Record, NilClass]
     def record(index)
       seek(index * @record_length)
-      deleted_record? ? nil : DBF::Record.new(@data.read(@record_length), columns, version, @memo)
+      if !deleted_record?
+        DBF::Record.new(@data.read(@record_length), columns, version, @memo)
+      end
     end
 
     alias_method :row, :record
@@ -84,7 +84,7 @@ module DBF
     #
     # @return [String]
     def version_description
-      VERSION_DESCRIPTIONS[version]
+      VERSIONS[version]
     end
 
     # Generate an ActiveRecord::Schema
@@ -187,16 +187,22 @@ module DBF
 
     private
     
-    def column_class
-      @column_class ||= FOXPRO_VERSIONS.include?(version) ? FoxproColumn : Column
+    def column_class #nodoc
+      @column_class ||= if FOXPRO_VERSIONS.keys.include?(version)
+        FoxproColumn
+      else 
+        Column
+      end
     end
     
-    def column_count
+    def column_count #nodoc
       @column_count ||= (@header_length - DBF_HEADER_SIZE + 1) / DBF_HEADER_SIZE
     end
 
     def open_memo(path) #nodoc
-      files = Dir.glob("#{File.dirname(path)}/#{File.basename(path, '.*')}*.{fpt,FPT,dbt,DBT}")
+      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
     end
 
@@ -236,7 +242,7 @@ module DBF
       File.basename(@data.path, '.dbf') + '.csv'
     end
 
-    def self.encodings
+    def self.encodings #nodoc
       @encodings ||= YAML.load_file File.expand_path("../encodings.yml", __FILE__)
     end
   end

data/lib/dbf/util.rb

@@ -1,5 +1,5 @@
 class Util
-  def self.underscore(string)
+  def self.underscore(string) #nodoc
     string.gsub(/::/, '/').
       gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
       gsub(/([a-z\d])([A-Z])/,'\1_\2').

data/lib/dbf/version.rb

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

data/spec/dbf/table_spec.rb

@@ -1,9 +1,9 @@
 require "spec_helper"
 
 describe DBF::Table do  
-  # specify do
-  #   DBF::Table::FOXPRO_VERSIONS.should == %w(30 31 f5 fb)
-  # end
+  specify 'foxpro versions' do
+    DBF::Table::FOXPRO_VERSIONS.keys.should == %w(30 31 f5 fb)
+  end
   
   context "when closed" do
     before do
@@ -23,16 +23,13 @@ describe DBF::Table do
   describe "#schema" do
     it "should match the test schema fixture" do
       table = DBF::Table.new "#{DB_PATH}/dbase_83.dbf"
-      control_schema = File.read(File.dirname(__FILE__) + '/../fixtures/dbase_83_schema.txt')
-
+      control_schema = File.read("#{DB_PATH}/dbase_83_schema.txt")
       table.schema.should == control_schema
     end
   end
   
   describe '#to_csv' do
-    before do
-      @table = DBF::Table.new "#{DB_PATH}/dbase_83.dbf"
-    end
+    let(:table) { DBF::Table.new "#{DB_PATH}/dbase_83.dbf" }
     
     after do
       FileUtils.rm_f 'dbase_83.csv'
@@ -40,13 +37,13 @@ describe DBF::Table do
     end
     
     it 'should create default dump.csv' do
-      @table.to_csv
+      table.to_csv
       File.exists?('dbase_83.csv').should be_true
     end
 
     describe 'when path param passed' do
       it 'should create custom csv file' do
-        @table.to_csv('test.csv')
+        table.to_csv('test.csv')
         File.exists?('test.csv').should be_true
       end
     end
@@ -165,5 +162,17 @@ describe DBF::Table do
       @table.filename.should == "dbase_03.dbf"
     end
   end
+  
+  describe 'has_memo_file?' do
+    describe 'without a memo file' do
+      let(:table) { DBF::Table.new "#{DB_PATH}/dbase_03.dbf" }
+      specify { table.has_memo_file?.should be_false }
+    end
+    
+    describe 'with a memo file' do
+      let(:table) { DBF::Table.new "#{DB_PATH}/dbase_30.dbf" }
+      specify { table.has_memo_file?.should be_true }
+    end
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dbf
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-30 00:00:00.000000000Z
+date: 2011-11-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &70121607557520 !ruby/object:Gem::Requirement
+  requirement: &70198302238320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: 1.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70121607557520
+  version_requirements: *70198302238320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70121607556660 !ruby/object:Gem::Requirement
+  requirement: &70198302237860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70121607556660
+  version_requirements: *70198302237860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70121607555460 !ruby/object:Gem::Requirement
+  requirement: &70198302237300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70121607555460
+  version_requirements: *70198302237300
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70121607554600 !ruby/object:Gem::Requirement
+  requirement: &70198302236780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.9.0
   type: :development
   prerelease: false
-  version_requirements: *70121607554600
+  version_requirements: *70198302236780
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70121607553520 !ruby/object:Gem::Requirement
+  requirement: &70198302236340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,51 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70121607553520
-- !ruby/object:Gem::Dependency
-  name: metric_fu
-  requirement: &70121607552460 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70121607552460
-- !ruby/object:Gem::Dependency
-  name: fattr
-  requirement: &70121607551860 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70121607551860
-- !ruby/object:Gem::Dependency
-  name: arrayfields
-  requirement: &70121607551280 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70121607551280
-- !ruby/object:Gem::Dependency
-  name: map
-  requirement: &70121607550460 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70121607550460
+  version_requirements: *70198302236340
 description: A small fast library for reading dBase, xBase, Clipper and FoxPro database
   files.
 email: keithm@infused.org
@@ -143,8 +99,6 @@ files:
 - spec/dbf/file_formats_spec.rb
 - spec/dbf/record_spec.rb
 - spec/dbf/table_spec.rb
-- spec/fixtures/colores.DBF
-- spec/fixtures/colores.FPT
 - spec/fixtures/cp1251.dbf
 - spec/fixtures/dbase_03.dbf
 - spec/fixtures/dbase_30.dbf