dbf 3.1.3 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05f4c5675dae61be9046beaf3dab5cf09d16752bdfa5b3841f7811fe4e08b981
-  data.tar.gz: 7dd76a7c629a0965557d2c4fae8043ac7e5811834e3e011ea55ab669678a238c
+  metadata.gz: 4c2ff24f150ee6567de0532c773695f8b47c0db811660e0f5f3be3d53a7cc053
+  data.tar.gz: 7006275aff71326833452546657bb07520d53024b6846b0c982121a488cd8235
 SHA512:
-  metadata.gz: eeb040f9f564e605a0fb107c43558d060c55ff868cadccfdfdd5b452040cc0ec30261ed0db0eb31ff8891efb6f1e57305743b6176f90ed3a7508186166e80752
-  data.tar.gz: 303215437b2339e83436e8999c9b2465ac69ee48a2be591c63e77a1c53968accfcb1c84a5160174d47665dd6af561721dcb255777db9861a442452a399342015
+  metadata.gz: b2d4bffa8201a8fa07abf642e721523e7ed59bb2b3e9a0fae31fe5ce6a4a3078f1520eb09e350d979dd88a68801c7c52d3236c402f83a41da1e5e6c4bca39911
+  data.tar.gz: fddf6622338b52b4bb6006513a92d9fd44c8f1e864738fd597d7e9f3fc21bcd86707f5e68e76216bd4c6d3be7dad9a48e5e19d55a6728691f6d90d86ec6db25e

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+# 4.1.3
+  - Raise DBF::NoColumnsDefined error when attempting to read records if no columns are defined
+
+# 4.1.1
+  - Add required_ruby_version to gemspec
+
+# 4.1.0
+  - Return Time instead of DateTime
+
+# 4.0.0
+  - Drop support for ruby-2.2 and earlier
+
+# 3.1.3
+  - Ensure malformed dates return nil
+
 # 3.1.2
   - Fix incorrect columns list when StringIO and encoding set
 

data/Gemfile

@@ -4,9 +4,13 @@ source 'https://rubygems.org'
 group :development, :test do
   gem 'awesome_print'
   gem 'byebug'
+  gem 'e2mmap'
   gem 'guard'
   gem 'guard-rspec'
+  gem 'irb'
   gem 'rake'
-  gem 'rubocop'
   gem 'rspec'
+  gem 'rubocop'
+  gem 'rubocop-performance'
+  gem 'rubocop-rspec'
 end

data/Gemfile.lock

@@ -1,19 +1,20 @@
 PATH
   remote: .
   specs:
-    dbf (3.1.3)
+    dbf (4.1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
     awesome_print (1.8.0)
-    byebug (10.0.2)
+    byebug (11.0.1)
     coderay (1.1.2)
     diff-lcs (1.3)
-    ffi (1.9.25)
+    e2mmap (0.1.0)
+    ffi (1.11.1)
     formatador (0.2.5)
-    guard (2.14.2)
+    guard (2.15.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -27,55 +28,58 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    jaro_winkler (1.5.1)
+    irb (1.0.0)
+    jaro_winkler (1.5.3)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
-    method_source (0.9.0)
+    method_source (0.9.2)
     nenv (0.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.12.1)
-    parser (2.5.1.2)
+    parallel (1.17.0)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
-    powerpack (0.1.2)
-    pry (0.11.3)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     rainbow (3.0.0)
-    rake (12.3.1)
+    rake (12.3.2)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.59.2)
+    rspec-support (3.8.2)
+    rubocop (0.73.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
+      parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.10.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    rubocop-performance (1.4.0)
+      rubocop (>= 0.71.0)
+    rubocop-rspec (1.33.0)
+      rubocop (>= 0.60.0)
+    ruby-progressbar (1.10.1)
     ruby_dep (1.5.0)
     shellany (0.0.1)
-    thor (0.20.0)
-    unicode-display_width (1.4.0)
+    thor (0.20.3)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
@@ -84,11 +88,15 @@ DEPENDENCIES
   awesome_print
   byebug
   dbf!
+  e2mmap
   guard
   guard-rspec
+  irb
   rake
   rspec
   rubocop
+  rubocop-performance
+  rubocop-rspec
 
 BUNDLED WITH
-   1.16.5
+   2.1.4

data/Guardfile

@@ -6,6 +6,6 @@ guard :rspec, cmd: 'bundle exec rspec' do
   # watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch(%r{^lib/(.+)\.rb$})     { 'spec' }
   watch('spec/spec_helper.rb')  { 'spec' }
-  watch(/spec\/fixtures\/(.+)/) { 'spec' }
+  watch(%r{spec/fixtures/(.+)}) { 'spec' }
   watch('Guardfile')            { 'spec' }
 end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2018 Keith Morrison <keithm@infused.org>
+Copyright (c) 2006-2020 Keith Morrison <keithm@infused.org>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -16,14 +16,17 @@ database files
   subject line
 * Change log: <https://github.com/infused/dbf/blob/master/CHANGELOG.md>
 
-NOTE: beginning with version 3 we have dropped support for Ruby 1.8 and 1.9. If you need support for older Rubies, please use 2.0.x (https://github.com/infused/dbf/tree/2_stable)
+NOTE: Beginning with version 4 we have dropped support for Ruby 2.0, 2.1, 2.2, and 2.3. If you need support for these older Rubies,
+please use 3.0.x (https://github.com/infused.org/dbf/tree/3_stable)
+
+NOTE: Beginning with version 3 we have dropped support for Ruby 1.8 and 1.9. If you need support for older Rubies,
+please use 2.0.x (https://github.com/infused/dbf/tree/2_stable)
 
 ## Compatibility
 
 DBF is tested to work with the following versions of Ruby:
 
-* MRI Ruby 2.0.x, 2.1.x, 2.2.x, 2.3.x, 2.4.x, 2.5.x
-* JRuby 1.7.x
+* Ruby 2.4.x, 2.5.x, 2.6.x, 2.7.x
 
 ## Installation
 
@@ -208,7 +211,7 @@ Sequel.migration do
 end
 ```
 
-If you have initalized the DBF::Table with raw data, you will need to set the
+If you have initialized the DBF::Table with raw data, you will need to set the
 exported table name manually:
 
 ```ruby
@@ -226,7 +229,7 @@ A small command-line utility called dbf is installed along with the gem.
       -s = print summary information
       -a = create an ActiveRecord::Schema
       -r = create a Sequel Migration
-      -c = dump data in CSV format
+      -c = export as CSV
 
 Create an executable ActiveRecord schema:
 
@@ -272,7 +275,7 @@ for a full list of supported column types.
 
 ## License
 
-Copyright (c) 2006-2018 Keith Morrison <<keithm@infused.org>>
+Copyright (c) 2006-2020 Keith Morrison <<keithm@infused.org>>
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/bin/dbf

@@ -9,14 +9,14 @@ params = ARGV.getopts('h', 's', 'a', 'c', 'r', 'v')
 if params['v']
   puts "dbf version: #{DBF::VERSION}"
 
-elsif params['h'] then
+elsif params['h']
   puts "usage: #{File.basename(__FILE__)} [-h|-s|-a|-c|-r] filename"
   puts '  -h = print this message'
   puts '  -v = print the DBF gem version'
   puts '  -s = print summary information'
   puts '  -a = create an ActiveRecord::Schema'
   puts '  -r = create a Sequel migration'
-  puts '  -c = create a CSV file'
+  puts '  -c = export as CSV'
 else
 
   filename = ARGV.shift
@@ -46,7 +46,7 @@ else
     puts 'Name             Type       Length     Decimal'
     puts '-' * 78
     table.columns.each do |f|
-      puts '%-16s %-10s %-10s %-10s' % [f.name, f.type, f.length, f.decimal]
+      puts format('%-16s %-10s %-10s %-10s', f.name, f.type, f.length, f.decimal)
     end
   end
 

data/dbf.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib/', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 require 'dbf/version'
 
@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
   s.test_files = Dir.glob('spec/**/*_spec.rb')
   s.require_paths = ['lib']
   s.required_rubygems_version = Gem::Requirement.new('>= 1.3.0')
+  s.required_ruby_version = Gem::Requirement.new('>= 2.4.0')
 end

data/docs/supported_types.markdown

@@ -1,36 +1,21 @@
 # DBF supported data types
 
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | Version | Description                       | C | N | L | D | M | F | B | G | P | Y | T | I | V | X | @ | O | + |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 02      | FoxBase                           | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - | - |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 03      | dBase III without memo file       | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - | - |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 04      | dBase IV without memo file        | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - | - |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 05      | dBase V without memo file         | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - | - |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 07      | Visual Objects 1.x                | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - | - |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 30      | Visual FoxPro                     | Y | Y | Y | Y | Y | Y | Y | Y | N | Y | N | Y | N | N | N | N | - |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 31      | Visual FoxPro with AutoIncrement  | Y | Y | Y | Y | Y | Y | Y | Y | N | Y | N | Y | N | N | N | N | N |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 7b      | dBase IV with memo file           | Y | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 83      | dBase III with memo file          | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 87      | Visual Objects 1.x with memo file | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 8b      | dBase IV with memo file           | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | N | - | - | - |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 8e      | dBase IV with SQL table           | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | N | - | - | - |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | f5      | FoxPro with memo file             | Y | Y | Y | Y | Y | Y | Y | Y | N | Y | N | Y | N | N | N | N | N |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | fb      | FoxPro without memo file          | Y | Y | Y | Y | - | Y | Y | Y | N | Y | N | Y | N | N | N | N | N |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+| Version | Description                       | C | N | L | D | M | F | B | G | P | Y | T | I | V | X | @ | O | + |
+|---------|-----------------------------------|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
+| 02      | FoxBase                           | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - | - |
+| 03      | dBase III without memo file       | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - | - |
+| 04      | dBase IV without memo file        | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - | - |
+| 05      | dBase V without memo file         | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - | - |
+| 07      | Visual Objects 1.x                | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - | - |
+| 30      | Visual FoxPro                     | Y | Y | Y | Y | Y | Y | Y | Y | N | Y | N | Y | N | N | N | N | - |
+| 31      | Visual FoxPro with AutoIncrement  | Y | Y | Y | Y | Y | Y | Y | Y | N | Y | N | Y | N | N | N | N | N |
+| 7b      | dBase IV with memo file           | Y | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - |
+| 83      | dBase III with memo file          | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - |
+| 87      | Visual Objects 1.x with memo file | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - |
+| 8b      | dBase IV with memo file           | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | N | - | - | - |
+| 8e      | dBase IV with SQL table           | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | N | - | - | - |
+| f5      | FoxPro with memo file             | Y | Y | Y | Y | Y | Y | Y | Y | N | Y | N | Y | N | N | N | N | N |
+| fb      | FoxPro without memo file          | Y | Y | Y | Y | - | Y | Y | Y | N | Y | N | Y | N | N | N | N | N |
 
 Data type descriptions
 

data/lib/dbf.rb

@@ -1,7 +1,8 @@
-require 'date'
-
 require 'csv'
+require 'date'
+require 'forwardable'
 require 'json'
+require 'time'
 
 require 'dbf/version'
 require 'dbf/schema'

data/lib/dbf/column.rb

@@ -1,5 +1,7 @@
 module DBF
   class Column
+    extend Forwardable
+
     class LengthError < StandardError
     end
 
@@ -7,6 +9,7 @@ module DBF
     end
 
     attr_reader :table, :name, :type, :length, :decimal
+    def_delegator :type_cast_class, :type_cast
 
     TYPE_CAST_CLASS = {
       N: ColumnType::Number,
@@ -56,14 +59,6 @@ module DBF
       {name: name, type: type, length: length, decimal: decimal}
     end
 
-    # Cast value to native type
-    #
-    # @param [String] value
-    # @return [Integer, Float, Date, DateTime, Boolean, String]
-    def type_cast(value)
-      type_cast_class.type_cast(value)
-    end
-
     # Underscored name
     #
     # This is the column name converted to underscore format.

data/lib/dbf/column_type.rb

@@ -1,11 +1,6 @@
 module DBF
   module ColumnType
     class Base
-      ENCODING_ARGS = [
-        Encoding.default_external,
-        {undef: :replace, invalid: :replace}
-      ].freeze
-
       attr_reader :decimal, :encoding
 
       def initialize(decimal, encoding)
@@ -15,7 +10,7 @@ module DBF
     end
 
     class Nil < Base
-      def type_cast(value)
+      def type_cast(_value)
         nil
       end
     end
@@ -23,19 +18,20 @@ module DBF
     class Number < Base
       def type_cast(value)
         return nil if value.strip.empty?
+
         @decimal.zero? ? value.to_i : value.to_f
       end
     end
 
     class Currency < Base
       def type_cast(value)
-        (value.unpack('q<')[0] / 10_000.0).to_f
+        (value.unpack1('q<') / 10_000.0).to_f
       end
     end
 
     class SignedLong < Base
       def type_cast(value)
-        value.unpack('l<')[0]
+        value.unpack1('l<')
       end
     end
 
@@ -47,20 +43,20 @@ module DBF
 
     class Double < Base
       def type_cast(value)
-        value.unpack('E')[0]
+        value.unpack1('E')
       end
     end
 
     class Boolean < Base
       def type_cast(value)
-        value.strip =~ /^(y|t)$/i ? true : false
+        value.strip.match?(/^(y|t)$/i)
       end
     end
 
     class Date < Base
       def type_cast(value)
-        value =~ /\d{8}/ && ::Date.strptime(value, '%Y%m%d')
-      rescue
+        value.match?(/\d{8}/) && ::Date.strptime(value, '%Y%m%d')
+      rescue StandardError
         nil
       end
     end
@@ -69,8 +65,8 @@ module DBF
       def type_cast(value)
         days, msecs = value.unpack('l2')
         secs = (msecs / 1000).to_i
-        ::DateTime.jd(days, (secs / 3600).to_i, (secs / 60).to_i % 60, secs % 60)
-      rescue
+        ::DateTime.jd(days, (secs / 3600).to_i, (secs / 60).to_i % 60, secs % 60).to_time
+      rescue StandardError
         nil
       end
     end
@@ -78,7 +74,7 @@ module DBF
     class Memo < Base
       def type_cast(value)
         if encoding && !value.nil?
-          value.force_encoding(@encoding).encode(*ENCODING_ARGS)
+          value.force_encoding(@encoding).encode(Encoding.default_external, undef: :replace, invalid: :replace)
         else
           value
         end
@@ -94,9 +90,8 @@ module DBF
     class String < Base
       def type_cast(value)
         value = value.strip
-        @encoding ? value.force_encoding(@encoding).encode(*ENCODING_ARGS) : value
+        @encoding ? value.force_encoding(@encoding).encode(Encoding.default_external, undef: :replace, invalid: :replace) : value
       end
     end
-
   end
 end

data/lib/dbf/database/foxpro.rb

@@ -45,9 +45,7 @@ module DBF
         glob = File.join(@dirname, "#{name}.dbf")
         path = Dir.glob(glob, File::FNM_CASEFOLD).first
 
-        unless path && File.exist?(path)
-          raise DBF::FileNotFoundError, "related table not found: #{name}"
-        end
+        raise DBF::FileNotFoundError, "related table not found: #{name}" unless path && File.exist?(path)
 
         path
       end

data/lib/dbf/memo/base.rb

@@ -15,6 +15,7 @@ module DBF
 
       def get(start_block)
         return nil unless start_block > 0
+
         build_memo start_block
       end
 

data/lib/dbf/memo/dbase4.rb

@@ -3,7 +3,7 @@ module DBF
     class Dbase4 < Base
       def build_memo(start_block) # :nodoc:
         @data.seek offset(start_block)
-        @data.read(@data.read(BLOCK_HEADER_SIZE).unpack('x4L').first)
+        @data.read(@data.read(BLOCK_HEADER_SIZE).unpack1('x4L'))
       end
     end
   end

data/lib/dbf/memo/foxpro.rb

@@ -15,8 +15,7 @@ module DBF
           memo_string = memo_string[0, memo_size]
         end
         memo_string
-
-      rescue
+      rescue StandardError
         nil
       end
 
@@ -25,7 +24,7 @@ module DBF
       def block_size # :nodoc:
         @block_size ||= begin
           @data.rewind
-          @data.read(FPT_HEADER_SIZE).unpack('x6n').first || 0
+          @data.read(FPT_HEADER_SIZE).unpack1('x6n') || 0
         end
       end
     end

data/lib/dbf/record.rb

@@ -83,7 +83,7 @@ module DBF
 
     def memo_start_block(column) # :nodoc:
       data = get_data(column)
-      data = data.unpack('V').first if %w[30 31].include?(@version)
+      data = data.unpack1('V') if %w[30 31].include?(@version)
       data.to_i
     end
 

data/lib/dbf/table.rb

@@ -2,9 +2,13 @@ module DBF
   class FileNotFoundError < StandardError
   end
 
+  class NoColumnsDefined < StandardError
+  end
+
   # DBF::Table is the primary interface to a single DBF file and provides
   # methods for enumerating and searching the records.
   class Table
+    extend Forwardable
     include Enumerable
     include ::DBF::Schema
 
@@ -40,6 +44,11 @@ module DBF
     attr_accessor :encoding
     attr_writer :name
 
+    def_delegator :header, :header_length
+    def_delegator :header, :record_count
+    def_delegator :header, :record_length
+    def_delegator :header, :version
+
     # Opens a DBF::Table
     # Examples:
     #   # working with a file stored on the filesystem
@@ -104,12 +113,14 @@ module DBF
     #
     # @yield [nil, DBF::Record]
     def each
-      header.record_count.times { |i| yield record(i) }
+      record_count.times { |i| yield record(i) }
     end
 
     # @return [String]
     def filename
-      File.basename(@data.path) if @data.respond_to?(:path)
+      return unless @data.respond_to?(:path)
+
+      File.basename(@data.path)
     end
 
     # Find records using a simple ActiveRecord-like syntax.
@@ -167,20 +178,17 @@ module DBF
     # @param [Integer] index
     # @return [DBF::Record, NilClass]
     def record(index)
+      raise DBF::NoColumnsDefined, 'The DBF file has no columns defined' if columns.empty?
+
       seek_to_record(index)
       return nil if deleted_record?
-      DBF::Record.new(@data.read(header.record_length), columns, version, @memo)
+
+      record_data = @data.read(record_length)
+      DBF::Record.new(record_data, columns, version, @memo)
     end
 
     alias row record
 
-    # Total number of records
-    #
-    # @return [Integer]
-    def record_count
-      @record_count ||= header.record_count
-    end
-
     # Dumps all records to a CSV file.  If no filename is given then CSV is
     # output to STDOUT.
     #
@@ -192,13 +200,6 @@ module DBF
       each { |record| csv << record.to_a }
     end
 
-    # Internal dBase version number
-    #
-    # @return [String]
-    def version
-      @version ||= header.version
-    end
-
     # Human readable version description
     #
     # @return [String]
@@ -222,7 +223,7 @@ module DBF
 
     def deleted_record? # :nodoc:
       flag = @data.read(1)
-      flag ? flag.unpack('a') == ['*'] : true
+      flag ? flag.unpack1('a') == '*' : true
     end
 
     def end_of_record? # :nodoc:
@@ -232,6 +233,7 @@ module DBF
     def find_all(options) # :nodoc:
       select do |record|
         next unless record && record.match?(options)
+
         yield record if block_given?
         record
       end
@@ -242,7 +244,7 @@ module DBF
     end
 
     def foxpro? # :nodoc:
-      FOXPRO_VERSIONS.keys.include? version
+      FOXPRO_VERSIONS.key?(version)
     end
 
     def header # :nodoc:
@@ -290,11 +292,11 @@ module DBF
     end
 
     def seek(offset) # :nodoc:
-      @data.seek(header.header_length + offset)
+      @data.seek(header_length + offset)
     end
 
     def seek_to_record(index) # :nodoc:
-      seek(index * header.record_length)
+      seek(index * record_length)
     end
   end
 end

data/lib/dbf/version.rb

@@ -1,3 +1,3 @@
 module DBF
-  VERSION = '3.1.3'
+  VERSION = '4.1.3'.freeze
 end

data/spec/dbf/column_spec.rb

@@ -42,7 +42,7 @@ RSpec.describe DBF::Column do
     end
   end
 
-  context '#type_cast' do
+  describe '#type_cast' do
     context 'with type N (number)' do
       context 'when value is empty' do
         it 'returns nil' do
@@ -52,14 +52,14 @@ RSpec.describe DBF::Column do
         end
       end
 
-      context 'and 0 length' do
+      context 'with 0 length' do
         it 'returns nil' do
           column = DBF::Column.new table, 'ColumnName', 'N', 0, 0
           expect(column.type_cast('')).to be_nil
         end
       end
 
-      context 'and 0 decimals' do
+      context 'with 0 decimals' do
         it 'casts value to Integer' do
           value = '135'
           column = DBF::Column.new table, 'ColumnName', 'N', 3, 0
@@ -69,11 +69,11 @@ RSpec.describe DBF::Column do
         it 'supports negative Integer' do
           value = '-135'
           column = DBF::Column.new table, 'ColumnName', 'N', 3, 0
-          expect(column.type_cast(value)).to eq (-135)
+          expect(column.type_cast(value)).to eq(-135)
         end
       end
 
-      context 'and more than 0 decimals' do
+      context 'with more than 0 decimals' do
         it 'casts value to Float' do
           value = '13.5'
           column = DBF::Column.new table, 'ColumnName', 'N', 2, 1
@@ -83,13 +83,13 @@ RSpec.describe DBF::Column do
         it 'casts negative value to Float' do
           value = '-13.5'
           column = DBF::Column.new table, 'ColumnName', 'N', 2, 1
-          expect(column.type_cast(value)).to eq (-13.5)
+          expect(column.type_cast(value)).to eq(-13.5)
         end
       end
     end
 
     context 'with type F (float)' do
-      context 'and 0 length' do
+      context 'with 0 length' do
         it 'returns nil' do
           column = DBF::Column.new table, 'ColumnName', 'F', 0, 0
           expect(column.type_cast('')).to be_nil
@@ -105,7 +105,7 @@ RSpec.describe DBF::Column do
       it 'casts negative value to Float' do
         value = '-135'
         column = DBF::Column.new table, 'ColumnName', 'F', 3, 0
-        expect(column.type_cast(value)).to eq (-135.0)
+        expect(column.type_cast(value)).to eq(-135.0)
       end
     end
 
@@ -126,13 +126,13 @@ RSpec.describe DBF::Column do
         it 'supports negative binary' do
           column = DBF::Column.new table, 'ColumnName', 'B', 1, 2
           expect(column.type_cast("\x00\x00\x00\x00\x00\xC0\x65\xC0")).to be_a(Float)
-          expect(column.type_cast("\x00\x00\x00\x00\x00\xC0\x65\xC0")).to eq (-174.0)
+          expect(column.type_cast("\x00\x00\x00\x00\x00\xC0\x65\xC0")).to eq(-174.0)
         end
       end
     end
 
     context 'with type I (integer)' do
-      context 'and 0 length' do
+      context 'with 0 length' do
         it 'returns nil' do
           column = DBF::Column.new table, 'ColumnName', 'I', 0, 0
           expect(column.type_cast('')).to be_nil
@@ -142,13 +142,13 @@ RSpec.describe DBF::Column do
       it 'casts value to Integer' do
         value = "\203\171\001\000"
         column = DBF::Column.new table, 'ColumnName', 'I', 3, 0
-        expect(column.type_cast(value)).to eq 96643
+        expect(column.type_cast(value)).to eq 96_643
       end
 
       it 'supports negative Integer' do
         value = "\x24\xE1\xFF\xFF"
         column = DBF::Column.new table, 'ColumnName', 'I', 3, 0
-        expect(column.type_cast(value)).to eq (-7900)
+        expect(column.type_cast(value)).to eq(-7900)
       end
     end
 
@@ -167,7 +167,7 @@ RSpec.describe DBF::Column do
         expect(column.type_cast('n')).to be false
       end
 
-      context 'and 0 length' do
+      context 'with 0 length' do
         it 'returns nil' do
           column = DBF::Column.new table, 'ColumnName', 'L', 0, 0
           expect(column.type_cast('')).to be_nil
@@ -180,7 +180,7 @@ RSpec.describe DBF::Column do
 
       context 'with valid datetime' do
         it 'casts to DateTime' do
-          expect(column.type_cast("Nl%\000\300Z\252\003")).to eq DateTime.parse('2002-10-10T17:04:56+00:00')
+          expect(column.type_cast("Nl%\000\300Z\252\003")).to eq Time.parse('2002-10-10T17:04:56+00:00')
         end
       end
 
@@ -190,7 +190,7 @@ RSpec.describe DBF::Column do
         end
       end
 
-      context 'and 0 length' do
+      context 'with 0 length' do
         it 'returns nil' do
           column = DBF::Column.new table, 'ColumnName', 'T', 0, 0
           expect(column.type_cast('')).to be_nil
@@ -203,7 +203,7 @@ RSpec.describe DBF::Column do
 
       context 'with valid date' do
         it 'casts to Date' do
-          expect(column.type_cast('20050712')).to eq Date.new(2005,7,12)
+          expect(column.type_cast('20050712')).to eq Date.new(2005, 7, 12)
         end
       end
 
@@ -213,7 +213,7 @@ RSpec.describe DBF::Column do
         end
       end
 
-      context 'and 0 length' do
+      context 'with 0 length' do
         it 'returns nil' do
           column = DBF::Column.new table, 'ColumnName', 'D', 0, 0
           expect(column.type_cast('')).to be_nil
@@ -232,7 +232,7 @@ RSpec.describe DBF::Column do
         expect(column.type_cast(nil)).to be_nil
       end
 
-      context 'and 0 length' do
+      context 'with 0 length' do
         it 'returns nil' do
           column = DBF::Column.new table, 'ColumnName', 'M', 0, 0
           expect(column.type_cast('')).to be_nil
@@ -252,7 +252,7 @@ RSpec.describe DBF::Column do
         expect(column.type_cast(nil)).to be_nil
       end
 
-      context 'and 0 length' do
+      context 'with 0 length' do
         it 'returns nil' do
           column = DBF::Column.new table, 'ColumnName', 'G', 0, 0
           expect(column.type_cast('')).to be_nil
@@ -269,14 +269,14 @@ RSpec.describe DBF::Column do
     end
 
     it 'supports negative currency' do
-      expect(column.type_cast("\xFC\xF0\xF0\xFE\xFF\xFF\xFF\xFF")).to eq (-1776.41)
+      expect(column.type_cast("\xFC\xF0\xF0\xFE\xFF\xFF\xFF\xFF")).to eq(-1776.41)
     end
 
     it 'supports 64bit negative currency' do
-      expect(column.type_cast("pN'9\xFF\xFF\xFF\xFF")).to eq (-333609.0)
+      expect(column.type_cast("pN'9\xFF\xFF\xFF\xFF")).to eq(-333_609.0)
     end
 
-    context 'and 0 length' do
+    context 'with 0 length' do
       it 'returns nil' do
         column = DBF::Column.new table, 'ColumnName', 'Y', 0, 0
         expect(column.type_cast('')).to be_nil
@@ -284,7 +284,7 @@ RSpec.describe DBF::Column do
     end
   end
 
-  context '#name' do
+  describe '#name' do
     it 'contains only ASCII characters' do
       column = DBF::Column.new table, "--\x1F-\x68\x65\x6C\x6C\x6F world-\x80--", 'N', 1, 0
       expect(column.name).to eq '---hello world---'

data/spec/dbf/file_formats_spec.rb

@@ -1,17 +1,15 @@
 require 'spec_helper'
 
 RSpec.shared_examples_for 'DBF' do
-  specify 'sum of column lengths should equal record length specified in header plus one' do
-    header_record_length = table.instance_eval { @header.record_length }
-    sum_of_column_lengths = table.columns.inject(1) { |sum, column| sum += column.length }
+  let(:header_record_length) { table.instance_eval { header.record_length } }
+  let(:sum_of_column_lengths) { table.columns.inject(1) { |sum, column| sum + column.length } }
 
+  specify 'sum of column lengths should equal record length specified in header plus one' do
     expect(header_record_length).to eq sum_of_column_lengths
   end
 
   specify 'records should be instances of DBF::Record' do
-    table.each do |record|
-      expect(record).to be_kind_of(DBF::Record)
-    end
+    expect(table).to all be_kind_of(DBF::Record)
   end
 
   specify 'record count should be the same as reported in the header' do
@@ -20,7 +18,7 @@ RSpec.shared_examples_for 'DBF' do
 
   specify 'column names should not be blank' do
     table.columns.each do |column|
-      expect(column.name).not_to be_empty
+      expect(column.name).to_not be_empty
     end
   end
 
@@ -53,17 +51,17 @@ end
 RSpec.describe DBF, 'of type 03 (dBase III without memo file)' do
   let(:table) { DBF::Table.new fixture('dbase_03.dbf') }
 
-  it_should_behave_like 'DBF'
+  it_behaves_like 'DBF'
 
-  it 'should report the correct version number' do
+  it 'reports the correct version number' do
     expect(table.version).to eq '03'
   end
 
-  it 'should report the correct version description' do
+  it 'reports the correct version description' do
     expect(table.version_description).to eq 'dBase III without memo file'
   end
 
-  it 'should determine the number of records' do
+  it 'determines the number of records' do
     expect(table.record_count).to eq 14
   end
 end
@@ -71,17 +69,17 @@ end
 RSpec.describe DBF, 'of type 30 (Visual FoxPro)' do
   let(:table) { DBF::Table.new fixture('dbase_30.dbf') }
 
-  it_should_behave_like 'DBF'
+  it_behaves_like 'DBF'
 
-  it 'should report the correct version number' do
+  it 'reports the correct version number' do
     expect(table.version).to eq '30'
   end
 
-  it 'should report the correct version description' do
+  it 'reports the correct version description' do
     expect(table.version_description).to eq 'Visual FoxPro'
   end
 
-  it 'should determine the number of records' do
+  it 'determines the number of records' do
     expect(table.record_count).to eq 34
   end
 
@@ -93,17 +91,17 @@ end
 RSpec.describe DBF, 'of type 31 (Visual FoxPro with AutoIncrement field)' do
   let(:table) { DBF::Table.new fixture('dbase_31.dbf') }
 
-  it_should_behave_like 'DBF'
+  it_behaves_like 'DBF'
 
-  it 'should have a dBase version of 31' do
+  it 'has a dBase version of 31' do
     expect(table.version).to eq '31'
   end
 
-  it 'should report the correct version description' do
+  it 'reports the correct version description' do
     expect(table.version_description).to eq 'Visual FoxPro with AutoIncrement field'
   end
 
-  it 'should determine the number of records' do
+  it 'determines the number of records' do
     expect(table.record_count).to eq 77
   end
 end
@@ -111,17 +109,17 @@ end
 RSpec.describe DBF, 'of type 83 (dBase III with memo file)' do
   let(:table) { DBF::Table.new fixture('dbase_83.dbf') }
 
-  it_should_behave_like 'DBF'
+  it_behaves_like 'DBF'
 
-  it 'should report the correct version number' do
+  it 'reports the correct version number' do
     expect(table.version).to eq '83'
   end
 
-  it 'should report the correct version description' do
+  it 'reports the correct version description' do
     expect(table.version_description).to eq 'dBase III with memo file'
   end
 
-  it 'should determine the number of records' do
+  it 'determines the number of records' do
     expect(table.record_count).to eq 67
   end
 end
@@ -129,17 +127,17 @@ end
 RSpec.describe DBF, 'of type 8b (dBase IV with memo file)' do
   let(:table) { DBF::Table.new fixture('dbase_8b.dbf') }
 
-  it_should_behave_like 'DBF'
+  it_behaves_like 'DBF'
 
-  it 'should report the correct version number' do
+  it 'reports the correct version number' do
     expect(table.version).to eq '8b'
   end
 
-  it 'should report the correct version description' do
+  it 'reports the correct version description' do
     expect(table.version_description).to eq 'dBase IV with memo file'
   end
 
-  it 'should determine the number of records' do
+  it 'determines the number of records' do
     expect(table.record_count).to eq 10
   end
 end
@@ -147,17 +145,17 @@ end
 RSpec.describe DBF, 'of type f5 (FoxPro with memo file)' do
   let(:table) { DBF::Table.new fixture('dbase_f5.dbf') }
 
-  it_should_behave_like 'DBF'
+  it_behaves_like 'DBF'
 
-  it 'should report the correct version number' do
+  it 'reports the correct version number' do
     expect(table.version).to eq 'f5'
   end
 
-  it 'should report the correct version description' do
+  it 'reports the correct version description' do
     expect(table.version_description).to eq 'FoxPro with memo file'
   end
 
-  it 'should determine the number of records' do
+  it 'determines the number of records' do
     expect(table.record_count).to eq 975
   end
 

data/spec/dbf/record_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe DBF::Record do
     let(:record_0) { YAML.load_file(fixture('dbase_83_record_0.yml')) }
     let(:record_9) { YAML.load_file(fixture('dbase_83_record_9.yml')) }
 
-    it 'should return an ordered array of attribute values' do
+    it 'returns an ordered array of attribute values' do
       record = table.record(0)
       expect(record.to_a).to eq record_0
 
@@ -44,13 +44,13 @@ RSpec.describe DBF::Record do
 
     describe 'when other does not have attributes' do
       it 'returns false' do
-        expect((record == double('other'))).to be_falsey
+        expect((record == instance_double('DBF::Record'))).to be_falsey
       end
     end
 
     describe 'if other attributes match' do
       let(:attributes) { {x: 1, y: 2} }
-      let(:other) { double('object', attributes: attributes) }
+      let(:other) { instance_double('DBF::Record', attributes: attributes) }
 
       before do
         allow(record).to receive(:attributes).and_return(attributes)
@@ -80,11 +80,11 @@ RSpec.describe DBF::Record do
       let(:table) { DBF::Table.new fixture('cp1251.dbf') }
       let(:record) { table.find(0) }
 
-      it 'should automatically encodes to default system encoding' do
+      it 'encodes to default system encoding' do
         expect(record.name.encoding).to eq Encoding.default_external
 
         # russian a
-        expect(record.name.encode('UTF-8').unpack('H4')).to eq ['d0b0']
+        expect(record.name.encode('UTF-8').unpack1('H4')).to eq 'd0b0'
       end
     end
 
@@ -92,11 +92,11 @@ RSpec.describe DBF::Record do
       let(:table) { DBF::Table.new fixture('cp1251.dbf'), nil, 'cp866' }
       let(:record) { table.find(0) }
 
-      it 'should transcode from manually specified encoding to default system encoding' do
+      it 'transcodes from manually specified encoding to default system encoding' do
         expect(record.name.encoding).to eq Encoding.default_external
 
         # russian а encoded in cp1251 and read as if it was encoded in cp866
-        expect(record.name.encode('UTF-8').unpack('H4')).to eq ['d180']
+        expect(record.name.encode('UTF-8').unpack1('H4')).to eq 'd180'
       end
     end
   end

data/spec/dbf/table_spec.rb

@@ -44,7 +44,7 @@ RSpec.describe DBF::Table do
     end
   end
 
-  context '#close' do
+  describe '#close' do
     before { table.close }
 
     it 'closes the io' do
@@ -83,12 +83,12 @@ RSpec.describe DBF::Table do
   end
 
   describe '#sequel_schema' do
-    it 'should return a valid Sequel migration by default' do
+    it 'returns a valid Sequel migration by default' do
       control_schema = File.read(fixture('dbase_83_schema_sq.txt'))
       expect(table.sequel_schema).to eq control_schema
     end
 
-    it 'should return a limited Sequel migration when passed true' do
+    it 'returns a limited Sequel migration when passed true' do
       control_schema = File.read(fixture('dbase_83_schema_sq_lim.txt'))
       expect(table.sequel_schema).to eq control_schema
     end
@@ -129,13 +129,7 @@ RSpec.describe DBF::Table do
 
     describe 'when no path param passed' do
       it 'writes to STDOUT' do
-        begin
-          $stdout = StringIO.new
-          table.to_csv
-          expect($stdout.string).not_to be_empty
-        ensure
-          $stdout = STDOUT
-        end
+        expect { table.to_csv }.to output.to_stdout
       end
     end
 
@@ -143,7 +137,7 @@ RSpec.describe DBF::Table do
       before { table.to_csv('test.csv') }
 
       it 'creates a custom csv file' do
-        expect(File.exist?('test.csv')).to be_truthy
+        expect(File).to be_exist('test.csv')
       end
     end
   end
@@ -153,10 +147,18 @@ RSpec.describe DBF::Table do
       allow(table).to receive(:deleted_record?).and_return(true)
       expect(table.record(5)).to be_nil
     end
+
+    describe 'when dbf has no column definitions' do
+      let(:dbf_path) { fixture('polygon.dbf') }
+
+      it 'raises a DBF::NoColumnsDefined error' do
+        expect { DBF::Table.new(dbf_path).record(1) }.to raise_error(DBF::NoColumnsDefined, 'The DBF file has no columns defined')
+      end
+    end
   end
 
   describe '#current_record' do
-    it 'should return nil for deleted records' do
+    it 'returns nil for deleted records' do
       allow(table).to receive(:deleted_record?).and_return(true)
       expect(table.record(0)).to be_nil
     end
@@ -201,24 +203,24 @@ RSpec.describe DBF::Table do
         expect(table.find(:all, 'WEIGHT' => 0.0)).to eq table.select { |r| r['weight'] == 0.0 }
       end
 
-      it 'should AND multiple search terms' do
+      it 'ANDS multiple search terms' do
         expect(table.find(:all, 'ID' => 30, :IMAGE => 'graphics/00000001/TBC01.jpg')).to be_empty
       end
 
-      it 'should match original column names' do
-        expect(table.find(:all, 'WEIGHT' => 0.0)).not_to be_empty
+      it 'matches original column names' do
+        expect(table.find(:all, 'WEIGHT' => 0.0)).to_not be_empty
       end
 
       it 'matches symbolized column names' do
-        expect(table.find(:all, :WEIGHT => 0.0)).not_to be_empty
+        expect(table.find(:all, WEIGHT: 0.0)).to_not be_empty
       end
 
       it 'matches downcased column names' do
-        expect(table.find(:all, 'weight' => 0.0)).not_to be_empty
+        expect(table.find(:all, 'weight' => 0.0)).to_not be_empty
       end
 
       it 'matches symbolized downcased column names' do
-        expect(table.find(:all, :weight => 0.0)).not_to be_empty
+        expect(table.find(:all, weight: 0.0)).to_not be_empty
       end
     end
 
@@ -276,13 +278,13 @@ RSpec.describe DBF::Table do
       let(:table) { DBF::Table.new fixture('dbase_03.dbf') }
 
       it 'is false' do
-        expect(table.has_memo_file?).to be_falsey
+        expect(table).to_not have_memo_file
       end
     end
 
     describe 'with a memo file' do
       it 'is true' do
-        expect(table.has_memo_file?).to be_truthy
+        expect(table).to have_memo_file
       end
     end
   end
@@ -293,7 +295,7 @@ RSpec.describe DBF::Table do
     it 'is an array of Columns' do
       expect(columns).to be_an(Array)
       expect(columns).to_not be_empty
-      expect(columns.all? { |c| c.class == DBF::Column }).to be_truthy
+      expect(columns).to be_all { |c| c.is_a? DBF::Column }
     end
   end
 
@@ -318,7 +320,7 @@ RSpec.describe DBF::Table do
     end
   end
 
-  context '#activerecord_schema_definition' do
+  describe '#activerecord_schema_definition' do
     context 'with type N (number)' do
       it 'outputs an integer column' do
         column = DBF::Column.new table, 'ColumnName', 'N', 1, 0
@@ -326,7 +328,7 @@ RSpec.describe DBF::Table do
       end
     end
 
-    context 'with type B (binary)' do
+    describe 'with type B (binary)' do
       context 'with Foxpro dbf' do
         it 'outputs a float column' do
           column = DBF::Column.new table, 'ColumnName', 'B', 1, 2

data/spec/spec_helper.rb

@@ -4,8 +4,6 @@ begin
 rescue LoadError
 end
 
-Encoding.default_external = 'UTF-8'
-
 require 'dbf'
 require 'yaml'
 require 'rspec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbf
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 4.1.3
 platform: ruby
 authors:
 - Keith Morrison
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-02 00:00:00.000000000 Z
+date: 2020-08-29 00:00:00.000000000 Z
 dependencies: []
 description: A small fast library for reading dBase, xBase, Clipper and FoxPro database
   files.
@@ -48,7 +48,7 @@ files:
 - lib/dbf/table.rb
 - lib/dbf/version.rb
 - spec/dbf/column_spec.rb
-- spec/dbf/database_spec.rb
+- spec/dbf/database/foxpro_spec.rb
 - spec/dbf/file_formats_spec.rb
 - spec/dbf/record_spec.rb
 - spec/dbf/table_spec.rb
@@ -90,12 +90,13 @@ files:
 - spec/fixtures/foxprodb/setup.dbf
 - spec/fixtures/foxprodb/types.CDX
 - spec/fixtures/foxprodb/types.dbf
+- spec/fixtures/polygon.dbf
 - spec/spec_helper.rb
 homepage: http://github.com/infused/dbf
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -104,21 +105,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.0
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Read xBase files
 test_files:
+- spec/dbf/database/foxpro_spec.rb
 - spec/dbf/file_formats_spec.rb
-- spec/dbf/database_spec.rb
 - spec/dbf/column_spec.rb
 - spec/dbf/record_spec.rb
 - spec/dbf/table_spec.rb