dbf 3.0.0 → 3.0.1

data/lib/dbf/database/foxpro.rb

@@ -104,7 +104,7 @@ module DBF
       end
 
       def table_field_hash(name)
-        {:name => name, :fields => []}
+        {name: name, fields: []}
       end
     end
 
@@ -118,7 +118,7 @@ module DBF
         # columnname property is readonly, recreate the column definitions
         columns.map do |column|
           long_name = long_names[columns.index(column)]
-          column_class.new(self, long_name, column.type, column.length, column.decimal)
+          Column.new(self, long_name, column.type, column.length, column.decimal)
         end
       end
     end

data/lib/dbf/header.rb

@@ -1,6 +1,5 @@
 module DBF
   class Header
-    attr_reader :data
     attr_reader :version
     attr_reader :record_count
     attr_reader :header_length
@@ -8,14 +7,14 @@ module DBF
     attr_reader :encoding_key
     attr_reader :encoding
 
-    def initialize(data, set_encoding)
+    def initialize(data)
       @data = data
       @version, @record_count, @header_length, @record_length, @encoding_key = unpack_header
-      @encoding = DBF::ENCODINGS[@encoding_key] if set_encoding
+      @encoding = DBF::ENCODINGS[@encoding_key]
     end
 
     def unpack_header
-      data.unpack('H2 x3 V v2 x17H2')
+      @data.unpack('H2 x3 V v2 x17H2')
     end
   end
 end

data/lib/dbf/record.rb

@@ -44,7 +44,7 @@ module DBF
       key = name.to_s
       if attributes.key?(key)
         attributes[key]
-      elsif (index = underscored_column_names.index(key))
+      elsif index = underscored_column_names.index(key)
         attributes[@columns[index].name]
       end
     end
@@ -53,8 +53,7 @@ module DBF
     #
     # @return [Hash]
     def attributes
-      @attributes ||=
-        Hash[@columns.map { |column| [column.name, init_attribute(column)] }]
+      @attributes ||= Hash[attribute_map]
     end
 
     # Overrides standard Object.respond_to? to return true if a
@@ -63,16 +62,16 @@ module DBF
     # @param [String, Symbol] method
     # @return [Boolean]
     def respond_to?(method, *args)
-      if underscored_column_names.include?(method.to_s)
-        true
-      else
-        super
-      end
+      underscored_column_names.include?(method.to_s) || super
     end
 
     private
 
-    def file_offset(attribute_name)
+    def attribute_map # nodoc
+      @columns.map { |column| [column.name, init_attribute(column)] }
+    end
+
+    def file_offset(attribute_name) # nodoc
       column = @columns.detect { |c| c.name == attribute_name.to_s }
       index = @columns.index(column)
       @columns[0, index + 1].compact.reduce(0) { |x, c| x += c.length }

data/lib/dbf/table.rb

@@ -64,7 +64,7 @@ module DBF
     def initialize(data, memo = nil, encoding = nil)
       @data = open_data(data)
       @data.rewind
-      @header = Header.new(@data.read(DBF_HEADER_SIZE), supports_encoding?)
+      @header = Header.new(@data.read DBF_HEADER_SIZE)
       @encoding = encoding || header.encoding
       @memo = open_memo(data, memo)
       yield self if block_given?
@@ -162,10 +162,10 @@ module DBF
     #   table.find(5)
     #
     #   # Find all records for Keith Morrison
-    #   table.find :all, :first_name => "Keith", :last_name => "Morrison"
+    #   table.find :all, first_name: "Keith", last_name: "Morrison"
     #
     #   # Find first record
-    #   table.find :first, :first_name => "Keith"
+    #   table.find :first, first_name: "Keith"
     #
     # The <b>command</b> may be a record index, :all, or :first.
     # <b>options</b> is optional and, if specified, should be a hash where the
@@ -205,25 +205,6 @@ module DBF
       columns.map(&:name)
     end
 
-    # Is string encoding supported?
-    # String encoding is always supported in Ruby 1.9+.
-    # Ruby 1.8.x requires that Ruby be compiled with iconv support.
-    def supports_encoding?
-      supports_string_encoding? || supports_iconv?
-    end
-
-    # Does String support encoding?  Should be true in Ruby 1.9+
-    def supports_string_encoding?
-      ''.respond_to?(:encoding)
-    end
-
-    def supports_iconv? # nodoc
-      require 'iconv'
-      true
-    rescue
-      false
-    end
-
     private
 
     def build_columns # nodoc
@@ -232,7 +213,7 @@ module DBF
       until end_of_record?
         column_data = @data.read(DBF_HEADER_SIZE)
         name, type, length, decimal = column_data.unpack('a10 x a x4 C2')
-        columns << column_class.new(self, name, type, length, decimal)
+        columns << Column.new(self, name, type, length, decimal)
       end
       columns
     end
@@ -248,10 +229,6 @@ module DBF
       FOXPRO_VERSIONS.keys.include? version
     end
 
-    def column_class # nodoc
-      @column_class ||= foxpro? ? Column::Foxpro : Column::Dbase
-    end
-
     def memo_class # nodoc
       @memo_class ||= begin
         if foxpro?

data/lib/dbf/version.rb

@@ -1,3 +1,3 @@
 module DBF
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

data/spec/dbf/column_spec.rb

@@ -2,11 +2,11 @@
 
 require 'spec_helper'
 
-describe DBF::Column::Dbase do
-  let(:table) { DBF::Table.new fixture_path('dbase_30.dbf')}
+RSpec.describe DBF::Column do
+  let(:table) { DBF::Table.new fixture('dbase_30.dbf')}
 
   context 'when initialized' do
-    let(:column) { DBF::Column::Dbase.new table, 'ColumnName', 'N', 1, 0 }
+    let(:column) { DBF::Column.new table, 'ColumnName', 'N', 1, 0 }
 
     it 'sets :name accessor' do
       expect(column.name).to eq 'ColumnName'
@@ -25,19 +25,19 @@ describe DBF::Column::Dbase do
     end
 
     it 'accepts length of 0' do
-      column = DBF::Column::Dbase.new table, 'ColumnName', 'N', 0, 0
+      column = DBF::Column.new table, 'ColumnName', 'N', 0, 0
       expect(column.length).to eq 0
     end
 
     describe 'with length less than 0' do
       it 'raises DBF::Column::LengthError' do
-        expect { DBF::Column::Dbase.new table, 'ColumnName', 'N', -1, 0 }.to raise_error(DBF::Column::LengthError)
+        expect { DBF::Column.new table, 'ColumnName', 'N', -1, 0 }.to raise_error(DBF::Column::LengthError)
       end
     end
 
     describe 'with empty column name' do
       it 'raises DBF::Column::NameError' do
-        expect { DBF::Column::Dbase.new table, "\xFF\xFC", 'N', 1, 0 }.to raise_error(DBF::Column::NameError)
+        expect { DBF::Column.new table, "\xFF\xFC", 'N', 1, 0 }.to raise_error(DBF::Column::NameError)
       end
     end
   end
@@ -46,7 +46,7 @@ describe DBF::Column::Dbase do
     context 'with type N (number)' do
       context 'and 0 length' do
         it 'returns nil' do
-          column = DBF::Column::Dbase.new table, 'ColumnName', 'N', 0, 0
+          column = DBF::Column.new table, 'ColumnName', 'N', 0, 0
           expect(column.type_cast('')).to be_nil
         end
       end
@@ -54,32 +54,28 @@ describe DBF::Column::Dbase do
       context 'and 0 decimals' do
         it 'casts value to Fixnum' do
           value = '135'
-          column = DBF::Column::Dbase.new table, 'ColumnName', 'N', 3, 0
-          expect(column.type_cast(value)).to be_a(Fixnum)
+          column = DBF::Column.new table, 'ColumnName', 'N', 3, 0
           expect(column.type_cast(value)).to eq 135
         end
 
         it 'supports negative Fixnum' do
           value = '-135'
-          column = DBF::Column::Dbase.new table, 'ColumnName', 'N', 3, 0
-          expect(column.type_cast(value)).to be_a(Fixnum)
-          expect(column.type_cast(value)).to eq -135
+          column = DBF::Column.new table, 'ColumnName', 'N', 3, 0
+          expect(column.type_cast(value)).to eq (-135)
         end
       end
 
       context 'and more than 0 decimals' do
         it 'casts value to Float' do
           value = '13.5'
-          column = DBF::Column::Dbase.new table, 'ColumnName', 'N', 2, 1
-          expect(column.type_cast(value)).to be_a(Float)
+          column = DBF::Column.new table, 'ColumnName', 'N', 2, 1
           expect(column.type_cast(value)).to eq 13.5
         end
 
         it 'casts negative value to Float' do
           value = '-13.5'
-          column = DBF::Column::Dbase.new table, 'ColumnName', 'N', 2, 1
-          expect(column.type_cast(value)).to be_a(Float)
-          expect(column.type_cast(value)).to eq -13.5
+          column = DBF::Column.new table, 'ColumnName', 'N', 2, 1
+          expect(column.type_cast(value)).to eq (-13.5)
         end
       end
     end
@@ -87,44 +83,42 @@ describe DBF::Column::Dbase do
     context 'with type F (float)' do
       context 'and 0 length' do
         it 'returns nil' do
-          column = DBF::Column::Dbase.new table, 'ColumnName', 'F', 0, 0
+          column = DBF::Column.new table, 'ColumnName', 'F', 0, 0
           expect(column.type_cast('')).to be_nil
         end
       end
 
       it 'casts value to Float' do
         value = '135'
-        column = DBF::Column::Dbase.new table, 'ColumnName', 'F', 3, 0
-        expect(column.type_cast(value)).to be_a(Float)
+        column = DBF::Column.new table, 'ColumnName', 'F', 3, 0
         expect(column.type_cast(value)).to eq 135.0
       end
 
       it 'casts negative value to Float' do
         value = '-135'
-        column = DBF::Column::Dbase.new table, 'ColumnName', 'F', 3, 0
-        expect(column.type_cast(value)).to be_a(Float)
-        expect(column.type_cast(value)).to eq -135.0
+        column = DBF::Column.new table, 'ColumnName', 'F', 3, 0
+        expect(column.type_cast(value)).to eq (-135.0)
       end
     end
 
     context 'with type B (binary)' do
       context 'with Foxpro dbf' do
         it 'casts to float' do
-          column = DBF::Column::Dbase.new table, 'ColumnName', 'B', 1, 2
+          column = DBF::Column.new table, 'ColumnName', 'B', 1, 2
           expect(column.type_cast("\xEC\x51\xB8\x1E\x85\x6B\x31\x40")).to be_a(Float)
           expect(column.type_cast("\xEC\x51\xB8\x1E\x85\x6B\x31\x40")).to eq 17.42
         end
 
         it 'stores original precision' do
-          column = DBF::Column::Dbase.new table, 'ColumnName', 'B', 1, 0
+          column = DBF::Column.new table, 'ColumnName', 'B', 1, 0
           expect(column.type_cast("\xEC\x51\xB8\x1E\x85\x6B\x31\x40")).to be_a(Float)
           expect(column.type_cast("\xEC\x51\xB8\x1E\x85\x6B\x31\x40")).to eq 17.42
         end
 
         it 'supports negative binary' do
-          column = DBF::Column::Dbase.new table, 'ColumnName', 'B', 1, 2
+          column = DBF::Column.new table, 'ColumnName', 'B', 1, 2
           expect(column.type_cast("\x00\x00\x00\x00\x00\xC0\x65\xC0")).to be_a(Float)
-          expect(column.type_cast("\x00\x00\x00\x00\x00\xC0\x65\xC0")).to eq -174.0
+          expect(column.type_cast("\x00\x00\x00\x00\x00\xC0\x65\xC0")).to eq (-174.0)
         end
       end
     end
@@ -132,28 +126,26 @@ describe DBF::Column::Dbase do
     context 'with type I (integer)' do
       context 'and 0 length' do
         it 'returns nil' do
-          column = DBF::Column::Dbase.new table, 'ColumnName', 'I', 0, 0
+          column = DBF::Column.new table, 'ColumnName', 'I', 0, 0
           expect(column.type_cast('')).to be_nil
         end
       end
 
       it 'casts value to Fixnum' do
         value = "\203\171\001\000"
-        column = DBF::Column::Dbase.new table, 'ColumnName', 'I', 3, 0
-        expect(column.type_cast(value)).to be_a(Fixnum)
+        column = DBF::Column.new table, 'ColumnName', 'I', 3, 0
         expect(column.type_cast(value)).to eq 96643
       end
 
       it 'supports negative Fixnum' do
         value = "\x24\xE1\xFF\xFF"
-        column = DBF::Column::Dbase.new table, 'ColumnName', 'I', 3, 0
-        expect(column.type_cast(value)).to be_a(Fixnum)
-        expect(column.type_cast(value)).to eq -7900
+        column = DBF::Column.new table, 'ColumnName', 'I', 3, 0
+        expect(column.type_cast(value)).to eq (-7900)
       end
     end
 
     context 'with type L (logical/boolean)' do
-      let(:column) { DBF::Column::Dbase.new table, 'ColumnName', 'L', 1, 0 }
+      let(:column) { DBF::Column.new table, 'ColumnName', 'L', 1, 0 }
 
       it "casts 'y' to true" do
         expect(column.type_cast('y')).to be true
@@ -169,70 +161,53 @@ describe DBF::Column::Dbase do
 
       context 'and 0 length' do
         it 'returns nil' do
-          column = DBF::Column::Dbase.new table, 'ColumnName', 'L', 0, 0
+          column = DBF::Column.new table, 'ColumnName', 'L', 0, 0
           expect(column.type_cast('')).to be_nil
         end
       end
     end
 
     context 'with type T (datetime)' do
-      let(:column) { DBF::Column::Dbase.new table, 'ColumnName', 'T', 16, 0 }
+      let(:column) { DBF::Column.new table, 'ColumnName', 'T', 16, 0 }
 
       context 'with valid datetime' do
         it 'casts to DateTime' do
-          expect(column.type_cast("Nl%\000\300Z\252\003")).to be_a(DateTime)
           expect(column.type_cast("Nl%\000\300Z\252\003")).to eq DateTime.parse('2002-10-10T17:04:56+00:00')
         end
       end
 
-      if ruby_supports_mathn?
-        context 'when requiring mathn' do
-          it 'casts to DateTime' do
-            with_mathn = lambda do
-              require 'mathn'
-              column.type_cast("Nl%\000\300Z\252\003")
-            end
-            expect(with_mathn.call).to be_a(DateTime)
-            expect(with_mathn.call).to eq DateTime.parse('2002-10-10T17:04:56+00:00')
-          end
-        end
-      end
-
       context 'with invalid datetime' do
         it 'casts to nil' do
-          expect(column.type_cast("Nl%\000\000A\000\999")).to be_a(NilClass)
           expect(column.type_cast("Nl%\000\000A\000\999")).to be_nil
         end
       end
 
       context 'and 0 length' do
         it 'returns nil' do
-          column = DBF::Column::Dbase.new table, 'ColumnName', 'T', 0, 0
+          column = DBF::Column.new table, 'ColumnName', 'T', 0, 0
           expect(column.type_cast('')).to be_nil
         end
       end
     end
 
     context 'with type D (date)' do
-      let(:column) { DBF::Column::Dbase.new table, 'ColumnName', 'D', 8, 0 }
+      let(:column) { DBF::Column.new table, 'ColumnName', 'D', 8, 0 }
 
       context 'with valid date' do
         it 'casts to Date' do
-          expect(column.type_cast('20050712')).to be_a(Date)
           expect(column.type_cast('20050712')).to eq Date.new(2005,7,12)
         end
       end
 
       context 'with invalid date' do
         it 'casts to nil' do
-          expect(column.type_cast('0')).to be_a(NilClass)
           expect(column.type_cast('0')).to be_nil
         end
       end
 
       context 'and 0 length' do
         it 'returns nil' do
-          column = DBF::Column::Dbase.new table, 'ColumnName', 'D', 0, 0
+          column = DBF::Column.new table, 'ColumnName', 'D', 0, 0
           expect(column.type_cast('')).to be_nil
         end
       end
@@ -240,20 +215,38 @@ describe DBF::Column::Dbase do
 
     context 'with type M (memo)' do
       it 'casts to string' do
-        column = DBF::Column::Dbase.new table, 'ColumnName', 'M', 3, 0
-        expect(column.type_cast('abc')).to be_a(String)
+        column = DBF::Column.new table, 'ColumnName', 'M', 3, 0
         expect(column.type_cast('abc')).to eq 'abc'
       end
 
       it 'casts nil to nil' do
-        column = DBF::Column::Dbase.new table, 'ColumnName', 'M', 3, 0
-        expect(column.type_cast(nil)).to be_a(NilClass)
+        column = DBF::Column.new table, 'ColumnName', 'M', 3, 0
         expect(column.type_cast(nil)).to be_nil
       end
 
       context 'and 0 length' do
         it 'returns nil' do
-          column = DBF::Column::Dbase.new table, 'ColumnName', 'M', 0, 0
+          column = DBF::Column.new table, 'ColumnName', 'M', 0, 0
+          expect(column.type_cast('')).to be_nil
+        end
+      end
+    end
+
+    context 'with type G (memo)' do
+      it 'returns binary data' do
+        column = DBF::Column.new table, 'ColumnName', 'G', 3, 0
+        expect(column.type_cast("\000\013\120")).to eq "\000\013\120"
+        expect(column.type_cast("\000\013\120").encoding).to eq Encoding::ASCII_8BIT
+      end
+
+      it 'casts nil to nil' do
+        column = DBF::Column.new table, 'ColumnName', 'G', 3, 0
+        expect(column.type_cast(nil)).to be_nil
+      end
+
+      context 'and 0 length' do
+        it 'returns nil' do
+          column = DBF::Column.new table, 'ColumnName', 'G', 0, 0
           expect(column.type_cast('')).to be_nil
         end
       end
@@ -261,26 +254,23 @@ describe DBF::Column::Dbase do
   end
 
   context 'with type Y (currency)' do
-    let(:column) { DBF::Column::Dbase.new table, 'ColumnName', 'Y', 8, 4 }
+    let(:column) { DBF::Column.new table, 'ColumnName', 'Y', 8, 4 }
 
     it 'casts to float' do
-      expect(column.type_cast(" \xBF\x02\x00\x00\x00\x00\x00")).to be_a(Float)
       expect(column.type_cast(" \xBF\x02\x00\x00\x00\x00\x00")).to eq 18.0
     end
 
     it 'supports negative currency' do
-      expect(column.type_cast("\xFC\xF0\xF0\xFE\xFF\xFF\xFF\xFF")).to be_a(Float)
-      expect(column.type_cast("\xFC\xF0\xF0\xFE\xFF\xFF\xFF\xFF")).to eq -1776.41
+      expect(column.type_cast("\xFC\xF0\xF0\xFE\xFF\xFF\xFF\xFF")).to eq (-1776.41)
     end
 
     it 'supports 64bit negative currency' do
-      expect(column.type_cast("pN'9\xFF\xFF\xFF\xFF")).to be_a(Float)
-      expect(column.type_cast("pN'9\xFF\xFF\xFF\xFF")).to eq -333609.0
+      expect(column.type_cast("pN'9\xFF\xFF\xFF\xFF")).to eq (-333609.0)
     end
 
     context 'and 0 length' do
       it 'returns nil' do
-        column = DBF::Column::Dbase.new table, 'ColumnName', 'Y', 0, 0
+        column = DBF::Column.new table, 'ColumnName', 'Y', 0, 0
         expect(column.type_cast('')).to be_nil
       end
     end
@@ -289,7 +279,7 @@ describe DBF::Column::Dbase do
   context '#schema_definition' do
     context 'with type N (number)' do
       it 'outputs an integer column' do
-        column = DBF::Column::Dbase.new table, 'ColumnName', 'N', 1, 0
+        column = DBF::Column.new table, 'ColumnName', 'N', 1, 0
         expect(column.schema_definition).to eq "\"column_name\", :integer\n"
       end
     end
@@ -297,65 +287,52 @@ describe DBF::Column::Dbase do
     context 'with type B (binary)' do
       context 'with Foxpro dbf' do
         it 'outputs a float column' do
-          column = DBF::Column::Dbase.new table, 'ColumnName', 'B', 1, 2
+          column = DBF::Column.new table, 'ColumnName', 'B', 1, 2
           expect(column.schema_definition).to eq "\"column_name\", :float\n"
         end
       end
     end
 
     it 'defines a float colmn if type is (N)umber with more than 0 decimals' do
-      column = DBF::Column::Dbase.new table, 'ColumnName', 'N', 1, 2
+      column = DBF::Column.new table, 'ColumnName', 'N', 1, 2
       expect(column.schema_definition).to eq "\"column_name\", :float\n"
     end
 
     it 'defines a date column if type is (D)ate' do
-      column = DBF::Column::Dbase.new table, 'ColumnName', 'D', 8, 0
+      column = DBF::Column.new table, 'ColumnName', 'D', 8, 0
       expect(column.schema_definition).to eq "\"column_name\", :date\n"
     end
 
     it 'defines a datetime column if type is (D)ate' do
-      column = DBF::Column::Dbase.new table, 'ColumnName', 'T', 16, 0
+      column = DBF::Column.new table, 'ColumnName', 'T', 16, 0
       expect(column.schema_definition).to eq "\"column_name\", :datetime\n"
     end
 
     it 'defines a boolean column if type is (L)ogical' do
-      column = DBF::Column::Dbase.new table, 'ColumnName', 'L', 1, 0
+      column = DBF::Column.new table, 'ColumnName', 'L', 1, 0
       expect(column.schema_definition).to eq "\"column_name\", :boolean\n"
     end
 
     it 'defines a text column if type is (M)emo' do
-      column = DBF::Column::Dbase.new table, 'ColumnName', 'M', 1, 0
+      column = DBF::Column.new table, 'ColumnName', 'M', 1, 0
       expect(column.schema_definition).to eq "\"column_name\", :text\n"
     end
 
     it 'defines a string column with length for any other data types' do
-      column = DBF::Column::Dbase.new table, 'ColumnName', 'X', 20, 0
+      column = DBF::Column.new table, 'ColumnName', 'X', 20, 0
       expect(column.schema_definition).to eq "\"column_name\", :string, :limit => 20\n"
     end
   end
 
   context '#name' do
     it 'contains only ASCII characters' do
-      column = DBF::Column::Dbase.new table, "--\x1F-\x68\x65\x6C\x6C\x6F world-\x80--", 'N', 1, 0
+      column = DBF::Column.new table, "--\x1F-\x68\x65\x6C\x6C\x6F world-\x80--", 'N', 1, 0
       expect(column.name).to eq '---hello world---'
     end
 
     it 'is truncated at the null character' do
-      column = DBF::Column::Dbase.new table, "--\x1F-\x68\x65\x6C\x6C\x6F \x00 world-\x80--", 'N', 1, 0
+      column = DBF::Column.new table, "--\x1F-\x68\x65\x6C\x6C\x6F \x00 world-\x80--", 'N', 1, 0
       expect(column.name).to eq '---hello '
     end
   end
-
-  context '#decode_date' do
-    let(:column) { DBF::Column::Dbase.new table, 'ColumnName', 'N', 1, 0 }
-
-    it 'is nil if value is blank' do
-      expect(column.send(:decode_date, '')).to be_nil
-    end
-
-    it 'interperets spaces as zeros' do
-      expect(column.send(:decode_date, '2010 715')).to eq Date.parse('20100715')
-    end
-  end
-
 end