dbf 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aecf544df6670b726e4edfbf08511819e9eb67d3
-  data.tar.gz: 7b5e97b5e6102e13648ed1542066f47d78cebba3
+  metadata.gz: a8b06626d3eb46fa746bd21d8b359c099dec90b2
+  data.tar.gz: e1da4bd35cc876d257552581d1d41079d55fc15c
 SHA512:
-  metadata.gz: 5dd35b97f6f334523543f0885a893c37eb7edfba91ffe529c769bc38f51a7ffed55edc4eb50b6d74e587a56d5c35055d1188ac97e024ceb8b24e14527cb21e29
-  data.tar.gz: a4faecdc9176581351003c30ef8651d8a7fbe6031b8cc85989f20677a3eb95f6d76e919eb7d4f017d129abff23670472ac71c0371763ae3555936225f5344196
+  metadata.gz: 1496225ad7fbbc044287627d2a13196e70614d4adbd7467911b51bd4860ce6e35f86c86713c5ec05dbed19a0c956bad80e2906ea8c6541ffd4f6a26764e73304
+  data.tar.gz: 23f28160bb106378de8e7ffe409ab1db78d31d6c8f380a5a2e21e05f820b48b86030dba346e6d5c461cb292cfbd640c7562ec5a653e29055ea3822166bf97593

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 3.1.1
+  - Use Date.strptime to parse date fields
+
 # 3.1.0
   - Use :binary for binary fields in ActiveRecord schemas
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dbf (3.0.8)
+    dbf (3.1.1)
 
 GEM
   remote: https://rubygems.org/
@@ -10,6 +10,7 @@ GEM
     coderay (1.1.0)
     diff-lcs (1.2.5)
     ffi (1.9.10)
+    ffi (1.9.10-java)
     formatador (0.2.5)
     guard (2.13.0)
       formatador (>= 0.2.4)
@@ -25,7 +26,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    listen (3.0.3)
+    listen (3.0.5)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
@@ -34,11 +35,16 @@ GEM
     notiffany (0.0.8)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    pry (0.10.2)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rake (10.4.2)
+    pry (0.10.3-java)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+      spoon (~> 0.0)
+    rake (11.2.2)
     rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
@@ -57,9 +63,12 @@ GEM
     rspec-support (3.4.0)
     shellany (0.0.1)
     slop (3.6.0)
+    spoon (0.0.4)
+      ffi
     thor (0.19.1)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
@@ -71,4 +80,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   1.11.2
+   1.13.7

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2016 Keith Morrison <keithm@infused.org>
+Copyright (c) 2006-2017 Keith Morrison <keithm@infused.org>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -22,8 +22,8 @@ NOTE: beginning with version 3 we have dropped support for Ruby 1.8 and 1.9. If
 
 DBF is tested to work with the following versions of Ruby:
 
-* MRI Ruby 2.0.x, 2.1.x, 2.2.x, 2.3.x
-* JRuby head
+* MRI Ruby 2.0.x, 2.1.x, 2.2.x, 2.3.x, 2.4.x
+* JRuby 1.7.x
 
 ## Installation
 
@@ -79,21 +79,17 @@ widget = widgets.find(6)
 Note that find() will return nil if the requested record has been deleted
 and not yet pruned from the database.
 
-The value for a attribute can be accessed via element reference in one of three
-ways
+The value for an attribute can be accessed via element reference in several
+ways.
 
 ```ruby
+widget.slot_number     # underscored field name as method
+
 widget["SlotNumber"]   # original field name in dbf file
 widget['slot_number']  # underscored field name string
 widget[:slot_number]   # underscored field name symbol
 ```
 
-Attributes can also be accessed as method using the underscored field name
-
-```ruby
-widget.slot_number
-```
-
 Get a hash of all attributes. The keys are the original column names.
 
 ```ruby
@@ -276,7 +272,7 @@ for a full list of supported column types.
 
 ## License
 
-Copyright (c) 2006-2016 Keith Morrison <<keithm@infused.org>>
+Copyright (c) 2006-2017 Keith Morrison <<keithm@infused.org>>
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/lib/dbf/column.rb

@@ -1,10 +1,10 @@
 module DBF
   class Column
-    # Raised if length is less than 1
-    class LengthError < StandardError; end
+    class LengthError < StandardError
+    end
 
-    # Raised if name is empty
-    class NameError < StandardError; end
+    class NameError < StandardError
+    end
 
     attr_reader :table, :name, :type, :length, :decimal
 
@@ -26,8 +26,8 @@ module DBF
     #
     # @param [String] name
     # @param [String] type
-    # @param [Fixnum] length
-    # @param [Fixnum] decimal
+    # @param [Integer] length
+    # @param [Integer] decimal
     def initialize(table, name, type, length, decimal)
       @table = table
       @name = clean(name)
@@ -41,14 +41,6 @@ module DBF
       validate_name
     end
 
-    # Cast value to native type
-    #
-    # @param [String] value
-    # @return [Fixnum, Float, Date, DateTime, Boolean, String]
-    def type_cast(value)
-      type_cast_class.type_cast(value)
-    end
-
     # Returns true if the column is a memo
     #
     # @return [Boolean]
@@ -56,18 +48,19 @@ module DBF
       @memo ||= type == 'M'
     end
 
-    # Schema definition
+    # Returns a Hash with :name, :type, :length, and :decimal keys
     #
-    # @return [String]
-    def schema_definition
-      "\"#{underscored_name}\", #{schema_data_type}\n"
+    # @return [Hash]
+    def to_hash
+      {name: name, type: type, length: length, decimal: decimal}
     end
 
-    # Sequel Schema definition
+    # Cast value to native type
     #
-    # @return [String]
-    def sequel_schema_definition
-      ":#{underscored_name}, #{schema_data_type(:sequel)}\n"
+    # @param [String] value
+    # @return [Integer, Float, Date, DateTime, Boolean, String]
+    def type_cast(value)
+      type_cast_class.type_cast(value)
     end
 
     # Underscored name
@@ -78,27 +71,19 @@ module DBF
     # @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
+        name.gsub(/::/, '/')
+          .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+          .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+          .tr('-', '_')
+          .downcase
       end
     end
 
-    def to_hash
-      {name: name, type: type, length: length, decimal: decimal}
-    end
-
     private
 
-    def type_cast_class # nodoc
-      @type_cast_class ||= begin
-        klass = @length == 0 ? ColumnType::Nil : TYPE_CAST_CLASS[type.to_sym]
-        klass.new(@decimal, @encoding)
-      end
+    def clean(value) # nodoc
+      truncated_value = value.strip.partition("\x00").first
+      truncated_value.gsub(/[^\x20-\x7E]/, '')
     end
 
     def encode(value, strip_output = false) # nodoc
@@ -108,10 +93,6 @@ module DBF
       strip_output ? output.strip : output
     end
 
-    def encode_string(string) # nodoc
-      string.force_encoding(@encoding).encode(*encoding_args)
-    end
-
     def encoding_args # nodoc
       @encoding_args ||= [
         Encoding.default_external,
@@ -119,6 +100,10 @@ module DBF
       ]
     end
 
+    def encode_string(string) # nodoc
+      string.force_encoding(@encoding).encode(*encoding_args)
+    end
+
     def schema_data_type(format = :activerecord) # nodoc
       case type
       when 'N', 'F'
@@ -146,9 +131,11 @@ module DBF
       end
     end
 
-    def clean(value) # nodoc
-      truncated_value = value.strip.partition("\x00").first
-      truncated_value.gsub(/[^\x20-\x7E]/, '')
+    def type_cast_class # nodoc
+      @type_cast_class ||= begin
+        klass = @length == 0 ? ColumnType::Nil : TYPE_CAST_CLASS[type.to_sym]
+        klass.new(@decimal, @encoding)
+      end
     end
 
     def validate_length # nodoc

data/lib/dbf/column_type.rb

@@ -59,10 +59,7 @@ module DBF
 
     class Date < Base
       def type_cast(value)
-        v = value.tr(' ', '0')
-        v !~ /\S/ ? nil : ::Date.parse(v)
-      rescue
-        nil
+        value =~ /\d{8}/ && ::Date.strptime(value, '%Y%m%d')
       end
     end
 

data/lib/dbf/database/foxpro.rb

@@ -43,9 +43,8 @@ module DBF
       # on any platform.
       # @return String
       def table_path(name)
-        example = File.join(@dirname, "#{name}.dbf")
-        glob = File.join(@dirname, '*')
-        path = Dir.glob(glob).find { |match| match.downcase == example.downcase }
+        glob = File.join(@dirname, "#{name}.dbf")
+        path = Dir.glob(glob, File::FNM_CASEFOLD).first
 
         unless path && File.exist?(path)
           raise DBF::FileNotFoundError, "related table not found: #{name}"

data/lib/dbf/record.rb

@@ -22,21 +22,6 @@ module DBF
       other.respond_to?(:attributes) && other.attributes == attributes
     end
 
-    # Maps a row to an array of values
-    #
-    # @return [Array]
-    def to_a
-      @columns.map { |column| attributes[column.name] }
-    end
-
-    # Do all search parameters match?
-    #
-    # @param [Hash] options
-    # @return [Boolean]
-    def match?(options)
-      options.all? { |key, value| self[key] == value }
-    end
-
     # Reads attributes by column name
     #
     # @param [String, Symbol] key
@@ -56,6 +41,14 @@ module DBF
       @attributes ||= Hash[attribute_map]
     end
 
+    # Do all search parameters match?
+    #
+    # @param [Hash] options
+    # @return [Boolean]
+    def match?(options)
+      options.all? { |key, value| self[key] == value }
+    end
+
     # Overrides standard Object.respond_to? to return true if a
     # matching column name is found.
     #
@@ -65,36 +58,24 @@ module DBF
       underscored_column_names.include?(method.to_s) || super
     end
 
+    # Maps a row to an array of values
+    #
+    # @return [Array]
+    def to_a
+      @columns.map { |column| attributes[column.name] }
+    end
+
     private
 
     def attribute_map # nodoc
       @columns.map { |column| [column.name, init_attribute(column)] }
     end
 
-    def file_offset(attribute_name) # nodoc
-      column = @columns.detect { |c| c.name == attribute_name.to_s }
-      index = @columns.index(column)
-      @columns[0, index + 1].compact.reduce(0) { |x, c| x += c.length }
-    end
-
-    def method_missing(method, *args) # nodoc
-      if (index = underscored_column_names.index(method.to_s))
-        attributes[@columns[index].name]
-      else
-        super
-      end
-    end
-
-    def underscored_column_names # nodoc
-      @underscored_column_names ||= @columns.map(&:underscored_name)
-    end
-
-    def init_attribute(column) # nodoc
-      value = column.memo? ? memo(column) : get_data(column)
-      column.type_cast(value)
+    def get_data(column) # nodoc
+      @data.read(column.length)
     end
 
-    def memo(column) # nodoc
+    def get_memo(column) # nodoc
       if @memo
         @memo.get(memo_start_block(column))
       else
@@ -104,6 +85,11 @@ module DBF
       end
     end
 
+    def init_attribute(column) # nodoc
+      value = column.memo? ? get_memo(column) : get_data(column)
+      column.type_cast(value)
+    end
+
     def memo_start_block(column) # nodoc
       data = get_data(column)
       if %w(30 31).include?(@version)
@@ -112,8 +98,16 @@ module DBF
       data.to_i
     end
 
-    def get_data(column) # nodoc
-      @data.read(column.length)
+    def method_missing(method, *args) # nodoc
+      if (index = underscored_column_names.index(method.to_s))
+        attributes[@columns[index].name]
+      else
+        super
+      end
+    end
+
+    def underscored_column_names # nodoc
+      @underscored_column_names ||= @columns.map(&:underscored_name)
     end
   end
 end

data/lib/dbf/schema.rb

@@ -32,23 +32,23 @@ module DBF
       end
     end
 
-    def activerecord_schema(_table_only = false)
+    def activerecord_schema(_table_only = false) # nodoc
       s = "ActiveRecord::Schema.define do\n"
       s << "  create_table \"#{name}\" do |t|\n"
       columns.each do |column|
-        s << "    t.column #{column.schema_definition}"
+        s << "    t.column #{activerecord_schema_definition(column)}"
       end
       s << "  end\nend"
       s
     end
 
-    def sequel_schema(table_only = false)
+    def sequel_schema(table_only = false) # nodoc
       s = ''
       s << "Sequel.migration do\n" unless table_only
       s << "  change do\n " unless table_only
       s << "    create_table(:#{name}) do\n"
       columns.each do |column|
-        s << "      column #{column.sequel_schema_definition}"
+        s << "      column #{sequel_schema_definition(column)}"
       end
       s << "    end\n"
       s << "  end\n"  unless table_only
@@ -56,8 +56,51 @@ module DBF
       s
     end
 
-    def json_schema(_table_only = false)
+    def json_schema(_table_only = false) # nodoc
       columns.map(&:to_hash).to_json
     end
+
+    # ActiveRecord schema definition
+    #
+    # @param [DBF::Column]
+    # @return [String]
+    def activerecord_schema_definition(column)
+      "\"#{column.underscored_name}\", #{schema_data_type(column, :activerecord)}\n"
+    end
+
+    # Sequel schema definition
+    #
+    # @params [DBF::Column]
+    # @return [String]
+    def sequel_schema_definition(column)
+      ":#{column.underscored_name}, #{schema_data_type(column, :sequel)}\n"
+    end
+
+    def schema_data_type(column, format = :activerecord) # nodoc
+      case column.type
+      when 'N', 'F'
+        column.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'
+        ':binary'
+      else
+        if format == :sequel
+          ":varchar, :size => #{column.length}"
+        else
+          ":string, :limit => #{column.length}"
+        end
+      end
+    end
   end
 end

data/lib/dbf/table.rb

@@ -37,7 +37,6 @@ module DBF
       'fb' => 'FoxPro without memo file'
     }
 
-    attr_reader :header
     attr_accessor :encoding
     attr_writer :name
 
@@ -64,18 +63,9 @@ module DBF
     # @param [optional String, Encoding] encoding Name of the encoding or an Encoding object
     def initialize(data, memo = nil, encoding = nil)
       @data = open_data(data)
-      @data.rewind
-      @header = Header.new(@data.read DBF_HEADER_SIZE)
       @encoding = encoding || header.encoding
       @memo = open_memo(data, memo)
       yield self if block_given?
-    rescue Errno::ENOENT
-      raise DBF::FileNotFoundError, "file not found: #{data}"
-    end
-
-    # @return [TrueClass, FalseClass]
-    def has_memo_file?
-      !!@memo
     end
 
     # Closes the table and memo file
@@ -95,14 +85,18 @@ module DBF
       end
     end
 
-    # @return String
-    def filename
-      File.basename @data.path if @data.respond_to?(:path)
+    # Column names
+    #
+    # @return [String]
+    def column_names
+      columns.map(&:name)
     end
 
-    # @return String
-    def name
-      @name ||= filename && File.basename(filename, ".*")
+    # All columns
+    #
+    # @return [Array]
+    def columns
+      @columns ||= build_columns
     end
 
     # Calls block once for each record in the table. The record may be nil
@@ -113,50 +107,9 @@ module DBF
       header.record_count.times { |i| yield record(i) }
     end
 
-    # Retrieve a record by index number.
-    # The record will be nil if it has been deleted, but not yet pruned from
-    # the database.
-    #
-    # @param [Fixnum] index
-    # @return [DBF::Record, NilClass]
-    def record(index)
-      seek_to_record(index)
-      return nil if deleted_record?
-      DBF::Record.new(@data.read(header.record_length), columns, version, @memo)
-    end
-
-    alias_method :row, :record
-
-    # Internal dBase version number
-    #
-    # @return [String]
-    def version
-      @version ||= header.version
-    end
-
-    # Total number of records
-    #
-    # @return [Fixnum]
-    def record_count
-      @record_count ||= header.record_count
-    end
-
-    # Human readable version description
-    #
     # @return [String]
-    def version_description
-      VERSIONS[version]
-    end
-
-    # Dumps all records to a CSV file.  If no filename is given then CSV is
-    # output to STDOUT.
-    #
-    # @param [optional String] path Defaults to STDOUT
-    def to_csv(path = nil)
-      out_io = path ? File.open(path, 'w') : $stdout
-      csv = CSV.new(out_io, force_quotes: true)
-      csv << column_names
-      each { |record| csv << record.to_a }
+    def filename
+      File.basename(@data.path) if @data.respond_to?(:path)
     end
 
     # Find records using a simple ActiveRecord-like syntax.
@@ -181,12 +134,12 @@ module DBF
     # returned.  The equivalent SQL would be "WHERE key1 = 'value1'
     # AND key2 = 'value2'".
     #
-    # @param [Fixnum, Symbol] command
+    # @param [Integer, Symbol] command
     # @param [optional, Hash] options Hash of search parameters
     # @yield [optional, DBF::Record, NilClass]
     def find(command, options = {}, &block)
       case command
-      when Fixnum
+      when Integer
         record(command)
       when Array
         command.map { |i| record(i) }
@@ -197,18 +150,60 @@ module DBF
       end
     end
 
-    # All columns
+    # @return [TrueClass, FalseClass]
+    def has_memo_file?
+      !!@memo
+    end
+
+    # @return [String]
+    def name
+      @name ||= filename && File.basename(filename, ".*")
+    end
+
+    # Retrieve a record by index number.
+    # The record will be nil if it has been deleted, but not yet pruned from
+    # the database.
     #
-    # @return [Array]
-    def columns
-      @columns ||= build_columns
+    # @param [Integer] index
+    # @return [DBF::Record, NilClass]
+    def record(index)
+      seek_to_record(index)
+      return nil if deleted_record?
+      DBF::Record.new(@data.read(header.record_length), columns, version, @memo)
     end
 
-    # Column names
+    alias_method :row, :record
+
+    # Total number of records
+    #
+    # @return [Integer]
+    def record_count
+      @record_count ||= header.record_count
+    end
+
+    # Dumps all records to a CSV file.  If no filename is given then CSV is
+    # output to STDOUT.
+    #
+    # @param [optional String] path Defaults to STDOUT
+    def to_csv(path = nil)
+      out_io = path ? File.open(path, 'w') : $stdout
+      csv = CSV.new(out_io, force_quotes: true)
+      csv << column_names
+      each { |record| csv << record.to_a }
+    end
+
+    # Internal dBase version number
     #
     # @return [String]
-    def column_names
-      columns.map(&:name)
+    def version
+      @version ||= header.version
+    end
+
+    # Human readable version description
+    #
+    # @return [String]
+    def version_description
+      VERSIONS[version]
     end
 
     private
@@ -224,6 +219,11 @@ module DBF
       columns
     end
 
+    def deleted_record? # nodoc
+      flag = @data.read(1)
+      flag ? flag.unpack('a') == ['*'] : true
+    end
+
     def end_of_record? # nodoc
       original_pos = @data.pos
       byte = @data.read(1)
@@ -231,10 +231,27 @@ module DBF
       byte.ord == 13
     end
 
+    def find_all(options) # nodoc
+      map do |record|
+        if record && record.match?(options)
+          yield record if block_given?
+          record
+        end
+      end.compact
+    end
+
+    def find_first(options) # nodoc
+      detect { |record| record && record.match?(options) }
+    end
+
     def foxpro? # nodoc
       FOXPRO_VERSIONS.keys.include? version
     end
 
+    def header
+      @header ||= Header.new(@data.read DBF_HEADER_SIZE)
+    end
+
     def memo_class # nodoc
       @memo_class ||= begin
         if foxpro?
@@ -245,8 +262,16 @@ module DBF
       end
     end
 
+    def memo_search_path(io) # nodoc
+      dirname = File.dirname(io)
+      basename = File.basename(io, '.*')
+      "#{dirname}/#{basename}*.{fpt,FPT,dbt,DBT}"
+    end
+
     def open_data(data) # nodoc
       data.is_a?(StringIO) ? data : File.open(data, 'rb')
+    rescue Errno::ENOENT
+      raise DBF::FileNotFoundError, "file not found: #{data}"
     end
 
     def open_memo(data, memo = nil) # nodoc
@@ -259,32 +284,8 @@ module DBF
       end
     end
 
-    def memo_search_path(io) # nodoc
-      dirname = File.dirname(io)
-      basename = File.basename(io, '.*')
-      "#{dirname}/#{basename}*.{fpt,FPT,dbt,DBT}"
-    end
-
-    def find_all(options) # nodoc
-      map do |record|
-        if record && record.match?(options)
-          yield record if block_given?
-          record
-        end
-      end.compact
-    end
-
-    def find_first(options) # nodoc
-      detect { |record| record && record.match?(options) }
-    end
-
-    def deleted_record? # nodoc
-      flag = @data.read(1)
-      flag ? flag.unpack('a') == ['*'] : true
-    end
-
     def seek(offset) # nodoc
-      @data.seek header.header_length + offset
+      @data.seek(header.header_length + offset)
     end
 
     def seek_to_record(index) # nodoc

data/lib/dbf/version.rb

@@ -1,3 +1,3 @@
 module DBF
-  VERSION = '3.1.0'
+  VERSION = '3.1.1'
 end

data/spec/dbf/column_spec.rb

@@ -60,13 +60,13 @@ RSpec.describe DBF::Column do
       end
 
       context 'and 0 decimals' do
-        it 'casts value to Fixnum' do
+        it 'casts value to Integer' do
           value = '135'
           column = DBF::Column.new table, 'ColumnName', 'N', 3, 0
           expect(column.type_cast(value)).to eq 135
         end
 
-        it 'supports negative Fixnum' 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)
@@ -139,13 +139,13 @@ RSpec.describe DBF::Column do
         end
       end
 
-      it 'casts value to Fixnum' do
+      it 'casts value to Integer' do
         value = "\203\171\001\000"
         column = DBF::Column.new table, 'ColumnName', 'I', 3, 0
         expect(column.type_cast(value)).to eq 96643
       end
 
-      it 'supports negative Fixnum' 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)
@@ -284,54 +284,6 @@ RSpec.describe DBF::Column do
     end
   end
 
-  context '#schema_definition' do
-    context 'with type N (number)' do
-      it 'outputs an integer column' do
-        column = DBF::Column.new table, 'ColumnName', 'N', 1, 0
-        expect(column.schema_definition).to eq "\"column_name\", :integer\n"
-      end
-    end
-
-    context 'with type B (binary)' do
-      context 'with Foxpro dbf' do
-        it 'outputs a float column' do
-          column = DBF::Column.new table, 'ColumnName', 'B', 1, 2
-          expect(column.schema_definition).to eq "\"column_name\", :binary\n"
-        end
-      end
-    end
-
-    it 'defines a float colmn if type is (N)umber with more than 0 decimals' do
-      column = DBF::Column.new table, 'ColumnName', 'N', 1, 2
-      expect(column.schema_definition).to eq "\"column_name\", :float\n"
-    end
-
-    it 'defines a date column if type is (D)ate' do
-      column = DBF::Column.new table, 'ColumnName', 'D', 8, 0
-      expect(column.schema_definition).to eq "\"column_name\", :date\n"
-    end
-
-    it 'defines a datetime column if type is (D)ate' do
-      column = DBF::Column.new table, 'ColumnName', 'T', 16, 0
-      expect(column.schema_definition).to eq "\"column_name\", :datetime\n"
-    end
-
-    it 'defines a boolean column if type is (L)ogical' do
-      column = DBF::Column.new table, 'ColumnName', 'L', 1, 0
-      expect(column.schema_definition).to eq "\"column_name\", :boolean\n"
-    end
-
-    it 'defines a text column if type is (M)emo' do
-      column = DBF::Column.new table, 'ColumnName', 'M', 1, 0
-      expect(column.schema_definition).to eq "\"column_name\", :text\n"
-    end
-
-    it 'defines a string column with length for any other data types' do
-      column = DBF::Column.new table, 'ColumnName', 'X', 20, 0
-      expect(column.schema_definition).to eq "\"column_name\", :string, :limit => 20\n"
-    end
-  end
-
   context '#name' do
     it 'contains only ASCII characters' do
       column = DBF::Column.new table, "--\x1F-\x68\x65\x6C\x6C\x6F world-\x80--", 'N', 1, 0

data/spec/dbf/file_formats_spec.rb

@@ -31,9 +31,9 @@ RSpec.shared_examples_for 'DBF' do
     end
   end
 
-  specify "column lengths should be instances of Fixnum" do
+  specify "column lengths should be instances of Integer" do
     table.columns.each do |column|
-      expect(column.length).to be_kind_of(Fixnum)
+      expect(column.length).to be_kind_of(Integer)
     end
   end
 
@@ -43,9 +43,9 @@ RSpec.shared_examples_for 'DBF' do
     end
   end
 
-  specify "column decimals should be instances of Fixnum" do
+  specify "column decimals should be instances of Integer" do
     table.columns.each do |column|
-      expect(column.decimal).to be_kind_of(Fixnum)
+      expect(column.decimal).to be_kind_of(Integer)
     end
   end
 end

data/spec/dbf/table_spec.rb

@@ -326,4 +326,52 @@ SCHEMA
       expect(table.column_names).to eq column_names
     end
   end
+
+  context '#activerecord_schema_definition' do
+    context 'with type N (number)' do
+      it 'outputs an integer column' do
+        column = DBF::Column.new table, 'ColumnName', 'N', 1, 0
+        expect(table.activerecord_schema_definition(column)).to eq "\"column_name\", :integer\n"
+      end
+    end
+
+    context 'with type B (binary)' do
+      context 'with Foxpro dbf' do
+        it 'outputs a float column' do
+          column = DBF::Column.new table, 'ColumnName', 'B', 1, 2
+          expect(table.activerecord_schema_definition(column)).to eq "\"column_name\", :binary\n"
+        end
+      end
+    end
+
+    it 'defines a float colmn if type is (N)umber with more than 0 decimals' do
+      column = DBF::Column.new table, 'ColumnName', 'N', 1, 2
+      expect(table.activerecord_schema_definition(column)).to eq "\"column_name\", :float\n"
+    end
+
+    it 'defines a date column if type is (D)ate' do
+      column = DBF::Column.new table, 'ColumnName', 'D', 8, 0
+      expect(table.activerecord_schema_definition(column)).to eq "\"column_name\", :date\n"
+    end
+
+    it 'defines a datetime column if type is (D)ate' do
+      column = DBF::Column.new table, 'ColumnName', 'T', 16, 0
+      expect(table.activerecord_schema_definition(column)).to eq "\"column_name\", :datetime\n"
+    end
+
+    it 'defines a boolean column if type is (L)ogical' do
+      column = DBF::Column.new table, 'ColumnName', 'L', 1, 0
+      expect(table.activerecord_schema_definition(column)).to eq "\"column_name\", :boolean\n"
+    end
+
+    it 'defines a text column if type is (M)emo' do
+      column = DBF::Column.new table, 'ColumnName', 'M', 1, 0
+      expect(table.activerecord_schema_definition(column)).to eq "\"column_name\", :text\n"
+    end
+
+    it 'defines a string column with length for any other data types' do
+      column = DBF::Column.new table, 'ColumnName', 'X', 20, 0
+      expect(table.activerecord_schema_definition(column)).to eq "\"column_name\", :string, :limit => 20\n"
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ begin
 rescue LoadError
 end
 
-Encoding.default_external = "UTF-8"
+Encoding.default_external = 'UTF-8'
 
 require 'dbf'
 require 'yaml'
@@ -26,7 +26,7 @@ RSpec.configure do |config|
 end
 
 def fixture_path
-  @fixture_path ||= File.join(File.dirname(__FILE__), '/fixtures')
+  @fixture_path ||= File.join(File.dirname(__FILE__), 'fixtures')
 end
 
 def fixture(filename)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbf
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Keith Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-30 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies: []
 description: A small fast library for reading dBase, xBase, Clipper and FoxPro database
   files.
@@ -110,13 +110,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Read xBase files
 test_files:
-- spec/dbf/column_spec.rb
-- spec/dbf/database_spec.rb
 - spec/dbf/file_formats_spec.rb
+- spec/dbf/database_spec.rb
+- spec/dbf/column_spec.rb
 - spec/dbf/record_spec.rb
 - spec/dbf/table_spec.rb