dbf 1.2.0 → 1.2.1

data/History.txt

@@ -1,3 +1,11 @@
+== 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

data/README.markdown

@@ -1,18 +1,20 @@
 # DBF
 
-DBF is a small fast library for reading dBase, xBase, Clipper and FoxPro database files
+DBF is a small fast library for reading dBase, xBase, Clipper and FoxPro
+database files
 
 * Project page: <http://github.com/infused/dbf>
 * API Documentation: <http://rdoc.info/projects/infused/dbf>
 * Report bugs: <http://github.com/infused/dbf/issues>
-* Questions: Email <mailto:keithm@infused.org> and put DBF somewhere in the subject line
+* Questions: Email <mailto:keithm@infused.org> and put DBF somewhere in the 
+  subject line
 
 ## Features
 
-* No external dependencies
-* Fields are type cast to the appropriate Ruby types
-* ActiveRecord like finder methods
-* Ability to dump the database schema in the portable ActiveRecord::Schema format
+* Fields are type cast to the appropriate Ruby types 
+* ActiveRecord style finder methods 
+* Ability to dump the database schema in the portable ActiveRecord::Schema 
+  format 
 * Ruby 1.9.1 compatible
 
 ## Installation
@@ -42,6 +44,8 @@ Load a single record using <tt>record</tt> or <tt>find</tt>
 
 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)
 
     table.record(4).attributes["PhoneBook"]
     table.record(4).attributes["phone_book"]
@@ -53,7 +57,10 @@ 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|
-      puts record.last_name
+      # the record will be nil if deleted and not yet pruned from the database
+      if record
+        puts record.last_name
+      end
     end
     
     # find all records with first_name equal to Keith and last_name equal
@@ -99,16 +106,17 @@ A small command-line utility called dbf is installed along with the gem.
       -s = print summary information
       -a = create an ActiveRecord::Schema
   
-## Limitations and known bugs
+## Limitations
   
 * DBF is read-only
-* External index files are not used
+* index files are not utilized
 
 ## License
 
 (The MIT Licence)
 
-Copyright (c) 2006-2009 Keith Morrison <mailto:keithm@infused.org>, <http://www.infused.org>
+Copyright (c) 2006-2010 Keith Morrison <mailto:keithm@infused.org>, 
+<http://www.infused.org>.
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/VERSION.yml

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

data/dbf.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dbf}
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Keith Morrison"]
-  s.date = %q{2010-02-13}
+  s.date = %q{2010-03-30}
   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}
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/infused/dbf}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Read xBase files}
   s.test_files = [
     "spec/functional/dbf_shared.rb",

data/lib/dbf/column.rb

@@ -28,6 +28,8 @@ module DBF
       case type
       when 'N' # number
         unpack_number(value)
+      when 'F' # float
+        unpack_float(value)
       when 'D' # date
         value.to_date unless value.blank?
       when 'L' # logical
@@ -59,6 +61,14 @@ module DBF
       decimal.zero? ? unpack_integer(value) : value.to_f
     end
     
+    # Decode a float value
+    #
+    # @param [String] value
+    # @return [Float]
+    def unpack_float(value)
+      value.to_f
+    end
+    
     # Decode an integer
     #
     # @param [String] value
@@ -87,7 +97,7 @@ module DBF
     # @return [String]
     def schema_data_type
       case type
-      when "N"
+      when "N", "F"
         decimal > 0 ? ":float" : ":integer"
       when "I"
         ":integer"

data/lib/dbf/table.rb

@@ -61,17 +61,19 @@ module DBF
     def each
       0.upto(@record_count - 1) do |n|
         seek_to_record(n)
-        yield deleted_record? ? nil : DBF::Record.new(self)
+        yield current_record
       end
     end
     
-    # Retrieve a record by index number
+    # Retrieve a record by index number.
+    # The record will be nil if it has been deleted, but not yet pruned from
+    # the database.
     #
     # @param [Fixnum] index
-    # @return [DBF::Record]
+    # @return [DBF::Record, NilClass]
     def record(index)
       seek_to_record(index)
-      deleted_record? ? nil : DBF::Record.new(self)
+      current_record
     end
     
     alias_method :row, :record
@@ -162,7 +164,7 @@ module DBF
     #
     # @param [Fixnum, Symbol] command
     # @param [optional, Hash] options Hash of search parameters
-    # @yield [optional, DBF::Record]
+    # @yield [optional, DBF::Record, NilClass]
     def find(command, options = {}, &block)
       case command
       when Fixnum
@@ -248,6 +250,10 @@ module DBF
       @data.read(1).unpack('a') == ['*']
     end
     
+    def current_record
+      deleted_record? ? nil : DBF::Record.new(self)
+    end
+    
     # Determine database version, record count, header length and record length
     def get_header_info
       @data.rewind

data/spec/unit/column_spec.rb

@@ -45,6 +45,18 @@ describe DBF::Column do
       column = DBF::Column.new "ColumnName", "N", 3, 0
       column.type_cast(value).should == 135
     end
+
+    it "should cast numbers with decimals to Float" do
+      value = "13.5"
+      column = DBF::Column.new "ColumnName", "N", 2, 1
+      column.type_cast(value).should == 13.5
+    end
+    
+    it "should cast float numbers to Float" do
+      value = "135"
+      column = DBF::Column.new "ColumnName", "F", 3, 0
+      column.type_cast(value).should == 135.0
+    end
     
     it "should cast :integer to Integer" do
       value = "135"

data/spec/unit/record_spec.rb

@@ -89,7 +89,7 @@ describe DBF::Record do
     it 'should return an ordered array of attribute values' do
       table = DBF::Table.new "#{DB_PATH}/dbase_8b.dbf"
       record = table.record(9)
-      record.to_a.should == ["Ten records stored in this database", 10.0, nil, false, "0.100000000000000000", nil]
+      record.to_a.should == ["Ten records stored in this database", 10.0, nil, false, 0.1, nil]
     end
   end
   

data/spec/unit/table_spec.rb

@@ -136,6 +136,21 @@ describe DBF::Table do
     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
+    end
+    
+    it 'should return a DBF::Record' do
+      @table.record(0).should be_kind_of(DBF::Record)
+    end
+  end
+  
   describe "#find" do
     describe "with index" do
       before do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dbf
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Keith Morrison
@@ -9,29 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-13 00:00:00 -08:00
+date: 2010-03-30 00:00:00 -07:00
 default_executable: dbf
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 0
         version: 2.1.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: fastercsv
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 0
         version: 1.4.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: A small fast library for reading dBase, xBase, Clipper and FoxPro database files.
 email: keithm@infused.org
 executables: 
@@ -87,18 +100,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Read xBase files