dbf 2.0.8 → 2.0.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ae3ffdc41708236ad7e4f5b6e97ccb7d1f4103a9
+  data.tar.gz: 92ac525038db50bd6ee8860a22d4314a37c76b4c
+SHA512:
+  metadata.gz: 1301756b1375c63e6508d32328b411577c39f38568396d0123c25d8e6a03de85a06765e3e9cdeddd86a3588d58961108778d4b795724f1b8323adc9f9a564968
+  data.tar.gz: 06dd9b432d1c2dab916e7aab441f268951325e6d36b7e125e7c8f0a04b8ece6ecc79c025e59d29e191438bb10978603564aa9357ec28c27c8945df1dd4149dad

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 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
 

data/Gemfile.lock

@@ -1,15 +1,20 @@
 PATH
   remote: .
   specs:
-    dbf (2.0.7)
+    dbf (2.0.8)
       fastercsv (~> 1.5.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    byebug (3.2.0)
+      columnize (~> 0.8)
+      debugger-linecache (~> 1.2)
     celluloid (0.15.2)
       timers (~> 1.1.0)
     coderay (1.1.0)
+    columnize (0.9.0)
+    debugger-linecache (1.2.0)
     diff-lcs (1.2.5)
     fastercsv (1.5.5)
     ffi (1.9.3)
@@ -259,6 +264,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  byebug
   dbf!
   guard
   guard-rspec

data/dbf.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.required_rubygems_version = '>= 1.3.0'
-  s.add_dependency 'fastercsv', '~> 1.5.4'
+  s.add_dependency 'fastercsv', '~> 1.5'
 end

data/lib/dbf/record.rb

@@ -82,12 +82,18 @@ module DBF
     end
 
     def init_attribute(column) #nodoc
-      value = if column.memo?
-        @memo && @memo.get(memo_start_block(column))
+      value = column.memo? ? memo(column) : unpack_data(column)
+      column.type_cast(value)
+    end
+
+    def memo(column) #nodoc
+      if @memo
+        @memo.get(memo_start_block(column))
       else
-        unpack_data(column)
+        # the memo file is missing, so read ahead to next record and return nil
+        @data.read(column.length)
+        nil
       end
-      column.type_cast(value)
     end
 
     def memo_start_block(column) #nodoc

data/lib/dbf/table.rb

@@ -149,9 +149,10 @@ module DBF
     #
     # @param [optional String] path Defaults to STDOUT
     def to_csv(path = nil)
-      csv = csv_class.new((path ? File.open(path, 'w') : $stdout), :force_quotes => true)
-      csv << columns.map {|c| c.name}
-      each {|record| csv << record.to_a}
+      out_io = path ? File.open(path, 'w') : $stdout
+      csv = csv_class.new(out_io, :force_quotes => true)
+      csv << column_names
+      each { |record| csv << record.to_a }
     end
 
     # Find records using a simple ActiveRecord-like syntax.
@@ -232,9 +233,7 @@ module DBF
       while !["\0", "\r"].include?(first_byte = @data.read(1))
         column_data = first_byte + @data.read(DBF_HEADER_SIZE - 1)
         name, type, length, decimal = column_data.unpack('a10 x a x4 C2')
-        if length > 0
-          columns << column_class.new(self, name, type, length, decimal)
-        end
+        columns << column_class.new(self, name, type, length, decimal)
       end
       columns
     end

data/lib/dbf/version.rb

@@ -1,3 +1,3 @@
 module DBF
-  VERSION = '2.0.8'
+  VERSION = '2.0.9'
 end

data/spec/dbf/record_spec.rb

@@ -14,11 +14,23 @@ describe DBF::Record do
     end
 
     describe 'with missing memo file' do
-      let(:table) { DBF::Table.new fixture_path('dbase_83_missing_memo.dbf') }
+      describe 'when opening a path' do
+        let(:table) { DBF::Table.new fixture_path('dbase_83_missing_memo.dbf') }
+
+        it 'returns nil values for memo fields' do
+          record = table.record(0)
+          expect(record.to_a).to eq [87, 2, 0, 0, 87, "1", "Assorted Petits Fours", "graphics/00000001/t_1.jpg", "graphics/00000001/1.jpg", 0.0, 0.0, nil, 5.51, true, true]
+        end
+      end
+    end
+
+    describe 'when opening StringIO' do
+      let(:data) { StringIO.new(File.read(fixture_path('dbase_83_missing_memo.dbf'))) }
+      let(:table) { DBF::Table.new(data) }
 
       it 'returns nil values for memo fields' do
         record = table.record(0)
-        expect(record.to_a).to eq [87, 2, 0, 0, 87, "1", "Assorted Petits Fours", "graphics/00000001/t_1.jpg", "graphics/00000001/1.jpg", 0.0, 0.0, nil, 1.0, false, false]
+        expect(record.to_a).to eq [87, 2, 0, 0, 87, "1", "Assorted Petits Fours", "graphics/00000001/t_1.jpg", "graphics/00000001/1.jpg", 0.0, 0.0, nil, 5.51, true, true]
       end
     end
   end

metadata

@@ -1,32 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dbf
 version: !ruby/object:Gem::Version
-  version: 2.0.8
-  prerelease: 
+  version: 2.0.9
 platform: ruby
 authors:
 - Keith Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: '1.5'
 description: A small fast library for reading dBase, xBase, Clipper and FoxPro database
   files.
 email: keithm@infused.org
@@ -45,11 +42,13 @@ files:
 - Gemfile.travis18
 - Guardfile
 - LICENSE
-- Rakefile
 - README.md
+- Rakefile
 - bin/dbf
+- dbf.gemspec
 - docs/supported_encodings.csv
 - docs/supported_types.markdown
+- lib/dbf.rb
 - lib/dbf/column/base.rb
 - lib/dbf/column/dbase.rb
 - lib/dbf/column/foxpro.rb
@@ -63,7 +62,6 @@ files:
 - lib/dbf/schema.rb
 - lib/dbf/table.rb
 - lib/dbf/version.rb
-- lib/dbf.rb
 - spec/dbf/column_spec.rb
 - spec/dbf/file_formats_spec.rb
 - spec/dbf/record_spec.rb
@@ -82,32 +80,30 @@ files:
 - spec/fixtures/dbase_f5.dbf
 - spec/fixtures/dbase_f5.fpt
 - spec/spec_helper.rb
-- dbf.gemspec
 homepage: http://github.com/infused/dbf
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Read xBase files
 test_files:
 - spec/dbf/column_spec.rb