dbf 3.1.1 → 3.1.2

data/spec/dbf/record_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require 'spec_helper'
 
 RSpec.describe DBF::Record do
   describe '#to_a' do
@@ -67,8 +67,7 @@ RSpec.describe DBF::Record do
     let(:table) { DBF::Table.new fixture('dbase_8b.dbf') }
     let(:record) { table.find(0) }
 
-    %w(character numerical date logical float memo).each do |column_name|
-
+    %w[character numerical date logical float memo].each do |column_name|
       it "defines accessor method for '#{column_name}' column" do
         expect(record).to respond_to(column_name.to_sym)
       end
@@ -85,19 +84,19 @@ RSpec.describe DBF::Record do
         expect(record.name.encoding).to eq Encoding.default_external
 
         # russian a
-        expect(record.name.encode("UTF-8").unpack("H4")).to eq ["d0b0"]
+        expect(record.name.encode('UTF-8').unpack('H4')).to eq ['d0b0']
       end
     end
 
     describe 'overriding specified in dbf encoding' do
-      let(:table) { DBF::Table.new fixture('cp1251.dbf'), nil, 'cp866'}
+      let(:table) { DBF::Table.new fixture('cp1251.dbf'), nil, 'cp866' }
       let(:record) { table.find(0) }
 
       it 'should transcode from manually specified encoding to default system encoding' do
         expect(record.name.encoding).to eq Encoding.default_external
 
         # russian а encoded in cp1251 and read as if it was encoded in cp866
-        expect(record.name.encode("UTF-8").unpack("H4")).to eq ["d180"]
+        expect(record.name.encode('UTF-8').unpack('H4')).to eq ['d180']
       end
     end
   end
@@ -112,7 +111,7 @@ RSpec.describe DBF::Record do
     end
 
     it 'has only original field names as keys' do
-      original_field_names = %w(CHARACTER DATE FLOAT LOGICAL MEMO NUMERICAL)
+      original_field_names = %w[CHARACTER DATE FLOAT LOGICAL MEMO NUMERICAL]
       expect(record.attributes.keys.sort).to eq original_field_names
     end
   end

data/spec/dbf/table_spec.rb

@@ -6,7 +6,11 @@ RSpec.describe DBF::Table do
   let(:table) { DBF::Table.new dbf_path }
 
   specify 'foxpro versions' do
-    expect(DBF::Table::FOXPRO_VERSIONS.keys.sort).to eq %w(30 31 f5 fb).sort
+    expect(DBF::Table::FOXPRO_VERSIONS.keys.sort).to eq %w[30 31 f5 fb].sort
+  end
+
+  specify 'row is an alias of record' do
+    expect(table.record(1)).to eq table.row(1)
   end
 
   describe '#initialize' do
@@ -50,11 +54,18 @@ RSpec.describe DBF::Table do
 
   describe '#schema' do
     describe 'when data is IO' do
-      let(:control_schema) { File.read(fixture('dbase_83_schema.txt')) }
+      let(:control_schema) { File.read(fixture('dbase_83_schema_ar.txt')) }
 
       it 'matches the test schema fixture' do
         expect(table.schema).to eq control_schema
       end
+
+      it 'raises ArgumentError if there is no matching schema' do
+        expect { table.schema(:invalid) }.to raise_error(
+          ArgumentError,
+          ':invalid is not a valid schema. Valid schemas are: activerecord, json, sequel.'
+        )
+      end
     end
 
     describe 'when data is StringIO' do
@@ -62,7 +73,7 @@ RSpec.describe DBF::Table do
       let(:memo) { StringIO.new File.read(memo_path) }
       let(:table) { DBF::Table.new data }
 
-      let(:control_schema) { File.read(fixture('dbase_83_schema.txt')) }
+      let(:control_schema) { File.read(fixture('dbase_83_schema_ar.txt')) }
 
       it 'matches the test schema fixture' do
         table.name = 'dbase_83'
@@ -73,51 +84,13 @@ RSpec.describe DBF::Table do
 
   describe '#sequel_schema' do
     it 'should return a valid Sequel migration by default' do
-      expect(table.sequel_schema).to eq <<-SCHEMA
-Sequel.migration do
-  change do
-     create_table(:dbase_83) do
-      column :id, :integer
-      column :catcount, :integer
-      column :agrpcount, :integer
-      column :pgrpcount, :integer
-      column :order, :integer
-      column :code, :varchar, :size => 50
-      column :name, :varchar, :size => 100
-      column :thumbnail, :varchar, :size => 254
-      column :image, :varchar, :size => 254
-      column :price, :float
-      column :cost, :float
-      column :desc, :text
-      column :weight, :float
-      column :taxable, :boolean
-      column :active, :boolean
-    end
-  end
-end
-SCHEMA
+      control_schema = File.read(fixture('dbase_83_schema_sq.txt'))
+      expect(table.sequel_schema).to eq control_schema
     end
 
     it 'should return a limited Sequel migration when passed true' do
-      expect(table.sequel_schema(true)).to eq <<-SCHEMA
-    create_table(:dbase_83) do
-      column :id, :integer
-      column :catcount, :integer
-      column :agrpcount, :integer
-      column :pgrpcount, :integer
-      column :order, :integer
-      column :code, :varchar, :size => 50
-      column :name, :varchar, :size => 100
-      column :thumbnail, :varchar, :size => 254
-      column :image, :varchar, :size => 254
-      column :price, :float
-      column :cost, :float
-      column :desc, :text
-      column :weight, :float
-      column :taxable, :boolean
-      column :active, :boolean
-    end
-SCHEMA
+      control_schema = File.read(fixture('dbase_83_schema_sq_lim.txt'))
+      expect(table.sequel_schema).to eq control_schema
     end
 
   end
@@ -218,7 +191,7 @@ SCHEMA
       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 'should AND multiple search terms' do
@@ -313,17 +286,28 @@ SCHEMA
     it 'is an array of Columns' do
       expect(columns).to be_an(Array)
       expect(columns).to_not be_empty
-      expect(columns.all? {|c| c.class == DBF::Column}).to be_truthy
+      expect(columns.all? { |c| c.class == DBF::Column }).to be_truthy
     end
   end
 
   describe '#column_names' do
     let(:column_names) do
-      %w(ID CATCOUNT AGRPCOUNT PGRPCOUNT ORDER CODE NAME THUMBNAIL IMAGE PRICE COST DESC WEIGHT TAXABLE ACTIVE)
+      %w[ID CATCOUNT AGRPCOUNT PGRPCOUNT ORDER CODE NAME THUMBNAIL IMAGE PRICE COST DESC WEIGHT TAXABLE ACTIVE]
     end
 
-    it 'is an array of all column names' do
-      expect(table.column_names).to eq column_names
+    describe 'when data is an IO' do
+      it 'is an array of all column names' do
+        expect(table.column_names).to eq column_names
+      end
+    end
+
+    describe 'when data is a StringIO' do
+      let(:data) { StringIO.new File.read(dbf_path) }
+      let(:table) { DBF::Table.new data, nil, Encoding::US_ASCII }
+
+      it 'is an array of all column names' do
+        expect(table.column_names).to eq column_names
+      end
     end
   end
 

data/spec/fixtures/dbase_83_schema_sq.txt

@@ -0,0 +1,21 @@
+Sequel.migration do
+  change do
+     create_table(:dbase_83) do
+      column :id, :integer
+      column :catcount, :integer
+      column :agrpcount, :integer
+      column :pgrpcount, :integer
+      column :order, :integer
+      column :code, :varchar, :size => 50
+      column :name, :varchar, :size => 100
+      column :thumbnail, :varchar, :size => 254
+      column :image, :varchar, :size => 254
+      column :price, :float
+      column :cost, :float
+      column :desc, :text
+      column :weight, :float
+      column :taxable, :boolean
+      column :active, :boolean
+    end
+  end
+end

data/spec/fixtures/dbase_83_schema_sq_lim.txt

@@ -0,0 +1,21 @@
+Sequel.migration do
+  change do
+     create_table(:dbase_83) do
+      column :id, :integer
+      column :catcount, :integer
+      column :agrpcount, :integer
+      column :pgrpcount, :integer
+      column :order, :integer
+      column :code, :varchar, :size => 50
+      column :name, :varchar, :size => 100
+      column :thumbnail, :varchar, :size => 254
+      column :image, :varchar, :size => 254
+      column :price, :float
+      column :cost, :float
+      column :desc, :text
+      column :weight, :float
+      column :taxable, :boolean
+      column :active, :boolean
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbf
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Keith Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies: []
 description: A small fast library for reading dBase, xBase, Clipper and FoxPro database
   files.
@@ -67,7 +67,9 @@ files:
 - spec/fixtures/dbase_83_missing_memo_record_0.yml
 - spec/fixtures/dbase_83_record_0.yml
 - spec/fixtures/dbase_83_record_9.yml
-- spec/fixtures/dbase_83_schema.txt
+- spec/fixtures/dbase_83_schema_ar.txt
+- spec/fixtures/dbase_83_schema_sq.txt
+- spec/fixtures/dbase_83_schema_sq_lim.txt
 - spec/fixtures/dbase_83_summary.txt
 - spec/fixtures/dbase_8b.dbf
 - spec/fixtures/dbase_8b.dbt
@@ -110,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Read xBase files