dbf 4.3.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d40b6c4a0c614eda7638ef810b682b3ee767153b95cc4075d90c1f12937e57c
-  data.tar.gz: 6b74646387585dc0d497181d2253324cf92717b217b6642f5a1e307a7413e557
+  metadata.gz: a59c64cae2987160691a8cc8e99ed63e68cd7e50b5dbc1941a186454d5c37903
+  data.tar.gz: 618e8a2512bab2d9cedf26e94e1bca45159db880d11243695669c3bbc43452ac
 SHA512:
-  metadata.gz: 98414f9a53a66b60f69b419740cb2f28eff4bdd81de67e5b09b9ae274c1f5a2e40c8730546f4719c09078b590837b1da607685833034f96a86ab2bea62637629
-  data.tar.gz: 28a3a92617d4d889777d718cd88f43cec0217c6fd64135375699f81047186ddad0d1a345f32e2822d8f29a192fec579bef255efd316c5fb10594740042cd63a3
+  metadata.gz: cdd9d908bbc01b061d300ce780c83577f0bbaff1dcaba5375a69e71d43714d599a62879c0f6f56537a7d059764fc32102ca97eb67c4cafe6c38a68563ec88f74
+  data.tar.gz: 663fc952afb30bf77a5287edac7118ce5ab649cf3819f4a40994dd2f533765be9c42ec5e825a3443b47f5eba79393216fdc1448a6ebfd95fd8e1016d2fc69283

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 5.0.0
+
+- Refactor the Column class to support non-ASCII header names
+- Output encoding is now set to UTF-8 if there is no embedded encoding and one is not
+  specified during DBF::Table initialization.
+
+## 4.3.2
+
+- Fixes to maintain support for Ruby 3.0.x until it's EOL
+
 ## 4.3.1
 
 - Fix bug (since 4.2.0) that caused column names not to be truncated after null character

data/bin/dbf

@@ -41,6 +41,7 @@ else
     puts
     puts "Database: #{filename}"
     puts "Type: (#{table.version}) #{table.version_description}"
+    puts "Encoding: #{table.header_encoding}" if table.header_encoding
     puts "Memo File: #{table.has_memo_file? ? 'true' : 'false'}"
     puts "Records: #{table.record_count}"
 

data/lib/dbf/column.rb

@@ -8,7 +8,7 @@ module DBF
     class NameError < StandardError
     end
 
-    attr_reader :table, :name, :type, :length, :decimal
+    attr_reader :table, :name, :type, :length, :decimal, :encoding
 
     def_delegator :type_cast_class, :type_cast
 
@@ -38,13 +38,14 @@ module DBF
     # @param length [Integer]
     # @param decimal [Integer]
     def initialize(table, name, type, length, decimal)
+      @encoding = table.encoding
+
       @table = table
       @name = clean(name)
       @type = type
       @length = length
       @decimal = decimal
       @version = table.version
-      @encoding = table.encoding
 
       validate_length
       validate_name
@@ -61,7 +62,7 @@ module DBF
     #
     # @return [Hash]
     def to_hash
-      {name:, type:, length:, decimal:}
+      {name: name, type: type, length: length, decimal: decimal}
     end
 
     # Underscored name
@@ -72,37 +73,18 @@ module DBF
     # @return [String]
     def underscored_name
       @underscored_name ||= name.gsub(/([a-z\d])([A-Z])/, '\1_\2').tr('-', '_').downcase
-      
     end
 
     private
 
     def clean(value) # :nodoc:
-      value.strip.partition("\x00").first.gsub(/[^\x20-\x7E]/, '')
-    end
-
-    def encode(value, strip_output: false) # :nodoc:
-      return value unless value.respond_to?(:encoding)
-
-      output = @encoding ? encode_string(value) : value
-      strip_output ? output.strip : output
-    end
-
-    def encoding_args # :nodoc:
-      @encoding_args ||= [
-        Encoding.default_external,
-        {undef: :replace, invalid: :replace}
-      ]
-    end
-
-    def encode_string(string) # :nodoc:
-      string.force_encoding(@encoding).encode(*encoding_args)
+      table.encode_string(value.strip.partition("\x00").first)
     end
 
     def type_cast_class # :nodoc:
       @type_cast_class ||= begin
         klass = @length == 0 ? ColumnType::Nil : TYPE_CAST_CLASS[type.to_sym]
-        klass.new(@decimal, @encoding)
+        klass.new(self)
       end
     end
 

data/lib/dbf/column_type.rb

@@ -5,9 +5,9 @@ module DBF
 
       # @param decimal [Integer]
       # @param encoding [String, Encoding]
-      def initialize(decimal, encoding)
-        @decimal = decimal
-        @encoding = encoding
+      def initialize(column)
+        @decimal = column.decimal
+        @encoding = column.encoding
       end
     end
 

data/lib/dbf/database/foxpro.rb

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

data/lib/dbf/schema.rb

@@ -37,7 +37,7 @@ module DBF
     # @return [String]
     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: table_only)
     rescue NameError
       raise ArgumentError, ":#{format} is not a valid schema. Valid schemas are: #{FORMATS.join(', ')}."
     end

data/lib/dbf/table.rb

@@ -76,7 +76,7 @@ module DBF
     # @param encoding [optional String, Encoding] encoding Name of the encoding or an Encoding object
     def initialize(data, memo = nil, encoding = nil)
       @data = open_data(data)
-      @encoding = encoding || header.encoding
+      @encoding = encoding || header.encoding || Encoding.default_external
       @memo = open_memo(data, memo)
       yield self if block_given?
     end
@@ -211,6 +211,21 @@ module DBF
       VERSIONS[version]
     end
 
+    # Encode string
+    #
+    # @param [String] string
+    # @return [String]
+    def encode_string(string) # :nodoc:
+      string.force_encoding(@encoding).encode(Encoding.default_external, undef: :replace, invalid: :replace)
+    end
+
+    # Encoding specified in the file header
+    #
+    # @return [Encoding]
+    def header_encoding
+      header.encoding
+    end
+
     private
 
     def build_columns # :nodoc:

data/lib/dbf/version.rb

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

data/spec/dbf/column_spec.rb

@@ -37,7 +37,7 @@ RSpec.describe DBF::Column do
 
     describe 'with empty column name' do
       it 'raises DBF::Column::NameError' do
-        expect { DBF::Column.new table, "\xFF\xFC", 'N', 1, 0 }.to raise_error(DBF::Column::NameError)
+        expect { DBF::Column.new table, '', 'N', 1, 0 }.to raise_error(DBF::Column::NameError)
       end
     end
   end
@@ -283,16 +283,4 @@ RSpec.describe DBF::Column do
       end
     end
   end
-
-  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 '
-    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 '
-    end
-  end
 end

data/spec/dbf/encoding_spec.rb

@@ -0,0 +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 'амбулаторно-поликлиническое'
+  end
+end

data/spec/dbf/record_spec.rb

@@ -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:) }
+      let(:other) { instance_double('DBF::Record', attributes: attributes) }
 
       before do
         allow(record).to receive(:attributes).and_return(attributes)

data/spec/fixtures/cp1251_summary.txt

@@ -1,6 +1,7 @@
 
 Database: cp1251.dbf
 Type: (30) Visual FoxPro
+Encoding: cp1251
 Memo File: false
 Records: 4
 

data/spec/fixtures/dbase_03_cyrillic_summary.txt

@@ -0,0 +1,11 @@
+
+Database: dbase_03_cyrillic.dbf
+Type: (03) dBase III without memo file
+Memo File: false
+Records: 2
+
+Fields:
+Name             Type       Length     Decimal
+------------------------------------------------------------------------------
+ШАР              C          25         0         
+ПЛОЩА            N          15         2         

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbf
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 5.0.0
 platform: ruby
 authors:
 - Keith Morrison
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-22 00:00:00.000000000 Z
+date: 2024-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv
@@ -56,6 +56,7 @@ files:
 - lib/dbf/version.rb
 - spec/dbf/column_spec.rb
 - spec/dbf/database/foxpro_spec.rb
+- spec/dbf/encoding_spec.rb
 - spec/dbf/file_formats_spec.rb
 - spec/dbf/record_spec.rb
 - spec/dbf/table_spec.rb
@@ -64,6 +65,8 @@ files:
 - spec/fixtures/dbase_02.dbf
 - spec/fixtures/dbase_02_summary.txt
 - spec/fixtures/dbase_03.dbf
+- spec/fixtures/dbase_03_cyrillic.dbf
+- spec/fixtures/dbase_03_cyrillic_summary.txt
 - spec/fixtures/dbase_03_summary.txt
 - spec/fixtures/dbase_30.dbf
 - spec/fixtures/dbase_30.fpt
@@ -125,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.0
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.8
 signing_key:
 specification_version: 4
 summary: Read xBase files