dbf 3.0.0 → 3.0.1

data/spec/dbf/database_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe DBF::Database::Foxpro do
-  let(:dbf_path) { fixture_path('foxprodb/FOXPRO-DB-TEST.DBC') }
+RSpec.describe DBF::Database::Foxpro do
+  let(:dbf_path) { fixture('foxprodb/FOXPRO-DB-TEST.DBC') }
   let(:db) { DBF::Database::Foxpro.new(dbf_path) }
 
   describe '#initialize' do

data/spec/dbf/file_formats_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-shared_examples_for 'DBF' do
+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}
@@ -50,16 +50,8 @@ shared_examples_for 'DBF' do
   end
 end
 
-shared_examples_for 'Foxpro DBF' do
-  specify "columns should be instances of DBF::FoxproColumn" do
-    table.columns.each do |column|
-      expect(column).to be_kind_of(DBF::Column::Foxpro)
-    end
-  end
-end
-
-describe DBF, "of type 03 (dBase III without memo file)" do
-  let(:table) { DBF::Table.new fixture_path('dbase_03.dbf') }
+RSpec.describe DBF, "of type 03 (dBase III without memo file)" do
+  let(:table) { DBF::Table.new fixture('dbase_03.dbf') }
 
   it_should_behave_like "DBF"
 
@@ -76,8 +68,8 @@ describe DBF, "of type 03 (dBase III without memo file)" do
   end
 end
 
-describe DBF, "of type 30 (Visual FoxPro)" do
-  let(:table) { DBF::Table.new fixture_path('dbase_30.dbf') }
+RSpec.describe DBF, "of type 30 (Visual FoxPro)" do
+  let(:table) { DBF::Table.new fixture('dbase_30.dbf') }
 
   it_should_behave_like "DBF"
 
@@ -98,8 +90,8 @@ describe DBF, "of type 30 (Visual FoxPro)" do
   end
 end
 
-describe DBF, "of type 31 (Visual FoxPro with AutoIncrement field)" do
-  let(:table) { DBF::Table.new fixture_path('dbase_31.dbf') }
+RSpec.describe DBF, "of type 31 (Visual FoxPro with AutoIncrement field)" do
+  let(:table) { DBF::Table.new fixture('dbase_31.dbf') }
 
   it_should_behave_like "DBF"
 
@@ -116,8 +108,8 @@ describe DBF, "of type 31 (Visual FoxPro with AutoIncrement field)" do
   end
 end
 
-describe DBF, "of type 83 (dBase III with memo file)" do
-  let(:table) { DBF::Table.new fixture_path('dbase_83.dbf') }
+RSpec.describe DBF, "of type 83 (dBase III with memo file)" do
+  let(:table) { DBF::Table.new fixture('dbase_83.dbf') }
 
   it_should_behave_like "DBF"
 
@@ -134,8 +126,8 @@ describe DBF, "of type 83 (dBase III with memo file)" do
   end
 end
 
-describe DBF, "of type 8b (dBase IV with memo file)" do
-  let(:table) { DBF::Table.new fixture_path('dbase_8b.dbf') }
+RSpec.describe DBF, "of type 8b (dBase IV with memo file)" do
+  let(:table) { DBF::Table.new fixture('dbase_8b.dbf') }
 
   it_should_behave_like "DBF"
 
@@ -152,11 +144,10 @@ describe DBF, "of type 8b (dBase IV with memo file)" do
   end
 end
 
-describe DBF, "of type f5 (FoxPro with memo file)" do
-  let(:table) { DBF::Table.new fixture_path('dbase_f5.dbf') }
+RSpec.describe DBF, "of type f5 (FoxPro with memo file)" do
+  let(:table) { DBF::Table.new fixture('dbase_f5.dbf') }
 
   it_should_behave_like "DBF"
-  it_should_behave_like "Foxpro DBF"
 
   it "should report the correct version number" do
     expect(table.version).to eq "f5"

data/spec/dbf/record_spec.rb

@@ -1,11 +1,10 @@
 require "spec_helper"
 
-describe DBF::Record do
-
+RSpec.describe DBF::Record do
   describe '#to_a' do
-    let(:table) { DBF::Table.new fixture_path('dbase_83.dbf') }
-    let(:record_0) { YAML.load_file(fixture_path('dbase_83_record_0.yml')) }
-    let(:record_9) { YAML.load_file(fixture_path('dbase_83_record_9.yml')) }
+    let(:table) { DBF::Table.new fixture('dbase_83.dbf') }
+    let(:record_0) { YAML.load_file(fixture('dbase_83_record_0.yml')) }
+    let(:record_9) { YAML.load_file(fixture('dbase_83_record_9.yml')) }
 
     it 'should return an ordered array of attribute values' do
       record = table.record(0)
@@ -17,8 +16,8 @@ describe DBF::Record do
 
     describe 'with missing memo file' do
       describe 'when opening a path' do
-        let(:table) { DBF::Table.new fixture_path('dbase_83_missing_memo.dbf') }
-        let(:record_0) { YAML.load_file(fixture_path('dbase_83_missing_memo_record_0.yml')) }
+        let(:table) { DBF::Table.new fixture('dbase_83_missing_memo.dbf') }
+        let(:record_0) { YAML.load_file(fixture('dbase_83_missing_memo_record_0.yml')) }
 
         it 'returns nil values for memo fields' do
           record = table.record(0)
@@ -28,9 +27,9 @@ describe DBF::Record do
     end
 
     describe 'when opening StringIO' do
-      let(:data) { StringIO.new(File.read(fixture_path('dbase_83_missing_memo.dbf'))) }
+      let(:data) { StringIO.new(File.read(fixture('dbase_83_missing_memo.dbf'))) }
       let(:table) { DBF::Table.new(data) }
-      let(:record_0) { YAML.load_file(fixture_path('dbase_83_missing_memo_record_0.yml')) }
+      let(:record_0) { YAML.load_file(fixture('dbase_83_missing_memo_record_0.yml')) }
 
       it 'returns nil values for memo fields' do
         record = table.record(0)
@@ -40,7 +39,7 @@ describe DBF::Record do
   end
 
   describe '#==' do
-    let(:table) { DBF::Table.new fixture_path('dbase_8b.dbf') }
+    let(:table) { DBF::Table.new fixture('dbase_8b.dbf') }
     let(:record) { table.record(9) }
 
     describe 'when other does not have attributes' do
@@ -50,8 +49,8 @@ describe DBF::Record do
     end
 
     describe 'if other attributes match' do
-      let(:attributes) { {:x => 1, :y => 2} }
-      let(:other) { double('object', :attributes => attributes) }
+      let(:attributes) { {x: 1, y: 2} }
+      let(:other) { double('object', attributes: attributes) }
 
       before do
         allow(record).to receive(:attributes).and_return(attributes)
@@ -65,7 +64,7 @@ describe DBF::Record do
   end
 
   describe 'column accessors' do
-    let(:table) { DBF::Table.new fixture_path('dbase_8b.dbf') }
+    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|
@@ -79,36 +78,32 @@ describe DBF::Record do
 
   describe 'column data for table' do
     describe 'using specified in dbf encoding' do
-      let(:table) { DBF::Table.new fixture_path('cp1251.dbf') }
+      let(:table) { DBF::Table.new fixture('cp1251.dbf') }
       let(:record) { table.find(0) }
 
       it 'should automatically encodes to default system encoding' do
-        if table.supports_string_encoding?
-          expect(record.name.encoding).to eq Encoding.default_external
+        expect(record.name.encoding).to eq Encoding.default_external
 
-          # russian a
-          expect(record.name.encode("UTF-8").unpack("H4")).to eq ["d0b0"]
-        end
+        # russian a
+        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_path('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
-        if table.supports_string_encoding?
-          expect(record.name.encoding).to eq Encoding.default_external
+        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"]
-        end
+        # russian а encoded in cp1251 and read as if it was encoded in cp866
+        expect(record.name.encode("UTF-8").unpack("H4")).to eq ["d180"]
       end
     end
   end
 
   describe '#attributes' do
-    let(:table) { DBF::Table.new fixture_path('dbase_8b.dbf') }
+    let(:table) { DBF::Table.new fixture('dbase_8b.dbf') }
     let(:record) { table.find(0) }
 
     it 'is a hash of attribute name/value pairs' do

data/spec/dbf/table_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe DBF::Table do
-  let(:dbf_path) { fixture_path('dbase_83.dbf') }
-  let(:memo_path) { fixture_path('dbase_83.dbt') }
+RSpec.describe DBF::Table do
+  let(:dbf_path) { fixture('dbase_83.dbf') }
+  let(:memo_path) { fixture('dbase_83.dbt') }
   let(:table) { DBF::Table.new dbf_path }
 
   specify 'foxpro versions' do
@@ -10,6 +10,9 @@ describe DBF::Table do
   end
 
   describe '#initialize' do
+    let(:data) { StringIO.new File.read(dbf_path) }
+    let(:memo) { StringIO.new File.read(memo_path) }
+
     describe 'when given a path to an existing dbf file' do
       it 'does not raise an error' do
         expect { DBF::Table.new dbf_path }.to_not raise_error
@@ -29,27 +32,26 @@ describe DBF::Table do
     end
 
     it 'accepts an io-like data object' do
-      data = StringIO.new File.read(dbf_path)
       expect { DBF::Table.new data }.to_not raise_error
     end
 
     it 'accepts an io-like data and memo object' do
-      data = StringIO.new File.read(dbf_path)
-      memo = StringIO.new File.read(memo_path)
       expect { DBF::Table.new data, memo }.to_not raise_error
     end
   end
 
   context '#close' do
+    before { table.close }
+
     it 'closes the io' do
-      table.close
       expect { table.record(1) }.to raise_error(IOError)
     end
   end
 
   describe '#schema' do
+    let(:control_schema) { File.read(fixture('dbase_83_schema.txt')) }
+
     it 'matches the test schema fixture' do
-      control_schema = File.read(fixture_path('dbase_83_schema.txt'))
       expect(table.schema).to eq control_schema
     end
   end
@@ -99,8 +101,9 @@ describe DBF::Table do
     end
 
     describe 'when path param passed' do
+      before { table.to_csv('test.csv') }
+
       it 'creates a custom csv file' do
-        table.to_csv('test.csv')
         expect(File.exist?('test.csv')).to be_truthy
       end
     end
@@ -134,12 +137,14 @@ describe DBF::Table do
     end
 
     describe 'with :all' do
-      it 'accepts a block' do
-        records = []
-        table.find(:all, :weight => 0.0) do |record|
+      let(:records) do
+        table.find(:all, weight: 0.0).inject([]) do |records, record|
           records << record
         end
-        expect(records).to eq table.find(:all, :weight => 0.0)
+      end
+
+      it 'accepts a block' do
+        expect(records).to eq table.find(:all, weight: 0.0)
       end
 
       it 'returns all records if options are empty' do
@@ -194,8 +199,9 @@ describe DBF::Table do
 
   describe '#has_memo_file?' do
     describe 'without a memo file' do
+      let(:table) { DBF::Table.new fixture('dbase_03.dbf') }
+
       it 'is false' do
-        table = DBF::Table.new fixture_path('dbase_03.dbf')
         expect(table.has_memo_file?).to be_falsey
       end
     end
@@ -208,18 +214,22 @@ describe DBF::Table do
   end
 
   describe '#columns' do
+    let(:columns) { table.columns }
+
     it 'is an array of Columns' do
-      expect(table.columns).to be_an(Array)
-      expect(table.columns).to_not be_empty
-      expect(table.columns.all? {|c| c.class == DBF::Column::Dbase}).to be_truthy
+      expect(columns).to be_an(Array)
+      expect(columns).to_not be_empty
+      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)
+    end
+
     it 'is an array of all column names' do
-      correct_column_names = %w(ID CATCOUNT AGRPCOUNT PGRPCOUNT ORDER CODE NAME THUMBNAIL IMAGE PRICE COST DESC WEIGHT TAXABLE ACTIVE)
-      expect(table.column_names).to eq correct_column_names
+      expect(table.column_names).to eq column_names
     end
   end
-
 end

data/spec/spec_helper.rb

@@ -9,20 +9,24 @@ require 'yaml'
 require 'rspec'
 require 'fileutils'
 
-Encoding.default_external = "UTF-8" if defined?(Encoding)
+RSpec.configure do |config|
+  config.disable_monkey_patching!
+  config.warnings = true
+  config.order = :random
 
-DB_PATH = File.dirname(__FILE__) + '/fixtures' unless defined?(DB_PATH)
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
 
-RSpec.configure do |config|
-  def ruby_supports_mathn?
-    begin
-      require 'mathn'
-    rescue UnsupportedLibraryError
-      false
-    end
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
   end
 end
 
-def fixture_path(filename)
-  "#{DB_PATH}/#{filename}"
+def fixture_path
+  @fixture_path ||= File.join(File.dirname(__FILE__), '/fixtures')
+end
+
+def fixture(filename)
+  File.join(fixture_path, filename)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbf
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Keith Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies: []
 description: A small fast library for reading dBase, xBase, Clipper and FoxPro database
   files.
@@ -34,9 +34,8 @@ files:
 - docs/supported_encodings.csv
 - docs/supported_types.markdown
 - lib/dbf.rb
-- lib/dbf/column/base.rb
-- lib/dbf/column/dbase.rb
-- lib/dbf/column/foxpro.rb
+- lib/dbf/column.rb
+- lib/dbf/column_type.rb
 - lib/dbf/database/foxpro.rb
 - lib/dbf/encodings.rb
 - lib/dbf/header.rb
@@ -111,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Read xBase files

data/lib/dbf/column/base.rb

@@ -1,199 +0,0 @@
-module DBF
-  module Column
-    # Raised if length is less than 1
-    class LengthError < StandardError; end
-
-    # Raised if name is empty
-    class NameError < StandardError; end
-
-    class Base
-      attr_reader :table, :name, :type, :length, :decimal
-
-      # Initialize a new DBF::Column
-      #
-      # @param [String] name
-      # @param [String] type
-      # @param [Fixnum] length
-      # @param [Fixnum] decimal
-      def initialize(table, name, type, length, decimal)
-        @table = table
-        @name = clean(name)
-        @type = type
-        @length = length
-        @decimal = decimal
-        @version = table.version
-        @encoding = table.encoding
-
-        validate_length
-        validate_name
-      end
-
-      # Cast value to native type
-      #
-      # @param [String] value
-      # @return [Fixnum, Float, Date, DateTime, Boolean, String]
-      def type_cast(value)
-        return nil if length == 0
-
-        meth = type_cast_methods[type]
-        meth ? send(meth, value) : encode_string(value, true)
-      end
-
-      # Returns true if the column is a memo
-      #
-      # @return [Boolean]
-      def memo?
-        @memo ||= type == 'M'
-      end
-
-      # Schema definition
-      #
-      # @return [String]
-      def schema_definition
-        "\"#{underscored_name}\", #{schema_data_type}\n"
-      end
-
-      # Underscored name
-      #
-      # This is the column name converted to underscore format.
-      # For example, MyColumn will be returned as my_column.
-      #
-      # @return [String]
-      def underscored_name
-        @underscored_name ||= begin
-          un = name.dup
-          un.gsub!(/::/, '/')
-          un.gsub!(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-          un.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
-          un.tr!('-', '_')
-          un.downcase!
-          un
-        end
-      end
-
-      def to_hash
-        {name: name, type: type, length: length, decimal: decimal}
-      end
-
-      private
-
-      def type_cast_methods # nodoc
-        {
-          'N' => :unpack_number,
-          'I' => :unpack_signed_long,
-          'F' => :unpack_float,
-          'Y' => :unpack_currency,
-          'D' => :decode_date,
-          'T' => :decode_datetime,
-          'L' => :boolean,
-          'M' => :decode_memo,
-          'B' => :unpack_double
-        }
-      end
-
-      def decode_date(value) # nodoc
-        v = value.tr(' ', '0')
-        v !~ /\S/ ? nil : Date.parse(v)
-      rescue
-        nil
-      end
-
-      def decode_datetime(value) # nodoc
-        days, msecs = value.unpack('l2')
-        secs = (msecs / 1000).to_i
-        DateTime.jd(days, (secs / 3600).to_i, (secs / 60).to_i % 60, secs % 60)
-      rescue
-        nil
-      end
-
-      def decode_memo(value) # nodoc
-        value && encode_string(value)
-      end
-
-      def unpack_number(value) # nodoc
-        decimal.zero? ? value.to_i : value.to_f
-      end
-
-      def unpack_currency(value) # nodoc
-        (value.unpack('q<')[0] / 10_000.0).to_f
-      end
-
-      def unpack_signed_long(value) # nodoc
-        value.unpack('l<')[0]
-      end
-
-      def unpack_float(value) # nodoc
-        value.to_f
-      end
-
-      def unpack_double(value) # nodoc
-        value.unpack('E')[0]
-      end
-
-      def boolean(value) # nodoc
-        value.strip =~ /^(y|t)$/i ? true : false
-      end
-
-      def encode_string(value, strip_output = false) # nodoc
-        output =
-          if supports_encoding? && table.supports_string_encoding?
-            value.to_s.force_encoding(@encoding).encode(*encoding_args)
-          elsif supports_encoding? && table.supports_iconv?
-            Iconv.conv('UTF-8', @encoding, value.to_s)
-          else
-            value
-          end
-
-        strip_output ? output.strip : output
-      end
-
-      def encoding_args # nodoc
-        [Encoding.default_external, {:undef => :replace, :invalid => :replace}]
-      end
-
-      def schema_data_type # nodoc
-        case type
-        when 'N', 'F'
-          decimal > 0 ? ':float' : ':integer'
-        when 'I'
-          ':integer'
-        when 'Y'
-          ':decimal, :precision => 15, :scale => 4'
-        when 'D'
-          ':date'
-        when 'T'
-          ':datetime'
-        when 'L'
-          ':boolean'
-        when 'M'
-          ':text'
-        when 'B'
-          if DBF::Table::FOXPRO_VERSIONS.keys.include?(@version)
-            ':float'
-          else
-            ':text'
-          end
-        else
-          ":string, :limit => #{length}"
-        end
-      end
-
-      def clean(value) # nodoc
-        truncated_value = value.strip.partition("\x00").first
-        truncated_value.gsub(/[^\x20-\x7E]/, '')
-      end
-
-      def validate_length
-        raise LengthError, 'field length must be 0 or greater' if length < 0
-      end
-
-      def validate_name
-        raise NameError, 'column name cannot be empty' if @name.empty?
-      end
-
-      def supports_encoding?
-        @encoding && table.supports_encoding?
-      end
-    end
-  end
-end