dbf 4.1.6 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a45d2baaa7a531875b0528d1d7b83f7cc01cfe502b85c42b461b5749745638a
-  data.tar.gz: f5eebeb1bc1f3d49bab802671f7ac3cfbc7722a1c1a797173cfdd025a684e30f
+  metadata.gz: 429e8806f5675886a27b904b879c244f9808c83c3da82937d6953d13a01dd333
+  data.tar.gz: e3d916d24891b6f26237c41fc6cad865544b2c1b6c91430f93fad58a8d712298
 SHA512:
-  metadata.gz: a9624d7a37d29bc6f2eaf3546ad41ec8e04b84d1c48ccc9d92122e9682161bbe706459468f6a220e288ba07203fb419574723b376236868f8351e6a66dc58b67
-  data.tar.gz: d821ec9443f26d3c7c5515cd6f0722f0c5ebcdf189aee5689cb63133c1ba3d1d03a03b6c9f2f9f1514900169ce8895c7ca33cbc8e24611ddbfeb9c216ee5171b
+  metadata.gz: 542522a8b7964b4a517bb4a1c68ae95ebbebab15ca4ef9ca8b6ce515b5a4df73e8c8b6dd27bf7c9273d6c879839c165ed94bfc17a2a26b069697b6badcbac3f9
+  data.tar.gz: 81b8db3ad10edbef672257239b2c9389f7292420feb7fab8343c9e2736bbc17835a55101c87dae84463b0c931fcc6d5acb6a9a27190a37dd284d1e2175d4a5f0

data/CHANGELOG.md

@@ -1,159 +1,223 @@
-# 4.1.5
-  - Better handling for PIPE errors when using command line utility
+# Changelog
 
-# 4.1.4
-  - Add full support for FoxBase files
+## 4.2.2
 
-# 4.1.3
-  - Raise DBF::NoColumnsDefined error when attempting to read records if no columns are defined
+- Faster CSV generation
 
-# 4.1.1
-  - Add required_ruby_version to gemspec
+## 4.2.1
 
-# 4.1.0
-  - Return Time instead of DateTime
+- Support for dBase IV "04" type files
 
-# 4.0.0
-  - Drop support for ruby-2.2 and earlier
+## 4.2.0
 
-# 3.1.3
-  - Ensure malformed dates return nil
+- Initial support for dBase 7 files
 
-# 3.1.2
-  - Fix incorrect columns list when StringIO and encoding set
+## 4.1.6
 
-# 3.1.1
-  - Use Date.strptime to parse date fields
+- Add support for file type 32
 
-# 3.1.0
-  - Use :binary for binary fields in ActiveRecord schemas
+## 4.1.5
 
-# 3.0.8
-  - Fix uninitialized constant error under Rails 5
+- Better handling for PIPE errors when using command line utility
 
-# 3.0.7
-  - Ignore non-existent records if header record count is incorrect
+## 4.1.4
 
-# 3.0.6
-  - This version has been yanked from rubygems due to errors
+- Add full support for FoxBase files
 
-# 3.0.5
-  - Override table name for schema output
+## 4.1.3
 
-# 3.0.4
-  - Adds -v command-line option to print version
-  - Adds -r command-line option to create Sequel migration
+- Raise DBF::NoColumnsDefined error when attempting to read records if no columns are defined
 
-# 3.0.3
-  - Uninitialized (N)umbers should return nil
+## 4.1.1
 
-# 3.0.2
-  - Performance improvements for large files
+- Add required_ruby_version to gemspec
 
-# 3.0.1
-  - Support FoxPro (G) general field type
-  - Fix ruby warnings
+## 4.1.0
 
-# 3.0.0
-  - Requires Ruby version 2.0 and above
-  - Support the (G) General Foxpro field type
+- Return Time instead of DateTime
 
-# 2.0.13
-  - Support 64-bit currency signed currency values
-    (see https://github.com/infused/dbf/pull/71)
+## 4.0.0
 
-# 2.0.12
-  - Parse (I) values as signed
-    (see https://github.com/infused/dbf/pull/70)
+- Drop support for ruby-2.2 and earlier
 
-# 2.0.11
-  - Foxpro doubles should always return the full stored precision
-    (see https://github.com/infused/dbf/pull/69)
+## 3.1.3
 
-# 2.0.10
-  - allow 0 length fields, but always return nil as value
+- Ensure malformed dates return nil
 
-# 2.0.9
-  - fix dBase IV attributes when memo file is missing
+## 3.1.2
 
-# 2.0.8
-  - fix FoxPro currency fields on some builds of Ruby 1.9.3 and 2.0.0
+- Fix incorrect columns list when StringIO and encoding set
 
-# 2.0.7
-  - fix the dbf binary on some linux systems
+## 3.1.1
 
-# 2.0.6
-  - build_memo returns nil on errors
+- Use Date.strptime to parse date fields
 
-# 2.0.5
-  - use correct FoxPro memo block size
+## 3.1.0
 
-# 2.0.4
-  - memo fields return nil if memo file is missing
+- Use :binary for binary fields in ActiveRecord schemas
 
-# 2.0.3
-  - set encoding if table encoding is nil
+## 3.0.8
 
-# 2.0.2
-  - Allow overriding the character encoding specified in the file
+- Fix uninitialized constant error under Rails 5
 
-# 2.0.1
-  - Add experimental support for character encodings under Ruby 1.8
+## 3.0.7
 
-# 2.0.0
-  - #44 Require FasterCSV gem on all platforms
-  - Remove rdoc development dependency
-  - #42 Fixes encoding of memos
-  - #43 Improve handling of record attributes
+- Ignore non-existent records if header record count is incorrect
 
-# 1.7.5
-  - fixes FoxPro currency (Y) fields
+## 3.0.6
 
-# 1.7.4
-  - Replace Memo Type with Memo File boolean in command-line utility summary output
+- This version has been yanked from rubygems due to errors
 
-# 1.7.3
-  - find_all/find_first should ignore deleted records
+## 3.0.5
 
-# 1.7.2
-  - Fix integer division under Ruby 1.8 when requiring mathn
-    standard library (see http://bugs.ruby-lang.org/issues/2121)
+- Override table name for schema output
 
-# 1.7.1
-  - Fix Table.FOXPRO_VERSIONS breakage on Ruby 1.8
+## 3.0.4
 
-# 1.7.0
-  - allow DBF::Table to work with dbf data in memory
-  - allow DBF::Table#to_csv to write to STDOUT
+- Adds -v command-line option to print version
+- Adds -r command-line option to create Sequel migration
 
-# 1.6.7
-  - memo columns return nil when no memo file found
+## 3.0.3
 
-# 1.6.6
-  - add binary data type support to ActiveRecord schema output
+- Uninitialized (N)umbers should return nil
 
-# 1.6.5
-  - support for visual foxpro double (b) data type
+## 3.0.2
+  
+- Performance improvements for large files
 
-# 1.6.3
-  - Replace invalid chars with 'unicode replacement character' (U+FFFD)
+## 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
+
+## 2.0.13
+
+- Support 64-bit currency signed currency values
+  (see https://github.com/infused/dbf/pull/71)
+
+## 2.0.12
+
+- Parse (I) values as signed
+  (see https://github.com/infused/dbf/pull/70)
+
+## 2.0.11
+
+- Foxpro doubles should always return the full stored precision
+  (see https://github.com/infused/dbf/pull/69)
+
+## 2.0.10
+
+- allow 0 length fields, but always return nil as value
+
+## 2.0.9
+
+- fix dBase IV attributes when memo file is missing
+
+## 2.0.8
+
+- fix FoxPro currency fields on some builds of Ruby 1.9.3 and 2.0.0
+
+## 2.0.7
+
+- fix the dbf binary on some linux systems
+
+## 2.0.6
+
+- build_memo returns nil on errors
+
+## 2.0.5
+
+- use correct FoxPro memo block size
+
+## 2.0.4
+  
+- memo fields return nil if memo file is missing
+
+## 2.0.3
+
+- set encoding if table encoding is nil
+
+## 2.0.2
+
+- Allow overriding the character encoding specified in the file
+
+## 2.0.1
+
+- Add experimental support for character encodings under Ruby 1.8
+
+## 2.0.0
+
+- #44 Require FasterCSV gem on all platforms
+- Remove rdoc development dependency
+- #42 Fixes encoding of memos
+- #43 Improve handling of record attributes
+
+## 1.7.5
+  
+- fixes FoxPro currency (Y) fields
+
+## 1.7.4
+  
+- Replace Memo Type with Memo File boolean in command-line utility summary output
+
+## 1.7.3
+  
+- find_all/find_first should ignore deleted records
+
+## 1.7.2
+  
+- Fix integer division under Ruby 1.8 when requiring mathn
+  standard library (see http://bugs.ruby-lang.org/issues/2121)
+
+## 1.7.1
+
+- Fix Table.FOXPRO_VERSIONS breakage on Ruby 1.8
+
+## 1.7.0
+
+- allow DBF::Table to work with dbf data in memory
+- allow DBF::Table#to_csv to write to STDOUT
+
+## 1.6.7
+
+- memo columns return nil when no memo file found
+
+## 1.6.6
+
+- add binary data type support to ActiveRecord schema output
+
+## 1.6.5
+
+- support for visual foxpro double (b) data type
+
+## 1.6.3
+
+- Replace invalid chars with 'unicode replacement character' (U+FFFD)
 
 ## 1.6.2
-  - add Table#filename method
-  - Rakefile now loads gems with bundler
-  - add Table#supports_encoding?
-  - simplify encodings.yml loader
-  - add rake and rdoc as development dependencies
-  - simplify open_memo file search logic
-  - remove unnecessary requires in spec helper
-  - fix cli summary
+
+- add Table#filename method
+- Rakefile now loads gems with bundler
+- add Table#supports_encoding?
+- simplify encodings.yml loader
+- add rake and rdoc as development dependencies
+- simplify open_memo file search logic
+- remove unnecessary requires in spec helper
+- fix cli summary
 
 ## 1.6.1
-  - fix YAML issue when using MRI version > 1.9.1
-  - remove Table#seek_to_index and Table#current_record private methods
+
+- fix YAML issue when using MRI version > 1.9.1
+- remove Table#seek_to_index and Table#current_record private methods
 
 ## 1.6.0
-  - remove activesupport gem dependency
+
+- remove activesupport gem dependency
 
 ## 1.5.0
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dbf (4.1.5)
+    dbf (4.2.1)
 
 GEM
   remote: https://rubygems.org/
@@ -10,10 +10,10 @@ GEM
     awesome_print (1.9.2)
     byebug (11.1.3)
     coderay (1.1.3)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     e2mmap (0.1.0)
-    ffi (1.15.3)
-    formatador (0.3.0)
+    ffi (1.15.5)
+    formatador (1.1.0)
     guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -28,10 +28,10 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    io-console (0.5.9)
-    irb (1.3.6)
-      reline (>= 0.2.5)
-    listen (3.6.0)
+    io-console (0.5.11)
+    irb (1.4.1)
+      reline (>= 0.3.0)
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
@@ -40,59 +40,60 @@ GEM
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.20.1)
-    parser (3.0.2.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (2.1.1)
-    reline (0.2.6)
+    regexp_parser (2.5.0)
+    reline (0.3.1)
       io-console (~> 0.5)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.18.4)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.30.1)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.8.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.9.0)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.11.4)
+    rubocop-ast (1.18.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.14.2)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rspec (2.4.0)
-      rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
+    rubocop-rspec (2.11.1)
+      rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     shellany (0.0.1)
-    thor (1.1.0)
-    unicode-display_width (2.0.0)
-    yard (0.9.26)
+    thor (1.2.1)
+    unicode-display_width (2.1.0)
+    webrick (1.7.0)
+    yard (0.9.28)
+      webrick (~> 1.7.0)
 
 PLATFORMS
-  ruby
+  arm64-darwin-21
 
 DEPENDENCIES
   awesome_print
@@ -110,4 +111,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.2.15
+   2.3.20

data/README.md

@@ -1,6 +1,6 @@
 # DBF
 [![Version](https://img.shields.io/gem/v/dbf.svg?style=flat)](https://rubygems.org/gems/dbf)
-[![Build Status](https://img.shields.io/travis/infused/dbf/master.svg?style=flat)](https://travis-ci.com/infused/dbf)
+[![Build Status](https://github.com/infused/dbf/actions/workflows/build.yml/badge.svg)](https://github.com/infused/dbf/actions/workflows/build.yml)
 [![Code Quality](https://img.shields.io/codeclimate/maintainability/infused/dbf.svg?style=flat)](https://codeclimate.com/github/infused/dbf)
 [![Code Coverage](https://img.shields.io/codeclimate/c/infused/dbf.svg?style=flat)](https://codeclimate.com/github/infused/dbf)
 [![Total Downloads](https://img.shields.io/gem/dt/dbf.svg)](https://rubygems.org/gems/dbf/)

data/Rakefile

@@ -14,5 +14,5 @@ task default: :spec
 
 desc 'Open an irb session preloaded with this library'
 task :console do
-  sh 'irb -rubygems -I lib -r dbf.rb'
+  sh 'irb -r rubygems -I lib -r dbf.rb'
 end

data/lib/dbf/column.rb

@@ -21,7 +21,8 @@ module DBF
       L: ColumnType::Boolean,
       M: ColumnType::Memo,
       B: ColumnType::Double,
-      G: ColumnType::General
+      G: ColumnType::General,
+      '+'.to_sym => ColumnType::SignedLong2
     }
     TYPE_CAST_CLASS.default = ColumnType::String
     TYPE_CAST_CLASS.freeze
@@ -79,8 +80,7 @@ module DBF
     private
 
     def clean(value) # :nodoc:
-      truncated_value = value.strip.partition("\x00").first
-      truncated_value.gsub(/[^\x20-\x7E]/, '')
+      value.strip.gsub("\x00", '').gsub(/[^\x20-\x7E]/, '')
     end
 
     def encode(value, strip_output = false) # :nodoc:

data/lib/dbf/column_type.rb

@@ -12,7 +12,6 @@ module DBF
     end
 
     class Nil < Base
-
       # @param _value [String]
       def type_cast(_value)
         nil
@@ -20,7 +19,6 @@ module DBF
     end
 
     class Number < Base
-
       # @param value [String]
       def type_cast(value)
         return nil if value.strip.empty?
@@ -30,7 +28,6 @@ module DBF
     end
 
     class Currency < Base
-
       # @param value [String]
       def type_cast(value)
         (value.unpack1('q<') / 10_000.0).to_f
@@ -38,15 +35,22 @@ module DBF
     end
 
     class SignedLong < Base
-
       # @param value [String]
       def type_cast(value)
         value.unpack1('l<')
       end
     end
 
-    class Float < Base
+    class SignedLong2 < Base
+      # @param value [String]
+      def type_cast(value)
+        s = value.unpack1('B*')
+        sign_multiplier = s[0] == '0' ? -1 : 1
+        s[1, 31].to_i(2) * sign_multiplier
+      end
+    end
 
+    class Float < Base
       # @param value [String]
       def type_cast(value)
         value.to_f
@@ -54,7 +58,6 @@ module DBF
     end
 
     class Double < Base
-
       # @param value [String]
       def type_cast(value)
         value.unpack1('E')
@@ -62,7 +65,6 @@ module DBF
     end
 
     class Boolean < Base
-
       # @param value [String]
       def type_cast(value)
         value.strip.match?(/^(y|t)$/i)
@@ -70,7 +72,6 @@ module DBF
     end
 
     class Date < Base
-
       # @param value [String]
       def type_cast(value)
         value.match?(/\d{8}/) && ::Date.strptime(value, '%Y%m%d')
@@ -80,7 +81,6 @@ module DBF
     end
 
     class DateTime < Base
-
       # @param value [String]
       def type_cast(value)
         days, msecs = value.unpack('l2')
@@ -92,7 +92,6 @@ module DBF
     end
 
     class Memo < Base
-
       # @param value [String]
       def type_cast(value)
         if encoding && !value.nil?
@@ -104,7 +103,6 @@ module DBF
     end
 
     class General < Base
-
       # @param value [String]
       def type_cast(value)
         value
@@ -112,7 +110,6 @@ module DBF
     end
 
     class String < Base
-
       # @param value [String]
       def type_cast(value)
         value = value.strip

data/lib/dbf/record.rb

@@ -38,7 +38,7 @@ module DBF
     #
     # @return [Hash]
     def attributes
-      @attributes ||= Hash[attribute_map]
+      @attributes ||= Hash[column_names.zip(to_a)]
     end
 
     # Do all search parameters match?
@@ -53,13 +53,13 @@ module DBF
     #
     # @return [Array]
     def to_a
-      @columns.map { |column| attributes[column.name] }
+      @to_a ||= @columns.map { |column| init_attribute(column) }
     end
 
     private
 
-    def attribute_map # :nodoc:
-      @columns.map { |column| [column.name, init_attribute(column)] }
+    def column_names # :nodoc:
+      @column_names ||= @columns.map { |column| column.name }
     end
 
     def get_data(column) # :nodoc: