dbf 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7051deaf2cb9c0f103fe91bb811ac576453e1c4
-  data.tar.gz: f0c06a0ca2a0cd6b2ac8e29eaa8d14f2b496a5d4
+  metadata.gz: 5eb7b6698bb3117ab55add9db5b4b3cb768c82e8
+  data.tar.gz: bfbc755dbd887584c102fdc249583c859c14011c
 SHA512:
-  metadata.gz: 4a963a10bdb5e02c5dce9b8b7f5d8446e636b4f07ab20a07c19611617edd5d3b5f461df2537ce8be97473a1ceafc2f9cd94a9f8bfcaff6fe3e1acbf4828bfab6
-  data.tar.gz: 1dbcdf3f5a5a84cc7fba894556f120e0fc23b4ca46572cf2ef9cb8fe4dac04a24ecf009f9e34786a75be8ec38f9144b38682496c22a3d4d61aee66d0ad97ab10
+  metadata.gz: 84b5da89c2953f28a559d47271614afeb452f0fbd3d770881634a4731f86279f327a67095b6191fed3e7916d886a498b880f4d69a002264b9a5fee8f62d32e09
+  data.tar.gz: b67fa325a58fefd66b344bba83dc58718f4ecc07bdf5676e1f0ce2a698fce1907628069fb75a75d20ca6772988c6c21f1c242949f080786f3007f18d4762549b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 3.0.0
+  - Requires Ruby version 2.0 and above
+  - Support the (G) General Foxpro field type
+
 # 2.0.13
   - Support 64-bit currency signed currency values
     (see https://github.com/infused/dbf/pull/71)

data/Gemfile.lock

@@ -1,17 +1,14 @@
 PATH
   remote: .
   specs:
-    dbf (2.0.12)
-      fastercsv (~> 1.5)
+    dbf (3.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.0)
     diff-lcs (1.2.5)
-    fastercsv (1.5.5)
     ffi (1.9.10)
-    ffi (1.9.10-java)
     formatador (0.2.5)
     guard (2.13.0)
       formatador (>= 0.2.4)
@@ -33,42 +30,34 @@ GEM
     lumberjack (1.0.9)
     method_source (0.8.2)
     nenv (0.2.0)
-    notiffany (0.0.7)
+    notiffany (0.0.8)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    pry (0.10.1)
+    pry (0.10.2)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry (0.10.1-java)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-      spoon (~> 0.0)
-    rb-fsevent (0.9.5)
+    rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
+      rspec-support (~> 3.4.0)
+    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
@@ -76,3 +65,6 @@ DEPENDENCIES
   guard
   guard-rspec
   rspec
+
+BUNDLED WITH
+   1.10.6

data/Gemfile.travis

@@ -1,9 +1,7 @@
 gemspec
 source 'https://rubygems.org'
 
-
 group :test do
-  gem 'rubysl', :platform => :rbx
   gem 'rspec'
-  gem 'codeclimate-test-reporter', :require => false, :platform => :ruby
+  gem 'codeclimate-test-reporter', require: false, platform: :ruby
 end

data/README.md

@@ -28,10 +28,18 @@ DBF is tested to work with the following versions of ruby:
 
 ## Installation
 
+Install the gem manually:
+
 ```
 gem install dbf
 ```
 
+Or add to your Gemfile:
+
+```ruby
+gem 'dbf'
+```
+
 ## Basic Usage
 
 Open a DBF file:
@@ -87,7 +95,7 @@ all records will be loaded into memory.
 
 ```ruby
 # find all records with slot_number equal to s42
-widgets.find(:all, :slot_number => 's42') do |widget|
+widgets.find(:all, slot_number: 's42') do |widget|
   # the record will be nil if deleted, but not yet pruned from the database
   if widget
     puts widget.serial_number
@@ -95,7 +103,7 @@ widgets.find(:all, :slot_number => 's42') do |widget|
 end
 
 # find the first record with slot_number equal to s42
-widgets.find :first, :slot_number => 's42'
+widgets.find :first, slot_number: 's42'
 
 # find record number 10
 widgets.find(10)
@@ -149,7 +157,7 @@ class CreateBooks < ActiveRecord::Migration
 
     Book.reset_column_information
     table.each do |record|
-      Book.create(:title => record.title, :author => record.author)
+      Book.create(title: record.title, author: record.author)
     end
   end
 

data/Rakefile

@@ -10,7 +10,7 @@ RSpec::Core::RakeTask.new :specdoc do |t|
   t.rspec_opts = %w(-fl)
 end
 
-task :default => :spec
+task default: :spec
 
 desc "Open an irb session preloaded with this library"
 task :console do

data/docs/supported_types.markdown

@@ -13,9 +13,9 @@
     +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
     | 07      | Visual Objects 1.x                | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - | - |
     +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 30      | Visual FoxPro                     | Y | Y | Y | Y | - | Y | Y | N | N | N | N | Y | N | N | N | N | - |
+    | 30      | Visual FoxPro                     | 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 | N | N | N | N | Y | N | 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 | - | - | - | - | - | - | - | - | - | - | - |
     +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
@@ -27,9 +27,9 @@
     +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
     | 8e      | dBase IV with SQL table           | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | N | - | - | - |
     +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | f5      | FoxPro with memo file             | Y | Y | Y | Y | Y | Y | Y | N | N | N | N | Y | N | N | N | N | 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 | N | N | N | 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
@@ -50,4 +50,4 @@ Data type descriptions
 * X = SQL compat
 * @ = Timestamp
 * O = Double
-* + = Autoincrement
+* + = Autoincrement

data/lib/dbf.rb

@@ -5,9 +5,8 @@ require 'json'
 
 require 'dbf/schema'
 require 'dbf/record'
-require 'dbf/column/base'
-require 'dbf/column/dbase'
-require 'dbf/column/foxpro'
+require 'dbf/column'
+require 'dbf/column_type'
 require 'dbf/encodings'
 require 'dbf/header'
 require 'dbf/table'

data/lib/dbf/column.rb

@@ -0,0 +1,161 @@
+module DBF
+  class Column
+    # Raised if length is less than 1
+    class LengthError < StandardError; end
+
+    # Raised if name is empty
+    class NameError < StandardError; end
+
+    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
+
+      klass = type_cast_class[type.to_sym]
+      cast_value = klass.new(value, decimal).type_cast
+      binary? ? cast_value : encode(cast_value)
+    end
+
+    # Returns true if the column is a memo
+    #
+    # @return [Boolean]
+    def memo?
+      @memo ||= type == 'M'
+    end
+
+    # Returns true if the column contains binary data
+    #
+    # @return [Boolean]
+    def binary?
+      @binary ||= type == 'G'
+    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
+
+    # TODO this should be a constant
+    def type_cast_class # nodoc
+      h = Hash.new(ColumnType::String)
+      h[:N] = ColumnType::Number
+      h[:I] = ColumnType::SignedLong
+      h[:F] = ColumnType::Float
+      h[:Y] = ColumnType::Currency
+      h[:D] = ColumnType::Date
+      h[:T] = ColumnType::DateTime
+      h[:L] = ColumnType::Boolean
+      h[:M] = ColumnType::Memo
+      h[:B] = ColumnType::Double
+      h[:G] = ColumnType::General
+      h
+    end
+
+    def encode(value, strip_output = false) # nodoc
+      return value if !value.respond_to?(:encoding)
+
+      output = @encoding ? encode_string(value) : value
+      strip_output ? output.strip : output
+    end
+
+    def encode_string(string)
+      string.force_encoding(@encoding).encode(*encoding_args)
+    end
+
+    def encoding_args # nodoc
+      @encoding_args ||= [
+        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
+  end
+end

data/lib/dbf/column_type.rb

@@ -0,0 +1,85 @@
+module DBF
+  module ColumnType
+    class Base
+      attr_reader :value, :decimal
+
+      def initialize(value, decimal)
+        @value = value
+        @decimal = decimal
+      end
+    end
+
+    class Number < Base
+      def type_cast
+        decimal.zero? ? value.to_i : value.to_f
+      end
+    end
+
+    class Currency < Base
+      def type_cast
+        (value.unpack('q<')[0] / 10_000.0).to_f
+      end
+    end
+
+    class SignedLong < Base
+      def type_cast
+        value.unpack('l<')[0]
+      end
+    end
+
+    class Float < Base
+      def type_cast
+        value.to_f
+      end
+    end
+
+    class Double < Base
+      def type_cast
+        value.unpack('E')[0]
+      end
+    end
+
+    class Boolean < Base
+      def type_cast
+        value.strip =~ /^(y|t)$/i ? true : false
+      end
+    end
+
+    class Date < Base
+      def type_cast
+        v = value.tr(' ', '0')
+        v !~ /\S/ ? nil : ::Date.parse(v)
+      rescue
+        nil
+      end
+    end
+
+    class DateTime < Base
+      def type_cast
+        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
+    end
+
+    class Memo < Base
+      def type_cast
+        value
+      end
+    end
+
+    class General < Base
+      def type_cast
+        value
+      end
+    end
+
+    class String < Base
+      def type_cast
+        value.strip
+      end
+    end
+  end
+end