dbf 4.1.2 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b6cdaff3283aa216120ba94a5301ccdb2bdcac4d48549a2c10677684e1b01a4
-  data.tar.gz: e95965ac3b2415ce00db81f5e066e0dc5761cce1d35345f152b4c349d387f51e
+  metadata.gz: 4c2ff24f150ee6567de0532c773695f8b47c0db811660e0f5f3be3d53a7cc053
+  data.tar.gz: 7006275aff71326833452546657bb07520d53024b6846b0c982121a488cd8235
 SHA512:
-  metadata.gz: dce2c6e83afa30f01e209175cf0b4391e24dd06e5738be754fbce53d4812c01b2357da125e00ab233703f7b8fbbcbddcabf4e0a9778d25884cc801b4850bd0f1
-  data.tar.gz: 2ff59e987e773d92abc46b11130c2403c013eb3c0309be0a4bb995b85e61b8b61afc066140e055fdc6bb345107ad10940194569bebd886a838cfaca7441f1fe3
+  metadata.gz: b2d4bffa8201a8fa07abf642e721523e7ed59bb2b3e9a0fae31fe5ce6a4a3078f1520eb09e350d979dd88a68801c7c52d3236c402f83a41da1e5e6c4bca39911
+  data.tar.gz: fddf6622338b52b4bb6006513a92d9fd44c8f1e864738fd597d7e9f3fc21bcd86707f5e68e76216bd4c6d3be7dad9a48e5e19d55a6728691f6d90d86ec6db25e

data/CHANGELOG.md

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

data/Gemfile

@@ -4,11 +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 'rspec'
   gem 'rubocop'
+  gem 'rubocop-performance'
   gem 'rubocop-rspec'
 end

data/Gemfile.lock

@@ -1,19 +1,20 @@
 PATH
   remote: .
   specs:
-    dbf (4.1.1)
+    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)
@@ -28,57 +29,57 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     irb (1.0.0)
-    jaro_winkler (1.5.1)
+    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)
-    rubocop-rspec (1.30.0)
-      rubocop (>= 0.58.0)
-    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
@@ -87,13 +88,15 @@ DEPENDENCIES
   awesome_print
   byebug
   dbf!
+  e2mmap
   guard
   guard-rspec
   irb
   rake
   rspec
   rubocop
+  rubocop-performance
   rubocop-rspec
 
 BUNDLED WITH
-   1.17.3
+   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-2019 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,15 +16,17 @@ database files
   subject line
 * Change log: <https://github.com/infused/dbf/blob/master/CHANGELOG.md>
 
-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 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)
+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:
 
-* Ruby 2.4.x, 2.5.x, 2.6.x
+* Ruby 2.4.x, 2.5.x, 2.6.x, 2.7.x
 
 ## Installation
 
@@ -209,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
@@ -227,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:
 
@@ -273,7 +275,7 @@ for a full list of supported column types.
 
 ## License
 
-Copyright (c) 2006-2019 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

@@ -16,7 +16,7 @@ elsif params['h']
   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

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)
@@ -79,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
@@ -95,7 +90,7 @@ 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

data/lib/dbf/table.rb

@@ -2,6 +2,9 @@ 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
@@ -175,10 +178,13 @@ 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(record_length), columns, version, @memo)
+      record_data = @data.read(record_length)
+      DBF::Record.new(record_data, columns, version, @memo)
     end
 
     alias row record

data/lib/dbf/version.rb

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

data/spec/dbf/column_spec.rb

@@ -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
@@ -73,7 +73,7 @@ RSpec.describe DBF::Column do
         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
@@ -89,7 +89,7 @@ RSpec.describe DBF::Column do
     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
@@ -132,7 +132,7 @@ RSpec.describe DBF::Column do
     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
@@ -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
@@ -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
@@ -276,7 +276,7 @@ RSpec.describe DBF::Column do
       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

data/spec/dbf/record_spec.rb

@@ -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)

data/spec/dbf/table_spec.rb

@@ -147,6 +147,14 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbf
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.1.3
 platform: ruby
 authors:
 - Keith Morrison
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-22 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:
@@ -111,13 +112,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.0
 requirements: []
-rubygems_version: 3.0.2
-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