dbf 2.0.4 → 2.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 250d5b1253dc56182318a846f9002e61d87b45bb
+  data.tar.gz: c434e084787b3ff199e87c759b52783b8cffad4b
+SHA512:
+  metadata.gz: 7b04b5bd719c803750d1d65d558c125f40b1f4480360a41f05dadeea2eb96f36fe995d7e6a15388de56c7880e660270f1b2f4be79471299396d38fa4919f68c2
+  data.tar.gz: 92fbdda6187c229b040bf1a830072b0f40652e1c5612ee4f31f164c481ab5486b13747107555d4433d7b9f2611999fc21150fe09e16de17b83ef7f386824ebf3

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2.0.5
+  - use correct FoxPro memo block size
+
 # 2.0.4
   - memo fields return nil if memo file is missing
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dbf (2.0.3)
+    dbf (2.0.4)
       fastercsv (~> 1.5.4)
 
 GEM
@@ -9,7 +9,7 @@ GEM
   specs:
     diff-lcs (1.2.4)
     fastercsv (1.5.5)
-    rake (0.9.2.2)
+    rake (10.0.4)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -20,6 +20,7 @@ GEM
     rspec-mocks (2.13.1)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/lib/dbf/memo/base.rb

@@ -29,7 +29,7 @@ module DBF
       private
 
       def offset(start_block) #nodoc
-        start_block * BLOCK_SIZE
+        start_block * block_size
       end
 
       def content_size(memo_size) #nodoc
@@ -39,6 +39,10 @@ module DBF
       def block_content_size #nodoc
         @block_content_size ||= block_size - BLOCK_HEADER_SIZE
       end
+
+      def block_size
+        BLOCK_SIZE
+      end
     end
   end
 end

data/lib/dbf/memo/foxpro.rb

@@ -2,13 +2,13 @@ module DBF
   module Memo
     class Foxpro < Base
       FPT_HEADER_SIZE = 512
-      
+
       def build_memo(start_block) #nodoc
         @data.seek offset(start_block)
-        
+
         memo_type, memo_size, memo_string = @data.read(block_size).unpack("NNa*")
         return nil unless memo_type == 1 && memo_size > 0
-        
+
         if memo_size > block_content_size
           memo_string << @data.read(content_size(memo_size))
         else
@@ -16,9 +16,9 @@ module DBF
         end
         memo_string
       end
-      
+
       private
-      
+
       def block_size #nodoc
         @block_size ||= begin
           @data.rewind

data/lib/dbf/record.rb

@@ -51,8 +51,11 @@ module DBF
     end
 
     def respond_to?(method, *args)
-      return true if column_names.include?(method.to_s)
-      super
+      if column_names.include?(method.to_s)
+        true
+      else
+        super
+      end
     end
 
     def method_missing(method, *args)

data/lib/dbf/version.rb

@@ -1,3 +1,3 @@
 module DBF
-  VERSION = '2.0.4'
+  VERSION = '2.0.5'
 end

data/spec/dbf/file_formats_spec.rb

@@ -151,4 +151,8 @@ describe DBF, "of type f5 (FoxPro with memo file)" do
   it "should determine the number of records" do
     expect(table.record_count).to eq 975
   end
+
+  it "reads memo data" do
+    expect(table.record(3).obse).to match(/\Ajos.*pare\.\Z/m)
+  end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: dbf
 version: !ruby/object:Gem::Version
-  version: 2.0.4
-  prerelease: 
+  version: 2.0.5
 platform: ruby
 authors:
 - Keith Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,17 +41,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
 description: A small fast library for reading dBase, xBase, Clipper and FoxPro database
@@ -112,28 +105,27 @@ files:
 - dbf.gemspec
 homepage: http://github.com/infused/dbf
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --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.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Read xBase files
 test_files:
 - spec/dbf/column_spec.rb