dbf 1.7.2 → 1.7.3

data/CHANGELOG.md

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

data/Gemfile.lock

@@ -2,33 +2,29 @@ PATH
   remote: .
   specs:
     dbf (1.7.2)
-      fastercsv (~> 1.5.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
-    fastercsv (1.5.4)
-    json (1.6.3)
-    json (1.6.3-java)
+    json (1.6.5)
     rake (0.9.2.2)
-    rdoc (3.11)
+    rdoc (3.12)
       json (~> 1.4)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
+    rspec-mocks (2.8.0)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
   dbf!
   rake (~> 0.9.2)
   rdoc (~> 3.11)
-  rspec (~> 2.7.0)
+  rspec (~> 2.8.0)

data/README.md

@@ -1,4 +1,4 @@
-# DBF
+# DBF [![Build Status](https://secure.travis-ci.org/infused/dbf.png)](http://travis-ci.org/infused/dbf)
 
 DBF is a small fast library for reading dBase, xBase, Clipper and FoxPro
 database files
@@ -17,8 +17,6 @@ DBF is tested to work with the following versions of ruby:
 * JRuby 1.6.2, 1.6.3, 1.6.4, and 1.6.5
 * REE 1.8.6, 1.8.7
 
-[![Build Status](https://secure.travis-ci.org/infused/dbf.png)](http://travis-ci.org/infused/dbf)
-
 ## Installation
   
     gem install dbf
@@ -28,7 +26,6 @@ DBF is tested to work with the following versions of ruby:
 Open a DBF file:
 
     require 'dbf'
-
     widgets = DBF::Table.new("widgets.dbf")
 
 Enumerate all records
@@ -121,7 +118,7 @@ implemented, please give me a shout. FoxBase/dBase II files are not supported
 at this time.
 
 See
-[docs/supported_types.markdown](http://github.com/infused/dbf/blob/master/docs/supported_types.markdown)
+[doc/supported_types.markdown](docs/supported_types.markdown)
 for a full list of supported column types.
 
 ## Limitations
@@ -131,7 +128,7 @@ for a full list of supported column types.
 
 ## License
 
-Copyright (c) 2006-2011 Keith Morrison <keithm@infused.org>
+Copyright (c) 2006-2012 Keith Morrison <keithm@infused.org>
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/dbf.gemspec

@@ -19,11 +19,13 @@ 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_development_dependency 'rspec', '~> 2.7.0'
+  if RUBY_VERSION.to_f < 1.9
+    s.add_dependency 'fastercsv', '~> 1.5.4'
+  end
+  s.add_development_dependency 'rspec', '~> 2.8.0'
   s.add_development_dependency 'rake', '~> 0.9.2'
   
-  if RUBY_VERSION == '1.8.6'
+  if RUBY_VERSION == RUBY_VERSION.to_f >= 1.9
     s.add_development_dependency 'rdoc', '~> 2.5.0'
   else
     s.add_development_dependency 'rdoc', '~> 3.11'

data/docs/supported_types.markdown

@@ -1,25 +1,53 @@
 # DBF supported data types
 
-    +---------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | Version | C | N | L | D | M | F | B | G | P | Y | T | I | V | X | @ | O | + |
-    +---------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 03      | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - | - |
-    +---------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 04      | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - | - |
-    +---------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 05      | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - | - |
-    +---------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 30      | Y | Y | Y | Y | - | Y | Y | N | N | N | N | Y | N | N | N | N | - |
-    +---------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 31      | Y | Y | Y | Y | Y | Y | Y | N | N | N | N | Y | N | N | N | N | N |
-    +---------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 7b      | Y | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - |
-    +---------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 83      | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - |
-    +---------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 8e      | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | N | - | - | - |
-    +---------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | f5      | Y | Y | Y | Y | Y | Y | Y | N | N | N | N | Y | N | N | N | N | N |
-    +---------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | fb      | Y | Y | Y | Y | - | Y | Y | N | N | N | N | Y | N | N | N | N | N |
-    +---------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    | Version | Description                       | C | N | L | D | M | F | B | G | P | Y | T | I | V | X | @ | O | + |
+    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    | 02      | FoxBase                           | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - | - |
+    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    | 03      | dBase III without memo file       | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - | - |
+    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    | 04      | dBase IV without memo file        | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - | - |
+    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    | 05      | dBase V without memo file         | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - | - |
+    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    | 07      | Visual Objects 1.x                | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - | - |
+    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    | 30      | Visual FoxPro                     | Y | Y | Y | Y | - | Y | Y | N | N | N | N | Y | N | N | N | N | - |
+    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    | 31      | Visual FoxPro with AutoIncrement  | Y | Y | Y | Y | Y | Y | Y | N | N | N | N | Y | N | N | N | N | N |
+    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    | 7b      | dBase IV with memo file           | Y | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - |
+    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    | 83      | dBase III with memo file          | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - |
+    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    | 87      | Visual Objects 1.x with memo file | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - |
+    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    | 8b      | dBase IV with memo file           | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | N | - | - | - |
+    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    | 8e      | dBase IV with SQL table           | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | N | - | - | - |
+    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    | f5      | FoxPro with memo file             | Y | Y | Y | Y | Y | Y | Y | N | N | N | N | Y | N | N | N | N | N |
+    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    | fb      | FoxPro without memo file          | Y | Y | Y | Y | - | Y | Y | N | N | N | N | Y | N | N | N | N | N |
+    +---------+-----------------------------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+
+Data type descriptions
+
+* C = Character
+* N = Number
+* L = Logical
+* D = Date
+* M = Memo
+* F = Float
+* B = Binary
+* G = General
+* P = Picture
+* Y = Currency
+* T = DateTime
+* I = Integer
+* V = VariField
+* X = SQL compat
+* @ = Timestamp
+* O = Double
+* + = Autoincrement

data/lib/dbf/column/base.rb

@@ -81,7 +81,7 @@ module DBF
         value.strip =~ /^(y|t)$/i ? true : false
       end
 
-      def encode_string(value)
+      def encode_string(value) #nodoc
         @encoding ? value.force_encoding(@encoding).encode(Encoding.default_external, :undef => :replace, :invalid => :replace) : value
       end
 
@@ -116,7 +116,6 @@ module DBF
         value.gsub(/[^\x20-\x7E]/, "")
       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

@@ -3,7 +3,10 @@ module DBF
   class Record
     # Initialize a new DBF::Record
     # 
-    # @param [DBF::Table] table
+    # @data [String, StringIO] data
+    # @columns [Column]
+    # @version [String]
+    # @memo [DBF::Memo]
     def initialize(data, columns, version, memo)
       @data = StringIO.new(data)
       @columns, @version, @memo = columns, version, memo
@@ -23,7 +26,7 @@ module DBF
     # 
     # @return [Array]
     def to_a
-      @column_names.map { |name| attributes[name] }
+      @column_names.map {|name| attributes[name]}
     end
     
     # Do all search parameters match?
@@ -36,13 +39,11 @@ module DBF
     
     # @return [Hash]
     def attributes
-      return @attributes if @attributes
-      
-      @attributes = Attributes.new
-      @columns.each do |column|
-        @attributes[column.name] = init_attribute(column)
+      @attributes ||= begin
+        attributes = Attributes.new
+        @columns.each {|column| attributes[column.name] = init_attribute(column)}
+        attributes
       end
-      @attributes
     end
     
     private
@@ -50,17 +51,15 @@ module DBF
     def define_accessors #nodoc
       @column_names.each do |name|
         next if respond_to? name
-        self.class.class_eval <<-END
-          def #{name}
-            @#{name} ||= attributes['#{name}']
-          end
-        END
+        self.class.send(:define_method, name) do
+          attributes[name]
+        end
       end
     end
     
     def init_attribute(column) #nodoc
       if column.memo?
-        @memo.get get_memo_start_block(column) if @memo
+        @memo.get get_memo_start_block(column)
       else
         column.type_cast unpack_data(column)
       end
@@ -79,4 +78,4 @@ module DBF
     end
     
   end
-end
+end

data/lib/dbf/table.rb

@@ -12,10 +12,12 @@ module DBF
       "03" => "dBase III without memo file",
       "04" => "dBase IV without memo file",
       "05" => "dBase V without memo file",
+      "07" => "Visual Objects 1.x",
       "30" => "Visual FoxPro",
       "31" => "Visual FoxPro with AutoIncrement field",
       "7b" => "dBase IV with memo file",
       "83" => "dBase III with memo file",
+      "87" => "Visual Objects 1.x with memo file",
       "8b" => "dBase IV with memo file",
       "8e" => "dBase IV with SQL table",
       "f5" => "FoxPro with memo file",
@@ -186,8 +188,9 @@ module DBF
       @columns ||= begin
         @data.seek(DBF_HEADER_SIZE)
         columns = []
-        column_count.times do
-          name, type, length, decimal = @data.read(32).unpack('a10 x a x4 C2')
+        while !["\0", "\r"].include?(first_byte = @data.read(1))
+          column_data = first_byte + @data.read(31)
+          name, type, length, decimal = column_data.unpack('a10 x a x4 C2')
           if length > 0
             columns << column_class.new(name.strip, type, length, decimal, version, @encoding)
           end
@@ -197,7 +200,7 @@ module DBF
     end
     
     def supports_encoding?
-      "".respond_to? :encoding
+      String.new.respond_to? :encoding
     end
     
     def foxpro?
@@ -251,7 +254,7 @@ module DBF
 
     def find_all(options) #nodoc
       map do |record|
-        if record.match? options
+        if record && record.match?(options)
           yield record if block_given?
           record
         end
@@ -259,7 +262,7 @@ module DBF
     end
 
     def find_first(options) #nodoc
-      detect {|record| record.match? options}
+      detect {|record| record && record.match?(options)}
     end
 
     def deleted_record? #nodoc
@@ -268,9 +271,12 @@ module DBF
 
     def get_header_info #nodoc
       @data.rewind
-      @version, @record_count, @header_length, @record_length, encoding_key =
-        @data.read(DBF_HEADER_SIZE).unpack("H2 x3 V v2 x17H2")
-      @encoding = self.class.encodings[encoding_key] if supports_encoding?
+      @version, @record_count, @header_length, @record_length, @encoding_key = read_header
+      @encoding = self.class.encodings[@encoding_key] if supports_encoding?
+    end
+    
+    def read_header #nodoc
+      @data.read(DBF_HEADER_SIZE).unpack("H2 x3 V v2 x17H2")
     end
 
     def seek(offset) #nodoc
@@ -278,7 +284,7 @@ module DBF
     end
 
     def csv_class #nodoc
-      CSV.const_defined?(:Reader) ? FCSV : CSV
+      @csv_class ||= CSV.const_defined?(:Reader) ? FCSV : CSV
     end
 
     def self.encodings #nodoc

data/lib/dbf/version.rb

@@ -1,3 +1,3 @@
 module DBF
-  VERSION = '1.7.2'
+  VERSION = '1.7.3'
 end

data/spec/dbf/table_spec.rb

@@ -202,16 +202,18 @@ describe DBF::Table do
     end
   end
 
-  describe 'when requiring mathn' do
-    describe 'column_count' do
-      let(:table) { DBF::Table.new "#{DB_PATH}/dbase_03.dbf" }
+  describe 'columns' do
+    before do
+      @table = DBF::Table.new "#{DB_PATH}/dbase_03.dbf"
+    end
 
-      it 'returns an integer' do
-        lambda do
-          require 'mathn'
-          table.send(:column_count)
-        end.call.should == 31
-      end
+    it 'should have correct size' do
+      @table.columns.size.should == 31
+    end
+
+    it 'should have correct names' do
+      @table.columns.first.name.should == 'Point_ID'
+      @table.columns[29].name.should == 'Easting'
     end
   end
 end

metadata

@@ -1,96 +1,60 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dbf
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 1.7.3
   prerelease: 
-  segments: 
-  - 1
-  - 7
-  - 2
-  version: 1.7.2
 platform: ruby
-authors: 
+authors:
 - Keith Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: fastercsv
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 5
-        - 4
-        version: 1.5.4
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+date: 2012-02-21 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70326836737820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 7
-        - 0
-        version: 2.7.0
+      - !ruby/object:Gem::Version
+        version: 2.8.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70326836737820
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70326836737100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70326836737100
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70326836736220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 3
-        - 11
-        version: "3.11"
+      - !ruby/object:Gem::Version
+        version: '3.11'
   type: :development
-  version_requirements: *id004
-description: A small fast library for reading dBase, xBase, Clipper and FoxPro database files.
+  prerelease: false
+  version_requirements: *70326836736220
+description: A small fast library for reading dBase, xBase, Clipper and FoxPro database
+  files.
 email: keithm@infused.org
-executables: 
+executables:
 - dbf
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - CHANGELOG.md
 - MIT-LICENSE
-files: 
+files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -134,40 +98,30 @@ files:
 - dbf.gemspec
 homepage: http://github.com/infused/dbf
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 27
-      segments: 
-      - 1
-      - 3
-      - 0
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.0
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Read xBase files
-test_files: 
+test_files:
 - spec/dbf/column_spec.rb
 - spec/dbf/file_formats_spec.rb
 - spec/dbf/record_spec.rb