dbf 1.0.6 → 1.0.7

data/History.txt

@@ -1,3 +1,7 @@
+== 1.0.7
+
+* Remove support for original column names.  All columns names are now downcased/underscored.
+
 == 1.0.6
 
 * DBF::Table now includes the Enumerable module

data/README.txt

@@ -2,7 +2,7 @@
 
 DBF is a small fast library for reading dBase, xBase, Clipper and FoxPro database files.  It is written completely in Ruby and has no external dependencies.
 
-Copyright (c) 2006-2007 Keith Morrison <keithm@infused.org, www.infused.org>
+Copyright (c) 2006-2008 Keith Morrison <keithm@infused.org, www.infused.org>
 
 * Official project page: http://rubyforge.org/projects/dbf
 * API Documentation: http://dbf.rubyforge.org/docs
@@ -14,11 +14,8 @@ Copyright (c) 2006-2007 Keith Morrison <keithm@infused.org, www.infused.org>
 
 * No external dependencies
 * Fields are type cast to the appropriate Ruby types
-* Date/Time fields are returned as either a Time or Date object.  Date 
-  will only be used if the date is out of range for Ruby's built in Time
-  class.
 * Ability to dump the database schema in the portable ActiveRecord::Schema
-  format.
+  format
 
 == Installation
   
@@ -29,7 +26,12 @@ Copyright (c) 2006-2007 Keith Morrison <keithm@infused.org, www.infused.org>
   require 'rubygems'
   require 'dbf'
 
-  table = DBF::Table.new("old_data.dbf")
+  table = DBF::Table.new("widgets.dbf")
+  
+  # Tables are enumerable
+  widget_ids = table.map { |row| row.id }
+  abc_names = table.select { |row| row.name =~ /^[a-cA-C] }
+  sorted = table.sort_by { |row| row.name }
   
   # Print the 'name' field from record number 4
   puts table.record(4).name

data/Rakefile

@@ -2,7 +2,7 @@ require 'hoe'
 require 'spec/rake/spectask'
 
 PKG_NAME = "dbf"
-PKG_VERSION = "1.0.6"
+PKG_VERSION = "1.0.7"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 Hoe.new PKG_NAME, PKG_VERSION do |p|
@@ -15,6 +15,7 @@ Hoe.new PKG_NAME, PKG_VERSION do |p|
   p.url = "http://github.com/infused/dm-dbf/tree/master"
   p.need_tar = true
   p.need_zip = true
+  p.extra_deps << ['activesupport', '>= 2.1.0']
 end
 
 task :default => :spec

data/dbf.gemspec

@@ -1,13 +1,13 @@
 (in /Users/keithm/projects/dbf)
 Gem::Specification.new do |s|
   s.name = %q{dbf}
-  s.version = "1.0.6"
+  s.version = "1.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Keith Morrison"]
-  s.date = %q{2008-06-30}
+  s.date = %q{2008-09-02}
   s.default_executable = %q{dbf}
-  s.description = %q{DBF is a small fast library for reading dBase, xBase, Clipper and FoxPro database files.  It is written completely in Ruby and has no external dependencies.  Copyright (c) 2006-2007 Keith Morrison <keithm@infused.org, www.infused.org>  * Official project page: http://rubyforge.org/projects/dbf * API Documentation: http://dbf.rubyforge.org/docs * To report bugs: http://www.rubyforge.org/tracker/?group_id=2009 * Questions: Email keithm@infused.org and put DBF somewhere in the subject line}
+  s.description = %q{DBF is a small fast library for reading dBase, xBase, Clipper and FoxPro database files.  It is written completely in Ruby and has no external dependencies.  Copyright (c) 2006-2008 Keith Morrison <keithm@infused.org, www.infused.org>  * Official project page: http://rubyforge.org/projects/dbf * API Documentation: http://dbf.rubyforge.org/docs * To report bugs: http://www.rubyforge.org/tracker/?group_id=2009 * Questions: Email keithm@infused.org and put DBF somewhere in the subject line}
   s.email = %q{keithm@infused.org}
   s.executables = ["dbf"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt", "spec/fixtures/dbase_83_schema.txt"]
@@ -25,11 +25,14 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if current_version >= 3 then
-      s.add_runtime_dependency(%q<hoe>, [">= 1.6.0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.1.0"])
+      s.add_development_dependency(%q<hoe>, [">= 1.7.0"])
     else
-      s.add_dependency(%q<hoe>, [">= 1.6.0"])
+      s.add_dependency(%q<activesupport>, [">= 2.1.0"])
+      s.add_dependency(%q<hoe>, [">= 1.7.0"])
     end
   else
-    s.add_dependency(%q<hoe>, [">= 1.6.0"])
+    s.add_dependency(%q<activesupport>, [">= 2.1.0"])
+    s.add_dependency(%q<hoe>, [">= 1.7.0"])
   end
 end

data/lib/dbf.rb

@@ -1,4 +1,5 @@
 require 'date'
+require 'activesupport'
 
 require 'dbf/globals'
 require 'dbf/record'

data/lib/dbf/column.rb

@@ -29,7 +29,7 @@ module DBF
         ":string, :limit => #{length}"
       end
       
-      "\"#{underscore(name)}\", #{data_type}\n"
+      "\"#{name.underscore}\", #{data_type}\n"
     end
     
     private

data/lib/dbf/globals.rb

@@ -25,12 +25,12 @@ module DBF
   class DBFError < StandardError; end
   
   module Helpers
-    def underscore(camel_cased_word)
-      camel_cased_word.to_s.gsub(/::/, '/').
-        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-        gsub(/([a-z\d])([A-Z])/,'\1_\2').
-        tr("-", "_").
-        downcase
-    end
+    # def underscore(camel_cased_word)
+    #   camel_cased_word.to_s.gsub(/::/, '/').
+    #     gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+    #     gsub(/([a-z\d])([A-Z])/,'\1_\2').
+    #     tr("-", "_").
+    #     downcase
+    # end
   end
 end

data/lib/dbf/record.rb

@@ -18,45 +18,40 @@ module DBF
     
     def define_accessors
       @table.columns.each do |column|
-        underscored_column_name = underscore(column.name)
+        underscored_column_name = column.name.underscore
         unless respond_to?(underscored_column_name)
           self.class.send :define_method, underscored_column_name do
-            @attributes[column.name]
+            @attributes[column.name.underscore]
           end
         end
       end
     end
     
     def initialize_values(columns)
-      @attributes = {}
-      columns.each do |column|
-        @attributes[column.name] = case column.type
-        when 'N' # number
-          column.decimal.zero? ? unpack_string(column).to_i : unpack_string(column).to_f
-        when 'D' # date
-          raw = unpack_string(column).strip
-          unless raw.empty?
-            parts = raw.match(DATE_REGEXP).captures.map {|n| n.to_i}
-            begin
-              Time.gm(*parts)
-            rescue
-              Date.new(*parts)
-            end
-          end
-        when 'M' # memo
-          starting_block = unpack_string(column).to_i
-          read_memo(starting_block)
-        when 'L' # logical
-          unpack_string(column) =~ /^(y|t)$/i ? true : false
-        when 'I' # integer
-          unpack_integer(column)
-        when 'T' # datetime
-          unpack_datetime(column)
-        else
-          unpack_string(column).strip
-        end
-        @attributes[underscore(column.name)] = @attributes[column.name]
-        @attributes
+      @attributes = columns.inject({}) do |hash, column|
+        hash[column.name.underscore] = typecast_column(column)
+        hash
+      end
+    end
+    
+    def typecast_column(column)
+      case column.type
+      when 'N' # number
+        column.decimal.zero? ? unpack_string(column).to_i : unpack_string(column).to_f
+      when 'D' # date
+        raw = unpack_string(column).strip
+        raw.to_time unless raw.blank?
+      when 'M' # memo
+        starting_block = unpack_string(column).to_i
+        read_memo(starting_block)
+      when 'L' # logical
+        unpack_string(column) =~ /^(y|t)$/i ? true : false
+      when 'I' # integer
+        unpack_integer(column)
+      when 'T' # datetime
+        unpack_datetime(column)
+      else
+        unpack_string(column).strip
       end
     end
   

data/lib/dbf/table.rb

@@ -236,7 +236,7 @@ module DBF
       end
       
       def all_values_match?(record, options)
-        options.map {|key, value| record.attributes[key.to_s] == value}.all?
+        options.map {|key, value| record.attributes[key.to_s.underscore] == value}.all?
       end
   end
   

data/spec/unit/record_spec.rb

@@ -22,26 +22,26 @@ describe DBF::Record do
       table = DBF::Table.new "#{DB_PATH}/dbase_83.dbf"
       table.column("ID").type.should == "N"
       table.column("ID").decimal.should == 0
-      table.records.all? {|record| record.attributes['ID'].should be_kind_of(Integer)}
+      table.records.all? {|record| record.attributes['id'].should be_kind_of(Integer)}
     end
   
     it "should typecast number columns with decimals > 0 to Float" do
       table = DBF::Table.new "#{DB_PATH}/dbase_83.dbf"
       table.column("ID").type.should == "N"
       table.column("COST").decimal.should == 2
-      table.records.all? {|record| record.attributes['COST'].should be_kind_of(Float)}
+      table.records.all? {|record| record.attributes['cost'].should be_kind_of(Float)}
     end
   
     it "should typecast memo columns to String" do
       table = DBF::Table.new "#{DB_PATH}/dbase_83.dbf"
       table.column("DESC").type.should == "M"
-      table.records.all? {|record| record.attributes['DESC'].should be_kind_of(String)}
+      table.records.all? {|record| record.attributes['desc'].should be_kind_of(String)}
     end
   
     it "should typecast logical columns to True or False" do
       table = DBF::Table.new "#{DB_PATH}/dbase_30.dbf"
       table.column("WEBINCLUDE").type.should == "L"
-      table.records.all? {|record| record.attributes["WEBINCLUDE"].should satisfy {|v| v == true || v == false}}
+      table.records.all? {|record| record.attributes["webinclude"].should satisfy {|v| v == true || v == false}}
     end
   
     it "should typecast datetime columns to DateTime" do
@@ -94,7 +94,31 @@ describe DBF::Record do
       
       record.send(:read_memo, 5).should be_nil
     end
-
+  end
+  
+  describe "#typecase_column" do
+    before do
+      @table = mock_table
+      @column = mock('column')
+      @column.stub!(:name).and_return('created')
+      @column.stub!(:length).and_return(8)
+      @column.stub!(:type).and_return('D')
+      @table.stub!(:columns).and_return([@column])
+      @record = DBF::Record.new(@table)
+    end
+    
+    describe 'when column is type D' do
+      it 'should return Time' do
+        @record.stub!(:unpack_string).and_return('20080606')
+        @record.send(:typecast_column, @column).should == Time.gm(2008, 6, 6)
+      end
+    
+      it 'should return Date if Time is out of range' do
+        @record.stub!(:unpack_string).and_return('19440606')
+        @record.send(:typecast_column, @column).should == Date.new(1944, 6, 6)
+      end
+    end
+    
   end
 
 end

data/spec/unit/table_spec.rb

@@ -56,7 +56,7 @@ describe DBF::Table do
       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.attributes["weight"] == 0.0}
       end
 
       it "with multiple options should search for all search terms as if using AND" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dbf
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors: 
 - Keith Morrison
@@ -9,9 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-08 00:00:00 -07:00
+date: 2008-09-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.1.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -22,7 +32,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.7.0
     version: 
-description: "DBF is a small fast library for reading dBase, xBase, Clipper and FoxPro database files.  It is written completely in Ruby and has no external dependencies.  Copyright (c) 2006-2007 Keith Morrison <keithm@infused.org, www.infused.org>  * Official project page: http://rubyforge.org/projects/dbf * API Documentation: http://dbf.rubyforge.org/docs * To report bugs: http://www.rubyforge.org/tracker/?group_id=2009 * Questions: Email keithm@infused.org and put DBF somewhere in the subject line"
+description: "DBF is a small fast library for reading dBase, xBase, Clipper and FoxPro database files.  It is written completely in Ruby and has no external dependencies.  Copyright (c) 2006-2008 Keith Morrison <keithm@infused.org, www.infused.org>  * Official project page: http://rubyforge.org/projects/dbf * API Documentation: http://dbf.rubyforge.org/docs * To report bugs: http://www.rubyforge.org/tracker/?group_id=2009 * Questions: Email keithm@infused.org and put DBF somewhere in the subject line"
 email: keithm@infused.org
 executables: 
 - dbf