dbf 4.1.6 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a45d2baaa7a531875b0528d1d7b83f7cc01cfe502b85c42b461b5749745638a
-  data.tar.gz: f5eebeb1bc1f3d49bab802671f7ac3cfbc7722a1c1a797173cfdd025a684e30f
+  metadata.gz: 825e580742ca7cb994908e488763e40ac36f4570b23d8fe75e6ba389ac9de769
+  data.tar.gz: 461dae904d53d1c26558b671d4a0ea2101538e2673bf7b307e39d37470909ce7
 SHA512:
-  metadata.gz: a9624d7a37d29bc6f2eaf3546ad41ec8e04b84d1c48ccc9d92122e9682161bbe706459468f6a220e288ba07203fb419574723b376236868f8351e6a66dc58b67
-  data.tar.gz: d821ec9443f26d3c7c5515cd6f0722f0c5ebcdf189aee5689cb63133c1ba3d1d03a03b6c9f2f9f1514900169ce8895c7ca33cbc8e24611ddbfeb9c216ee5171b
+  metadata.gz: 4f4c2824d0eb7a5f822515b8093f51a3e7f8892b0e4987f3b537ce007667e6232e80b4af8f87c449a4be061d39607772a5082e09ea67c73f1a1156dd86889e40
+  data.tar.gz: 711155242a0c16f765b327005157e4097489a348a2653bfbbf5f017304c0534f30abb8282075e2e4c6b63c236a94fb8b426e3303917c8882971a9c0f9068a73e

data/CHANGELOG.md

@@ -1,159 +1,215 @@
-# 4.1.5
-  - Better handling for PIPE errors when using command line utility
+# Changelog
 
-# 4.1.4
-  - Add full support for FoxBase files
+## 4.2.0
 
-# 4.1.3
-  - Raise DBF::NoColumnsDefined error when attempting to read records if no columns are defined
+- Initial support for dBase 7 files
 
-# 4.1.1
-  - Add required_ruby_version to gemspec
+## 4.1.6
 
-# 4.1.0
-  - Return Time instead of DateTime
+- Add support for file type 32
 
-# 4.0.0
-  - Drop support for ruby-2.2 and earlier
+## 4.1.5
 
-# 3.1.3
-  - Ensure malformed dates return nil
+- Better handling for PIPE errors when using command line utility
 
-# 3.1.2
-  - Fix incorrect columns list when StringIO and encoding set
+## 4.1.4
 
-# 3.1.1
-  - Use Date.strptime to parse date fields
+- Add full support for FoxBase files
 
-# 3.1.0
-  - Use :binary for binary fields in ActiveRecord schemas
+## 4.1.3
 
-# 3.0.8
-  - Fix uninitialized constant error under Rails 5
+- Raise DBF::NoColumnsDefined error when attempting to read records if no columns are defined
 
-# 3.0.7
-  - Ignore non-existent records if header record count is incorrect
+## 4.1.1
 
-# 3.0.6
-  - This version has been yanked from rubygems due to errors
+- Add required_ruby_version to gemspec
 
-# 3.0.5
-  - Override table name for schema output
+## 4.1.0
 
-# 3.0.4
-  - Adds -v command-line option to print version
-  - Adds -r command-line option to create Sequel migration
+- Return Time instead of DateTime
 
-# 3.0.3
-  - Uninitialized (N)umbers should return nil
+## 4.0.0
 
-# 3.0.2
-  - Performance improvements for large files
+- Drop support for ruby-2.2 and earlier
 
-# 3.0.1
-  - Support FoxPro (G) general field type
-  - Fix ruby warnings
+## 3.1.3
 
-# 3.0.0
-  - Requires Ruby version 2.0 and above
-  - Support the (G) General Foxpro field type
+- Ensure malformed dates return nil
 
-# 2.0.13
-  - Support 64-bit currency signed currency values
-    (see https://github.com/infused/dbf/pull/71)
+## 3.1.2
 
-# 2.0.12
-  - Parse (I) values as signed
-    (see https://github.com/infused/dbf/pull/70)
+- Fix incorrect columns list when StringIO and encoding set
 
-# 2.0.11
-  - Foxpro doubles should always return the full stored precision
-    (see https://github.com/infused/dbf/pull/69)
+## 3.1.1
 
-# 2.0.10
-  - allow 0 length fields, but always return nil as value
+- Use Date.strptime to parse date fields
 
-# 2.0.9
-  - fix dBase IV attributes when memo file is missing
+## 3.1.0
 
-# 2.0.8
-  - fix FoxPro currency fields on some builds of Ruby 1.9.3 and 2.0.0
+- Use :binary for binary fields in ActiveRecord schemas
 
-# 2.0.7
-  - fix the dbf binary on some linux systems
+## 3.0.8
 
-# 2.0.6
-  - build_memo returns nil on errors
+- Fix uninitialized constant error under Rails 5
 
-# 2.0.5
-  - use correct FoxPro memo block size
+## 3.0.7
 
-# 2.0.4
-  - memo fields return nil if memo file is missing
+- Ignore non-existent records if header record count is incorrect
 
-# 2.0.3
-  - set encoding if table encoding is nil
+## 3.0.6
 
-# 2.0.2
-  - Allow overriding the character encoding specified in the file
+- This version has been yanked from rubygems due to errors
 
-# 2.0.1
-  - Add experimental support for character encodings under Ruby 1.8
+## 3.0.5
 
-# 2.0.0
-  - #44 Require FasterCSV gem on all platforms
-  - Remove rdoc development dependency
-  - #42 Fixes encoding of memos
-  - #43 Improve handling of record attributes
+- Override table name for schema output
 
-# 1.7.5
-  - fixes FoxPro currency (Y) fields
+## 3.0.4
 
-# 1.7.4
-  - Replace Memo Type with Memo File boolean in command-line utility summary output
+- Adds -v command-line option to print version
+- Adds -r command-line option to create Sequel migration
 
-# 1.7.3
-  - find_all/find_first should ignore deleted records
+## 3.0.3
 
-# 1.7.2
-  - Fix integer division under Ruby 1.8 when requiring mathn
-    standard library (see http://bugs.ruby-lang.org/issues/2121)
+- Uninitialized (N)umbers should return nil
 
-# 1.7.1
-  - Fix Table.FOXPRO_VERSIONS breakage on Ruby 1.8
+## 3.0.2
+  
+- Performance improvements for large files
 
-# 1.7.0
-  - allow DBF::Table to work with dbf data in memory
-  - allow DBF::Table#to_csv to write to STDOUT
+## 3.0.1
 
-# 1.6.7
-  - memo columns return nil when no memo file found
+- Support FoxPro (G) general field type
+- Fix ruby warnings
 
-# 1.6.6
-  - add binary data type support to ActiveRecord schema output
+## 3.0.0
 
-# 1.6.5
-  - support for visual foxpro double (b) data type
+- Requires Ruby version 2.0 and above
+- Support the (G) General Foxpro field type
 
-# 1.6.3
-  - Replace invalid chars with 'unicode replacement character' (U+FFFD)
+## 2.0.13
+
+- Support 64-bit currency signed currency values
+  (see https://github.com/infused/dbf/pull/71)
+
+## 2.0.12
+
+- Parse (I) values as signed
+  (see https://github.com/infused/dbf/pull/70)
+
+## 2.0.11
+
+- Foxpro doubles should always return the full stored precision
+  (see https://github.com/infused/dbf/pull/69)
+
+## 2.0.10
+
+- allow 0 length fields, but always return nil as value
+
+## 2.0.9
+
+- fix dBase IV attributes when memo file is missing
+
+## 2.0.8
+
+- fix FoxPro currency fields on some builds of Ruby 1.9.3 and 2.0.0
+
+## 2.0.7
+
+- fix the dbf binary on some linux systems
+
+## 2.0.6
+
+- build_memo returns nil on errors
+
+## 2.0.5
+
+- use correct FoxPro memo block size
+
+## 2.0.4
+  
+- memo fields return nil if memo file is missing
+
+## 2.0.3
+
+- set encoding if table encoding is nil
+
+## 2.0.2
+
+- Allow overriding the character encoding specified in the file
+
+## 2.0.1
+
+- Add experimental support for character encodings under Ruby 1.8
+
+## 2.0.0
+
+- #44 Require FasterCSV gem on all platforms
+- Remove rdoc development dependency
+- #42 Fixes encoding of memos
+- #43 Improve handling of record attributes
+
+## 1.7.5
+  
+- fixes FoxPro currency (Y) fields
+
+## 1.7.4
+  
+- Replace Memo Type with Memo File boolean in command-line utility summary output
+
+## 1.7.3
+  
+- find_all/find_first should ignore deleted records
+
+## 1.7.2
+  
+- Fix integer division under Ruby 1.8 when requiring mathn
+  standard library (see http://bugs.ruby-lang.org/issues/2121)
+
+## 1.7.1
+
+- Fix Table.FOXPRO_VERSIONS breakage on Ruby 1.8
+
+## 1.7.0
+
+- allow DBF::Table to work with dbf data in memory
+- allow DBF::Table#to_csv to write to STDOUT
+
+## 1.6.7
+
+- memo columns return nil when no memo file found
+
+## 1.6.6
+
+- add binary data type support to ActiveRecord schema output
+
+## 1.6.5
+
+- support for visual foxpro double (b) data type
+
+## 1.6.3
+
+- Replace invalid chars with 'unicode replacement character' (U+FFFD)
 
 ## 1.6.2
-  - add Table#filename method
-  - Rakefile now loads gems with bundler
-  - add Table#supports_encoding?
-  - simplify encodings.yml loader
-  - add rake and rdoc as development dependencies
-  - simplify open_memo file search logic
-  - remove unnecessary requires in spec helper
-  - fix cli summary
+
+- add Table#filename method
+- Rakefile now loads gems with bundler
+- add Table#supports_encoding?
+- simplify encodings.yml loader
+- add rake and rdoc as development dependencies
+- simplify open_memo file search logic
+- remove unnecessary requires in spec helper
+- fix cli summary
 
 ## 1.6.1
-  - fix YAML issue when using MRI version > 1.9.1
-  - remove Table#seek_to_index and Table#current_record private methods
+
+- fix YAML issue when using MRI version > 1.9.1
+- remove Table#seek_to_index and Table#current_record private methods
 
 ## 1.6.0
-  - remove activesupport gem dependency
+
+- remove activesupport gem dependency
 
 ## 1.5.0
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dbf (4.1.5)
+    dbf (4.1.6)
 
 GEM
   remote: https://rubygems.org/

data/lib/dbf/column.rb

@@ -21,7 +21,8 @@ module DBF
       L: ColumnType::Boolean,
       M: ColumnType::Memo,
       B: ColumnType::Double,
-      G: ColumnType::General
+      G: ColumnType::General,
+      '+'.to_sym => ColumnType::SignedLong2
     }
     TYPE_CAST_CLASS.default = ColumnType::String
     TYPE_CAST_CLASS.freeze
@@ -79,8 +80,7 @@ module DBF
     private
 
     def clean(value) # :nodoc:
-      truncated_value = value.strip.partition("\x00").first
-      truncated_value.gsub(/[^\x20-\x7E]/, '')
+      value.strip.gsub("\x00", '').gsub(/[^\x20-\x7E]/, '')
     end
 
     def encode(value, strip_output = false) # :nodoc:

data/lib/dbf/column_type.rb

@@ -12,7 +12,6 @@ module DBF
     end
 
     class Nil < Base
-
       # @param _value [String]
       def type_cast(_value)
         nil
@@ -20,7 +19,6 @@ module DBF
     end
 
     class Number < Base
-
       # @param value [String]
       def type_cast(value)
         return nil if value.strip.empty?
@@ -30,7 +28,6 @@ module DBF
     end
 
     class Currency < Base
-
       # @param value [String]
       def type_cast(value)
         (value.unpack1('q<') / 10_000.0).to_f
@@ -38,15 +35,22 @@ module DBF
     end
 
     class SignedLong < Base
-
       # @param value [String]
       def type_cast(value)
         value.unpack1('l<')
       end
     end
 
-    class Float < Base
+    class SignedLong2 < Base
+      # @param value [String]
+      def type_cast(value)
+        s = value.unpack1('B*')
+        sign_multiplier = s[0] == '0' ? -1 : 1
+        s[1, 31].to_i(2) * sign_multiplier
+      end
+    end
 
+    class Float < Base
       # @param value [String]
       def type_cast(value)
         value.to_f
@@ -54,7 +58,6 @@ module DBF
     end
 
     class Double < Base
-
       # @param value [String]
       def type_cast(value)
         value.unpack1('E')
@@ -62,7 +65,6 @@ module DBF
     end
 
     class Boolean < Base
-
       # @param value [String]
       def type_cast(value)
         value.strip.match?(/^(y|t)$/i)
@@ -70,7 +72,6 @@ module DBF
     end
 
     class Date < Base
-
       # @param value [String]
       def type_cast(value)
         value.match?(/\d{8}/) && ::Date.strptime(value, '%Y%m%d')
@@ -80,7 +81,6 @@ module DBF
     end
 
     class DateTime < Base
-
       # @param value [String]
       def type_cast(value)
         days, msecs = value.unpack('l2')
@@ -92,7 +92,6 @@ module DBF
     end
 
     class Memo < Base
-
       # @param value [String]
       def type_cast(value)
         if encoding && !value.nil?
@@ -104,7 +103,6 @@ module DBF
     end
 
     class General < Base
-
       # @param value [String]
       def type_cast(value)
         value
@@ -112,7 +110,6 @@ module DBF
     end
 
     class String < Base
-
       # @param value [String]
       def type_cast(value)
         value = value.strip

data/lib/dbf/table.rb

@@ -14,6 +14,7 @@ module DBF
 
     DBASE2_HEADER_SIZE = 8
     DBASE3_HEADER_SIZE = 32
+    DBASE7_HEADER_SIZE = 68
 
     VERSIONS = {
       '02' => 'FoxBase',
@@ -30,6 +31,7 @@ module DBF
       '83' => 'dBase III with memo file',
       '87' => 'Visual Objects 1.x with memo file',
       '8b' => 'dBase IV with memo file',
+      '8c' => 'dBase 7',
       '8e' => 'dBase IV with SQL table',
       'cb' => 'dBASE IV SQL table files, with memo',
       'f5' => 'FoxPro with memo file',
@@ -216,23 +218,29 @@ module DBF
         @data.seek(header_size)
         [].tap do |columns|
           until end_of_record?
-            case version
+            args = case version
             when '02'
-              column_data = @data.read(header_size * 2)
-              columns << Column.new(self, *column_data.unpack('A11 a C'), 0)
+              [self, *@data.read(header_size * 2).unpack('A11 a C'), 0]
+            when '8c'
+              [self, *@data.read(48).unpack('A32 a C C x13')]
             else
-              column_data = @data.read(header_size)
-              columns << Column.new(self, *column_data.unpack('A11 a x4 C2'))
+              [self, *@data.read(header_size).unpack('A11 a x4 C2')]
             end
+
+            columns << Column.new(*args)
           end
         end
       end
     end
 
     def header_size
-      header_size = case version
-        when '02' then DBASE2_HEADER_SIZE
-        else DBASE3_HEADER_SIZE
+      case version
+      when '02'
+        DBASE2_HEADER_SIZE
+      when '8c'
+        DBASE7_HEADER_SIZE
+      else 
+        DBASE3_HEADER_SIZE
       end
     end
 

data/lib/dbf/version.rb

@@ -1,3 +1,3 @@
 module DBF
-  VERSION = '4.1.6'.freeze
+  VERSION = '4.2.0'.freeze
 end

data/spec/dbf/column_spec.rb

@@ -286,13 +286,13 @@ 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 world-\x80--", 'N', 1, 0
+      column = DBF::Column.new table, "--\x1F-\x68\x65\x6C\x6C\x6F \x00world-\x80--", 'N', 1, 0
       expect(column.name).to eq '---hello world---'
     end
 
     it 'is truncated at the null character' do
-      column = DBF::Column.new table, "--\x1F-\x68\x65\x6C\x6C\x6F \x00 world-\x80--", 'N', 1, 0
-      expect(column.name).to eq '---hello '
+      column = DBF::Column.new table, "--\x1F-\x68\x65\x6C\x6C\x6F \x00world-\x80--", 'N', 1, 0
+      expect(column.name).to eq '---hello world---'
     end
   end
 end

data/spec/dbf/file_formats_spec.rb

@@ -178,6 +178,24 @@ RSpec.describe DBF, 'of type 8b (dBase IV with memo file)' do
   end
 end
 
+RSpec.describe DBF, 'of type 8c (unknown)' do
+  let(:table) { DBF::Table.new fixture('dbase_8c.dbf') }
+
+  it_behaves_like 'DBF'
+
+  it 'reports the correct version number' do
+    expect(table.version).to eq '8c'
+  end
+
+  it 'reports the correct version description' do
+    expect(table.version_description).to eq 'dBase 7'
+  end
+
+  it 'determines the number of records' do
+    expect(table.record_count).to eq 10
+  end
+end
+
 RSpec.describe DBF, 'of type f5 (FoxPro with memo file)' do
   let(:table) { DBF::Table.new fixture('dbase_f5.dbf') }
 

data/spec/fixtures/dbase_02_summary.txt

@@ -0,0 +1,23 @@
+
+Database: dbase_02.dbf
+Type: (02) FoxBase
+Memo File: false
+Records: 9
+
+Fields:
+Name             Type       Length     Decimal
+------------------------------------------------------------------------------
+EMP:NMBR         N          3          0         
+LAST             C          10         0         
+FIRST            C          10         0         
+ADDR             C          20         0         
+CITY             C          15         0         
+ZIP:CODE         C          10         0         
+PHONE            C          9          0         
+SSN              C          11         0         
+HIREDATE         C          8          0         
+TERMDATE         C          8          0         
+CLASS            C          3          0         
+DEPT             C          3          0         
+PAYRATE          N          8          0         
+START:PAY        N          8          0         

data/spec/fixtures/dbase_32_summary.txt

@@ -0,0 +1,11 @@
+
+Database: dbase_32.dbf
+Type: (32) Visual FoxPro with field type Varchar or Varbinary
+Memo File: false
+Records: 1
+
+Fields:
+Name             Type       Length     Decimal
+------------------------------------------------------------------------------
+NAME             V          250        0         
+_NullFlags       0          1          0         

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbf
 version: !ruby/object:Gem::Version
-  version: 4.1.6
+  version: 4.2.0
 platform: ruby
 authors:
 - Keith Morrison
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-12 00:00:00.000000000 Z
+date: 2021-08-20 00:00:00.000000000 Z
 dependencies: []
 description: A small fast library for reading dBase, xBase, Clipper and FoxPro database
   files.
@@ -100,6 +100,7 @@ files:
 - spec/fixtures/cp1251.dbf
 - spec/fixtures/cp1251_summary.txt
 - spec/fixtures/dbase_02.dbf
+- spec/fixtures/dbase_02_summary.txt
 - spec/fixtures/dbase_03.dbf
 - spec/fixtures/dbase_03_summary.txt
 - spec/fixtures/dbase_30.dbf
@@ -108,6 +109,7 @@ files:
 - spec/fixtures/dbase_31.dbf
 - spec/fixtures/dbase_31_summary.txt
 - spec/fixtures/dbase_32.dbf
+- spec/fixtures/dbase_32_summary.txt
 - spec/fixtures/dbase_83.dbf
 - spec/fixtures/dbase_83.dbt
 - spec/fixtures/dbase_83_missing_memo.dbf
@@ -121,6 +123,7 @@ files:
 - spec/fixtures/dbase_8b.dbf
 - spec/fixtures/dbase_8b.dbt
 - spec/fixtures/dbase_8b_summary.txt
+- spec/fixtures/dbase_8c.dbf
 - spec/fixtures/dbase_f5.dbf
 - spec/fixtures/dbase_f5.fpt
 - spec/fixtures/dbase_f5_summary.txt