dbf 2.0.3 → 2.0.4

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2.0.4
+  - memo fields return nil if memo file is missing
+
 # 2.0.3
   - set encoding if table encoding is nil
 
@@ -38,7 +41,7 @@
 
 # 1.6.6
   - add binary data type support to ActiveRecord schema output
-  
+
 # 1.6.5
   - support for visual foxpro double (b) data type
 

data/Gemfile

@@ -1,2 +1,2 @@
 gemspec
-source :rubygems
+source 'https://rubygems.org'

data/Gemfile.lock

@@ -1,30 +1,28 @@
 PATH
   remote: .
   specs:
-    dbf (1.7.4)
+    dbf (2.0.3)
+      fastercsv (~> 1.5.4)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    diff-lcs (1.1.3)
-    json (1.6.5)
+    diff-lcs (1.2.4)
+    fastercsv (1.5.5)
     rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    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.8.0)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   dbf!
-  rake (~> 0.9.2)
-  rdoc (~> 3.11)
-  rspec (~> 2.8.0)
+  rake (>= 0.9.2)
+  rspec (~> 2.13.0)

data/README.md

@@ -1,4 +1,8 @@
-# DBF [![Build Status](https://secure.travis-ci.org/infused/dbf.png)](http://travis-ci.org/infused/dbf)
+# DBF
+[![Build Status](https://secure.travis-ci.org/infused/dbf.png)](http://travis-ci.org/infused/dbf)
+[![Gem Version](https://badge.fury.io/rb/dbf.png)](http://badge.fury.io/rb/dbf)
+[![Code Climate](https://codeclimate.com/github/infused/dbf.png)](https://codeclimate.com/github/infused/dbf)
+[![Dependency Status](https://gemnasium.com/infused/dbf.png)](https://gemnasium.com/infused/dbf)
 
 DBF is a small fast library for reading dBase, xBase, Clipper and FoxPro
 database files
@@ -6,22 +10,22 @@ database files
 * Project page: <http://github.com/infused/dbf>
 * API Documentation: <http://rubydoc.info/github/infused/dbf/frames>
 * Report bugs: <http://github.com/infused/dbf/issues>
-* Questions: Email <mailto:keithm@infused.org> and put DBF somewhere in the 
+* Questions: Email <mailto:keithm@infused.org> and put DBF somewhere in the
   subject line
 
 ## Compatibility
 
 DBF is tested to work with the following versions of ruby:
 
-* MRI Ruby 1.8.6, 1.8.7, 1.9.1, 1.9.2 and 1.9.3
+* MRI Ruby 1.8.6, 1.8.7, 1.9.1, 1.9.2, 1.9.3, 2.0.0
 * JRuby 1.6.x, 1.7.x
-* REE 1.8.6, 1.8.7
-* Rubinius (1.8 mode)
+* REE 1.8.7
+* Rubinius (1.8 and 1.9 modes)
 
 ## Installation
-  
+
     gem install dbf
-  
+
 ## Basic Usage
 
 Open a DBF file:
@@ -35,11 +39,11 @@ Enumerate all records
       puts record.name
       puts record.email
     end
-    
+
 Find a single record
 
     widget = widgets.find(6)
-    
+
 Note that find() will return nil if the requested record has been deleted
 and not yet pruned from the database.
 
@@ -49,16 +53,16 @@ ways
     widget["SlotNumber"]   # original field name in dbf file
     widget['slot_number']  # underscored field name string
     widget[:slot_number]   # underscored field name symbol
-    
+
 Get a hash of all attributes. The keys are the original column names.
 
     widgets.attributes
     => {"Name" => "Thing1", "SlotNumber" => 1}
-  
+
 Search for records using a simple hash format. Multiple search criteria are
 ANDed. Use the block form if the resulting recordset could be large, otherwise
 all records will be loaded into memory.
-    
+
     # find all records with slot_number equal to s42
     widgets.find(:all, :slot_number => 's42') do |widget|
       # the record will be nil if deleted, but not yet pruned from the database
@@ -66,13 +70,13 @@ all records will be loaded into memory.
         puts widget.serial_number
       end
     end
-    
+
     # find the first record with slot_number equal to s42
     widgets.find :first, :slot_number => 's42'
-    
+
     # find record number 10
     widgets.find(10)
-  
+
 ## Migrating to ActiveRecord
 
 An example of migrating a DBF book table to ActiveRecord using a migration:
@@ -80,12 +84,12 @@ An example of migrating a DBF book table to ActiveRecord using a migration:
     require 'dbf'
 
     class Book < ActiveRecord::Base; end
-    
+
     class CreateBooks < ActiveRecord::Migration
       def self.up
         table = DBF::Table.new('db/dbf/books.dbf')
         eval(table.schema)
-        
+
         Book.reset_column_information
         table.each do |record|
           Book.create(:title => record.title, :author => record.author)
@@ -96,7 +100,7 @@ An example of migrating a DBF book table to ActiveRecord using a migration:
         drop_table :books
       end
     end
-  
+
 ## Command-line utility
 
 A small command-line utility called dbf is installed along with the gem.
@@ -107,16 +111,16 @@ A small command-line utility called dbf is installed along with the gem.
       -s = print summary information
       -a = create an ActiveRecord::Schema
       -c = create a csv file
-      
+
 Create an executable ActiveRecord schema:
-    
+
     dbf -a books.dbf > books_schema.rb
-    
+
 Dump all records to a CSV file:
 
     dbf -c books.dbf > books.csv
-      
-## dBase version support
+
+## dBase version compatibility
 
 The basic dBase data types are generally supported well. Support for the
 advanced data types in dbase V and FoxPro are still experimental or not
@@ -135,7 +139,7 @@ for a full list of supported column types.
 
 ## License
 
-Copyright (c) 2006-2012 Keith Morrison <keithm@infused.org>
+Copyright (c) 2006-2013 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/bin/dbf

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby -s
 
-require 'rubygems'
 require 'dbf'
 
 $a ||= false
@@ -23,15 +22,15 @@ else
     table = DBF::Table.new filename
     puts table.schema
   end
-  
+
   if $s
     table = DBF::Table.new filename
     puts
     puts "Database: #{filename}"
     puts "Type: (#{table.version}) #{table.version_description}"
-    puts "Memo File: #{table.has_memo_file? ? 'true' : false}"
+    puts "Memo File: #{table.has_memo_file? ? 'true' : 'false'}"
     puts "Records: #{table.record_count}"
-    
+
     puts "\nFields:"
     puts "Name             Type       Length     Decimal"
     puts "-" * 78

data/dbf.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.homepage = 'http://github.com/infused/dbf'
   s.summary = 'Read xBase files'
   s.description = 'A small fast library for reading dBase, xBase, Clipper and FoxPro database files.'
-  
+
   s.executables = ['dbf']
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'CHANGELOG.md', 'MIT-LICENSE']
@@ -20,9 +20,9 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = '>= 1.3.0'
   s.add_dependency 'fastercsv', '~> 1.5.4'
-  
-  s.add_development_dependency 'rspec', '~> 2.11.0'
-  s.add_development_dependency 'rake', '~> 0.9.2'
+
+  s.add_development_dependency 'rspec', '~> 2.13.0'
+  s.add_development_dependency 'rake', '>= 0.9.2'
 
   # if RUBY_VERSION.to_f >= 1.9
   #   s.add_development_dependency 'ruby-debug19'

data/lib/dbf/column/base.rb

@@ -2,7 +2,7 @@ module DBF
   module Column
     class LengthError < StandardError; end
     class NameError < StandardError; end
-    
+
     class Base
       attr_reader :name, :type, :length, :decimal
 
@@ -32,7 +32,6 @@ module DBF
           when 'D' then decode_date(value)
           when 'T' then decode_datetime(value)
           when 'L' then boolean(value)
-          when 'B' then unpack_binary(value)
           when 'M' then decode_memo(value)
           else          encode_string(value.to_s).strip
         end
@@ -75,7 +74,7 @@ module DBF
         seconds = (milliseconds / 1000).to_i
         DateTime.jd(days, (seconds/3600).to_i, (seconds/60).to_i % 60, seconds % 60) rescue nil
       end
-      
+
       def decode_memo(value) #nodoc
         encode_string(value) if value
       end
@@ -88,9 +87,6 @@ module DBF
         value.unpack('V')[0]
       end
 
-      def unpack_binary(value) #nodoc
-      end
-
       def boolean(value) #nodoc
         value.strip =~ /^(y|t)$/i ? true : false
       end

data/lib/dbf/memo/base.rb

@@ -2,33 +2,34 @@ module DBF
   module Memo
     class Base
       BLOCK_HEADER_SIZE = 8
-    
+      BLOCK_SIZE = 512
+
       def self.open(filename, version)
         self.new File.open(filename, 'rb'), version
       end
-    
+
       def initialize(data, version)
         @data, @version = data, version
       end
-    
+
       def get(start_block)
         if start_block > 0
-          build_memo start_block 
+          build_memo start_block
         end
       end
-    
+
       def close
         @data.close && @data.closed?
       end
-      
+
       def closed?
         @data.closed?
       end
-    
+
       private
-    
+
       def offset(start_block) #nodoc
-        start_block * block_size
+        start_block * BLOCK_SIZE
       end
 
       def content_size(memo_size) #nodoc
@@ -38,10 +39,6 @@ module DBF
       def block_content_size #nodoc
         @block_content_size ||= block_size - BLOCK_HEADER_SIZE
       end
-    
-      def block_size #nodoc
-        512
-      end
     end
   end
 end

data/lib/dbf/memo/dbase3.rb

@@ -5,9 +5,9 @@ module DBF
         @data.seek offset(start_block)
         memo_string = ""
         begin
-          block = @data.read(block_size).gsub(/(\000|\032)/, '')
+          block = @data.read(BLOCK_SIZE).gsub(/(\000|\032)/, '')
           memo_string << block
-        end until block.size < block_size
+        end until block.size < BLOCK_SIZE
         memo_string
       end
     end

data/lib/dbf/record.rb

@@ -1,8 +1,8 @@
 module DBF
-  # An instance of DBF::Record represents a row in the DBF file 
+  # An instance of DBF::Record represents a row in the DBF file
   class Record
     # Initialize a new DBF::Record
-    # 
+    #
     # @data [String, StringIO] data
     # @columns [Column]
     # @version [String]
@@ -11,7 +11,7 @@ module DBF
       @data = StringIO.new(data)
       @columns, @version, @memo = columns, version, memo
     end
-    
+
     # Equality
     #
     # @param [DBF::Record] other
@@ -19,14 +19,14 @@ module DBF
     def ==(other)
       other.respond_to?(:attributes) && other.attributes == attributes
     end
-    
+
     # Maps a row to an array of values
-    # 
+    #
     # @return [Array]
     def to_a
       @columns.map {|column| attributes[column.name]}
     end
-    
+
     # Do all search parameters match?
     #
     # @param [Hash] options
@@ -44,12 +44,12 @@ module DBF
         attributes[@columns[index].name]
       end
     end
-    
+
     # @return [Hash]
     def attributes
       @attributes ||= Hash[@columns.map {|column| [column.name, init_attribute(column)]}]
     end
-    
+
     def respond_to?(method, *args)
       return true if column_names.include?(method.to_s)
       super
@@ -68,27 +68,25 @@ module DBF
     def column_names
       @column_names ||= @columns.map {|column| column.underscored_name}
     end
-    
+
     def init_attribute(column) #nodoc
       value = if column.memo?
-        @memo.get get_memo_start_block(column)
+        @memo && @memo.get(memo_start_block(column))
       else
         unpack_data(column)
       end
-      column.type_cast value
+      column.type_cast(value)
     end
-   
-    def get_memo_start_block(column) #nodoc
-      if %w(30 31).include?(@version)
-        @data.read(column.length).unpack('V').first
-      else
-        unpack_data(column).to_i
-      end
+
+    def memo_start_block(column) #nodoc
+      format = 'V' if %w(30 31).include?(@version)
+      unpack_data(column, format).to_i
     end
 
-    def unpack_data(column) #nodoc
-      @data.read(column.length).unpack("a#{column.length}").first
+    def unpack_data(column, format=nil) #nodoc
+      format ||= "a#{column.length}"
+      @data.read(column.length).unpack(format).first
     end
-    
+
   end
 end