dbf 1.0.10 → 1.0.11

data/.autotest

@@ -2,10 +2,10 @@ Autotest.add_hook :initialize do |autotest|
   autotest.clear_mappings
   
   autotest.add_mapping(%r%^lib/dbf/(.*)\.rb$%) do |filename, m|
-    autotest.files_matching %r!spec/(unit|integration)/#{m[1]}_spec.rb!
+    autotest.files_matching %r!spec/(unit|functional)/#{m[1]}_spec.rb!
   end
   
-  autotest.add_mapping(%r%^spec/(unit|integration)/.*\.rb$%) do |filename, m|
+  autotest.add_mapping(%r%^spec/(unit|functional)/.*\.rb$%) do |filename, m|
     filename
   end
   

data/.gitignore

@@ -0,0 +1 @@
+.DS_Store

data/History.txt

@@ -1,3 +1,11 @@
+== 1.0.11
+
+* Attributes are now accessible by original or underscored name
+
+== 1.0.11
+
+* Minor performance improvements
+
 == 1.0.9
 
 * Fix incorrect integer column values (only affecting some dbf files)

data/README.markdown

@@ -2,20 +2,16 @@
 
 DBF is a small fast library for reading dBase, xBase, Clipper and FoxPro database files
 
-Copyright (c) 2006-2009 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
+* 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
 
 ## Features
 
 * No external dependencies
 * Fields are type cast to the appropriate Ruby types
-* Ability to dump the database schema in the portable ActiveRecord::Schema
-  format
+* Ability to dump the database schema in the portable ActiveRecord::Schema format
 
 ## Installation
   
@@ -30,7 +26,7 @@ Copyright (c) 2006-2009 Keith Morrison <keithm@infused.org>, <www.infused.org>
 
     # Tables are enumerable
     widget_ids = table.map { |row| row.id }
-    abc_names = table.select { |row| row.name =~ /^[a-cA-C] }
+    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
@@ -91,7 +87,7 @@ A small command-line utility called dbf is installed along with the gem.
 
 (The MIT Licence)
 
-Copyright (c) 2006-2009 Keith Morrison <keithm@infused.org, www.infused.org>
+Copyright (c) 2006-2009 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/Rakefile

@@ -4,10 +4,10 @@ $: << File.join(PROJECT_ROOT, 'lib')
 require 'rubygems'
 require 'jeweler'
 require 'spec/rake/spectask'
+require 'metric_fu'
 
 Jeweler::Tasks.new do |s|
   s.name = 'dbf'
-  s.version = '1.0.9'
   s.description = 'A small fast library for reading dBase, xBase, Clipper and FoxPro database files.'
   s.summary = 'Read xBase files'
   s.platform = Gem::Platform::RUBY
@@ -16,11 +16,9 @@ Jeweler::Tasks.new do |s|
   s.add_dependency('activesupport', ['>= 2.1.0'])
   s.add_dependency('fastercsv', ['>= 1.4.0'])
   s.homepage = 'http://github.com/infused/dbf'
-  s.rubyforge_project = 'dbf'
 end
 
 Jeweler::GemcutterTasks.new
-Jeweler::RubyforgeTasks.new
 
 task :default => :spec
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 1
 :minor: 0
-:patch: 10
+:patch: 11
 

data/dbf.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{dbf}
-  s.version = "1.0.10"
+  s.version = "1.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Keith Morrison"]
-  s.date = %q{2009-10-04}
+  s.date = %q{2009-12-05}
   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}
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".autotest",
+     ".gitignore",
      "History.txt",
      "README.markdown",
      "Rakefile",
@@ -54,7 +55,6 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/infused/dbf}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{dbf}
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Read xBase files}
   s.test_files = [
@@ -86,3 +86,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<fastercsv>, [">= 1.4.0"])
   end
 end
+

data/lib/dbf.rb

@@ -1,5 +1,5 @@
 require 'date'
-require 'activesupport'
+require 'active_support'
 
 if RUBY_VERSION > '1.9'    
  require 'csv'  

data/lib/dbf/column.rb

@@ -13,15 +13,13 @@ module DBF
     end
     
     def type_cast(value)
-      value = value.is_a?(Array) ? value.first : value
-      
       case type
       when 'N' # number
-        decimal.zero? ? unpack_integer(value) : value.to_f
+        unpack_number(value)
       when 'D' # date
         value.to_date unless value.blank?
       when 'L' # logical
-        value.strip =~ /^(y|t)$/i ? true : false
+        boolean(value)
       when 'I' # integer
         unpack_integer(value)
       when 'T' # datetime
@@ -37,33 +35,39 @@ module DBF
       DateTime.jd(days, seconds/3600, seconds/60 % 60, seconds % 60)
     end
     
+    def unpack_number(value)
+      decimal.zero? ? unpack_integer(value) : value.to_f
+    end
+    
     def unpack_integer(value)
       value.to_i
     end
     
+    def boolean(value)
+      value.strip =~ /^(y|t)$/i ? true : false
+    end
+    
     def schema_definition
-      data_type = case type
-      when "N" # number
-        if decimal > 0
-          ":float"
-        else
-          ":integer"
-        end
-      when "I" # integer
+      "\"#{name.underscore}\", #{schema_data_type}\n"
+    end
+    
+    def schema_data_type
+      case type
+      when "N"
+        decimal > 0 ? ":float" : ":integer"
+      when "I"
         ":integer"
-      when "D" # date
+      when "D"
         ":date"
-      when "T" # datetime
+      when "T"
         ":datetime"
-      when "L" # boolean
+      when "L"
         ":boolean"
-      when "M" # memo
+      when "M"
         ":text"
       else
         ":string, :limit => #{length}"
       end
-      
-      "\"#{name.underscore}\", #{data_type}\n"
     end
     
     # strip all non-ascii and non-printable characters

data/lib/dbf/record.rb

@@ -14,12 +14,7 @@ module DBF
     end
     
     def to_a
-      columns.map do |column|
-        underscored_column_name = column.name.underscore
-        value = @attributes[column.name.underscore]
-        
-        value.is_a?(String) ? value.strip : value
-      end
+      columns.map { |column| @attributes[column.name.underscore] }
     end
     
     private
@@ -38,22 +33,20 @@ module DBF
     def initialize_values
       @attributes = columns.inject({}) do |hash, column|
         if column.type == 'M'
-          starting_block = unpack_string(column).to_i
+          starting_block = unpack_data(column.length).to_i
+          hash[column.name] = read_memo(starting_block)
           hash[column.name.underscore] = read_memo(starting_block)
         else
-          value = unpack_column(column)
+          value = unpack_data(column.length)
+          hash[column.name] = column.type_cast(value)
           hash[column.name.underscore] = column.type_cast(value)
         end
         hash
       end
     end
   
-    def unpack_column(column)
-      @data.read(column.length).to_s.unpack("a#{column.length}")
-    end
-  
-    def unpack_string(column)
-      unpack_column(column).to_s
+    def unpack_data(length)
+      @data.read(length).unpack("a#{length}").first
     end
   
     def read_memo(start_block)
@@ -65,7 +58,7 @@ module DBF
     def build_fpt_memo(start_block)
       @memo.seek(start_block * memo_block_size)
       
-      memo_type, memo_size, memo_string = @memo.read(memo_block_size).unpack("NNa56")
+      memo_type, memo_size, memo_string = @memo.read(memo_block_size).unpack("NNa*")
       return nil unless memo_type == 1 and memo_size > 0
       
       if memo_size > memo_block_content_size
@@ -83,7 +76,8 @@ module DBF
       when "83" # dbase iii
         memo_string = ""
         loop do
-          memo_string << block = @memo.read(memo_block_size)
+          block = @memo.read(memo_block_size)
+          memo_string << block
           break if block.rstrip.size < memo_block_size
         end
       when "8b" # dbase iv

data/spec/functional/dbf_shared.rb

@@ -37,9 +37,16 @@ describe DBF, :shared => true do
   
   specify "column read accessors should return the attribute after typecast" do
     @table.columns do |column|
-      record = table.records.first
+      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(column_name.underscore)
+    end
+  end
+  
 end

data/spec/unit/record_spec.rb

@@ -8,18 +8,20 @@ describe DBF::Record do
   end
   
   def mock_table(data = '')
+    @column1 = DBF::Column.new 'ColumnName', 'N', 1, 0
+    
     returning mock('table') do |table|
       table.stub!(:memo_block_size).and_return(8)
       table.stub!(:memo).and_return(nil)
-      table.stub!(:columns).and_return([])
-      table.stub!(:data)
+      table.stub!(:columns).and_return([@column1])
+      table.stub!(:data).and_return(data)
       table.stub!(:has_memo_file?).and_return(true)
       table.data.stub!(:read).and_return(data)
     end
   end
   
   context "when initialized" do
-    it "should typecast number columns with decimals == 0 to Integer" do
+    it "should typecast number columns no decimal places to Integer" do
       table = DBF::Table.new "#{DB_PATH}/dbase_83.dbf"
       table.column("ID").type.should == "N"
       table.column("ID").decimal.should == 0
@@ -90,5 +92,33 @@ describe DBF::Record do
       record.to_a.should == ["Ten records stored in this database", 10.0, nil, false, "0.100000000000000000", nil]
     end
   end
+  
+  describe '#==' do
+    before do
+      @record = example_record
+    end
+    
+    it 'should be false if other does not have attributes' do
+      other = mock('object')
+      (@record == 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)
+      other = mock('object', :attributes => attributes)
+      (@record == other).should be_true
+    end
+  end
+  
+  describe 'unpack_data' do
+    before do
+      @record = example_record('abc')
+    end
+    
+    it 'should unpack the data' do
+      @record.send(:unpack_data, 3).should == 'abc'
+    end
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dbf
 version: !ruby/object:Gem::Version 
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors: 
 - Keith Morrison
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-04 00:00:00 -07:00
+date: 2009-12-05 00:00:00 -08:00
 default_executable: dbf
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,7 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - .autotest
+- .gitignore
 - History.txt
 - README.markdown
 - Rakefile
@@ -96,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: dbf
+rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3