dbf 3.1.3 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05f4c5675dae61be9046beaf3dab5cf09d16752bdfa5b3841f7811fe4e08b981
-  data.tar.gz: 7dd76a7c629a0965557d2c4fae8043ac7e5811834e3e011ea55ab669678a238c
+  metadata.gz: c958b14933bbb6d5a9f1e4489b61603d68e43d5fc39331267aac586c324a9afb
+  data.tar.gz: 43714e5ff6c6c67f5e0d77fd0c6f7485466545ace2e3d911937076bb74ff4a23
 SHA512:
-  metadata.gz: eeb040f9f564e605a0fb107c43558d060c55ff868cadccfdfdd5b452040cc0ec30261ed0db0eb31ff8891efb6f1e57305743b6176f90ed3a7508186166e80752
-  data.tar.gz: 303215437b2339e83436e8999c9b2465ac69ee48a2be591c63e77a1c53968accfcb1c84a5160174d47665dd6af561721dcb255777db9861a442452a399342015
+  metadata.gz: c1b0f3d7edf0b5ec26d748c1c1f67be7877c4f150cb9adb14d0eb2994c3515ba466d803e3bc94c3111608c574908b54d1fd69077591e676ca75ea24cb81db6be
+  data.tar.gz: 28358a00908e6f8bdaec6e74731b9961380a87c67e43dab21971bd686b7aef6fa6ba554faedee3168082a62125fd4dda24d23b257b5f1fa536b3313a8e2ef7a8

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 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

@@ -6,7 +6,9 @@ group :development, :test do
   gem 'byebug'
   gem 'guard'
   gem 'guard-rspec'
+  gem 'irb'
   gem 'rake'
-  gem 'rubocop'
   gem 'rspec'
+  gem 'rubocop'
+  gem 'rubocop-rspec'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dbf (3.1.3)
+    dbf (4.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -27,6 +27,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
+    irb (1.0.0)
     jaro_winkler (1.5.1)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -56,7 +57,7 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-mocks (3.8.0)
@@ -71,6 +72,8 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
+    rubocop-rspec (1.30.0)
+      rubocop (>= 0.58.0)
     ruby-progressbar (1.10.0)
     ruby_dep (1.5.0)
     shellany (0.0.1)
@@ -86,9 +89,11 @@ DEPENDENCIES
   dbf!
   guard
   guard-rspec
+  irb
   rake
   rspec
   rubocop
+  rubocop-rspec
 
 BUNDLED WITH
-   1.16.5
+   2.0.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2018 Keith Morrison <keithm@infused.org>
+Copyright (c) 2006-2019 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,15 @@ 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: Beginninf 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.3.x, 2.4.x, 2.5.x, 2.6.x
 
 ## Installation
 
@@ -272,7 +273,7 @@ for a full list of supported column types.
 
 ## License
 
-Copyright (c) 2006-2018 Keith Morrison <<keithm@infused.org>>
+Copyright (c) 2006-2019 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,7 +9,7 @@ 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'
@@ -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'
 

data/lib/dbf.rb

@@ -1,6 +1,7 @@
 require 'date'
 
 require 'csv'
+require 'forwardable'
 require 'json'
 
 require 'dbf/version'

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

@@ -15,7 +15,7 @@ module DBF
     end
 
     class Nil < Base
-      def type_cast(value)
+      def type_cast(_value)
         nil
       end
     end
@@ -23,19 +23,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 +48,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
@@ -70,7 +71,7 @@ module DBF
         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
+      rescue StandardError
         nil
       end
     end
@@ -97,6 +98,5 @@ module DBF
         @encoding ? value.force_encoding(@encoding).encode(*ENCODING_ARGS) : 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

@@ -5,6 +5,7 @@ module DBF
   # 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 +41,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,7 +110,7 @@ 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]
@@ -169,18 +175,12 @@ module DBF
     def record(index)
       seek_to_record(index)
       return nil if deleted_record?
-      DBF::Record.new(@data.read(header.record_length), columns, version, @memo)
+
+      DBF::Record.new(@data.read(record_length), 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 +192,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 +215,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 +225,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 +236,7 @@ module DBF
     end
 
     def foxpro? # :nodoc:
-      FOXPRO_VERSIONS.keys.include? version
+      FOXPRO_VERSIONS.key?(version)
     end
 
     def header # :nodoc:
@@ -290,11 +284,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.0.0'.freeze
 end

data/spec/dbf/column_spec.rb

@@ -69,7 +69,7 @@ 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
 
@@ -83,7 +83,7 @@ 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
@@ -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,7 +126,7 @@ 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
@@ -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
 
@@ -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
 
@@ -269,11 +269,11 @@ 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

data/spec/dbf/file_formats_spec.rb

@@ -20,7 +20,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 +53,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 +71,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 +93,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 +111,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 +129,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 +147,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
 
@@ -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 'automaticallies 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

@@ -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
@@ -132,7 +132,7 @@ RSpec.describe DBF::Table do
         begin
           $stdout = StringIO.new
           table.to_csv
-          expect($stdout.string).not_to be_empty
+          expect($stdout.string).to_not be_empty
         ensure
           $stdout = STDOUT
         end
@@ -143,7 +143,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
@@ -156,7 +156,7 @@ RSpec.describe DBF::Table do
   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 +201,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 +276,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 +293,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.class == DBF::Column }
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbf
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 4.0.0
 platform: ruby
 authors:
 - Keith Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-02 00:00:00.000000000 Z
+date: 2019-01-05 00:00:00.000000000 Z
 dependencies: []
 description: A small fast library for reading dBase, xBase, Clipper and FoxPro database
   files.
@@ -111,8 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.0
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Read xBase files