dbf 4.1.5 → 4.2.1

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',
@@ -22,6 +23,7 @@ module DBF
       '05' => 'dBase V without memo file',
       '07' => 'Visual Objects 1.x',
       '30' => 'Visual FoxPro',
+      '32' => 'Visual FoxPro with field type Varchar or Varbinary',
       '31' => 'Visual FoxPro with AutoIncrement field',
       '43' => 'dBASE IV SQL table files, no memo',
       '63' => 'dBASE IV SQL system files, no memo',
@@ -29,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',
@@ -215,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 '04', '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 '04', '8c'
+        DBASE7_HEADER_SIZE
+      else 
+        DBASE3_HEADER_SIZE
       end
     end
 

data/lib/dbf/version.rb

@@ -1,3 +1,3 @@
 module DBF
-  VERSION = '4.1.5'.freeze
+  VERSION = '4.2.1'.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

@@ -124,6 +124,24 @@ RSpec.describe DBF, 'of type 31 (Visual FoxPro with AutoIncrement field)' do
   end
 end
 
+RSpec.describe DBF, 'of type 32 (Visual FoxPro with field type Varchar or Varbinary)' do
+  let(:table) { DBF::Table.new fixture('dbase_32.dbf') }
+
+  it_behaves_like 'DBF'
+
+  it 'has a dBase version of 32' do
+    expect(table.version).to eq '32'
+  end
+
+  it 'reports the correct version description' do
+    expect(table.version_description).to eq 'Visual FoxPro with field type Varchar or Varbinary'
+  end
+
+  it 'determines the number of records' do
+    expect(table.record_count).to eq 1
+  end
+end
+
 RSpec.describe DBF, 'of type 83 (dBase III with memo file)' do
   let(:table) { DBF::Table.new fixture('dbase_83.dbf') }
 
@@ -160,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.5
+  version: 4.2.1
 platform: ruby
 authors:
 - Keith Morrison
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-09 00:00:00.000000000 Z
+date: 2022-07-18 00:00:00.000000000 Z
 dependencies: []
 description: A small fast library for reading dBase, xBase, Clipper and FoxPro database
   files.
@@ -24,60 +24,13 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
-- Gemfile.travis
 - Guardfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/dbf
+- ci_A.dbf
 - dbf.gemspec
-- docs/CNAME
-- docs/DBF.html
-- docs/DBF/Column.html
-- docs/DBF/Column/LengthError.html
-- docs/DBF/Column/NameError.html
-- docs/DBF/ColumnType.html
-- docs/DBF/ColumnType/Base.html
-- docs/DBF/ColumnType/Boolean.html
-- docs/DBF/ColumnType/Currency.html
-- docs/DBF/ColumnType/Date.html
-- docs/DBF/ColumnType/DateTime.html
-- docs/DBF/ColumnType/Double.html
-- docs/DBF/ColumnType/Float.html
-- docs/DBF/ColumnType/General.html
-- docs/DBF/ColumnType/Memo.html
-- docs/DBF/ColumnType/Nil.html
-- docs/DBF/ColumnType/Number.html
-- docs/DBF/ColumnType/SignedLong.html
-- docs/DBF/ColumnType/String.html
-- docs/DBF/Database.html
-- docs/DBF/Database/Foxpro.html
-- docs/DBF/Database/Table.html
-- docs/DBF/FileNotFoundError.html
-- docs/DBF/Header.html
-- docs/DBF/Memo.html
-- docs/DBF/Memo/Base.html
-- docs/DBF/Memo/Dbase3.html
-- docs/DBF/Memo/Dbase4.html
-- docs/DBF/Memo/Foxpro.html
-- docs/DBF/NoColumnsDefined.html
-- docs/DBF/Record.html
-- docs/DBF/Schema.html
-- docs/DBF/Table.html
-- docs/_index.html
-- docs/class_list.html
-- docs/css/common.css
-- docs/css/full_list.css
-- docs/css/style.css
-- docs/file.README.html
-- docs/file_list.html
-- docs/frames.html
-- docs/index.html
-- docs/js/app.js
-- docs/js/full_list.js
-- docs/js/jquery.js
-- docs/method_list.html
-- docs/top-level-namespace.html
 - lib/dbf.rb
 - lib/dbf/column.rb
 - lib/dbf/column_type.rb
@@ -92,6 +45,7 @@ files:
 - lib/dbf/schema.rb
 - lib/dbf/table.rb
 - lib/dbf/version.rb
+- nBOOKS.DBF
 - spec/dbf/column_spec.rb
 - spec/dbf/database/foxpro_spec.rb
 - spec/dbf/file_formats_spec.rb
@@ -100,6 +54,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
@@ -107,6 +62,8 @@ files:
 - spec/fixtures/dbase_30_summary.txt
 - 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
@@ -120,6 +77,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
@@ -158,13 +116,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.0
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Read xBase files
 test_files:
+- spec/dbf/column_spec.rb
 - spec/dbf/database/foxpro_spec.rb
 - spec/dbf/file_formats_spec.rb
-- spec/dbf/column_spec.rb
 - spec/dbf/record_spec.rb
 - spec/dbf/table_spec.rb

data/Gemfile.travis

@@ -1,8 +0,0 @@
-gemspec
-source 'https://rubygems.org'
-
-group :test do
-  gem 'rspec'
-  gem 'simplecov', platform: :ruby
-  gem 'codeclimate-test-reporter'
-end

data/docs/CNAME

@@ -1 +0,0 @@
-dbf.infused.org

data/docs/DBF/Column/LengthError.html

@@ -1,124 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<title>
-  Exception: DBF::Column::LengthError
-  
-    &mdash; Documentation by YARD 0.9.26
-  
-</title>
-
-  <link rel="stylesheet" href="../../css/style.css" type="text/css" />
-
-  <link rel="stylesheet" href="../../css/common.css" type="text/css" />
-
-<script type="text/javascript">
-  pathId = "DBF::Column::LengthError";
-  relpath = '../../';
-</script>
-
-
-  <script type="text/javascript" charset="utf-8" src="../../js/jquery.js"></script>
-
-  <script type="text/javascript" charset="utf-8" src="../../js/app.js"></script>
-
-
-  </head>
-  <body>
-    <div class="nav_wrap">
-      <iframe id="nav" src="../../class_list.html?1"></iframe>
-      <div id="resizer"></div>
-    </div>
-
-    <div id="main" tabindex="-1">
-      <div id="header">
-        <div id="menu">
-  
-    <a href="../../_index.html">Index (L)</a> &raquo;
-    <span class='title'><span class='object_link'><a href="../../DBF.html" title="DBF (module)">DBF</a></span></span> &raquo; <span class='title'><span class='object_link'><a href="../Column.html" title="DBF::Column (class)">Column</a></span></span>
-     &raquo; 
-    <span class="title">LengthError</span>
-  
-</div>
-
-        <div id="search">
-  
-    <a class="full_list_link" id="class_list_link"
-        href="../../class_list.html">
-
-        <svg width="24" height="24">
-          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
-          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
-          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
-        </svg>
-    </a>
-  
-</div>
-        <div class="clear"></div>
-      </div>
-
-      <div id="content"><h1>Exception: DBF::Column::LengthError
-  
-  
-  
-</h1>
-<div class="box_info">
-  
-  <dl>
-    <dt>Inherits:</dt>
-    <dd>
-      <span class="inheritName">StandardError</span>
-      
-        <ul class="fullTree">
-          <li>Object</li>
-          
-            <li class="next">StandardError</li>
-          
-            <li class="next">DBF::Column::LengthError</li>
-          
-        </ul>
-        <a href="#" class="inheritanceTree">show all</a>
-      
-    </dd>
-  </dl>
-  
-
-  
-  
-  
-  
-  
-
-  
-
-  
-  <dl>
-    <dt>Defined in:</dt>
-    <dd>lib/dbf/column.rb</dd>
-  </dl>
-  
-</div>
-
-
-
-
-
-
-
-
-
-  
-
-</div>
-
-      <div id="footer">
-  Generated on Sun Aug  8 16:19:08 2021 by
-  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.26 (ruby-3.0.1).
-</div>
-
-    </div>
-  </body>
-</html>

data/docs/DBF/Column/NameError.html

@@ -1,124 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<title>
-  Exception: DBF::Column::NameError
-  
-    &mdash; Documentation by YARD 0.9.26
-  
-</title>
-
-  <link rel="stylesheet" href="../../css/style.css" type="text/css" />
-
-  <link rel="stylesheet" href="../../css/common.css" type="text/css" />
-
-<script type="text/javascript">
-  pathId = "DBF::Column::NameError";
-  relpath = '../../';
-</script>
-
-
-  <script type="text/javascript" charset="utf-8" src="../../js/jquery.js"></script>
-
-  <script type="text/javascript" charset="utf-8" src="../../js/app.js"></script>
-
-
-  </head>
-  <body>
-    <div class="nav_wrap">
-      <iframe id="nav" src="../../class_list.html?1"></iframe>
-      <div id="resizer"></div>
-    </div>
-
-    <div id="main" tabindex="-1">
-      <div id="header">
-        <div id="menu">
-  
-    <a href="../../_index.html">Index (N)</a> &raquo;
-    <span class='title'><span class='object_link'><a href="../../DBF.html" title="DBF (module)">DBF</a></span></span> &raquo; <span class='title'><span class='object_link'><a href="../Column.html" title="DBF::Column (class)">Column</a></span></span>
-     &raquo; 
-    <span class="title">NameError</span>
-  
-</div>
-
-        <div id="search">
-  
-    <a class="full_list_link" id="class_list_link"
-        href="../../class_list.html">
-
-        <svg width="24" height="24">
-          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
-          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
-          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
-        </svg>
-    </a>
-  
-</div>
-        <div class="clear"></div>
-      </div>
-
-      <div id="content"><h1>Exception: DBF::Column::NameError
-  
-  
-  
-</h1>
-<div class="box_info">
-  
-  <dl>
-    <dt>Inherits:</dt>
-    <dd>
-      <span class="inheritName">StandardError</span>
-      
-        <ul class="fullTree">
-          <li>Object</li>
-          
-            <li class="next">StandardError</li>
-          
-            <li class="next">DBF::Column::NameError</li>
-          
-        </ul>
-        <a href="#" class="inheritanceTree">show all</a>
-      
-    </dd>
-  </dl>
-  
-
-  
-  
-  
-  
-  
-
-  
-
-  
-  <dl>
-    <dt>Defined in:</dt>
-    <dd>lib/dbf/column.rb</dd>
-  </dl>
-  
-</div>
-
-
-
-
-
-
-
-
-
-  
-
-</div>
-
-      <div id="footer">
-  Generated on Sun Aug  8 16:19:08 2021 by
-  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.26 (ruby-3.0.1).
-</div>
-
-    </div>
-  </body>
-</html>