dbf 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96a42e8a2472368295efedd4e47ea2a96bcced01
-  data.tar.gz: b5a4f4b6fcf91a0f100581293489b7e087d94b06
+  metadata.gz: 7fcab794d4aecd4f5e77cfd92906d883668cf7dd
+  data.tar.gz: d5ccc39ccfd37f5b6c539b4185f52769c0b6382e
 SHA512:
-  metadata.gz: acaf78f1f98dc82f3feb05c2d70cda1bbdb64b6567de76a47723c2c440ddf00e16d54d358e12dac36139514b451487d1540e30b78ef510657d68554d97d08583
-  data.tar.gz: b6a86b0a5fb95da3e830847e7d39021b13fff15b06a81485db125b60ef6e99c29f34769e34fae0f1b9f4e809563047ae8667907bf3507a4268fa324c58f5150e
+  metadata.gz: f3cddf7e897fa59cb4560b452eddd89f196f574e827383d8470d79a9e5448356acc59764de27a6257f4f6efd5b3334f69e6a2c263b24c5ba27472e2d30baf71b
+  data.tar.gz: 3577e03cd8f8327dd60aadcb8c124e102d26f755c82588d5020df09fa3e1bc666c3b59e88069d70309753d42c250ad60a279f114a9bf8fcf5973d618e39817c8

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 3.0.3
+  - Uninitialized (N)umbers should return nil
+
 # 3.0.2
   - Performance improvements for large files
 

data/bin/dbf

@@ -12,7 +12,6 @@ if params['h'] then
   puts "  -a = create an ActiveRecord::Schema"
   puts "  -c = create a csv file"
 else
-
   filename = ARGV.shift
   abort "You must supply a filename on the command line" unless filename
 
@@ -39,8 +38,7 @@ else
   end
 
   if params['c']
-   table = DBF::Table.new filename
-   table.to_csv
+    table = DBF::Table.new filename
+    table.to_csv
   end
-
 end

data/lib/dbf/column.rb

@@ -88,12 +88,10 @@ module DBF
     private
 
     def type_cast_class # nodoc
-      @type_cast_class ||=
-        if @length == 0
-          ColumnType::Nil
-        else
-          TYPE_CAST_CLASS[type.to_sym]
-        end.new(@decimal, @encoding)
+      @type_cast_class ||= begin
+        klass = @length == 0 ? ColumnType::Nil : TYPE_CAST_CLASS[type.to_sym]
+        klass.new(@decimal, @encoding)
+      end
     end
 
     def encode(value, strip_output = false) # nodoc

data/lib/dbf/column_type.rb

@@ -22,6 +22,7 @@ module DBF
 
     class Number < Base
       def type_cast(value)
+        return nil if value.strip.empty?
         @decimal.zero? ? value.to_i : value.to_f
       end
     end
@@ -77,7 +78,7 @@ module DBF
 
     class Memo < Base
       def type_cast(value)
-        if encoding and not value.nil?
+        if encoding && !value.nil?
           value.force_encoding(@encoding).encode(*ENCODING_ARGS)
         else
           value

data/lib/dbf/version.rb

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

data/spec/dbf/column_spec.rb

@@ -44,6 +44,14 @@ RSpec.describe DBF::Column do
 
   context '#type_cast' do
     context 'with type N (number)' do
+      context 'when value is empty' do
+        it 'returns nil' do
+          value = ''
+          column = DBF::Column.new table, 'ColumnName', 'N', 5, 2
+          expect(column.type_cast(value)).to be_nil
+        end
+      end
+
       context 'and 0 length' do
         it 'returns nil' do
           column = DBF::Column.new table, 'ColumnName', 'N', 0, 0

metadata

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