dbf 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a59c64cae2987160691a8cc8e99ed63e68cd7e50b5dbc1941a186454d5c37903
-  data.tar.gz: 618e8a2512bab2d9cedf26e94e1bca45159db880d11243695669c3bbc43452ac
+  metadata.gz: ea8e27ddd0d6d12797336f59d245bc8b62245e59c8fad0ecbf12c97513ac244f
+  data.tar.gz: d3cc1955ebb54357b5c724ef1b8687a8f69a47f794c445a08840d5dc08fa5861
 SHA512:
-  metadata.gz: cdd9d908bbc01b061d300ce780c83577f0bbaff1dcaba5375a69e71d43714d599a62879c0f6f56537a7d059764fc32102ca97eb67c4cafe6c38a68563ec88f74
-  data.tar.gz: 663fc952afb30bf77a5287edac7118ce5ab649cf3819f4a40994dd2f533765be9c42ec5e825a3443b47f5eba79393216fdc1448a6ebfd95fd8e1016d2fc69283
+  metadata.gz: 87ec87d1e3a45f4ec1f787f4e56d64aad00779aebe5e391656fe457f278219ffa72de97cc4ae679d2b8a14c7f03035fb059397251a290bc21587513382207c82
+  data.tar.gz: a931c1aa3ab7a5128824cb43bd4ec03217a52d548a071209495dce1647f68f269c78f84c15534ecf35ed9badac227e96a46ab53e0f33a9271d440d832fd26959

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 5.1.0
+
+- Drop support for Ruby 3.0.x
+
+## 5.0.1
+
+- Raise ArgumentError data is not a string or StringIO object
+
 ## 5.0.0
 
 - Refactor the Column class to support non-ASCII header names

data/README.md

@@ -14,7 +14,7 @@ DBF is a small, fast Ruby library for reading dBase, xBase, Clipper, and FoxPro
 * Report bugs: <https://github.com/infused/dbf/issues>
 * Questions: Email <mailto:keithm@infused.org> and put DBF somewhere in the
   subject line
-* Change log: <https://github.com/infused/dbf/blob/master/CHANGELOG.md>
+* Change log: <https://github.com/infused/dbf/blob/main/CHANGELOG.md>
 
 NOTE: Beginning with version 4.3 we have dropped support for Ruby 3.0 and earlier.
 

data/dbf.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ['README.md', 'CHANGELOG.md', 'LICENSE']
   s.files = Dir['README.md', 'CHANGELOG.md', 'LICENSE', '{bin,lib,spec}/**/*', 'dbf.gemspec']
   s.require_paths = ['lib']
-  s.required_rubygems_version = Gem::Requirement.new('>= 1.3.0')
-  s.required_ruby_version = Gem::Requirement.new('>= 3.0.0')
+  s.required_rubygems_version = Gem::Requirement.new('>= 3.2.3')
+  s.required_ruby_version = Gem::Requirement.new('>= 3.1.0')
   s.metadata['rubygems_mfa_required'] = 'true'
-  s.add_runtime_dependency 'csv'
+  s.add_dependency 'csv'
 end

data/lib/dbf/column.rb

@@ -24,7 +24,7 @@ module DBF
       M: ColumnType::Memo,
       B: ColumnType::Double,
       G: ColumnType::General,
-      '+'.to_sym => ColumnType::SignedLong2
+      :+ => ColumnType::SignedLong2
     }
     # rubocop:enable Style/MutableConstant
     TYPE_CAST_CLASS.default = ColumnType::String

data/lib/dbf/database/foxpro.rb

@@ -85,9 +85,7 @@ module DBF
           end
         end
 
-        Hash[
-          data.values.map { |v| [v[:name], v[:fields]] }
-        ]
+        data.values.to_h { |v| [v[:name], v[:fields]] }
       end
 
       def process_table(record, data)

data/lib/dbf/record.rb

@@ -38,7 +38,7 @@ module DBF
     #
     # @return [Hash]
     def attributes
-      @attributes ||= Hash[column_names.zip(to_a)]
+      @attributes ||= column_names.zip(to_a).to_h
     end
 
     # Do all search parameters match?

data/lib/dbf/table.rb

@@ -295,10 +295,9 @@ module DBF
     def memo_class # :nodoc:
       @memo_class ||= if foxpro?
         Memo::Foxpro
-        else
-          version == '83' ? Memo::Dbase3 : Memo::Dbase4
+      else
+        version == '83' ? Memo::Dbase3 : Memo::Dbase4
       end
-      
     end
 
     def memo_search_path(io) # :nodoc:
@@ -308,7 +307,14 @@ module DBF
     end
 
     def open_data(data) # :nodoc:
-      data.is_a?(StringIO) ? data : File.open(data, 'rb')
+      case data
+      when StringIO
+        data
+      when String
+        File.open(data, 'rb')
+      else
+        raise ArgumentError, 'data must be a file path or StringIO object'
+      end
     rescue Errno::ENOENT
       raise DBF::FileNotFoundError, "file not found: #{data}"
     end

data/lib/dbf/version.rb

@@ -1,3 +1,3 @@
 module DBF
-  VERSION = '5.0.0'.freeze
+  VERSION = '5.1.0'.freeze
 end

data/spec/dbf/encoding_spec.rb

@@ -1,47 +1,47 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
-RSpec.describe 'default encoding' do
-  let(:dbf_path) { fixture('dbase_03_cyrillic.dbf') }
-  let(:table) { DBF::Table.new dbf_path }
-
-  it 'defaults to UTF-8 encoding' do
-    expect(table.encoding).to eq Encoding::UTF_8
-  end
-
-  it 'uses the table encoding for column encoding' do
-    column = table.columns.first
-    expect(column.encoding).to eq table.encoding
-  end
-
-  it 'encodes column names' do
-    expect(table.column_names).to eq ['ШАР', 'ПЛОЩА']
-  end
-
-  it 'encodes record values' do
-    expect(table.record(0).attributes['ШАР']).to eq 'Номер'
-  end
-end
-
-RSpec.describe 'embedded encoding' do
-  let(:dbf_path) { fixture('cp1251.dbf') }
-  let(:table) { DBF::Table.new dbf_path }
-
-  it 'defaults to UTF-8 encoding' do
-    expect(table.encoding).to eq 'cp1251'
-  end
-
-  it 'uses the table encoding for column encoding' do
-    column = table.columns.first
-    expect(column.encoding).to eq table.encoding
-  end
-
-  it 'encodes column names' do
-    expect(table.column_names).to eq ['RN', 'NAME']
-  end
-
-  it 'encodes record values' do
-    expect(table.record(0).attributes['NAME']).to eq 'амбулаторно-поликлиническое'
+RSpec.describe 'DBF::Table' do
+  context 'with default encoding' do
+    let(:dbf_path) { fixture('dbase_03_cyrillic.dbf') }
+    let(:table) { DBF::Table.new dbf_path }
+  
+    it 'defaults to UTF-8 encoding' do
+      expect(table.encoding).to eq Encoding::UTF_8
+    end
+  
+    it 'uses the table encoding for column encoding' do
+      column = table.columns.first
+      expect(column.encoding).to eq table.encoding
+    end
+  
+    it 'encodes column names' do
+      expect(table.column_names).to eq %w[ШАР ПЛОЩА]
+    end
+  
+    it 'encodes record values' do
+      expect(table.record(0).attributes['ШАР']).to eq 'Номер'
+    end
+  end
+
+  context 'with embedded encoding' do
+    let(:dbf_path) { fixture('cp1251.dbf') }
+    let(:table) { DBF::Table.new dbf_path }
+  
+    it 'defaults to UTF-8 encoding' do
+      expect(table.encoding).to eq 'cp1251'
+    end
+  
+    it 'uses the table encoding for column encoding' do
+      column = table.columns.first
+      expect(column.encoding).to eq table.encoding
+    end
+  
+    it 'encodes column names' do
+      expect(table.column_names).to eq %w[RN NAME]
+    end
+  
+    it 'encodes record values' do
+      expect(table.record(0).attributes['NAME']).to eq 'амбулаторно-поликлиническое'
+    end
   end
 end

data/spec/dbf/file_formats_spec.rb

@@ -9,7 +9,7 @@ RSpec.shared_examples_for 'DBF' do
   end
 
   specify 'records should be instances of DBF::Record' do
-    expect(table).to all be_kind_of(DBF::Record)
+    expect(table).to all be_a(DBF::Record)
   end
 
   specify 'record count should be the same as reported in the header' do
@@ -31,7 +31,7 @@ RSpec.shared_examples_for 'DBF' do
 
   specify 'column lengths should be instances of Integer' do
     table.columns.each do |column|
-      expect(column.length).to be_kind_of(Integer)
+      expect(column.length).to be_a(Integer)
     end
   end
 
@@ -43,7 +43,7 @@ RSpec.shared_examples_for 'DBF' do
 
   specify 'column decimals should be instances of Integer' do
     table.columns.each do |column|
-      expect(column.decimal).to be_kind_of(Integer)
+      expect(column.decimal).to be_a(Integer)
     end
   end
 end

data/spec/dbf/record_spec.rb

@@ -3,25 +3,22 @@ require 'spec_helper'
 RSpec.describe DBF::Record do
   describe '#to_a' do
     let(:table) { DBF::Table.new fixture('dbase_83.dbf') }
-    let(:record0) { YAML.load_file(fixture('dbase_83_record_0.yml')) }
-    let(:record9) { YAML.load_file(fixture('dbase_83_record_9.yml')) }
 
     it 'returns an ordered array of attribute values' do
       record = table.record(0)
-      expect(record.to_a).to eq record0
+      expect(record.to_a).to eq YAML.load_file(fixture('dbase_83_record_0.yml'))
 
       record = table.record(9)
-      expect(record.to_a).to eq record9
+      expect(record.to_a).to eq YAML.load_file(fixture('dbase_83_record_9.yml'))
     end
 
     describe 'with missing memo file' do
       describe 'when opening a path' do
         let(:table) { DBF::Table.new fixture('dbase_83_missing_memo.dbf') }
-        let(:record0) { YAML.load_file(fixture('dbase_83_missing_memo_record_0.yml')) }
 
         it 'returns nil values for memo fields' do
           record = table.record(0)
-          expect(record.to_a).to eq record0
+          expect(record.to_a).to eq YAML.load_file(fixture('dbase_83_missing_memo_record_0.yml'))
         end
       end
     end
@@ -29,11 +26,10 @@ RSpec.describe DBF::Record do
     describe 'when opening StringIO' do
       let(:data) { StringIO.new(File.read(fixture('dbase_83_missing_memo.dbf'))) }
       let(:table) { DBF::Table.new(data) }
-      let(:record0) { YAML.load_file(fixture('dbase_83_missing_memo_record_0.yml')) }
 
       it 'returns nil values for memo fields' do
         record = table.record(0)
-        expect(record.to_a).to eq record0
+        expect(record.to_a).to eq YAML.load_file(fixture('dbase_83_missing_memo_record_0.yml'))
       end
     end
   end
@@ -44,13 +40,13 @@ RSpec.describe DBF::Record do
 
     describe 'when other does not have attributes' do
       it 'returns false' do
-        expect((record == instance_double('DBF::Record'))).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) { instance_double('DBF::Record', 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

@@ -29,6 +29,12 @@ RSpec.describe DBF::Table do
       end
     end
 
+    describe 'when data is nil' do
+      it 'raises ArgumentError' do
+        expect { DBF::Table.new nil }.to raise_error(ArgumentError, 'data must be a file path or StringIO object')
+      end
+    end
+
     describe 'when given paths to existing dbf and memo files' do
       it 'does not raise an error' do
         expect { DBF::Table.new dbf_path, memo_path }.to_not raise_error
@@ -136,7 +142,7 @@ RSpec.describe DBF::Table do
       before { table.to_csv('test.csv') }
 
       it 'creates a custom csv file' do
-        expect(File).to be_exist('test.csv')
+        expect(File).to exist('test.csv')
       end
     end
   end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dbf
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Keith Morrison
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv
@@ -31,9 +30,9 @@ executables:
 - dbf
 extensions: []
 extra_rdoc_files:
-- README.md
 - CHANGELOG.md
 - LICENSE
+- README.md
 files:
 - CHANGELOG.md
 - LICENSE
@@ -112,7 +111,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -121,15 +119,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.0
+      version: 3.2.3
 requirements: []
-rubygems_version: 3.5.8
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Read xBase files
 test_files: []