dbf 1.0.2 → 1.0.3

data/History.txt

@@ -1,3 +1,6 @@
+== 1.0.3
+* Add support for Visual Foxpro Integer and Datetime columns
+
 == 1.0.2
 
 * Compatibility fix for Visual Foxpro memo files (ignore negative memo index values)
@@ -10,6 +13,9 @@
 
 * Renamed classes and refactored code in preparation for adding the
   ability to save records and create/compact databases.
+* The Reader class has been renamed to Table
+* Attributes are no longer accessed directly from the record.  Use record.attribute['column_name']
+  instead, or use the new attribute accessors detailed under Basic Usage.
 
 == 0.5.4
 

data/README.txt

@@ -49,6 +49,27 @@ Copyright (c) 2006-2007 Keith Morrison <keithm@infused.org, www.infused.org>
   table.find :first, :first_name => 'Keith'
   table.find(10)
   
+== Migrating to ActiveRecord
+
+An example of migrating a DBF book table to ActiveRecord using a migration:
+
+  require 'dbf'
+  
+  class CreateBooks < ActiveRecord::Migration
+    def self.up
+      table = DBF::Table.new('db/dbf/books.dbf')
+      eval(table.schema)
+
+      table.records.each do |record|
+        Book.create(record.attributes)
+      end
+    end
+
+    def self.down
+      drop_table :books
+    end
+  end
+  
 == Large databases
 
 DBF::Table defaults to loading all records into memory. This may not be what
@@ -66,12 +87,6 @@ A small command-line utility called dbf is installed along with the gem.
     -h = print this message
     -s = print summary information
     -a = create an ActiveRecord::Schema
-
-== Changes from 0.5.x
-
-* The Reader class has been renamed to Table
-* Attributes are no longer accessed directly from the record.  Use record.attribute['column_name']
-  instead, or use the new attribute accessors detailed under Basic Usage.
   
 == Limitations and known bugs
   

data/Rakefile

@@ -2,7 +2,7 @@ require 'hoe'
 require 'spec/rake/spectask'
 
 PKG_NAME = "dbf"
-PKG_VERSION = "1.0.2"
+PKG_VERSION = "1.0.3"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 Hoe.new PKG_NAME, PKG_VERSION do |p|

data/lib/dbf/globals.rb

@@ -18,5 +18,9 @@ module DBF
     "fb" => "FoxPro without memo file"
   }
   
+  MS_PER_SECOND = 1000
+  MS_PER_MINUTE = MS_PER_SECOND * 60
+  MS_PER_HOUR = MS_PER_MINUTE * 60
+  
   class DBFError < StandardError; end
 end

data/lib/dbf/record.rb

@@ -48,6 +48,10 @@ module DBF
           @attributes[column.name] = read_memo(starting_block)
         when 'L' # logical
           @attributes[column.name] = unpack_string(column) =~ /^(y|t)$/i ? true : false
+        when 'I' # integer
+          @attributes[column.name] = unpack_integer(column)
+        when 'T' # datetime
+          @attributes[column.name] = unpack_datetime(column)
         else
           @attributes[column.name] = unpack_string(column).strip
         end
@@ -61,9 +65,21 @@ module DBF
     def unpack_string(column)
       unpack_column(column).to_s
     end
+    
+    def unpack_integer(column)
+      @data.read(column.length).unpack("v").first
+    end
+    
+    def unpack_datetime(column)
+      days, milliseconds = @data.read(column.length).unpack('l2')
+      hours = (milliseconds / MS_PER_HOUR).to_i
+      minutes = ((milliseconds - (hours * MS_PER_HOUR)) / MS_PER_MINUTE).to_i
+      seconds = ((milliseconds - (hours * MS_PER_HOUR) - (minutes * MS_PER_MINUTE)) / MS_PER_SECOND).to_i
+      DateTime.jd(days, hours, minutes, seconds)
+    end
   
     def read_memo(start_block)
-      return nil if start_block <= 0
+      return nil if start_block <= 0 || @table.memo_block_size.nil?
       @memo.seek(start_block * @table.memo_block_size)
       if @table.memo_file_format == :fpt
         memo_type, memo_size, memo_string = @memo.read(@table.memo_block_size).unpack("NNa56")

data/spec/unit/record_spec.rb

@@ -1,6 +1,15 @@
 require File.dirname(__FILE__) + "/../spec_helper"
 
 describe DBF::Record, "when initialized" do
+  
+  def standalone_record(binary_data)
+    table = mock
+    table.stubs(:data)
+    table.data.stubs(:read).returns(binary_data)
+    table.stubs(:memo).returns(nil)
+    table.stubs(:columns).returns([])
+    DBF::Record.new(table)
+  end
 
   it "should typecast number columns with decimals == 0 to Integer" do
     table = DBF::Table.new "#{DB_PATH}/dbase_83.dbf"
@@ -27,5 +36,21 @@ describe DBF::Record, "when initialized" do
     table.column("WEBINCLUDE").type.should == "L"
     table.records.all? {|record| record.attributes["WEBINCLUDE"].should satisfy {|v| v == true || v == false}}
   end
+  
+  it "should typecast datetime columns to DateTime" do
+    binary_data = "Nl%\000\300Z\252\003"
+    record = standalone_record(binary_data)
+    column = stub(:length => 8)
+    
+    record.instance_eval {unpack_datetime(column)}.to_s.should == "2002-10-10T17:04:56+00:00"
+  end
+  
+  it "should typecast integers to Fixnum" do
+    binary_data = "\017\020\000\000"
+    record = standalone_record(binary_data)
+    column = stub(:length => 4)
+      
+    record.instance_eval {unpack_integer(column)}.should == 4111
+  end
 
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: dbf
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
-date: 2007-08-14 00:00:00 -07:00
+  version: 1.0.3
+date: 2007-09-02 00:00:00 -07:00
 summary: A small fast library for reading dBase, xBase, Clipper and FoxPro database files.
 require_paths: 
 - lib
@@ -85,5 +85,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.2
+        version: 1.3.0
     version: