dbf 1.2.9 → 1.3.0

data/CHANGELOG.md

@@ -0,0 +1,126 @@
+## 1.2.9
+
+- Retain trailing whitespace in memos
+
+## 1.2.8
+
+- Handle missing zeros in date values [#11]
+
+## 1.2.7
+
+- MIT License
+
+## 1.2.6
+
+- Support for Ruby 1.9.2
+
+## 1.2.5
+
+- Remove ruby warning switch
+- Requires activesupport version 2.3.5
+
+## 1.2.4
+
+- Add csv output option to dbf command-line utility
+- Read Visual FoxPro memos
+
+## 1.2.3
+
+- Small performance gain when unpacking values from the dbf file
+- Correctly handle FoxPro's integer data type
+
+## 1.2.2
+
+- Handle invalid date fields
+
+## 1.2.1
+
+- Add support for F field type (Float)
+
+## 1.2.0
+
+- Add Table#to_a
+
+## 1.1.1
+
+- Return invalid DateTime columns as nil
+
+## 1.1.0
+
+- Add support for large table that will not fit into memory
+
+## 1.0.13
+
+- Allow passing an array of ids to find
+
+## 1.0.11
+
+- Attributes are now accessible by original or underscored name
+
+## 1.0.9
+
+- Fix incorrect integer column values (only affecting some dbf files)
+- Add CSV export
+
+## 1.0.8
+
+- Truncate column names on NULL
+- Fix schema dump for date and datetime columns
+- Replace internal helpers with ActiveSupport
+- Always underscore attribute names
+
+## 1.0.7
+
+- Remove support for original column names.  All columns names are now downcased/underscored.
+
+## 1.0.6
+
+- DBF::Table now includes the Enumerable module
+- Return nil for memo values if the memo file is missing
+- Finder conditions now support the original and downcased/underscored column names
+
+## 1.0.5
+
+- Strip non-ascii characters from column names
+
+## 1.0.4
+
+- Underscore column names when dumping schemas (FieldId becomes field_id)
+
+## 1.0.3
+
+- Add support for Visual Foxpro Integer and Datetime columns
+
+## 1.0.2
+
+- Compatibility fix for Visual Foxpro memo files (ignore negative memo index values)
+
+## 1.0.1
+
+- Fixes error when using the command-line interface [#11984]
+
+## 1.0.0
+
+- Renamed classes and refactored code in preparation for adding the
+  ability to save records and create/compact databases.
+- The Reader class has been renamed to Table
+- Attributes are no longer accessed directly from the record.  Use record.attribute['column_name']
+  instead, or use the new attribute accessors detailed under Basic Usage.
+
+## 0.5.4
+
+- Ignore deleted records in both memory modes
+
+## 0.5.3
+
+- Added a standalone dbf utility (try dbf -h for help)
+
+## 0.5.0 / 2007-05-25
+
+- New find method
+- Full compatibility with the two flavors of memo file
+- Two modes of operation:
+  - In memory (default): All records are loaded into memory on the first
+    request. Records are retrieved from memory for all subsequent requests.
+  - File I/O: All records are retrieved from disk on every request
+- Improved documentation and more usage examples

data/Gemfile

@@ -0,0 +1,5 @@
+source :rubygems
+
+gem 'activesupport', '3.0.0'
+gem 'i18n', '0.4.1'
+gem 'rspec', '1.3.0'

data/Gemfile.lock

@@ -0,0 +1,14 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.0.0)
+    i18n (0.4.1)
+    rspec (1.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (= 3.0.0)
+  i18n (= 0.4.1)
+  rspec (= 1.3.0)

data/{README.markdown → README.md}

@@ -11,7 +11,7 @@ database files
 
 ## Compatibility
 
-DBF is tested to work with Ruby 1.8.6, 1.8.7, 1.9.1 and 1.9.2-head (using ActiveSupport 2.3.5 and 3 beta 3).
+DBF is tested to work with Ruby 1.8.6, 1.8.7, 1.9.1 and 1.9.2
 
 ## Installation
   
@@ -38,21 +38,21 @@ Load a single record using <tt>record</tt> or <tt>find</tt>
     table.find(6)
 
 Attributes can also be accessed through the attributes hash in original or
-underscored form or as an accessor method using the underscored name.
-(Note that record() will return nil if the requested record has been
-deleted and not yet pruned from the database)
+underscored form or as an accessor method using the underscored name. (Note
+that record() will return nil if the requested record has been deleted and not
+yet pruned from the database)
 
     table.record(4).attributes["PhoneBook"]
     table.record(4).attributes["phone_book"]
     table.record(4).phone_book
   
-Search for records using a simple hash format.  Multiple search criteria are
-ANDed. Use the block form of find if the resulting recordset could be large
-otherwise all records will be loaded into memory.
+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 first_name equal to Keith
     table.find(:all, :first_name => 'Keith') do |record|
-      # the record will be nil if deleted and not yet pruned from the database
+      # the record will be nil if deleted, but not yet pruned from the database
       if record
         puts record.last_name
       end
@@ -100,26 +100,23 @@ A small command-line utility called dbf is installed along with the gem.
 
 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
-supported. If you have any insight into how any of unsupported data
-types are implemented, please give me a shout. FoxBase/dBase II files are not
-supported at this time.
+supported. If you have insight into how any of unsupported data types are
+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) for a full
-list of supported column types.
+See
+[docs/supported_types.markdown](http://github.com/infused/dbf/blob/master/docs/supported_types.markdown)
+for a full list of supported column types.
 
 ## Limitations
 
 * DBF is read-only
-* index files are not utilized
-* No attempt is made to convert character sets based on the code page defined
-  in the dBase file
+* Index files are not utilized
+* No character set conversions from the code page defined in the dBase file
 
 ## License
 
-(The MIT Licence)
-
-Copyright (c) 2006-2010 Keith Morrison <mailto:keithm@infused.org>, 
-<http://www.infused.org>.
+Copyright (c) 2006-2010 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/Rakefile

@@ -1,40 +1,68 @@
-PROJECT_ROOT = File.expand_path(File.dirname(__FILE__))
-$: << File.join(PROJECT_ROOT, 'lib')
+# encoding: utf-8
 
 require 'rubygems'
-require 'jeweler'
-require 'spec/rake/spectask'
-
-Jeweler::Tasks.new do |s|
-  s.name = 'dbf'
-  s.description = 'A small fast library for reading dBase, xBase, Clipper and FoxPro database files.'
-  s.summary = 'Read xBase files'
-  s.platform = Gem::Platform::RUBY
-  s.authors = ['Keith Morrison']
-  s.email = 'keithm@infused.org'
-  s.add_dependency('activesupport', ['>= 2.3.5'])
-  s.add_dependency('fastercsv', ['>= 1.4.0'])
-  s.homepage = 'http://github.com/infused/dbf'
+require 'rubygems/specification'
+
+def gemspec
+  @gemspec ||= begin
+    file = File.expand_path('../dbf.gemspec', __FILE__)
+    eval(File.read(file), binding, file)
+  end
 end
 
-Jeweler::GemcutterTasks.new
+begin
+  require 'rake/gempackagetask'
+rescue LoadError
+  task(:gem) { $stderr.puts '`gem install rake` to package gems' }
+else
+  Rake::GemPackageTask.new(gemspec) do |pkg|
+    pkg.gem_spec = gemspec
+  end
+  task :gem => :gemspec
+end
 
-task :default => :spec
+begin
+  require 'spec/rake/spectask'
+rescue LoadError
+  raise 'Run `gem install rspec` to be able to run specs'
+else
+  task :clear_tmp do
+    FileUtils.rm_rf(File.expand_path("../tmp", __FILE__))
+  end
 
-desc "Run specs"
-Spec::Rake::SpecTask.new :spec do |t|
-  t.spec_files = FileList['spec/**/*spec.rb']
+  desc "Run specs"
+  Spec::Rake::SpecTask.new do |t|
+    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.spec_opts  = %w(-fs --color)
+    t.warning    = true
+  end
+  task :spec
 end
 
-desc "Run rcov"
-Spec::Rake::SpecTask.new :rcov do |t|
-  t.spec_files = FileList['spec/**/*spec.rb']
-  t.rcov = true
-  t.rcov_opts = ["--exclude ~\/.gem"]
+require 'rake'
+require 'rake/rdoctask'
+Rake::RDocTask.new { |rdoc|
+  rdoc.rdoc_dir = 'doc'
+  rdoc.title    = "DBF - A small fast library for reading dBase, xBase, Clipper and FoxPro database files."
+  rdoc.options << '--line-numbers'
+  rdoc.template = "#{ENV['template']}.rb" if ENV['template']
+  rdoc.rdoc_files.include('README.md', 'docs/supported_types.markdown', 'lib/**/*.rb')
+}
+
+desc "install the gem locally"
+task :install => :package do
+  sh %{gem install pkg/#{gemspec.name}-#{gemspec.version}}
 end
 
-desc "Run spec docs"
-Spec::Rake::SpecTask.new :specdoc do |t|
-  t.spec_opts = ["-f specdoc"]
-  t.spec_files = FileList['spec/**/*spec.rb']
+desc "validate the gemspec"
+task :gemspec do
+  gemspec.validate
 end
+
+task :package => :gemspec
+task :default => :spec
+
+desc "Open an irb session preloaded with this library"
+task :console do
+  sh "irb -rubygems -I lib -r dbf.rb"
+end

data/lib/dbf.rb

@@ -1,7 +1,12 @@
 require 'date'
-gem 'activesupport', '>=2.3.5'
-require 'active_support'
-require 'active_support/core_ext'
+gem 'activesupport', '=3.0.0'
+require 'active_support/core_ext/object'
+require 'active_support/core_ext/date/conversions'
+require 'active_support/core_ext/time/conversions'
+require 'active_support/core_ext/date_time/conversions'
+require 'active_support/core_ext/string/conversions'
+require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/string/inflections'
 
 if RUBY_VERSION > '1.9'    
  require 'csv'  
@@ -15,7 +20,7 @@ else
  require 'fastercsv'
 end
 
-require 'dbf/globals'
+require 'dbf/attributes'
 require 'dbf/record'
 require 'dbf/column'
 require 'dbf/table'

data/lib/dbf/attributes.rb

@@ -0,0 +1,6 @@
+class Attributes < Hash
+  def []=(key, value)
+    merge!(key => value)
+    merge!(key.underscore => value)
+  end
+end

data/lib/dbf/column.rb

@@ -1,6 +1,6 @@
 module DBF
-  class ColumnLengthError < DBFError; end
-  class ColumnNameError < DBFError; end
+  class ColumnLengthError < StandardError; end
+  class ColumnNameError < StandardError; end
   
   # DBF::Column stores all the information about a column including its name,
   # type, length and number of decimal places (if any)
@@ -143,6 +143,10 @@ module DBF
       
       s.gsub(/[^\x20-\x7E]/,"")
     end
+    
+    def memo?
+      type == 'M'
+    end
   end
   
 end

data/lib/dbf/record.rb

@@ -1,11 +1,13 @@
 module DBF
-  
   # An instance of DBF::Record represents a row in the DBF file 
   class Record
+    BLOCK_HEADER_SIZE = 8
+    
+    attr_reader :table
     attr_reader :attributes
     attr_reader :memo_block_size
     
-    delegate :columns, :to => :@table
+    delegate :columns, :to => :table
     
     # Initialize a new DBF::Record
     # 
@@ -32,14 +34,21 @@ module DBF
       columns.map { |column| @attributes[column.name.underscore] }
     end
     
+    # Do all search parameters match?
+    #
+    # @param [Hash] options
+    # @return [Boolean]
+    def match?(options)
+      options.all? {|key, value| attributes[key.to_s.underscore] == value}
+    end
+    
     private
     
     # Defined attribute accessor methods
     def define_accessors
       columns.each do |column|
-        underscored_column_name = column.name.underscore
-        unless respond_to?(underscored_column_name)
-          self.class.send :define_method, underscored_column_name do
+        unless self.class.method_defined?(column.name.underscore)
+          self.class.send :define_method, column.name.underscore do
             @attributes[column.name.underscore]
           end
         end
@@ -48,16 +57,11 @@ module DBF
     
     # Initialize values for a row
     def initialize_values
-      @attributes = columns.inject({}) do |hash, column|
-        if column.type == 'M'
-          memo = read_memo(get_starting_block(column))
-          hash[column.name] = memo
-          hash[column.name.underscore] = memo
+      @attributes = columns.inject(Attributes.new) do |hash, column|
+        if column.memo?
+          hash[column.name] = read_memo(get_starting_block(column))
         else
-          value = unpack_data(column.length)
-          type_cast_value = column.type_cast(value)
-          hash[column.name] = type_cast_value
-          hash[column.name.underscore] = type_cast_value
+          hash[column.name] = column.type_cast(unpack_data(column.length))
         end
         hash
       end
@@ -86,8 +90,7 @@ module DBF
     # @param [Fixnum] start_block
     def read_memo(start_block)
       return nil if !@table.has_memo_file? || start_block < 1
-
-      @table.memo_file_format == :fpt ? build_fpt_memo(start_block) : build_dbt_memo(start_block)
+      send "build_#{@table.memo_file_format}_memo", start_block
     end
     
     # Reconstructs a memo from an FPT memo file
@@ -98,7 +101,7 @@ module DBF
       @memo.seek(start_block * memo_block_size)
       
       memo_type, memo_size, memo_string = @memo.read(memo_block_size).unpack("NNa*")
-      return nil unless memo_type == 1 and memo_size > 0
+      return nil unless memo_type == 1 && memo_size > 0
       
       if memo_size > memo_block_content_size
         memo_string << @memo.read(memo_content_size(memo_size))

data/lib/dbf/table.rb

@@ -3,6 +3,24 @@ module DBF
   # DBF::Table is the primary interface to a single DBF file and provides 
   # methods for enumerating and searching the records.
   class Table
+    DBF_HEADER_SIZE = 32
+    FPT_HEADER_SIZE = 512
+    
+    VERSION_DESCRIPTIONS = {
+      "02" => "FoxBase",
+      "03" => "dBase III without memo file",
+      "04" => "dBase IV without memo file",
+      "05" => "dBase V without memo file",
+      "30" => "Visual FoxPro",
+      "31" => "Visual FoxPro with AutoIncrement field",
+      "7b" => "dBase IV with memo file",
+      "83" => "dBase III with memo file",
+      "8b" => "dBase IV with memo file",
+      "8e" => "dBase IV with SQL table",
+      "f5" => "FoxPro with memo file",
+      "fb" => "FoxPro without memo file"
+    }
+    
     attr_reader :column_count           # The total number of columns
     attr_reader :columns                # An array of DBF::Column
     attr_reader :version                # Internal dBase version number
@@ -35,7 +53,7 @@ module DBF
     def reload!
       @records = nil
       get_header_info
-      get_memo_header_info if @memo
+      get_memo_header_info
       get_column_descriptors
     end
     
@@ -59,10 +77,7 @@ module DBF
     #
     # @yield [nil, DBF::Record]
     def each
-      0.upto(@record_count - 1) do |n|
-        seek_to_record(n)
-        yield current_record
-      end
+      0.upto(@record_count - 1) {|index| yield record(index)}
     end
     
     # Retrieve a record by index number.
@@ -189,9 +204,9 @@ module DBF
     def find_all(options, &block)
       results = []
       each do |record|
-        if record && all_values_match?(record, options)
+        if record.try(:match?, options)
           if block_given?
-            yield(record)
+            yield record
           else
             results << record
           end
@@ -206,20 +221,11 @@ module DBF
     # @return [DBF::Record, nil]
     def find_first(options)
       each do |record|
-        return record if record && all_values_match?(record, options)
+        return record if record.try(:match?, options)
       end
       nil
     end
     
-    # Do all search parameters match?
-    #
-    # @param [DBF::Record] record
-    # @param [Hash] options
-    # @return [Boolean]
-    def all_values_match?(record, options)
-      options.all? {|key, value| record.attributes[key.to_s.underscore] == value}
-    end
-    
     # Open memo file
     #
     # @params [String] path
@@ -279,13 +285,15 @@ module DBF
     
     # Determines the memo block size and next available block
     def get_memo_header_info
-      @memo.rewind
-      if @memo_file_format == :fpt
-        @memo_next_available_block, @memo_block_size = @memo.read(FPT_HEADER_SIZE).unpack('N x2 n')
-        @memo_block_size = 0 if @memo_block_size.nil?
-      else
-        @memo_block_size = 512
-        @memo_next_available_block = File.size(@memo.path) / @memo_block_size
+      if has_memo_file?
+        @memo.rewind
+        if @memo_file_format == :fpt
+          @memo_next_available_block, @memo_block_size = @memo.read(FPT_HEADER_SIZE).unpack('N x2 n')
+          @memo_block_size = 0 if @memo_block_size.nil?
+        else
+          @memo_block_size = 512
+          @memo_next_available_block = File.size(@memo.path) / @memo_block_size
+        end
       end
     end
     

data/lib/dbf/version.rb

@@ -0,0 +1,3 @@
+module DBF
+  VERSION = '1.3.0'
+end

data/spec/unit/column_spec.rb

@@ -7,19 +7,19 @@ describe DBF::Column do
       @column = DBF::Column.new "ColumnName", "N", 1, 0
     end
     
-    it "should set the #name accessor" do
+    it "sets the #name accessor" do
       @column.name.should == "ColumnName"
     end
     
-    it "should set the #type accessor" do
+    it "sets the #type accessor" do
       @column.type.should == "N"
     end
     
-    it "should set the #length accessor" do
+    it "sets the #length accessor" do
       @column.length.should == 1
     end
     
-    it "should set the #decimal accessor" do
+    it "sets the #decimal accessor" do
       @column.decimal.should == 0
     end
     
@@ -36,20 +36,20 @@ describe DBF::Column do
     end
   end
   
-  context "#type_cast" do
+  context '#type_cast' do
     context 'with type N (number)' do
-      context 'with 0 decimals' do
-        it 'should cast value to Fixnum' do
-          value = "135"
+      context 'and 0 decimals' do
+        it 'casts value to Fixnum' do
+          value = '135'
           column = DBF::Column.new "ColumnName", "N", 3, 0
           column.type_cast(value).should be_a Fixnum
           column.type_cast(value).should == 135
         end
       end
       
-      context 'with more than 0 decimals' do
-        it "should cast value to Float" do
-          value = "13.5"
+      context 'and more than 0 decimals' do
+        it 'casts value to Float' do
+          value = '13.5'
           column = DBF::Column.new "ColumnName", "N", 2, 1
           column.type_cast(value).should be_a Float
           column.type_cast(value).should == 13.5
@@ -58,8 +58,8 @@ describe DBF::Column do
     end
     
     context 'with type F (float)' do
-      it "should cast value to Float" do
-        value = "135"
+      it 'casts value to Float' do
+        value = '135'
         column = DBF::Column.new "ColumnName", "F", 3, 0
         column.type_cast(value).should be_a Float
         column.type_cast(value).should == 135.0
@@ -67,33 +67,30 @@ describe DBF::Column do
     end
     
     context 'with type I (integer)' do
-      it "should cast value to Fixnum" do
+      it "casts value to Fixnum" do
         value = "\203\171\001\000"
         column = DBF::Column.new "ColumnName", "I", 3, 0
-        column.type_cast(value).should be_a Fixnum
         column.type_cast(value).should == 96643
       end
     end
     
     context 'with type L (logical/boolean)' do
-      it "should cast 'y' to true" do
+      it "casts 'y' to true" do
         value = "y"
         column = DBF::Column.new "ColumnName", "L", 1, 0
-        column.type_cast(value).should be_a TrueClass
         column.type_cast(value).should == true
       end
       
-      it "should cast 'n' to false" do
+      it "casts 'n' to false" do
         value = "n"
         column = DBF::Column.new "ColumnName", "L", 1, 0
-        column.type_cast(value).should be_a FalseClass
         column.type_cast(value).should == false
       end
     end
     
     context 'with type T (datetime)' do
       context 'with valid datetime' do
-        it "should cast to DateTime" do
+        it "casts to DateTime" do
           value = "Nl%\000\300Z\252\003"
           column = DBF::Column.new "ColumnName", "T", 16, 0
           column.type_cast(value).should == "2002-10-10T17:04:56+00:00"
@@ -101,7 +98,7 @@ describe DBF::Column do
       end
       
       context 'with invalid datetime' do
-        it "should cast to nil" do
+        it "casts to nil" do
           value = "Nl%\000\000A\000\999"
           column = DBF::Column.new "ColumnName", "T", 16, 0
           column.type_cast(value).should be_nil
@@ -111,7 +108,7 @@ describe DBF::Column do
     
     context 'with type D (date)' do
       context 'with valid date' do
-        it "should cast to Date" do
+        it "casts to Date" do
           value = "20050712"
           column = DBF::Column.new "ColumnName", "D", 8, 0
           column.type_cast(value).should == Date.new(2005,7,12)
@@ -119,7 +116,7 @@ describe DBF::Column do
       end
       
       context 'with invalid date' do
-        it "should cast to Date" do
+        it "casts to nil" do
           value = "0"
           column = DBF::Column.new "ColumnName", "D", 8, 0
           column.type_cast(value).should be_nil
@@ -128,7 +125,7 @@ describe DBF::Column do
     end
     
     context 'with type M (memo)' do
-      it "should typecast memo columns to String" do
+      it "casts to string" do
         value = 'abc'
         column = DBF::Column.new "ColumnName", "M", 3, 0
         column.type_cast(value).should be_a String
@@ -138,38 +135,38 @@ describe DBF::Column do
   
   context "#schema_definition" do
     context 'with type N (number)' do
-      it "should output an integer column" do
+      it "outputs an integer column" do
         column = DBF::Column.new "ColumnName", "N", 1, 0
         column.schema_definition.should == "\"column_name\", :integer\n"
       end
     end
     
-    it "should define a float colmn if type is (N)umber with more than 0 decimals" do
+    it "defines a float colmn if type is (N)umber with more than 0 decimals" do
       column = DBF::Column.new "ColumnName", "N", 1, 2
       column.schema_definition.should == "\"column_name\", :float\n"
     end
     
-    it "should define a date column if type is (D)ate" do
+    it "defines a date column if type is (D)ate" do
       column = DBF::Column.new "ColumnName", "D", 8, 0
       column.schema_definition.should == "\"column_name\", :date\n"
     end
     
-    it "should define a datetime column if type is (D)ate" do
+    it "defines a datetime column if type is (D)ate" do
       column = DBF::Column.new "ColumnName", "T", 16, 0
       column.schema_definition.should == "\"column_name\", :datetime\n"
     end
     
-    it "should define a boolean column if type is (L)ogical" do
+    it "defines a boolean column if type is (L)ogical" do
       column = DBF::Column.new "ColumnName", "L", 1, 0
       column.schema_definition.should == "\"column_name\", :boolean\n"
     end
     
-    it "should define a text column if type is (M)emo" do
+    it "defines a text column if type is (M)emo" do
       column = DBF::Column.new "ColumnName", "M", 1, 0
       column.schema_definition.should == "\"column_name\", :text\n"
     end
     
-    it "should define a string column with length for any other data types" do
+    it "defines a string column with length for any other data types" do
       column = DBF::Column.new "ColumnName", "X", 20, 0
       column.schema_definition.should == "\"column_name\", :string, :limit => 20\n"
     end
@@ -180,11 +177,11 @@ describe DBF::Column do
       @column = DBF::Column.new "ColumnName", "N", 1, 0
     end
     
-    it "should strip characters below decimal 32 and above decimal 127" do
+    it "strips characters below decimal 32 and above decimal 127" do
       @column.strip_non_ascii_chars("--\x1F-\x68\x65\x6C\x6C\x6F world-\x80--").should == "---hello world---"
     end
 
-    it "should truncate characters with decimal 0" do
+    it "truncates characters with decimal 0" do
       @column.strip_non_ascii_chars("--\x1F-\x68\x65\x6C\x6C\x6F \x00 world-\x80--").should == "---hello "
     end
   end

data/spec/unit/record_spec.rb

@@ -10,14 +10,14 @@ describe DBF::Record do
   def mock_table(data = '')
     @column1 = DBF::Column.new 'ColumnName', 'N', 1, 0
     
-    returning mock('table') do |table|
-      table.stub!(:memo_block_size).and_return(8)
-      table.stub!(:memo).and_return(nil)
-      table.stub!(:columns).and_return([@column1])
-      table.stub!(:data).and_return(data)
-      table.stub!(:has_memo_file?).and_return(true)
-      table.data.stub!(:read).and_return(data)
-    end
+    table = mock('table')
+    table.stub!(:memo_block_size).and_return(8)
+    table.stub!(:memo).and_return(nil)
+    table.stub!(:columns).and_return([@column1])
+    table.stub!(:data).and_return(data)
+    table.stub!(:has_memo_file?).and_return(true)
+    table.data.stub!(:read).and_return(data)
+    table
   end
   
   describe '#memo_block_content_size' do

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dbf
 version: !ruby/object:Gem::Version 
-  hash: 13
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 9
-  version: 1.2.9
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Keith Morrison
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-22 00:00:00 -07:00
+date: 2010-10-08 00:00:00 -07:00
 default_executable: dbf
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,14 +23,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
-        - 2
         - 3
-        - 5
-        version: 2.3.5
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,16 +38,30 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
-        - 4
-        - 0
-        version: 1.4.0
+        - 5
+        - 3
+        version: 1.5.3
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :development
+  version_requirements: *id003
 description: A small fast library for reading dBase, xBase, Clipper and FoxPro database files.
 email: keithm@infused.org
 executables: 
@@ -57,23 +69,23 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- README.markdown
+- README.md
+- CHANGELOG.md
 files: 
-- .autotest
-- .gitignore
-- History.txt
+- CHANGELOG.md
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
-- README.markdown
 - Rakefile
-- VERSION.yml
+- README.md
 - bin/dbf
-- dbf.gemspec
 - docs/supported_types.markdown
-- lib/dbf.rb
+- lib/dbf/attributes.rb
 - lib/dbf/column.rb
-- lib/dbf/globals.rb
 - lib/dbf/record.rb
 - lib/dbf/table.rb
+- lib/dbf/version.rb
+- lib/dbf.rb
 - spec/fixtures/dbase_03.dbf
 - spec/fixtures/dbase_30.dbf
 - spec/fixtures/dbase_30.fpt
@@ -110,7 +122,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -119,10 +130,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
+      - 1
+      - 3
       - 0
-      version: "0"
+      version: 1.3.0
 requirements: []
 
 rubyforge_project: 
@@ -131,14 +143,12 @@ signing_key:
 specification_version: 3
 summary: Read xBase files
 test_files: 
-- spec/functional/dbf_shared.rb
 - spec/functional/format_03_spec.rb
 - spec/functional/format_30_spec.rb
 - spec/functional/format_31_spec.rb
 - spec/functional/format_83_spec.rb
 - spec/functional/format_8b_spec.rb
 - spec/functional/format_f5_spec.rb
-- spec/spec_helper.rb
 - spec/unit/column_spec.rb
 - spec/unit/record_spec.rb
 - spec/unit/table_spec.rb

data/.autotest

@@ -1,15 +0,0 @@
-Autotest.add_hook :initialize do |autotest|
-  autotest.clear_mappings
-  
-  autotest.add_mapping(%r%^lib/dbf/(.*)\.rb$%) do |filename, m|
-    autotest.files_matching %r!spec/(unit|functional)/#{m[1]}_spec.rb!
-  end
-  
-  autotest.add_mapping(%r%^spec/(unit|functional)/.*\.rb$%) do |filename, m|
-    filename
-  end
-  
-  %w{.svn .hg .git .dbf .dbt .fpt .txt bin Rakefile .gemspec .autotest}.each  do |exception|
-    autotest.add_exception(exception)
-  end
-end

data/.gitignore

@@ -1 +0,0 @@
-.DS_Store

data/History.txt

@@ -1,118 +0,0 @@
-== 1.2.7
-
-* MIT License
-
-== 1.2.6
-
-* Support for Ruby 1.9.2
-
-== 1.2.5
-
-* Remove ruby warning switch
-* Requires activesupport version 2.3.5
-
-== 1.2.4
-
-* Add csv output option to dbf command-line utility
-* Read Visual FoxPro memos
-
-== 1.2.3
-
-* Small performance gain when unpacking values from the dbf file
-* Correctly handle FoxPro's integer data type
-
-== 1.2.2
-
-* Handle invalid date fields
-
-== 1.2.1
-
-* Add support for F field type (Float)
-
-== 1.2.0
-
-* Add Table#to_a
-
-== 1.1.1
-
-* Return invalid DateTime columns as nil
-
-== 1.1.0
-
-* Add support for large table that will not fit into memory
-
-== 1.0.13
-
-* Allow passing an array of ids to find
-
-== 1.0.11
-
-* Attributes are now accessible by original or underscored name
-
-== 1.0.9
-
-* Fix incorrect integer column values (only affecting some dbf files)
-* Add CSV export
-
-== 1.0.8
-
-* Truncate column names on NULL
-* Fix schema dump for date and datetime columns
-* Replace internal helpers with ActiveSupport
-* Always underscore attribute names
-
-== 1.0.7
-
-* Remove support for original column names.  All columns names are now downcased/underscored.
-
-== 1.0.6
-
-* DBF::Table now includes the Enumerable module
-* Return nil for memo values if the memo file is missing
-* Finder conditions now support the original and downcased/underscored column names
-
-== 1.0.5
-
-* Strip non-ascii characters from column names
-
-== 1.0.4
-
-* Underscore column names when dumping schemas (FieldId becomes field_id)
-
-== 1.0.3
-
-* Add support for Visual Foxpro Integer and Datetime columns
-
-== 1.0.2
-
-* Compatibility fix for Visual Foxpro memo files (ignore negative memo index values)
-
-== 1.0.1
-
-* Fixes error when using the command-line interface [#11984]
-
-== 1.0.0
-
-* Renamed classes and refactored code in preparation for adding the
-  ability to save records and create/compact databases.
-* The Reader class has been renamed to Table
-* Attributes are no longer accessed directly from the record.  Use record.attribute['column_name']
-  instead, or use the new attribute accessors detailed under Basic Usage.
-
-== 0.5.4
-
-* Ignore deleted records in both memory modes
-
-== 0.5.3
-
-* Added a standalone dbf utility (try dbf -h for help)
-
-== 0.5.0 / 2007-05-25
-
-* New find method
-* Full compatibility with the two flavors of memo file
-* Two modes of operation:
-  * In memory (default): All records are loaded into memory on the first
-    request. Records are retrieved from memory for all subsequent requests.
-  * File I/O: All records are retrieved from disk on every request
-* Improved documentation and more usage examples

data/VERSION.yml

@@ -1,5 +0,0 @@
---- 
-:patch: 9
-:build: 
-:major: 1
-:minor: 2

data/dbf.gemspec

@@ -1,94 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{dbf}
-  s.version = "1.2.9"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Keith Morrison"]
-  s.date = %q{2010-07-22}
-  s.default_executable = %q{dbf}
-  s.description = %q{A small fast library for reading dBase, xBase, Clipper and FoxPro database files.}
-  s.email = %q{keithm@infused.org}
-  s.executables = ["dbf"]
-  s.extra_rdoc_files = [
-    "README.markdown"
-  ]
-  s.files = [
-    ".autotest",
-     ".gitignore",
-     "History.txt",
-     "MIT-LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "VERSION.yml",
-     "bin/dbf",
-     "dbf.gemspec",
-     "docs/supported_types.markdown",
-     "lib/dbf.rb",
-     "lib/dbf/column.rb",
-     "lib/dbf/globals.rb",
-     "lib/dbf/record.rb",
-     "lib/dbf/table.rb",
-     "spec/fixtures/dbase_03.dbf",
-     "spec/fixtures/dbase_30.dbf",
-     "spec/fixtures/dbase_30.fpt",
-     "spec/fixtures/dbase_31.dbf",
-     "spec/fixtures/dbase_83.dbf",
-     "spec/fixtures/dbase_83.dbt",
-     "spec/fixtures/dbase_83_schema.txt",
-     "spec/fixtures/dbase_8b.dbf",
-     "spec/fixtures/dbase_8b.dbt",
-     "spec/fixtures/dbase_f5.dbf",
-     "spec/fixtures/dbase_f5.fpt",
-     "spec/functional/dbf_shared.rb",
-     "spec/functional/format_03_spec.rb",
-     "spec/functional/format_30_spec.rb",
-     "spec/functional/format_31_spec.rb",
-     "spec/functional/format_83_spec.rb",
-     "spec/functional/format_8b_spec.rb",
-     "spec/functional/format_f5_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/unit/column_spec.rb",
-     "spec/unit/record_spec.rb",
-     "spec/unit/table_spec.rb"
-  ]
-  s.homepage = %q{http://github.com/infused/dbf}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Read xBase files}
-  s.test_files = [
-    "spec/functional/dbf_shared.rb",
-     "spec/functional/format_03_spec.rb",
-     "spec/functional/format_30_spec.rb",
-     "spec/functional/format_31_spec.rb",
-     "spec/functional/format_83_spec.rb",
-     "spec/functional/format_8b_spec.rb",
-     "spec/functional/format_f5_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/unit/column_spec.rb",
-     "spec/unit/record_spec.rb",
-     "spec/unit/table_spec.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.5"])
-      s.add_runtime_dependency(%q<fastercsv>, [">= 1.4.0"])
-    else
-      s.add_dependency(%q<activesupport>, [">= 2.3.5"])
-      s.add_dependency(%q<fastercsv>, [">= 1.4.0"])
-    end
-  else
-    s.add_dependency(%q<activesupport>, [">= 2.3.5"])
-    s.add_dependency(%q<fastercsv>, [">= 1.4.0"])
-  end
-end
-

data/lib/dbf/globals.rb

@@ -1,22 +0,0 @@
-module DBF
-  DBF_HEADER_SIZE = 32
-  FPT_HEADER_SIZE = 512
-  BLOCK_HEADER_SIZE = 8
-  VERSION_DESCRIPTIONS = {
-    "02" => "FoxBase",
-    "03" => "dBase III without memo file",
-    "04" => "dBase IV without memo file",
-    "05" => "dBase V without memo file",
-    "30" => "Visual FoxPro",
-    "31" => "Visual FoxPro with AutoIncrement field",
-    "7b" => "dBase IV with memo file",
-    "83" => "dBase III with memo file",
-    "8b" => "dBase IV with memo file",
-    "8e" => "dBase IV with SQL table",
-    "f5" => "FoxPro with memo file",
-    "fb" => "FoxPro without memo file"
-  }
-  
-  class DBFError < StandardError
-  end
-end