dbf 1.7.8 → 2.0.0

data/CHANGELOG.md

@@ -1,6 +1,8 @@
-# 1.7.8
-  - [#44] Require FasterCSV on all platforms
+# 2.0.0
+  - #44 Require FasterCSV gem on all platforms
   - Remove rdoc development dependency
+  - #42 Fixes encoding of memos
+  - #43 Improve handling of record attributes
 
 # 1.7.5
   - fixes FoxPro currency (Y) fields

data/README.md

@@ -39,14 +39,14 @@ Find a single record
 
     widget.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 find() will return nil if the requested record has been deleted and not
-yet pruned from the database)
+Attributes can also be accessed through the attributes hash or the record
+object using either the original or underscored attribute name. Note that
+find() will return nil if the requested record has been deleted and not yet
+pruned from the database.
 
     widget.find(4).attributes["SlotNumber"]
-    widget.find(4).attributes["slot_number"]
-    widget.find(4).slot_number
+    widget.find(4)["SlotNumber"]
+    widget.find(4)[:slot_number]
   
 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

data/Rakefile

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'rubygems'
 require 'bundler/setup';
 Bundler.setup(:default, :development)

data/dbf.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.required_rubygems_version = '>= 1.3.0'
-
   s.add_dependency 'fastercsv', '~> 1.5.4'
   
   s.add_development_dependency 'rspec', '~> 2.9.0'

data/lib/dbf.rb

@@ -1,19 +1,17 @@
 require 'date'
 
-require 'yaml'
 require 'csv'
 if CSV.const_defined? :Reader
   require 'fastercsv'
 end
 
-require 'dbf/util'
-require 'dbf/attributes'
 require 'dbf/record'
 require 'dbf/column/base'
 require 'dbf/column/dbase'
 require 'dbf/column/foxpro'
 require 'dbf/table'
+require 'dbf/table/encodings'
 require 'dbf/memo/base'
 require 'dbf/memo/dbase3'
 require 'dbf/memo/dbase4'
-require 'dbf/memo/foxpro'
+require 'dbf/memo/foxpro'

data/lib/dbf/column/base.rb

@@ -33,6 +33,7 @@ module DBF
           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
       end
@@ -48,8 +49,16 @@ module DBF
         "\"#{underscored_name}\", #{schema_data_type}\n"
       end
 
+      def self.underscore_name(string)
+        string.gsub(/::/, '/').
+          gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+          gsub(/([a-z\d])([A-Z])/,'\1_\2').
+          tr('-', '_').
+          downcase
+      end
+
       def underscored_name
-        @underscored_name ||= Util.underscore(name)
+        @underscored_name ||= self.class.underscore_name(name)
       end
 
       private
@@ -66,6 +75,10 @@ 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
 
       def unpack_number(value) #nodoc
         decimal.zero? ? value.to_i : value.to_f
@@ -121,4 +134,4 @@ module DBF
 
     end
   end
-end
+end

data/lib/dbf/memo/base.rb

@@ -18,7 +18,11 @@ module DBF
       end
     
       def close
-        @data.close
+        @data.close && @data.closed?
+      end
+      
+      def closed?
+        @data.closed?
       end
     
       private

data/lib/dbf/record.rb

@@ -10,8 +10,6 @@ module DBF
     def initialize(data, columns, version, memo)
       @data = StringIO.new(data)
       @columns, @version, @memo = columns, version, memo
-      @column_names = @columns.map {|column| column.underscored_name}
-      define_accessors
     end
     
     # Equality
@@ -26,7 +24,7 @@ module DBF
     # 
     # @return [Array]
     def to_a
-      @column_names.map {|name| attributes[name]}
+      @columns.map {|column| attributes[column.name]}
     end
     
     # Do all search parameters match?
@@ -34,35 +32,50 @@ module DBF
     # @param [Hash] options
     # @return [Boolean]
     def match?(options)
-      options.all? {|key, value| attributes[Util.underscore(key.to_s)] == value}
+      options.all? {|key, value| self[key] == value}
+    end
+
+    # Reads attributes by column name
+    def [](key)
+      key = key.to_s
+      if attributes.has_key?(key)
+        attributes[key]
+      elsif index = column_names.index(key)
+        attributes[@columns[index].name]
+      end
     end
     
     # @return [Hash]
     def attributes
-      @attributes ||= begin
-        attributes = Attributes.new
-        @columns.each {|column| attributes[column.name] = init_attribute(column)}
-        attributes
-      end
+      @attributes ||= Hash[@columns.map {|column| [column.name, init_attribute(column)]}]
     end
     
-    private
-    
-    def define_accessors #nodoc
-      @column_names.each do |name|
-        next if respond_to? name
-        self.class.send(:define_method, name) do
-          attributes[name]
-        end
+    def respond_to?(method, *args)
+      return true if column_names.include?(method.to_s)
+      super
+    end
+
+    def method_missing(method, *args)
+      if index = column_names.index(method.to_s)
+        attributes[@columns[index].name]
+      else
+        super
       end
     end
+
+    private
+
+    def column_names
+      @column_names ||= @columns.map {|column| column.underscored_name}
+    end
     
     def init_attribute(column) #nodoc
-      if column.memo?
+      value = if column.memo?
         @memo.get get_memo_start_block(column)
       else
-        column.type_cast unpack_data(column)
+        unpack_data(column)
       end
+      column.type_cast value
     end
    
     def get_memo_start_block(column) #nodoc

data/lib/dbf/table.rb

@@ -66,8 +66,17 @@ module DBF
     #
     # @return [TrueClass, FalseClass]
     def close
+      @data.close
       @memo && @memo.close
-      @data.close && @data.closed?
+    end
+    
+    # @return [TrueClass, FalseClass]
+    def closed?
+      if @memo
+        @data.closed? && @memo.closed?
+      else
+        @data.closed?
+      end
     end
     
     # @return String
@@ -272,7 +281,7 @@ module DBF
     def get_header_info #nodoc
       @data.rewind
       @version, @record_count, @header_length, @record_length, @encoding_key = read_header
-      @encoding = self.class.encodings[@encoding_key] if supports_encoding?
+      @encoding = ENCODINGS[@encoding_key] if supports_encoding?
     end
     
     def read_header #nodoc
@@ -286,10 +295,6 @@ module DBF
     def csv_class #nodoc
       @csv_class ||= CSV.const_defined?(:Reader) ? FCSV : CSV
     end
-
-    def self.encodings #nodoc
-      @encodings ||= YAML.load_file File.expand_path("../encodings.yml", __FILE__)
-    end
   end
 
 end

data/lib/dbf/table/encodings.rb

@@ -0,0 +1,66 @@
+module DBF
+  class Table
+    # inspired by http://trac.osgeo.org/gdal/ticket/2864
+    ENCODINGS = {
+      "01" => "cp437",       # U.S. MS–DOS
+      "02" => "cp850",       # International MS–DOS
+      "03" => "cp1252",      # Windows ANSI
+      "08" => "cp865",       # Danish OEM
+      "09" => "cp437",       # Dutch OEM
+      "0a" => "cp850",       # Dutch OEM*
+      "0b" => "cp437",       # Finnish OEM
+      "0d" => "cp437",       # French OEM
+      "0e" => "cp850",       # French OEM*
+      "0f" => "cp437",       # German OEM
+      "10" => "cp850",       # German OEM*
+      "11" => "cp437",       # Italian OEM
+      "12" => "cp850",       # Italian OEM*
+      "13" => "cp932",       # Japanese Shift-JIS
+      "14" => "cp850",       # Spanish OEM*
+      "15" => "cp437",       # Swedish OEM
+      "16" => "cp850",       # Swedish OEM*
+      "17" => "cp865",       # Norwegian OEM
+      "18" => "cp437",       # Spanish OEM
+      "19" => "cp437",       # English OEM (Britain)
+      "1a" => "cp850",       # English OEM (Britain)*
+      "1b" => "cp437",       # English OEM (U.S.)
+      "1c" => "cp863",       # French OEM (Canada)
+      "1d" => "cp850",       # French OEM*
+      "1f" => "cp852",       # Czech OEM
+      "22" => "cp852",       # Hungarian OEM
+      "23" => "cp852",       # Polish OEM
+      "24" => "cp860",       # Portuguese OEM
+      "25" => "cp850",       # Portuguese OEM*
+      "26" => "cp866",       # Russian OEM
+      "37" => "cp850",       # English OEM (U.S.)*
+      "40" => "cp852",       # Romanian OEM
+      "4d" => "cp936",       # Chinese GBK (PRC)
+      "4e" => "cp949",       # Korean (ANSI/OEM)
+      "4f" => "cp950",       # Chinese Big5 (Taiwan)
+      "50" => "cp874",       # Thai (ANSI/OEM)
+      "57" => "cp1252",      # ANSI
+      "58" => "cp1252",      # Western European ANSI
+      "59" => "cp1252",      # Spanish ANSI
+      "64" => "cp852",       # Eastern European MS–DOS
+      "65" => "cp866",       # Russian MS–DOS
+      "66" => "cp865",       # Nordic MS–DOS
+      "67" => "cp861",       # Icelandic MS–DOS
+      "6a" => "cp737",       # Greek MS–DOS (437G)
+      "6b" => "cp857",       # Turkish MS–DOS
+      "6c" => "cp863",       # French–Canadian MS–DOS
+      "78" => "cp950",       # Taiwan Big 5
+      "79" => "cp949",       # Hangul (Wansung)
+      "7a" => "cp936",       # PRC GBK
+      "7b" => "cp932",       # Japanese Shift-JIS
+      "7c" => "cp874",       # Thai Windows/MS–DOS
+      "86" => "cp737",       # Greek OEM
+      "87" => "cp852",       # Slovenian OEM
+      "88" => "cp857",       # Turkish OEM
+      "c8" => "cp1250",      # Eastern European Windows
+      "c9" => "cp1251",      # Russian Windows
+      "ca" => "cp1254",      # Turkish Windows
+      "cb" => "cp1253",      # Greek Windows
+      "cc" => "cp1257",      # Baltic Windows
+    }
+  end
+end

data/lib/dbf/version.rb

@@ -1,3 +1,3 @@
 module DBF
-  VERSION = '1.7.8'
+  VERSION = '2.0.0'
 end

data/spec/dbf/column_spec.rb

@@ -22,15 +22,21 @@ describe DBF::Column::Dbase do
     end
     
     describe 'with length of 0' do
-      specify { lambda { DBF::Column::Dbase.new "ColumnName", "N", 0, 0, "30" }.should raise_error(DBF::Column::LengthError) }
+      it 'raises DBF::Column::LengthError' do
+        expect { DBF::Column::Dbase.new "ColumnName", "N", 0, 0, "30" }.to raise_error(DBF::Column::LengthError)
+      end
     end
     
     describe 'with length less than 0' do
-      specify { lambda { DBF::Column::Dbase.new "ColumnName", "N", -1, 0, "30" }.should raise_error(DBF::Column::LengthError) }
+      it 'raises DBF::Column::LengthError' do
+        expect { DBF::Column::Dbase.new "ColumnName", "N", -1, 0, "30" }.to raise_error(DBF::Column::LengthError)
+      end
     end
     
     describe 'with empty column name' do
-      specify { lambda { DBF::Column::Dbase.new "\xFF\xFC", "N", 1, 0, "30" }.should raise_error(DBF::Column::NameError) }
+      it 'raises DBF::Column::NameError' do
+        expect { DBF::Column::Dbase.new "\xFF\xFC", "N", 1, 0, "30" }.to raise_error(DBF::Column::NameError)
+      end
     end
   end
   
@@ -97,12 +103,14 @@ describe DBF::Column::Dbase 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")
+      if ruby_supports_mathn?
+        context 'when requiring mathn' do
+          it "casts to DateTime" do
+            expect 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
       end
       
@@ -167,12 +175,6 @@ describe DBF::Column::Dbase do
           column.schema_definition.should == "\"column_name\", :integer\n"
         end
       end
-      
-      context "when non-Foxpro dbf" do
-        it "outputs a text column" do
-          
-        end
-      end
     end
     
     it "defines a float colmn if type is (N)umber with more than 0 decimals" do

data/spec/dbf/file_formats_spec.rb

@@ -2,179 +2,153 @@ require "spec_helper"
 
 shared_examples_for 'DBF' do
   specify "sum of column lengths should equal record length specified in header plus one" do
-    header_record_length = @table.instance_eval {@record_length}
-    sum_of_column_lengths = @table.columns.inject(1) {|sum, column| sum += column.length}
+    header_record_length = table.instance_eval {@record_length}
+    sum_of_column_lengths = table.columns.inject(1) {|sum, column| sum += column.length}
     
     header_record_length.should == sum_of_column_lengths
   end
 
   specify "records should be instances of DBF::Record" do
-    @table.all? {|record| record.should be_an_instance_of(DBF::Record)}
+    table.all? {|record| record.is_a?(DBF::Record)}.should be_true
   end
   
   specify "record count should be the same as reported in the header" do
-    @table.entries.size.should == @table.record_count
+    table.entries.size.should == table.record_count
   end
   
   specify "column names should not be blank" do
-    @table.columns.all? {|column| column.name.should_not be_empty}
+    table.columns.all? {|column| !column.name.empty?}.should be_true
   end
   
   specify "column types should be valid" do
     valid_column_types = %w(C N L D M F B G P Y T I V X @ O + 0)
-    @table.columns.all? {|column| valid_column_types.should include(column.type)}
+    table.columns.all? {|column| valid_column_types.include?(column.type)}.should be_true
   end
   
   specify "column lengths should be instances of Fixnum" do
-    @table.columns.all? {|column| column.length.should be_an_instance_of(Fixnum)}
+    table.columns.all? {|column| column.length.is_a?(Fixnum)}.should be_true
   end
   
   specify "column lengths should be larger than 0" do
-    @table.columns.all? {|column| column.length.should > 0}
+    table.columns.all? {|column| column.length > 0}.should be_true
   end
   
   specify "column decimals should be instances of Fixnum" do
-    @table.columns.all? {|column| column.decimal.should be_an_instance_of(Fixnum)}
-  end
-  
-  specify "column read accessors should return the attribute after typecast" do
-    @table.columns do |column|
-      record = @table.records.first
-      record.send(column.name).should == record[column.name]
-    end
-  end
-  
-  specify "column attributes should be accessible in underscored form" do
-    @table.columns do |column|
-      record = @table.records.first
-      record.send(column_name).should == record.send(Util.underscore(column_name))
-    end
+    table.columns.all? {|column| column.decimal.is_a?(Fixnum)}.should be_true
   end
 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::Column::Foxpro)}
+    table.columns.all? {|column| column.is_a?(DBF::Column::Foxpro)}.should be_true
   end
 end
 
 describe DBF, "of type 03 (dBase III without memo file)" do
-  before do
-    @table = DBF::Table.new "#{DB_PATH}/dbase_03.dbf"
-  end
+  let(:table) { DBF::Table.new "#{DB_PATH}/dbase_03.dbf" }
   
   it_should_behave_like "DBF"
   
   it "should report the correct version number" do
-    @table.version.should == "03"
+    table.version.should == "03"
   end
   
   it "should report the correct version description" do
-    @table.version_description.should == "dBase III without memo file"
+    table.version_description.should == "dBase III without memo file"
   end
   
   it "should determine the number of records" do
-    @table.record_count.should == 14
+    table.record_count.should == 14
   end
 end
 
 describe DBF, "of type 30 (Visual FoxPro)" do
-  before do
-    @table = DBF::Table.new "#{DB_PATH}/dbase_30.dbf"
-  end
+  let(:table) { DBF::Table.new "#{DB_PATH}/dbase_30.dbf" }
   
   it_should_behave_like "DBF"
   
   it "should report the correct version number" do
-    @table.version.should == "30"
+    table.version.should == "30"
   end
   
   it "should report the correct version description" do
-    @table.version_description.should == "Visual FoxPro"
+    table.version_description.should == "Visual FoxPro"
   end
 
   it "should determine the number of records" do
-    @table.record_count.should == 34
+    table.record_count.should == 34
   end
 end
 
 describe DBF, "of type 31 (Visual FoxPro with AutoIncrement field)" do
-  before do
-    @table = DBF::Table.new "#{DB_PATH}/dbase_31.dbf"
-  end
+  let(:table) { DBF::Table.new "#{DB_PATH}/dbase_31.dbf" }
   
   it_should_behave_like "DBF"
   
   it "should have a dBase version of 31" do
-    @table.version.should == "31"
+    table.version.should == "31"
   end
   
   it "should report the correct version description" do
-    @table.version_description.should == "Visual FoxPro with AutoIncrement field"
+    table.version_description.should == "Visual FoxPro with AutoIncrement field"
   end
   
   it "should determine the number of records" do
-    @table.record_count.should == 77
+    table.record_count.should == 77
   end
 end
 
 describe DBF, "of type 83 (dBase III with memo file)" do
-  before do
-    @table = DBF::Table.new "#{DB_PATH}/dbase_83.dbf"
-  end
+  let(:table) { DBF::Table.new "#{DB_PATH}/dbase_83.dbf" }
   
   it_should_behave_like "DBF"
   
   it "should report the correct version number" do
-    @table.version.should == "83"
+    table.version.should == "83"
   end
   
   it "should report the correct version description" do
-    @table.version_description.should == "dBase III with memo file"
+    table.version_description.should == "dBase III with memo file"
   end
   
   it "should determine the number of records" do
-    @table.record_count.should == 67
+    table.record_count.should == 67
   end
 end
 
 describe DBF, "of type 8b (dBase IV with memo file)" do
-  before do
-    @table = DBF::Table.new "#{DB_PATH}/dbase_8b.dbf"
-  end
+  let(:table) { DBF::Table.new "#{DB_PATH}/dbase_8b.dbf" }
   
   it_should_behave_like "DBF"
   
   it "should report the correct version number" do
-    @table.version.should == "8b"
+    table.version.should == "8b"
   end
   
   it "should report the correct version description" do
-    @table.version_description.should == "dBase IV with memo file"
+    table.version_description.should == "dBase IV with memo file"
   end
   
   it "should determine the number of records" do
-    @table.record_count.should == 10
+    table.record_count.should == 10
   end
 end
 
 describe DBF, "of type f5 (FoxPro with memo file)" do
-  before do
-    @table = DBF::Table.new "#{DB_PATH}/dbase_f5.dbf"
-  end
+  let(:table) { DBF::Table.new "#{DB_PATH}/dbase_f5.dbf" }
   
   it_should_behave_like "DBF"
   it_should_behave_like "Foxpro DBF"
   
   it "should report the correct version number" do
-    @table.version.should == "f5"
+    table.version.should == "f5"
   end
   
   it "should report the correct version description" do
-    @table.version_description.should == "FoxPro with memo file"
+    table.version_description.should == "FoxPro with memo file"
   end
   
   it "should determine the number of records" do
-    @table.record_count.should == 975
+    table.record_count.should == 975
   end
-end
+end

data/spec/dbf/record_spec.rb

@@ -14,31 +14,40 @@ describe DBF::Record do
     end
   end
 
-  describe '#==' do
-    before do
+  describe '#==' do    
+    let :record do
       table = DBF::Table.new "#{DB_PATH}/dbase_8b.dbf"
-      @record = table.record(9)
+      table.record(9)
     end
 
     it 'should be false if other does not have attributes' do
-      (@record == mock('other')).should be_false
+      (record == mock('other')).should be_false
     end
 
     it 'should be true if other attributes match' do
       attributes = {:x => 1, :y => 2}
-      @record.stub!(:attributes).and_return(attributes)
+      record.stub!(:attributes).and_return(attributes)
       other = mock('object', :attributes => attributes)
-      (@record == other).should be_true
+      (record == other).should be_true
     end
   end
 
   describe 'column accessors' do
     let(:table) { DBF::Table.new "#{DB_PATH}/dbase_8b.dbf"}
+    let(:record) { table.find(0) }
 
-    it 'should define accessor methods for each column' do
-      record = table.find(0)
+    it 'should have dynamic accessors for the columns' do
       record.should respond_to(:character)
       record.character.should == 'One'
+      record.float.should == 1.23456789012346
+      record.logical.should == true
+    end
+
+    it 'should not define accessor methods on the base class' do
+      second_table = DBF::Table.new "#{DB_PATH}/dbase_03.dbf"
+      second_record = second_table.find(0)
+      record.character.should == 'One'
+      expect { second_record.character }.to raise_error(NoMethodError)
     end
   end
 

data/spec/dbf/table_spec.rb

@@ -6,20 +6,20 @@ describe DBF::Table do
   end
 
   describe '#initialize' do
-    it 'should accept a DBF filename' do
+    it 'accepts a DBF filename' do
       expect { DBF::Table.new "#{DB_PATH}/dbase_83.dbf" }.to_not raise_error
     end
 
-    it 'should accept a DBF and Memo filename' do
+    it 'accepts a DBF and Memo filename' do
       expect { DBF::Table.new "#{DB_PATH}/dbase_83.dbf", "#{DB_PATH}/dbase_83.dbt" }.to_not raise_error
     end
 
-    it 'should accept an io-like data object' do
+    it 'accepts an io-like data object' do
       data = StringIO.new File.read("#{DB_PATH}/dbase_83.dbf")
       expect { DBF::Table.new data }.to_not raise_error
     end
 
-    it 'should accept an io-like data and memo object' do
+    it 'accepts an io-like data and memo object' do
       data = StringIO.new File.read("#{DB_PATH}/dbase_83.dbf")
       memo = StringIO.new File.read("#{DB_PATH}/dbase_83.dbt")
       expect { DBF::Table.new data, memo }.to_not raise_error
@@ -27,17 +27,16 @@ describe DBF::Table do
   end
   
   context "when closed" do
-    before do
-      @table = DBF::Table.new "#{DB_PATH}/dbase_83.dbf"
-      @table.close
-    end
-    
-    it "should close the data file" do
-      @table.instance_eval { @data }.should be_closed
+    it "closes the data and memo files" do
+      table = DBF::Table.new "#{DB_PATH}/dbase_83.dbf"
+      table.close
+      table.should be_closed
     end
     
-    it "should close the memo file" do
-      @table.instance_eval { @memo }.instance_eval { @data }.should be_closed
+    it "closes the data" do
+      table = DBF::Table.new "#{DB_PATH}/dbase_30.dbf"
+      table.close
+      table.should be_closed
     end
   end
   
@@ -77,143 +76,122 @@ describe DBF::Table do
   end
   
   describe "#record" do
-    before do
-      @table = DBF::Table.new "#{DB_PATH}/dbase_83.dbf"
-    end
-    
     it "return nil for deleted records" do
-      @table.stub!(:deleted_record?).and_return(true)
-      @table.record(5).should be_nil
+      table = DBF::Table.new "#{DB_PATH}/dbase_83.dbf"
+      table.stub!(:deleted_record?).and_return(true)
+      table.record(5).should be_nil
     end
   end
   
   describe "#current_record" do
-    before do
-      @table = DBF::Table.new "#{DB_PATH}/dbase_83.dbf"
-    end
-    
     it "should return nil for deleted records" do
-      @table.stub!(:deleted_record?).and_return(true)
-      @table.record(0).should be_nil
+      table = DBF::Table.new "#{DB_PATH}/dbase_83.dbf"
+      table.stub!(:deleted_record?).and_return(true)
+      table.record(0).should be_nil
     end
   end
   
   describe "#find" do
+    let(:table) { DBF::Table.new "#{DB_PATH}/dbase_83.dbf" }
+    
     describe "with index" do
-      before do
-        @table = DBF::Table.new "#{DB_PATH}/dbase_83.dbf"
-      end
-      
       it "should return the correct record" do
-        @table.find(5).should == @table.record(5)
+        table.find(5).should == table.record(5)
       end
     end
     
-    describe 'with array of indexes' do
-      before do
-        @table = DBF::Table.new "#{DB_PATH}/dbase_83.dbf"
-      end
-      
+    describe 'with array of indexes' do      
       it "should return the correct records" do
-        @table.find([1, 5, 10]).should == [@table.record(1), @table.record(5), @table.record(10)]
+        table.find([1, 5, 10]).should == [table.record(1), table.record(5), table.record(10)]
       end
     end
     
     describe "with :all" do
-      before do
-        @table = DBF::Table.new "#{DB_PATH}/dbase_83.dbf"
-      end
-      
       it "should accept a block" do
         records = []
-        @table.find(:all, :weight => 0.0) do |record|
+        table.find(:all, :weight => 0.0) do |record|
           records << record
         end
-        records.should == @table.find(:all, :weight => 0.0)
+        records.should == table.find(:all, :weight => 0.0)
       end
 
       it "should return all records if options are empty" do
-        @table.find(:all).should == @table.to_a
+        table.find(:all).should == table.to_a
       end
 
       it "should return matching records when used with options" do
-        @table.find(:all, "WEIGHT" => 0.0).should == @table.select {|r| r.attributes["weight"] == 0.0}
+        table.find(:all, "WEIGHT" => 0.0).should == table.select {|r| r["weight"] == 0.0}
       end
 
       it "should AND multiple search terms" do
-        @table.find(:all, "ID" => 30, "IMAGE" => "graphics/00000001/TBC01.jpg").should == []
+        table.find(:all, "ID" => 30, "IMAGE" => "graphics/00000001/TBC01.jpg").should == []
       end
       
       it "should match original column names" do
-        @table.find(:all, "WEIGHT" => 0.0).should_not be_empty
+        table.find(:all, "WEIGHT" => 0.0).should_not be_empty
       end
       
       it "should match symbolized column names" do
-        @table.find(:all, :WEIGHT => 0.0).should_not be_empty
+        table.find(:all, :WEIGHT => 0.0).should_not be_empty
       end
       
       it "should match downcased column names" do
-        @table.find(:all, "weight" => 0.0).should_not be_empty
+        table.find(:all, "weight" => 0.0).should_not be_empty
       end
       
       it "should match symbolized downcased column names" do
-        @table.find(:all, :weight => 0.0).should_not be_empty
+        table.find(:all, :weight => 0.0).should_not be_empty
       end
     end
     
     describe "with :first" do
-      before do
-        @table = DBF::Table.new "#{DB_PATH}/dbase_83.dbf"
-      end
-
       it "should return the first record if options are empty" do
-        @table.find(:first).should == @table.record(0)
+        table.find(:first).should == table.record(0)
       end
 
       it "should return the first matching record when used with options" do
-        @table.find(:first, "CODE" => "C").should == @table.record(5)
+        table.find(:first, "CODE" => "C").should == table.record(5)
       end
 
       it "should AND multiple search terms" do
-        @table.find(:first, "ID" => 30, "IMAGE" => "graphics/00000001/TBC01.jpg").should be_nil
+        table.find(:first, "ID" => 30, "IMAGE" => "graphics/00000001/TBC01.jpg").should be_nil
       end
     end
   end
 
   describe "filename" do
-    before do
-      @table = DBF::Table.new "#{DB_PATH}/dbase_03.dbf"
-    end
-    
     it 'should be dbase_03.dbf' do
-      @table.filename.should == "dbase_03.dbf"
+      table = DBF::Table.new "#{DB_PATH}/dbase_03.dbf"
+      table.filename.should == "dbase_03.dbf"
     end
   end
   
   describe 'has_memo_file?' do
     describe 'without a memo file' do
-      let(:table) { DBF::Table.new "#{DB_PATH}/dbase_03.dbf" }
-      specify { table.has_memo_file?.should be_false }
+      it 'returns false' do
+        table = DBF::Table.new "#{DB_PATH}/dbase_03.dbf"
+        table.has_memo_file?.should be_false
+      end
     end
     
     describe 'with a memo file' do
-      let(:table) { DBF::Table.new "#{DB_PATH}/dbase_30.dbf" }
-      specify { table.has_memo_file?.should be_true }
+      it 'returns true' do
+        table = DBF::Table.new "#{DB_PATH}/dbase_30.dbf" 
+        table.has_memo_file?.should be_true
+      end
     end
   end
 
   describe 'columns' do
-    before do
-      @table = DBF::Table.new "#{DB_PATH}/dbase_03.dbf"
-    end
+    let(:table) { DBF::Table.new "#{DB_PATH}/dbase_03.dbf" }
 
     it 'should have correct size' do
-      @table.columns.size.should == 31
+      table.columns.size.should == 31
     end
 
     it 'should have correct names' do
-      @table.columns.first.name.should == 'Point_ID'
-      @table.columns[29].name.should == 'Easting'
+      table.columns.first.name.should == 'Point_ID'
+      table.columns[29].name.should == 'Easting'
     end
   end
 end

data/spec/spec_helper.rb

@@ -12,5 +12,11 @@ if RUBY_VERSION == "1.8.6"
 end
 
 RSpec.configure do |config|
-  
+  def ruby_supports_mathn?
+    begin
+      require 'mathn'
+    rescue UnsupportedLibraryError
+      false
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dbf
 version: !ruby/object:Gem::Version
-  version: 1.7.8
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -78,18 +78,16 @@ files:
 - README.md
 - bin/dbf
 - docs/supported_types.markdown
-- lib/dbf/attributes.rb
 - lib/dbf/column/base.rb
 - lib/dbf/column/dbase.rb
 - lib/dbf/column/foxpro.rb
-- lib/dbf/encodings.yml
 - 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/encodings.rb
 - lib/dbf/table.rb
-- lib/dbf/util.rb
 - lib/dbf/version.rb
 - lib/dbf.rb
 - spec/dbf/column_spec.rb

data/lib/dbf/attributes.rb

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

data/lib/dbf/encodings.yml

@@ -1,61 +0,0 @@
-# inspired by http://trac.osgeo.org/gdal/ticket/2864
-
-"01": "cp437"        # U.S. MS–DOS
-"02": "cp850"        # International MS–DOS
-"03": "cp1252"       # Windows ANSI
-"08": "cp865"        # Danish OEM
-"09": "cp437"        # Dutch OEM
-"0a": "cp850"        # Dutch OEM*
-"0b": "cp437"        # Finnish OEM
-"0d": "cp437"        # French OEM
-"0e": "cp850"        # French OEM*
-"0f": "cp437"        # German OEM
-"10": "cp850"        # German OEM*
-"11": "cp437"        # Italian OEM
-"12": "cp850"        # Italian OEM*
-"13": "cp932"        # Japanese Shift-JIS
-"14": "cp850"        # Spanish OEM*
-"15": "cp437"        # Swedish OEM
-"16": "cp850"        # Swedish OEM*
-"17": "cp865"        # Norwegian OEM
-"18": "cp437"        # Spanish OEM
-"19": "cp437"        # English OEM (Britain)
-"1a": "cp850"        # English OEM (Britain)*
-"1b": "cp437"        # English OEM (U.S.)
-"1c": "cp863"        # French OEM (Canada)
-"1d": "cp850"        # French OEM*
-"1f": "cp852"        # Czech OEM
-"22": "cp852"        # Hungarian OEM
-"23": "cp852"        # Polish OEM
-"24": "cp860"        # Portuguese OEM
-"25": "cp850"        # Portuguese OEM*
-"26": "cp866"        # Russian OEM
-"37": "cp850"        # English OEM (U.S.)*
-"40": "cp852"        # Romanian OEM
-"4d": "cp936"        # Chinese GBK (PRC)
-"4e": "cp949"        # Korean (ANSI/OEM)
-"4f": "cp950"        # Chinese Big5 (Taiwan)
-"50": "cp874"        # Thai (ANSI/OEM)
-"57": "cp1252"       # ANSI
-"58": "cp1252"       # Western European ANSI
-"59": "cp1252"       # Spanish ANSI
-"64": "cp852"        # Eastern European MS–DOS
-"65": "cp866"        # Russian MS–DOS
-"66": "cp865"        # Nordic MS–DOS
-"67": "cp861"        # Icelandic MS–DOS
-"6a": "cp737"        # Greek MS–DOS (437G)
-"6b": "cp857"        # Turkish MS–DOS
-"6c": "cp863"        # French–Canadian MS–DOS
-"78": "cp950"        # Taiwan Big 5
-"79": "cp949"        # Hangul (Wansung)
-"7a": "cp936"        # PRC GBK
-"7b": "cp932"        # Japanese Shift-JIS
-"7c": "cp874"        # Thai Windows/MS–DOS
-"86": "cp737"        # Greek OEM
-"87": "cp852"        # Slovenian OEM
-"88": "cp857"        # Turkish OEM
-"c8": "cp1250"       # Eastern European Windows
-"c9": "cp1251"       # Russian Windows
-"ca": "cp1254"       # Turkish Windows
-"cb": "cp1253"       # Greek Windows
-"cc": "cp1257"       # Baltic Windows

data/lib/dbf/util.rb

@@ -1,9 +0,0 @@
-class Util
-  def self.underscore(string) #nodoc
-    string.gsub(/::/, '/').
-      gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-      gsub(/([a-z\d])([A-Z])/,'\1_\2').
-      tr('-', '_').
-      downcase
-  end
-end