dbf 4.0.1 → 4.1.4

data/lib/dbf/version.rb

@@ -1,3 +1,3 @@
 module DBF
-  VERSION = '4.0.1'.freeze
+  VERSION = '4.1.4'.freeze
 end

data/spec/dbf/column_spec.rb

@@ -52,14 +52,14 @@ RSpec.describe DBF::Column do
         end
       end
 
-      context 'and 0 length' do
+      context 'with 0 length' do
         it 'returns nil' do
           column = DBF::Column.new table, 'ColumnName', 'N', 0, 0
           expect(column.type_cast('')).to be_nil
         end
       end
 
-      context 'and 0 decimals' do
+      context 'with 0 decimals' do
         it 'casts value to Integer' do
           value = '135'
           column = DBF::Column.new table, 'ColumnName', 'N', 3, 0
@@ -69,11 +69,11 @@ RSpec.describe DBF::Column do
         it 'supports negative Integer' do
           value = '-135'
           column = DBF::Column.new table, 'ColumnName', 'N', 3, 0
-          expect(column.type_cast(value)).to eq -135
+          expect(column.type_cast(value)).to eq(-135)
         end
       end
 
-      context 'and more than 0 decimals' do
+      context 'with more than 0 decimals' do
         it 'casts value to Float' do
           value = '13.5'
           column = DBF::Column.new table, 'ColumnName', 'N', 2, 1
@@ -83,13 +83,13 @@ RSpec.describe DBF::Column do
         it 'casts negative value to Float' do
           value = '-13.5'
           column = DBF::Column.new table, 'ColumnName', 'N', 2, 1
-          expect(column.type_cast(value)).to eq -13.5
+          expect(column.type_cast(value)).to eq(-13.5)
         end
       end
     end
 
     context 'with type F (float)' do
-      context 'and 0 length' do
+      context 'with 0 length' do
         it 'returns nil' do
           column = DBF::Column.new table, 'ColumnName', 'F', 0, 0
           expect(column.type_cast('')).to be_nil
@@ -105,7 +105,7 @@ RSpec.describe DBF::Column do
       it 'casts negative value to Float' do
         value = '-135'
         column = DBF::Column.new table, 'ColumnName', 'F', 3, 0
-        expect(column.type_cast(value)).to eq -135.0
+        expect(column.type_cast(value)).to eq(-135.0)
       end
     end
 
@@ -126,13 +126,13 @@ RSpec.describe DBF::Column do
         it 'supports negative binary' do
           column = DBF::Column.new table, 'ColumnName', 'B', 1, 2
           expect(column.type_cast("\x00\x00\x00\x00\x00\xC0\x65\xC0")).to be_a(Float)
-          expect(column.type_cast("\x00\x00\x00\x00\x00\xC0\x65\xC0")).to eq -174.0
+          expect(column.type_cast("\x00\x00\x00\x00\x00\xC0\x65\xC0")).to eq(-174.0)
         end
       end
     end
 
     context 'with type I (integer)' do
-      context 'and 0 length' do
+      context 'with 0 length' do
         it 'returns nil' do
           column = DBF::Column.new table, 'ColumnName', 'I', 0, 0
           expect(column.type_cast('')).to be_nil
@@ -148,7 +148,7 @@ RSpec.describe DBF::Column do
       it 'supports negative Integer' do
         value = "\x24\xE1\xFF\xFF"
         column = DBF::Column.new table, 'ColumnName', 'I', 3, 0
-        expect(column.type_cast(value)).to eq -7900
+        expect(column.type_cast(value)).to eq(-7900)
       end
     end
 
@@ -167,7 +167,7 @@ RSpec.describe DBF::Column do
         expect(column.type_cast('n')).to be false
       end
 
-      context 'and 0 length' do
+      context 'with 0 length' do
         it 'returns nil' do
           column = DBF::Column.new table, 'ColumnName', 'L', 0, 0
           expect(column.type_cast('')).to be_nil
@@ -232,7 +232,7 @@ RSpec.describe DBF::Column do
         expect(column.type_cast(nil)).to be_nil
       end
 
-      context 'and 0 length' do
+      context 'with 0 length' do
         it 'returns nil' do
           column = DBF::Column.new table, 'ColumnName', 'M', 0, 0
           expect(column.type_cast('')).to be_nil
@@ -252,7 +252,7 @@ RSpec.describe DBF::Column do
         expect(column.type_cast(nil)).to be_nil
       end
 
-      context 'and 0 length' do
+      context 'with 0 length' do
         it 'returns nil' do
           column = DBF::Column.new table, 'ColumnName', 'G', 0, 0
           expect(column.type_cast('')).to be_nil
@@ -269,14 +269,14 @@ RSpec.describe DBF::Column do
     end
 
     it 'supports negative currency' do
-      expect(column.type_cast("\xFC\xF0\xF0\xFE\xFF\xFF\xFF\xFF")).to eq -1776.41
+      expect(column.type_cast("\xFC\xF0\xF0\xFE\xFF\xFF\xFF\xFF")).to eq(-1776.41)
     end
 
     it 'supports 64bit negative currency' do
-      expect(column.type_cast("pN'9\xFF\xFF\xFF\xFF")).to eq -333_609.0
+      expect(column.type_cast("pN'9\xFF\xFF\xFF\xFF")).to eq(-333_609.0)
     end
 
-    context 'and 0 length' do
+    context 'with 0 length' do
       it 'returns nil' do
         column = DBF::Column.new table, 'ColumnName', 'Y', 0, 0
         expect(column.type_cast('')).to be_nil
@@ -284,7 +284,7 @@ RSpec.describe DBF::Column do
     end
   end
 
-  context '#name' 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
       expect(column.name).to eq '---hello world---'

data/spec/dbf/file_formats_spec.rb

@@ -1,17 +1,15 @@
 require 'spec_helper'
 
 RSpec.shared_examples_for 'DBF' do
-  specify 'sum of column lengths should equal record length specified in header plus one' do
-    header_record_length = table.instance_eval { @header.record_length }
-    sum_of_column_lengths = table.columns.inject(1) { |sum, column| sum += column.length }
+  let(:header_record_length) { table.instance_eval { header.record_length } }
+  let(:sum_of_column_lengths) { table.columns.inject(1) { |sum, column| sum + column.length } }
 
+  specify 'sum of column lengths should equal record length specified in header plus one' do
     expect(header_record_length).to eq sum_of_column_lengths
   end
 
   specify 'records should be instances of DBF::Record' do
-    table.each do |record|
-      expect(record).to be_kind_of(DBF::Record)
-    end
+    expect(table).to all be_kind_of(DBF::Record)
   end
 
   specify 'record count should be the same as reported in the header' do
@@ -50,6 +48,24 @@ RSpec.shared_examples_for 'DBF' do
   end
 end
 
+RSpec.describe DBF, 'of type 02 (FoxBase)' do
+  let(:table) { DBF::Table.new fixture('dbase_02.dbf') }
+
+  it_behaves_like 'DBF'
+
+  it 'reports the correct version number' do
+    expect(table.version).to eq '02'
+  end
+
+  it 'reports the correct version description' do
+    expect(table.version_description).to eq 'FoxBase'
+  end
+
+  it 'determines the number of records' do
+    expect(table.record_count).to eq 9
+  end
+end
+
 RSpec.describe DBF, 'of type 03 (dBase III without memo file)' do
   let(:table) { DBF::Table.new fixture('dbase_03.dbf') }
 

data/spec/dbf/record_spec.rb

@@ -44,13 +44,13 @@ RSpec.describe DBF::Record do
 
     describe 'when other does not have attributes' do
       it 'returns false' do
-        expect((record == double('other'))).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) { double('object', 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

@@ -147,6 +147,14 @@ RSpec.describe DBF::Table do
       allow(table).to receive(:deleted_record?).and_return(true)
       expect(table.record(5)).to be_nil
     end
+
+    describe 'when dbf has no column definitions' do
+      let(:dbf_path) { fixture('polygon.dbf') }
+
+      it 'raises a DBF::NoColumnsDefined error' do
+        expect { DBF::Table.new(dbf_path).record(1) }.to raise_error(DBF::NoColumnsDefined, 'The DBF file has no columns defined')
+      end
+    end
   end
 
   describe '#current_record' do

data/spec/spec_helper.rb

@@ -4,8 +4,6 @@ begin
 rescue LoadError
 end
 
-Encoding.default_external = 'UTF-8'
-
 require 'dbf'
 require 'yaml'
 require 'rspec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbf
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.4
 platform: ruby
 authors:
 - Keith Morrison
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-06 00:00:00.000000000 Z
+date: 2021-08-08 00:00:00.000000000 Z
 dependencies: []
 description: A small fast library for reading dBase, xBase, Clipper and FoxPro database
   files.
@@ -31,8 +31,53 @@ files:
 - Rakefile
 - bin/dbf
 - dbf.gemspec
-- docs/supported_encodings.csv
-- docs/supported_types.markdown
+- 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
@@ -48,12 +93,13 @@ files:
 - lib/dbf/table.rb
 - lib/dbf/version.rb
 - spec/dbf/column_spec.rb
-- spec/dbf/database_spec.rb
+- spec/dbf/database/foxpro_spec.rb
 - spec/dbf/file_formats_spec.rb
 - spec/dbf/record_spec.rb
 - spec/dbf/table_spec.rb
 - spec/fixtures/cp1251.dbf
 - spec/fixtures/cp1251_summary.txt
+- spec/fixtures/dbase_02.dbf
 - spec/fixtures/dbase_03.dbf
 - spec/fixtures/dbase_03_summary.txt
 - spec/fixtures/dbase_30.dbf
@@ -90,12 +136,13 @@ files:
 - spec/fixtures/foxprodb/setup.dbf
 - spec/fixtures/foxprodb/types.CDX
 - spec/fixtures/foxprodb/types.dbf
+- spec/fixtures/polygon.dbf
 - spec/spec_helper.rb
 homepage: http://github.com/infused/dbf
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -104,20 +151,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.0
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Read xBase files
 test_files:
-- spec/dbf/file_formats_spec.rb
-- spec/dbf/database_spec.rb
 - spec/dbf/column_spec.rb
+- spec/dbf/database/foxpro_spec.rb
+- spec/dbf/file_formats_spec.rb
 - spec/dbf/record_spec.rb
 - spec/dbf/table_spec.rb

data/docs/supported_encodings.csv

@@ -1,60 +0,0 @@
-"Code Page", "Encoding", "Description"
-"01", "cp437", "U.S. MS–DOS"
-"02", "cp850", "International MS–DOS"
-"03", "cp1252", "Windows ANSI"
-"08", "cp865", "Danish OEM"
-"09", "cp437", "Dutch OEM"
-"0a", "cp850", "Dutch OEM*"
-"0b", "cp437", "Finnish OEM"
-"0d", "cp437", "French OEM"
-"0e", "cp850", "French OEM*"
-"0f", "cp437", "German OEM"
-"10", "cp850", "German OEM*"
-"11", "cp437", "Italian OEM"
-"12", "cp850", "Italian OEM*"
-"13", "cp932", "Japanese Shift-JIS"
-"14", "cp850", "Spanish OEM*"
-"15", "cp437", "Swedish OEM"
-"16", "cp850", "Swedish OEM*"
-"17", "cp865", "Norwegian OEM"
-"18", "cp437", "Spanish OEM"
-"19", "cp437", "English OEM (Britain)"
-"1a", "cp850", "English OEM (Britain)*"
-"1b", "cp437", "English OEM (U.S.)"
-"1c", "cp863", "French OEM (Canada)"
-"1d", "cp850", "French OEM*"
-"1f", "cp852", "Czech OEM"
-"22", "cp852", "Hungarian OEM"
-"23", "cp852", "Polish OEM"
-"24", "cp860", "Portuguese OEM"
-"25", "cp850", "Portuguese OEM*"
-"26", "cp866", "Russian OEM"
-"37", "cp850", "English OEM (U.S.)*"
-"40", "cp852", "Romanian OEM"
-"4d", "cp936", "Chinese GBK (PRC)"
-"4e", "cp949", "Korean (ANSI/OEM)"
-"4f", "cp950", "Chinese Big5 (Taiwan)"
-"50", "cp874", "Thai (ANSI/OEM)"
-"57", "cp1252", "ANSI"
-"58", "cp1252", "Western European ANSI"
-"59", "cp1252", "Spanish ANSI"
-"64", "cp852", "Eastern European MS–DOS"
-"65", "cp866", "Russian MS–DOS"
-"66", "cp865", "Nordic MS–DOS"
-"67", "cp861", "Icelandic MS–DOS"
-"6a", "cp737", "Greek MS–DOS (437G)"
-"6b", "cp857", "Turkish MS–DOS"
-"6c", "cp863", "French–Canadian MS–DOS"
-"78", "cp950", "Taiwan Big 5"
-"79", "cp949", "Hangul (Wansung)"
-"7a", "cp936", "PRC GBK"
-"7b", "cp932", "Japanese Shift-JIS"
-"7c", "cp874", "Thai Windows/MS–DOS"
-"86", "cp737", "Greek OEM"
-"87", "cp852", "Slovenian OEM"
-"88", "cp857", "Turkish OEM"
-"c8", "cp1250", "Eastern European Windows"
-"c9", "cp1251", "Russian Windows"
-"ca", "cp1254", "Turkish Windows"
-"cb", "cp1253", "Greek Windows"
-"cc", "cp1257", "Baltic Windows"

data/docs/supported_types.markdown

@@ -1,53 +0,0 @@
-# DBF supported data types
-
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | Version | Description                       | C | N | L | D | M | F | B | G | P | Y | T | I | V | X | @ | O | + |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 02      | FoxBase                           | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - | - |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 03      | dBase III without memo file       | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - | - |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 04      | dBase IV without memo file        | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - | - |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 05      | dBase V without memo file         | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - | - |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 07      | Visual Objects 1.x                | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - | - |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 30      | Visual FoxPro                     | Y | Y | Y | Y | Y | Y | Y | Y | N | Y | N | Y | N | N | N | N | - |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 31      | Visual FoxPro with AutoIncrement  | Y | Y | Y | Y | Y | Y | Y | Y | N | Y | N | Y | N | N | N | N | N |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 7b      | dBase IV with memo file           | Y | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 83      | dBase III with memo file          | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 87      | Visual Objects 1.x with memo file | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 8b      | dBase IV with memo file           | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | N | - | - | - |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 8e      | dBase IV with SQL table           | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | N | - | - | - |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | f5      | FoxPro with memo file             | Y | Y | Y | Y | Y | Y | Y | Y | N | Y | N | Y | N | N | N | N | N |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | fb      | FoxPro without memo file          | Y | Y | Y | Y | - | Y | Y | Y | N | Y | N | Y | N | N | N | N | N |
-    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-
-Data type descriptions
-
-* C = Character
-* N = Number
-* L = Logical
-* D = Date
-* M = Memo
-* F = Float
-* B = Binary
-* G = General
-* P = Picture
-* Y = Currency
-* T = DateTime
-* I = Integer
-* V = VariField
-* X = SQL compat
-* @ = Timestamp
-* O = Double
-* + = Autoincrement