dbf 4.3.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b15db465fcb977bf3684285e38b07c4748bc9b8713274a80cc09a27fdefda8ca
-  data.tar.gz: f3009c19a0c6fd3f7291486a72a32a97a1a9f29fe4f24cd34f4d6a8e171b9879
+  metadata.gz: 8d40b6c4a0c614eda7638ef810b682b3ee767153b95cc4075d90c1f12937e57c
+  data.tar.gz: 6b74646387585dc0d497181d2253324cf92717b217b6642f5a1e307a7413e557
 SHA512:
-  metadata.gz: d99ab54892f6a2454a1c46191eea92c56d3efe4319e592cf767b53376b9c11c650d339aa6e0a88d4b959997a4f5beddcfd20f1dd9080ef60cef4ebf76bcd2214
-  data.tar.gz: da0a365801ac686861e92c5f22bf6b5fe9b383c14b7f65db6a2dcb95d3ec00be680a2b44b959b040296ccf833b778d64dd6677c6717ae08450ec7e312bde2b02
+  metadata.gz: 98414f9a53a66b60f69b419740cb2f28eff4bdd81de67e5b09b9ae274c1f5a2e40c8730546f4719c09078b590837b1da607685833034f96a86ab2bea62637629
+  data.tar.gz: 28a3a92617d4d889777d718cd88f43cec0217c6fd64135375699f81047186ddad0d1a345f32e2822d8f29a192fec579bef255efd316c5fb10594740042cd63a3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 4.3.1
+
+- Fix bug (since 4.2.0) that caused column names not to be truncated after null character
+
 ## 4.3.0
 
 - Drop support for Ruby versions older than 3.0

data/README.md

@@ -16,19 +16,19 @@ DBF is a small, fast Ruby library for reading dBase, xBase, Clipper, and FoxPro
   subject line
 * Change log: <https://github.com/infused/dbf/blob/master/CHANGELOG.md>
 
-NOTE: 
+NOTE: Beginning with version 4.3 we have dropped support for Ruby 3.0 and earlier.
 
-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,
+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,
+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 3.0.x, 3.1.x, 3.2.x, 3.3.x
+* Ruby 3.1.x, 3.2.x, 3.3.x
 
 ## Installation
 

data/lib/dbf/column.rb

@@ -9,8 +9,10 @@ module DBF
     end
 
     attr_reader :table, :name, :type, :length, :decimal
+
     def_delegator :type_cast_class, :type_cast
 
+    # rubocop:disable Style/MutableConstant
     TYPE_CAST_CLASS = {
       N: ColumnType::Number,
       I: ColumnType::SignedLong,
@@ -24,6 +26,7 @@ module DBF
       G: ColumnType::General,
       '+'.to_sym => ColumnType::SignedLong2
     }
+    # rubocop:enable Style/MutableConstant
     TYPE_CAST_CLASS.default = ColumnType::String
     TYPE_CAST_CLASS.freeze
 
@@ -58,7 +61,7 @@ module DBF
     #
     # @return [Hash]
     def to_hash
-      {name: name, type: type, length: length, decimal: decimal}
+      {name:, type:, length:, decimal:}
     end
 
     # Underscored name
@@ -68,18 +71,17 @@ module DBF
     #
     # @return [String]
     def underscored_name
-      @underscored_name ||= begin
-        name.gsub(/([a-z\d])([A-Z])/, '\1_\2').tr('-', '_').downcase
-      end
+      @underscored_name ||= name.gsub(/([a-z\d])([A-Z])/, '\1_\2').tr('-', '_').downcase
+      
     end
 
     private
 
     def clean(value) # :nodoc:
-      value.strip.gsub("\x00", '').gsub(/[^\x20-\x7E]/, '')
+      value.strip.partition("\x00").first.gsub(/[^\x20-\x7E]/, '')
     end
 
-    def encode(value, strip_output = false) # :nodoc:
+    def encode(value, strip_output: false) # :nodoc:
       return value unless value.respond_to?(:encoding)
 
       output = @encoding ? encode_string(value) : value

data/lib/dbf/database/foxpro.rb

@@ -105,7 +105,7 @@ module DBF
       end
 
       def table_field_hash(name)
-        {name: name, fields: []}
+        {name:, fields: []}
       end
     end
 

data/lib/dbf/header.rb

@@ -1,11 +1,6 @@
 module DBF
   class Header
-    attr_reader :version
-    attr_reader :record_count
-    attr_reader :header_length
-    attr_reader :record_length
-    attr_reader :encoding_key
-    attr_reader :encoding
+    attr_reader :version, :record_count, :header_length, :record_length, :encoding_key, :encoding
 
     def initialize(data)
       @data = data
@@ -13,7 +8,7 @@ module DBF
     end
 
     def unpack_header
-      @version = @data.unpack('H2').first
+      @version = @data.unpack1('H2')
 
       case @version
       when '02'

data/lib/dbf/record.rb

@@ -29,7 +29,7 @@ module DBF
       key = name.to_s
       if attributes.key?(key)
         attributes[key]
-      elsif index = underscored_column_names.index(key)
+      elsif (index = underscored_column_names.index(key))
         attributes[@columns[index].name]
       end
     end
@@ -59,7 +59,7 @@ module DBF
     private
 
     def column_names # :nodoc:
-      @column_names ||= @columns.map { |column| column.name }
+      @column_names ||= @columns.map(&:name)
     end
 
     def get_data(column) # :nodoc:

data/lib/dbf/schema.rb

@@ -35,9 +35,9 @@ module DBF
     # @param format [Symbol] format Valid options are :activerecord and :json
     # @param table_only [Boolean]
     # @return [String]
-    def schema(format = :activerecord, table_only = false)
+    def schema(format = :activerecord, table_only: false)
       schema_method_name = schema_name(format)
-      send(schema_method_name, table_only)
+      send(schema_method_name, table_only:)
     rescue NameError
       raise ArgumentError, ":#{format} is not a valid schema. Valid schemas are: #{FORMATS.join(', ')}."
     end
@@ -46,7 +46,7 @@ module DBF
       "#{format}_schema"
     end
 
-    def activerecord_schema(_table_only = false) # :nodoc:
+    def activerecord_schema(*) # :nodoc:
       s = "ActiveRecord::Schema.define do\n"
       s << "  create_table \"#{name}\" do |t|\n"
       columns.each do |column|
@@ -56,7 +56,7 @@ module DBF
       s
     end
 
-    def sequel_schema(table_only = false) # :nodoc:
+    def sequel_schema(table_only: false) # :nodoc:
       s = ''
       s << "Sequel.migration do\n" unless table_only
       s << "  change do\n " unless table_only
@@ -70,7 +70,7 @@ module DBF
       s
     end
 
-    def json_schema(_table_only = false) # :nodoc:
+    def json_schema(*) # :nodoc:
       columns.map(&:to_hash).to_json
     end
 
@@ -92,9 +92,9 @@ module DBF
 
     def schema_data_type(column, format = :activerecord) # :nodoc:
       case column.type
-      when *%w[N F I]
+      when 'N', 'F', 'I'
         number_data_type(column)
-      when *%w[Y D T L M B]
+      when 'Y', 'D', 'T', 'L', 'M', 'B'
         OTHER_DATA_TYPES[column.type]
       else
         string_data_format(format, column)

data/lib/dbf/table.rb

@@ -86,7 +86,7 @@ module DBF
     # @return [TrueClass, FalseClass]
     def close
       @data.close
-      @memo && @memo.close
+      @memo&.close
     end
 
     # @return [TrueClass, FalseClass]
@@ -255,7 +255,7 @@ module DBF
 
     def find_all(options) # :nodoc:
       select do |record|
-        next unless record && record.match?(options)
+        next unless record&.match?(options)
 
         yield record if block_given?
         record
@@ -263,7 +263,7 @@ module DBF
     end
 
     def find_first(options) # :nodoc:
-      detect { |record| record && record.match?(options) }
+      detect { |record| record&.match?(options) }
     end
 
     def foxpro? # :nodoc:
@@ -278,13 +278,12 @@ module DBF
     end
 
     def memo_class # :nodoc:
-      @memo_class ||= begin
-        if foxpro?
-          Memo::Foxpro
+      @memo_class ||= if foxpro?
+        Memo::Foxpro
         else
           version == '83' ? Memo::Dbase3 : Memo::Dbase4
-        end
       end
+      
     end
 
     def memo_search_path(io) # :nodoc:

data/lib/dbf/version.rb

@@ -1,3 +1,3 @@
 module DBF
-  VERSION = '4.3.0'.freeze
+  VERSION = '4.3.1'.freeze
 end

data/spec/dbf/column_spec.rb

@@ -287,12 +287,12 @@ RSpec.describe DBF::Column do
   describe '#name' do
     it 'contains only ASCII characters' do
       column = DBF::Column.new table, "--\x1F-\x68\x65\x6C\x6C\x6F \x00world-\x80--", 'N', 1, 0
-      expect(column.name).to eq '---hello world---'
+      expect(column.name).to eq '---hello '
     end
 
     it 'is truncated at the null character' do
       column = DBF::Column.new table, "--\x1F-\x68\x65\x6C\x6C\x6F \x00world-\x80\x80--", 'N', 1, 0
-      expect(column.name).to eq '---hello world---'
+      expect(column.name).to eq '---hello '
     end
   end
 end

data/spec/dbf/record_spec.rb

@@ -3,25 +3,25 @@ require 'spec_helper'
 RSpec.describe DBF::Record do
   describe '#to_a' do
     let(:table) { DBF::Table.new fixture('dbase_83.dbf') }
-    let(:record_0) { YAML.load_file(fixture('dbase_83_record_0.yml')) }
-    let(:record_9) { YAML.load_file(fixture('dbase_83_record_9.yml')) }
+    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 record_0
+      expect(record.to_a).to eq record0
 
       record = table.record(9)
-      expect(record.to_a).to eq record_9
+      expect(record.to_a).to eq record9
     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(:record_0) { YAML.load_file(fixture('dbase_83_missing_memo_record_0.yml')) }
+        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 record_0
+          expect(record.to_a).to eq record0
         end
       end
     end
@@ -29,11 +29,11 @@ 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(:record_0) { YAML.load_file(fixture('dbase_83_missing_memo_record_0.yml')) }
+      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 record_0
+        expect(record.to_a).to eq record0
       end
     end
   end
@@ -50,7 +50,7 @@ RSpec.describe DBF::Record do
 
     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:) }
 
       before do
         allow(record).to receive(:attributes).and_return(attributes)

data/spec/dbf/table_spec.rb

@@ -70,7 +70,6 @@ RSpec.describe DBF::Table do
 
     describe 'when data is StringIO' do
       let(:data) { StringIO.new File.read(dbf_path) }
-      let(:memo) { StringIO.new File.read(memo_path) }
       let(:table) { DBF::Table.new data }
 
       let(:control_schema) { File.read(fixture('dbase_83_schema_ar.txt')) }
@@ -200,7 +199,7 @@ RSpec.describe DBF::Table do
       end
 
       it 'returns matching records when used with options' do
-        expect(table.find(:all, 'WEIGHT' => 0.0)).to eq table.select { |r| r['weight'] == 0.0 }
+        expect(table.find(:all, 'WEIGHT' => 0.0)).to eq(table.select { |r| r['weight'] == 0.0 })
       end
 
       it 'ANDS multiple search terms' do
@@ -295,7 +294,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).to be_all { |c| c.is_a? DBF::Column }
+      expect(columns).to(be_all { |c| c.is_a? DBF::Column })
     end
   end
 

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ begin
   require 'simplecov'
   SimpleCov.start
 rescue LoadError
+  # ignore
 end
 
 require 'dbf'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbf
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.3.1
 platform: ruby
 authors:
 - Keith Morrison
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-27 00:00:00.000000000 Z
+date: 2024-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv