dbf 1.7.1 → 1.7.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.7.2
+  - Fix integer division under Ruby 1.8 when requiring mathn
+    standard library (see http://bugs.ruby-lang.org/issues/2121)
+
 # 1.7.1
   - Fix Table.FOXPRO_VERSIONS breakage on Ruby 1.8
 

data/Gemfile.lock

@@ -1,20 +1,19 @@
 PATH
   remote: .
   specs:
-    dbf (1.7.0)
+    dbf (1.7.2)
       fastercsv (~> 1.5.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    archive-tar-minitar (0.5.2)
-    columnize (0.3.4)
     diff-lcs (1.1.3)
     fastercsv (1.5.4)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
+    json (1.6.3)
+    json (1.6.3-java)
     rake (0.9.2.2)
-    rdoc (3.9.4)
+    rdoc (3.11)
+      json (~> 1.4)
     rspec (2.7.0)
       rspec-core (~> 2.7.0)
       rspec-expectations (~> 2.7.0)
@@ -23,23 +22,13 @@ GEM
     rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.7.0)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   dbf!
   rake (~> 0.9.2)
-  rdoc (~> 3.9.0)
+  rdoc (~> 3.11)
   rspec (~> 2.7.0)
-  ruby-debug19

data/README.md

@@ -11,7 +11,13 @@ database files
 
 ## Compatibility
 
-DBF is tested to work with MRI Ruby 1.8.6, 1.8.7, 1.9.2, 1.9.3 and Jruby 1.6.2
+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
+* 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
   

data/Rakefile

@@ -6,7 +6,11 @@ Bundler.setup(:default, :development)
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new :spec do |t|
-  t.rspec_opts = %w(-fs --color)
+  t.rspec_opts = %w(--color)
+end
+
+RSpec::Core::RakeTask.new :specdoc do |t|
+  t.rspec_opts = %w(-fl)
 end
 
 require 'rake'
@@ -30,4 +34,31 @@ end
 # MetricFu::Configuration.run do |config|
 #   config.rcov[:test_files] = ['spec/**/*_spec.rb']  
 #   config.rcov[:rcov_opts] << "-Ispec"
-# end
+# end
+
+namespace :test do
+  task :rubies do
+    require File.expand_path('spec/rvm_ruby_runner', File.dirname(__FILE__))
+    
+    current_rvm = `rvm info`.lines.to_a[1]
+  
+    rubies = %w(
+      ree-1.8.6
+      ree-1.8.7
+      jruby-1.6.2
+      jruby-1.6.3
+      jruby-1.6.4
+      jruby-1.6.5
+      ruby-1.8.6 
+      ruby-1.8.7
+      ruby-1.9.1
+      ruby-1.9.2
+      ruby-1.9.3
+    )
+    rubies.each do |version|
+      puts RvmRubyRunner.run(version)
+    end
+  
+    `rvm use #{current_rvm}`
+  end
+end

data/dbf.gemspec

@@ -0,0 +1,39 @@
+lib = File.expand_path('../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
+require 'dbf/version'
+
+Gem::Specification.new do |s|
+  s.name = 'dbf'
+  s.version = DBF::VERSION
+  s.authors = ['Keith Morrison']
+  s.email = 'keithm@infused.org'
+  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']
+  s.files = Dir['[A-Z]*', '{bin,docs,lib,spec}/**/*', 'dbf.gemspec']
+  s.test_files = Dir.glob('spec/**/*_spec.rb')
+  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'
+  s.add_development_dependency 'rake', '~> 0.9.2'
+  
+  if RUBY_VERSION == '1.8.6'
+    s.add_development_dependency 'rdoc', '~> 2.5.0'
+  else
+    s.add_development_dependency 'rdoc', '~> 3.11'
+  end
+
+  # if RUBY_VERSION.to_f >= 1.9
+  #   s.add_development_dependency 'ruby-debug19'
+  # elsif RUBY_VERSION != '1.8.6'
+  #   s.add_development_dependency 'ruby-debug'
+  # end
+  # s.add_development_dependency 'metric_fu'
+end
+

data/lib/dbf.rb

@@ -9,7 +9,11 @@ end
 require 'dbf/util'
 require 'dbf/attributes'
 require 'dbf/record'
-require 'dbf/column'
-require 'dbf/foxpro_column'
+require 'dbf/column/base'
+require 'dbf/column/dbase'
+require 'dbf/column/foxpro'
 require 'dbf/table'
-require 'dbf/memo'
+require 'dbf/memo/base'
+require 'dbf/memo/dbase3'
+require 'dbf/memo/dbase4'
+require 'dbf/memo/foxpro'

data/lib/dbf/column/base.rb

@@ -0,0 +1,122 @@
+module DBF
+  module Column
+    class LengthError < StandardError; end
+    class NameError < StandardError; end
+    
+    class Base
+      attr_reader :name, :type, :length, :decimal
+
+      # Initialize a new DBF::Column
+      #
+      # @param [String] name
+      # @param [String] type
+      # @param [Fixnum] length
+      # @param [Fixnum] decimal
+      def initialize(name, type, length, decimal, version, encoding=nil)
+        @name, @type, @length, @decimal, @version, @encoding = clean(name), type, length, decimal, version, encoding
+
+        raise LengthError, "field length must be greater than 0" unless length > 0
+        raise NameError, "column name cannot be empty" if @name.length == 0
+      end
+
+      # Cast value to native type
+      #
+      # @param [String] value
+      # @return [Fixnum, Float, Date, DateTime, Boolean, String]
+      def type_cast(value)
+        case type
+          when 'N' then unpack_number(value)
+          when 'I' then unpack_unsigned_long(value)
+          when 'F' then value.to_f
+          when 'D' then decode_date(value)
+          when 'T' then decode_datetime(value)
+          when 'L' then boolean(value)
+          when 'B' then unpack_binary(value)
+          else          encode_string(value.to_s).strip
+        end
+      end
+
+      def memo?
+        @memo ||= type == 'M'
+      end
+
+      # Schema definition
+      #
+      # @return [String]
+      def schema_definition
+        "\"#{underscored_name}\", #{schema_data_type}\n"
+      end
+
+      def underscored_name
+        @underscored_name ||= Util.underscore(name)
+      end
+
+      private
+
+      def decode_date(value) #nodoc
+        value.gsub!(' ', '0')
+        value !~ /\S/ ? nil : Date.parse(value)
+      rescue
+        nil
+      end
+
+      def decode_datetime(value) #nodoc
+        days, milliseconds = value.unpack('l2')
+        seconds = (milliseconds / 1000).to_i
+        DateTime.jd(days, (seconds/3600).to_i, (seconds/60).to_i % 60, seconds % 60) rescue nil
+      end
+
+      def unpack_number(value) #nodoc
+        decimal.zero? ? value.to_i : value.to_f
+      end
+
+      def unpack_unsigned_long(value) #nodoc
+        value.unpack('V')[0]
+      end
+
+      def unpack_binary(value) #nodoc
+      end
+
+      def boolean(value) #nodoc
+        value.strip =~ /^(y|t)$/i ? true : false
+      end
+
+      def encode_string(value)
+        @encoding ? value.force_encoding(@encoding).encode(Encoding.default_external, :undef => :replace, :invalid => :replace) : value
+      end
+
+      def schema_data_type #nodoc
+        case type
+        when "N", "F"
+          decimal > 0 ? ":float" : ":integer"
+        when "I"
+          ":integer"
+        when "D"
+          ":date"
+        when "T"
+          ":datetime"
+        when "L"
+          ":boolean"
+        when "M"
+          ":text"
+        when "B"
+          if DBF::Table::FOXPRO_VERSIONS.keys.include?(@version)
+            decimal > 0 ? ":float" : ":integer"
+          else
+            ":text"
+          end
+        else
+          ":string, :limit => #{length}"
+        end
+      end
+
+      def clean(value) #nodoc
+        first_null = value.index("\x00")
+        value = value[0, first_null] if first_null
+        value.gsub(/[^\x20-\x7E]/, "")
+      end
+
+      
+    end
+  end
+end

data/lib/dbf/column/dbase.rb

@@ -0,0 +1,7 @@
+module DBF
+  module Column
+    class Dbase < Base
+      
+    end
+  end
+end

data/lib/dbf/column/foxpro.rb

@@ -0,0 +1,9 @@
+module DBF
+  module Column
+    class Foxpro < Base
+      def unpack_binary(value) #nodoc
+        value.unpack('d')[0]
+      end
+    end
+  end
+end

data/lib/dbf/memo/base.rb

@@ -0,0 +1,43 @@
+module DBF
+  module Memo
+    class Base
+      BLOCK_HEADER_SIZE = 8
+    
+      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 
+        end
+      end
+    
+      def close
+        @data.close
+      end
+    
+      private
+    
+      def offset(start_block) #nodoc
+        start_block * block_size
+      end
+
+      def content_size(memo_size) #nodoc
+        (memo_size - block_size) + BLOCK_HEADER_SIZE
+      end
+
+      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

@@ -0,0 +1,15 @@
+module DBF
+  module Memo
+    class Dbase3 < Base
+      def build_memo(start_block) #nodoc
+        @data.seek offset(start_block)
+        memo_string = ""
+        begin
+          block = @data.read(block_size).gsub(/(\000|\032)/, '')
+          memo_string << block
+        end until block.size < block_size
+        memo_string
+      end
+    end
+  end
+end

data/lib/dbf/memo/dbase4.rb

@@ -0,0 +1,10 @@
+module DBF
+  module Memo
+    class Dbase4 < Base
+      def build_memo(start_block) #nodoc
+        @data.seek offset(start_block)
+        @data.read(@data.read(BLOCK_HEADER_SIZE).unpack("x4L").first)
+      end
+    end
+  end
+end

data/lib/dbf/memo/foxpro.rb

@@ -0,0 +1,30 @@
+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
+          memo_string = memo_string[0, memo_size]
+        end
+        memo_string
+      end
+    
+      private
+    
+      def block_size #nodoc
+        @block_size ||= begin
+          @data.rewind
+          @data.read(FPT_HEADER_SIZE).unpack('x6n').first || 0
+        end
+      end
+    end
+  end
+end

data/lib/dbf/table.rb

@@ -199,35 +199,51 @@ module DBF
     def supports_encoding?
       "".respond_to? :encoding
     end
+    
+    def foxpro?
+      FOXPRO_VERSIONS.keys.include? @version
+    end
 
     private
     
     def column_class #nodoc
-      @column_class ||= if FOXPRO_VERSIONS.keys.include?(version)
-        FoxproColumn
-      else 
-        Column
+      @column_class ||= if foxpro?
+        Column::Foxpro
+      else
+        Column::Dbase
+      end
+    end
+    
+    def memo_class #nodoc
+      @memo_class ||= if foxpro?
+        Memo::Foxpro
+      else
+        if @version == "83"
+          Memo::Dbase3
+        else
+          Memo::Dbase4
+        end
       end
     end
     
     def column_count #nodoc
-      @column_count ||= (@header_length - DBF_HEADER_SIZE + 1) / DBF_HEADER_SIZE
+      @column_count ||= ((@header_length - DBF_HEADER_SIZE + 1) / DBF_HEADER_SIZE).to_i
     end
 
-    def open_data(data)
+    def open_data(data) #nodoc
       data.is_a?(StringIO) ? data : File.open(data, 'rb')
     end
 
     def open_memo(data, memo = nil) #nodoc
       if memo.is_a? StringIO
-        DBF::Memo.new(memo, version)
+        memo_class.new(memo, version)
       elsif memo
-        DBF::Memo.open(memo, version)
+        memo_class.open(memo, version)
       elsif !data.is_a? StringIO
         dirname = File.dirname(data)
         basename = File.basename(data, '.*')
         files = Dir.glob("#{dirname}/#{basename}*.{fpt,FPT,dbt,DBT}")
-        files.any? ? DBF::Memo.open(files.first, version) : nil
+        files.any? ? memo_class.open(files.first, version) : nil
       else
         nil
       end

data/lib/dbf/version.rb

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

data/spec/dbf/column_spec.rb

@@ -1,9 +1,9 @@
 require "spec_helper"
 
-describe DBF::Column do
+describe DBF::Column::Dbase do
   
   context "when initialized" do
-    let(:column) { DBF::Column.new "ColumnName", "N", 1, 0, "30" }
+    let(:column) { DBF::Column::Dbase.new "ColumnName", "N", 1, 0, "30" }
     
     it "sets the #name accessor" do
       column.name.should == "ColumnName"
@@ -22,15 +22,15 @@ describe DBF::Column do
     end
     
     describe 'with length of 0' do
-      specify { lambda { DBF::Column.new "ColumnName", "N", 0, 0, "30" }.should raise_error(DBF::ColumnLengthError) }
+      specify { lambda { DBF::Column::Dbase.new "ColumnName", "N", 0, 0, "30" }.should raise_error(DBF::Column::LengthError) }
     end
     
     describe 'with length less than 0' do
-      specify { lambda { DBF::Column.new "ColumnName", "N", -1, 0, "30" }.should raise_error(DBF::ColumnLengthError) }
+      specify { lambda { DBF::Column::Dbase.new "ColumnName", "N", -1, 0, "30" }.should raise_error(DBF::Column::LengthError) }
     end
     
     describe 'with empty column name' do
-      specify { lambda { DBF::Column.new "\xFF\xFC", "N", 1, 0, "30" }.should raise_error(DBF::ColumnNameError) }
+      specify { lambda { DBF::Column::Dbase.new "\xFF\xFC", "N", 1, 0, "30" }.should raise_error(DBF::Column::NameError) }
     end
   end
   
@@ -39,8 +39,8 @@ describe DBF::Column do
       context 'and 0 decimals' do
         it 'casts value to Fixnum' do
           value = '135'
-          column = DBF::Column.new "ColumnName", "N", 3, 0, "30"
-          column.type_cast(value).should be_a Fixnum
+          column = DBF::Column::Dbase.new "ColumnName", "N", 3, 0, "30"
+          column.type_cast(value).should be_a(Fixnum)
           column.type_cast(value).should == 135
         end
       end
@@ -48,8 +48,8 @@ describe DBF::Column do
       context 'and more than 0 decimals' do
         it 'casts value to Float' do
           value = '13.5'
-          column = DBF::Column.new "ColumnName", "N", 2, 1, "30"
-          column.type_cast(value).should be_a Float
+          column = DBF::Column::Dbase.new "ColumnName", "N", 2, 1, "30"
+          column.type_cast(value).should be_a(Float)
           column.type_cast(value).should == 13.5
         end
       end
@@ -58,8 +58,8 @@ describe DBF::Column do
     context 'with type F (float)' do
       it 'casts value to Float' do
         value = '135'
-        column = DBF::Column.new "ColumnName", "F", 3, 0, "30"
-        column.type_cast(value).should be_a Float
+        column = DBF::Column::Dbase.new "ColumnName", "F", 3, 0, "30"
+        column.type_cast(value).should be_a(Float)
         column.type_cast(value).should == 135.0
       end
     end
@@ -67,13 +67,13 @@ describe DBF::Column do
     context 'with type I (integer)' do
       it "casts value to Fixnum" do
         value = "\203\171\001\000"
-        column = DBF::Column.new "ColumnName", "I", 3, 0, "30"
+        column = DBF::Column::Dbase.new "ColumnName", "I", 3, 0, "30"
         column.type_cast(value).should == 96643
       end
     end
     
     context 'with type L (logical/boolean)' do
-      let(:column) { DBF::Column.new "ColumnName", "L", 1, 0, "30" }
+      let(:column) { DBF::Column::Dbase.new "ColumnName", "L", 1, 0, "30" }
       
       it "casts 'y' to true" do
         column.type_cast('y').should == true
@@ -89,7 +89,7 @@ describe DBF::Column do
     end
     
     context 'with type T (datetime)' do
-      let(:column) { DBF::Column.new "ColumnName", "T", 16, 0, "30" }
+      let(:column) { DBF::Column::Dbase.new "ColumnName", "T", 16, 0, "30" }
       
       context 'with valid datetime' do
         it "casts to DateTime" do
@@ -97,6 +97,15 @@ describe DBF::Column do
         end
       end
       
+      context 'when requiring mathn' do
+        it "casts to DateTime" do
+          lambda do
+            require 'mathn'
+            column.type_cast("Nl%\000\300Z\252\003")
+          end.call.should == DateTime.parse("2002-10-10T17:04:56+00:00")
+        end
+      end
+      
       context 'with invalid datetime' do
         it "casts to nil" do
           column.type_cast("Nl%\000\000A\000\999").should be_nil
@@ -105,7 +114,7 @@ describe DBF::Column do
     end
     
     context 'with type D (date)' do
-      let(:column) { DBF::Column.new "ColumnName", "D", 8, 0, "30" }
+      let(:column) { DBF::Column::Dbase.new "ColumnName", "D", 8, 0, "30" }
       
       context 'with valid date' do
         it "casts to Date" do
@@ -122,8 +131,8 @@ describe DBF::Column do
     
     context 'with type M (memo)' do
       it "casts to string" do
-        column = DBF::Column.new "ColumnName", "M", 3, 0, "30"
-        column.type_cast('abc').should be_a String
+        column = DBF::Column::Dbase.new "ColumnName", "M", 3, 0, "30"
+        column.type_cast('abc').should be_a(String)
       end
     end
   end
@@ -131,7 +140,7 @@ describe DBF::Column do
   context "#schema_definition" do
     context 'with type N (number)' do
       it "outputs an integer column" do
-        column = DBF::Column.new "ColumnName", "N", 1, 0, "30"
+        column = DBF::Column::Dbase.new "ColumnName", "N", 1, 0, "30"
         column.schema_definition.should == "\"column_name\", :integer\n"
       end
     end
@@ -140,13 +149,13 @@ describe DBF::Column do
       context "with Foxpro dbf" do
         context "when decimal is greater than 0" do
           it "outputs an float column" do
-            column = DBF::Column.new "ColumnName", "B", 1, 2, "f5"
+            column = DBF::Column::Dbase.new "ColumnName", "B", 1, 2, "f5"
             column.schema_definition.should == "\"column_name\", :float\n"
           end
         end
         
         context "when decimal is 0" do
-          column = DBF::Column.new "ColumnName", "B", 1, 0, "f5"
+          column = DBF::Column::Dbase.new "ColumnName", "B", 1, 0, "f5"
           column.schema_definition.should == "\"column_name\", :integer\n"
         end
       end
@@ -159,50 +168,50 @@ describe DBF::Column do
     end
     
     it "defines a float colmn if type is (N)umber with more than 0 decimals" do
-      column = DBF::Column.new "ColumnName", "N", 1, 2, "30"
+      column = DBF::Column::Dbase.new "ColumnName", "N", 1, 2, "30"
       column.schema_definition.should == "\"column_name\", :float\n"
     end
     
     it "defines a date column if type is (D)ate" do
-      column = DBF::Column.new "ColumnName", "D", 8, 0, "30"
+      column = DBF::Column::Dbase.new "ColumnName", "D", 8, 0, "30"
       column.schema_definition.should == "\"column_name\", :date\n"
     end
     
     it "defines a datetime column if type is (D)ate" do
-      column = DBF::Column.new "ColumnName", "T", 16, 0, "30"
+      column = DBF::Column::Dbase.new "ColumnName", "T", 16, 0, "30"
       column.schema_definition.should == "\"column_name\", :datetime\n"
     end
     
     it "defines a boolean column if type is (L)ogical" do
-      column = DBF::Column.new "ColumnName", "L", 1, 0, "30"
+      column = DBF::Column::Dbase.new "ColumnName", "L", 1, 0, "30"
       column.schema_definition.should == "\"column_name\", :boolean\n"
     end
     
     it "defines a text column if type is (M)emo" do
-      column = DBF::Column.new "ColumnName", "M", 1, 0, "30"
+      column = DBF::Column::Dbase.new "ColumnName", "M", 1, 0, "30"
       column.schema_definition.should == "\"column_name\", :text\n"
     end
     
     it "defines a string column with length for any other data types" do
-      column = DBF::Column.new "ColumnName", "X", 20, 0, "30"
+      column = DBF::Column::Dbase.new "ColumnName", "X", 20, 0, "30"
       column.schema_definition.should == "\"column_name\", :string, :limit => 20\n"
     end
   end
   
   context "#name" do    
     it "contains only ASCII characters" do
-      column = DBF::Column.new "--\x1F-\x68\x65\x6C\x6C\x6F world-\x80--", "N", 1, 0, "30"
+      column = DBF::Column::Dbase.new "--\x1F-\x68\x65\x6C\x6C\x6F world-\x80--", "N", 1, 0, "30"
       column.name.should == "---hello world---"
     end
 
     it "is truncated at the null character" do
-      column = DBF::Column.new "--\x1F-\x68\x65\x6C\x6C\x6F \x00 world-\x80--", "N", 1, 0, "30"
+      column = DBF::Column::Dbase.new "--\x1F-\x68\x65\x6C\x6C\x6F \x00 world-\x80--", "N", 1, 0, "30"
       column.name.should == "---hello "
     end
   end
   
   context '#decode_date' do
-    let(:column) { DBF::Column.new "ColumnName", "N", 1, 0, "30" }
+    let(:column) { DBF::Column::Dbase.new "ColumnName", "N", 1, 0, "30" }
     
     it 'is nil if value is blank' do
       column.send(:decode_date, '').should be_nil

data/spec/dbf/file_formats_spec.rb

@@ -13,7 +13,7 @@ shared_examples_for 'DBF' do
   end
   
   specify "record count should be the same as reported in the header" do
-    @table.count.should == @table.record_count
+    @table.entries.size.should == @table.record_count
   end
   
   specify "column names should not be blank" do
@@ -54,7 +54,7 @@ end
 
 shared_examples_for 'Foxpro DBF' do
   specify "columns should be instances of DBF::FoxproColumn" do
-    @table.columns.all? {|column| column.should be_an_instance_of(DBF::FoxproColumn)}
+    @table.columns.all? {|column| column.should be_an_instance_of(DBF::Column::Foxpro)}
   end
 end
 

data/spec/dbf/table_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe DBF::Table do  
   specify 'foxpro versions' do
-    DBF::Table::FOXPRO_VERSIONS.keys.should == %w(30 31 f5 fb)
+    DBF::Table::FOXPRO_VERSIONS.keys.sort.should == %w(30 31 f5 fb).sort
   end
 
   describe '#initialize' do
@@ -167,7 +167,7 @@ describe DBF::Table do
       end
 
       it "should return the first record if options are empty" do
-        @table.find(:first).should == @table.first
+        @table.find(:first).should == @table.record(0)
       end
 
       it "should return the first matching record when used with options" do
@@ -201,5 +201,18 @@ describe DBF::Table do
       specify { table.has_memo_file?.should be_true }
     end
   end
+
+  describe 'when requiring mathn' do
+    describe 'column_count' do
+      let(:table) { DBF::Table.new "#{DB_PATH}/dbase_03.dbf" }
+
+      it 'returns an integer' do
+        lambda do
+          require 'mathn'
+          table.send(:column_count)
+        end.call.should == 31
+      end
+    end
+  end
 end
 

data/spec/rvm_ruby_runner.rb

@@ -0,0 +1,13 @@
+class RvmRubyRunner  
+  def self.run(ruby_string)
+    output = `rvm use #{ruby_string}@dbf --create; bundle install; rspec`
+    puts output if ENV['DEBUG=1']
+    if output =~ /To install do/
+      "#{ruby_string.rjust 12}: not installed"
+    elsif output =~ /Finished/m
+      results = output.lines.to_a[-1].strip
+      time = output.lines.to_a[-2].strip
+      "#{ruby_string.rjust 12}: #{results}, #{time}"
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -4,6 +4,13 @@ require 'rspec'
 
 DB_PATH = File.dirname(__FILE__) + '/fixtures' unless defined?(DB_PATH)
 
+if RUBY_VERSION == "1.8.6"
+  # warn 'ruby-1.8.6: defining Array#reduce as alias of Array#inject'
+  class Array
+    alias_method :reduce, :inject
+  end
+end
+
 RSpec.configure do |config|
   
 end

metadata

@@ -1,82 +1,96 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: dbf
-version: !ruby/object:Gem::Version
-  version: 1.7.1
+version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: 
+  segments: 
+  - 1
+  - 7
+  - 2
+  version: 1.7.2
 platform: ruby
-authors:
+authors: 
 - Keith Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-09 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-12-28 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: fastercsv
-  requirement: &70200311059140 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 5
+        - 4
         version: 1.5.4
   type: :runtime
-  prerelease: false
-  version_requirements: *70200311059140
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70200311058680 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 7
+        - 0
         version: 2.7.0
   type: :development
-  prerelease: false
-  version_requirements: *70200311058680
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70200311058220 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
         version: 0.9.2
   type: :development
-  prerelease: false
-  version_requirements: *70200311058220
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &70200311057760 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.9.0
-  type: :development
   prerelease: false
-  version_requirements: *70200311057760
-- !ruby/object:Gem::Dependency
-  name: ruby-debug19
-  requirement: &70200311057360 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 3
+        - 11
+        version: "3.11"
   type: :development
-  prerelease: false
-  version_requirements: *70200311057360
-description: A small fast library for reading dBase, xBase, Clipper and FoxPro database
-  files.
+  version_requirements: *id004
+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
@@ -86,10 +100,14 @@ files:
 - bin/dbf
 - docs/supported_types.markdown
 - lib/dbf/attributes.rb
-- lib/dbf/column.rb
+- lib/dbf/column/base.rb
+- lib/dbf/column/dbase.rb
+- lib/dbf/column/foxpro.rb
 - lib/dbf/encodings.yml
-- lib/dbf/foxpro_column.rb
-- lib/dbf/memo.rb
+- lib/dbf/memo/base.rb
+- lib/dbf/memo/dbase3.rb
+- lib/dbf/memo/dbase4.rb
+- lib/dbf/memo/foxpro.rb
 - lib/dbf/record.rb
 - lib/dbf/table.rb
 - lib/dbf/util.rb
@@ -111,33 +129,45 @@ files:
 - spec/fixtures/dbase_8b.dbt
 - spec/fixtures/dbase_f5.dbf
 - spec/fixtures/dbase_f5.fpt
+- spec/rvm_ruby_runner.rb
 - spec/spec_helper.rb
+- 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 27
+      segments: 
+      - 1
+      - 3
+      - 0
       version: 1.3.0
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 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

data/lib/dbf/column.rb

@@ -1,122 +0,0 @@
-module DBF
-  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)
-  class Column
-    attr_reader :name, :type, :length, :decimal
-
-    # Initialize a new DBF::Column
-    #
-    # @param [String] name
-    # @param [String] type
-    # @param [Fixnum] length
-    # @param [Fixnum] decimal
-    def initialize(name, type, length, decimal, version, encoding=nil)
-      @name, @type, @length, @decimal, @version, @encoding = clean(name), type, length, decimal, version, encoding
-
-      raise ColumnLengthError, "field length must be greater than 0" unless length > 0
-      raise ColumnNameError, "column name cannot be empty" if @name.length == 0
-    end
-
-    # Cast value to native type
-    #
-    # @param [String] value
-    # @return [Fixnum, Float, Date, DateTime, Boolean, String]
-    def type_cast(value)
-      case type
-        when 'N' then unpack_number(value)
-        when 'I' then unpack_unsigned_long(value)
-        when 'F' then value.to_f
-        when 'D' then decode_date(value)
-        when 'T' then decode_datetime(value)
-        when 'L' then boolean(value)
-        when 'B' then unpack_binary(value)
-        else          encode_string(value.to_s).strip
-      end
-    end
-
-    def memo?
-      @memo ||= type == 'M'
-    end
-
-    # Schema definition
-    #
-    # @return [String]
-    def schema_definition
-      "\"#{underscored_name}\", #{schema_data_type}\n"
-    end
-
-    def underscored_name
-      @underscored_name ||= Util.underscore(name)
-    end
-
-    private
-
-    def decode_date(value) #nodoc
-      value.gsub!(' ', '0')
-      value !~ /\S/ ? nil : Date.parse(value)
-    rescue
-      nil
-    end
-
-    def decode_datetime(value) #nodoc
-      days, milliseconds = value.unpack('l2')
-      seconds = milliseconds / 1000
-      DateTime.jd(days, seconds/3600, seconds/60 % 60, seconds % 60) rescue nil
-    end
-
-    def unpack_number(value) #nodoc
-      decimal.zero? ? value.to_i : value.to_f
-    end
-
-    def unpack_unsigned_long(value) #nodoc
-      value.unpack('V')[0]
-    end
-    
-    def unpack_binary(value) #nodoc
-    end
-
-    def boolean(value) #nodoc
-      value.strip =~ /^(y|t)$/i ? true : false
-    end
-
-    def encode_string(value)
-      @encoding ? value.force_encoding(@encoding).encode(Encoding.default_external, :undef => :replace, :invalid => :replace) : value
-    end
-
-    def schema_data_type #nodoc
-      case type
-      when "N", "F"
-        decimal > 0 ? ":float" : ":integer"
-      when "I"
-        ":integer"
-      when "D"
-        ":date"
-      when "T"
-        ":datetime"
-      when "L"
-        ":boolean"
-      when "M"
-        ":text"
-      when "B"
-        if DBF::Table::FOXPRO_VERSIONS.keys.include?(@version)
-          decimal > 0 ? ":float" : ":integer"
-        else
-          ":text"
-        end
-      else
-        ":string, :limit => #{length}"
-      end
-    end
-
-    def clean(value) #nodoc
-      first_null = value.index("\x00")
-      value = value[0, first_null] if first_null
-      value.gsub(/[^\x20-\x7E]/, "")
-    end
-
-  end
-
-end

data/lib/dbf/foxpro_column.rb

@@ -1,7 +0,0 @@
-module DBF
-  class FoxproColumn < Column
-    def unpack_binary(value) #nodoc
-      value.unpack('d')[0]
-    end
-  end
-end

data/lib/dbf/memo.rb

@@ -1,99 +0,0 @@
-module DBF
-  class Memo
-    BLOCK_HEADER_SIZE = 8
-    FPT_HEADER_SIZE = 512
-    FPT_FORMAT_VERSIONS = DBF::Table::FOXPRO_VERSIONS.keys
-    
-    def self.open(filename, version)
-      self.new File.open(filename, 'rb'), version
-    end
-    
-    def initialize(data, version)
-      @data, @version = data, version
-    end
-    
-    def format
-      format_fpt? ? 'fpt' : 'dbt'
-    end
-    
-    def get(start_block)
-      if start_block > 0
-        if format_fpt?
-          build_fpt_memo start_block 
-        else
-          build_dbt_memo start_block
-        end
-      end
-    end
-    
-    def close
-      @data.close
-    end
-    
-    private
-    
-    def format_fpt? #nodoc
-      FPT_FORMAT_VERSIONS.include?(@version)
-    end
-    
-    def build_fpt_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
-        memo_string = memo_string[0, memo_size]
-      end
-      memo_string
-    end
-    
-    def build_dbt_memo(start_block) #nodoc
-      case @version
-      when "83" # dbase iii
-        build_dbt_83_memo(start_block)
-      when "8b" # dbase iv
-        build_dbt_8b_memo(start_block)
-      else
-        nil
-      end
-    end
-    
-    def build_dbt_83_memo(start_block) #nodoc
-      @data.seek offset(start_block)
-      memo_string = ""
-      begin
-        block = @data.read(block_size).gsub(/(\000|\032)/, '')
-        memo_string << block
-      end until block.size < block_size
-      memo_string
-    end
-    
-    def build_dbt_8b_memo(start_block) #nodoc
-      @data.seek offset(start_block)
-      @data.read(@data.read(BLOCK_HEADER_SIZE).unpack("x4L").first)
-    end
-    
-    def offset(start_block) #nodoc
-      start_block * block_size
-    end
-
-    def content_size(memo_size) #nodoc
-      (memo_size - block_size) + BLOCK_HEADER_SIZE
-    end
-
-    def block_content_size #nodoc
-      @block_content_size ||= block_size - BLOCK_HEADER_SIZE
-    end
-    
-    def block_size #nodoc
-      @block_size ||= begin
-        @data.rewind
-        format_fpt? ? @data.read(FPT_HEADER_SIZE).unpack('x6n').first || 0 : 512
-      end
-    end
-    
-  end
-end