dbf 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5eb7b6698bb3117ab55add9db5b4b3cb768c82e8
-  data.tar.gz: bfbc755dbd887584c102fdc249583c859c14011c
+  metadata.gz: 96a42e8a2472368295efedd4e47ea2a96bcced01
+  data.tar.gz: b5a4f4b6fcf91a0f100581293489b7e087d94b06
 SHA512:
-  metadata.gz: 84b5da89c2953f28a559d47271614afeb452f0fbd3d770881634a4731f86279f327a67095b6191fed3e7916d886a498b880f4d69a002264b9a5fee8f62d32e09
-  data.tar.gz: b67fa325a58fefd66b344bba83dc58718f4ecc07bdf5676e1f0ce2a698fce1907628069fb75a75d20ca6772988c6c21f1c242949f080786f3007f18d4762549b
+  metadata.gz: acaf78f1f98dc82f3feb05c2d70cda1bbdb64b6567de76a47723c2c440ddf00e16d54d358e12dac36139514b451487d1540e30b78ef510657d68554d97d08583
+  data.tar.gz: b6a86b0a5fb95da3e830847e7d39021b13fff15b06a81485db125b60ef6e99c29f34769e34fae0f1b9f4e809563047ae8667907bf3507a4268fa324c58f5150e

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 3.0.2
+  - Performance improvements for large files
+
+# 3.0.1
+  - Support FoxPro (G) general field type
+  - Fix ruby warnings
+
 # 3.0.0
   - Requires Ruby version 2.0 and above
   - Support the (G) General Foxpro field type

data/Gemfile.lock

@@ -1,14 +1,18 @@
 PATH
   remote: .
   specs:
-    dbf (3.0.0)
+    dbf (3.0.1)
+      bindata
 
 GEM
   remote: https://rubygems.org/
   specs:
+    bindata (2.1.0)
+    byebug (8.2.0)
     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)
@@ -24,7 +28,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)
@@ -33,10 +37,15 @@ 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)
+    pry (0.10.3-java)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+      spoon (~> 0.0)
     rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
@@ -55,12 +64,16 @@ 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
+  byebug
   dbf!
   guard
   guard-rspec

data/README.md

@@ -4,7 +4,6 @@
 [![Code Quality](http://img.shields.io/codeclimate/github/infused/dbf.svg?style=flat)](https://codeclimate.com/github/infused/dbf)
 [![Test Coverage](http://img.shields.io/codeclimate/coverage/github/infused/dbf.svg?style=flat)](https://codeclimate.com/github/infused/dbf)
 [![Dependency Status](http://img.shields.io/gemnasium/infused/dbf.svg?style=flat)](https://gemnasium.com/infused/dbf)
-[![Issues](https://img.shields.io/github/issues/infused/dbf.svg)](https://github.com/infused/dbf/issues)
 [![Total Downloads](https://img.shields.io/gem/dt/dbf.svg)](https://rubygems.org/gems/dbf/)
 
 DBF is a small fast library for reading dBase, xBase, Clipper and FoxPro

data/lib/dbf.rb

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

data/lib/dbf/column.rb

@@ -8,6 +8,20 @@ module DBF
 
     attr_reader :table, :name, :type, :length, :decimal
 
+    TYPE_CAST_CLASS = {
+      N: ColumnType::Number,
+      I: ColumnType::SignedLong,
+      F: ColumnType::Float,
+      Y: ColumnType::Currency,
+      D: ColumnType::Date,
+      T: ColumnType::DateTime,
+      L: ColumnType::Boolean,
+      M: ColumnType::Memo,
+      B: ColumnType::Double,
+      G: ColumnType::General
+    }
+    TYPE_CAST_CLASS.default = ColumnType::String
+
     # Initialize a new DBF::Column
     #
     # @param [String] name
@@ -32,11 +46,7 @@ module DBF
     # @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)
+      type_cast_class.type_cast(value)
     end
 
     # Returns true if the column is a memo
@@ -46,13 +56,6 @@ module DBF
       @memo ||= type == 'M'
     end
 
-    # Returns true if the column contains binary data
-    #
-    # @return [Boolean]
-    def binary?
-      @binary ||= type == 'G'
-    end
-
     # Schema definition
     #
     # @return [String]
@@ -84,20 +87,13 @@ module DBF
 
     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
+      @type_cast_class ||=
+        if @length == 0
+          ColumnType::Nil
+        else
+          TYPE_CAST_CLASS[type.to_sym]
+        end.new(@decimal, @encoding)
     end
 
     def encode(value, strip_output = false) # nodoc
@@ -150,11 +146,11 @@ module DBF
       truncated_value.gsub(/[^\x20-\x7E]/, '')
     end
 
-    def validate_length
+    def validate_length # nodoc
       raise LengthError, 'field length must be 0 or greater' if length < 0
     end
 
-    def validate_name
+    def validate_name # nodoc
       raise NameError, 'column name cannot be empty' if @name.empty?
     end
   end

data/lib/dbf/column_type.rb

@@ -1,52 +1,63 @@
 module DBF
   module ColumnType
     class Base
-      attr_reader :value, :decimal
+      ENCODING_ARGS = [
+        Encoding.default_external,
+        {undef: :replace, invalid: :replace}
+      ]
 
-      def initialize(value, decimal)
-        @value = value
+      attr_reader :decimal, :encoding
+
+      def initialize(decimal, encoding)
         @decimal = decimal
+        @encoding = encoding
+      end
+    end
+
+    class Nil < Base
+      def type_cast(value)
+        nil
       end
     end
 
     class Number < Base
-      def type_cast
-        decimal.zero? ? value.to_i : value.to_f
+      def type_cast(value)
+        @decimal.zero? ? value.to_i : value.to_f
       end
     end
 
     class Currency < Base
-      def type_cast
+      def type_cast(value)
         (value.unpack('q<')[0] / 10_000.0).to_f
       end
     end
 
     class SignedLong < Base
-      def type_cast
+      def type_cast(value)
         value.unpack('l<')[0]
       end
     end
 
     class Float < Base
-      def type_cast
+      def type_cast(value)
         value.to_f
       end
     end
 
     class Double < Base
-      def type_cast
+      def type_cast(value)
         value.unpack('E')[0]
       end
     end
 
     class Boolean < Base
-      def type_cast
+      def type_cast(value)
         value.strip =~ /^(y|t)$/i ? true : false
       end
     end
 
     class Date < Base
-      def type_cast
+      def type_cast(value)
         v = value.tr(' ', '0')
         v !~ /\S/ ? nil : ::Date.parse(v)
       rescue
@@ -55,7 +66,7 @@ module DBF
     end
 
     class DateTime < Base
-      def type_cast
+      def type_cast(value)
         days, msecs = value.unpack('l2')
         secs = (msecs / 1000).to_i
         ::DateTime.jd(days, (secs / 3600).to_i, (secs / 60).to_i % 60, secs % 60)
@@ -65,21 +76,27 @@ module DBF
     end
 
     class Memo < Base
-      def type_cast
-        value
+      def type_cast(value)
+        if encoding and not value.nil?
+          value.force_encoding(@encoding).encode(*ENCODING_ARGS)
+        else
+          value
+        end
       end
     end
 
     class General < Base
-      def type_cast
+      def type_cast(value)
         value
       end
     end
 
     class String < Base
-      def type_cast
-        value.strip
+      def type_cast(value)
+        value = value.strip
+        @encoding ? value.force_encoding(@encoding).encode(*ENCODING_ARGS) : value
       end
     end
+
   end
 end

data/lib/dbf/record.rb

@@ -90,7 +90,7 @@ module DBF
     end
 
     def init_attribute(column) # nodoc
-      value = column.memo? ? memo(column) : unpack_data(column)
+      value = column.memo? ? memo(column) : get_data(column)
       column.type_cast(value)
     end
 
@@ -105,13 +105,15 @@ module DBF
     end
 
     def memo_start_block(column) # nodoc
-      format = 'V' if %w(30 31).include?(@version)
-      unpack_data(column, format).to_i
+      data = get_data(column)
+      if %w(30 31).include?(@version)
+        data = data.unpack('V').first
+      end
+      data.to_i
     end
 
-    def unpack_data(column, format = nil) # nodoc
-      format ||= "a#{column.length}"
-      @data.read(column.length).unpack(format).first
+    def get_data(column) # nodoc
+      @data.read(column.length)
     end
   end
 end

data/lib/dbf/version.rb

@@ -1,3 +1,3 @@
 module DBF
-  VERSION = '3.0.1'
+  VERSION = '3.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbf
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Keith Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies: []
 description: A small fast library for reading dBase, xBase, Clipper and FoxPro database
   files.