dbf 0.5.0 → 0.5.1

data/Rakefile

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

data/lib/dbf/record.rb

@@ -27,40 +27,45 @@ module DBF
       self
     end
     
-    def unpack_field(field)
-      @data_file.read(field.length).unpack("a#{field.length}")
-    end
+    private
     
-    def unpack_string(field)
-      unpack_field(field).to_s
-    end
+      def unpack_field(field)
+        @data_file.read(field.length).unpack("a#{field.length}")
+      end
+    
+      def unpack_string(field)
+        unpack_field(field).to_s
+      end
     
-    def read_memo(start_block)
-      return nil if start_block == 0
-      @memo_file.seek(start_block * @reader.memo_block_size)
-      if @reader.memo_file_format == :fpt
-        memo_type, memo_size, memo_string = @memo_file.read(@reader.memo_block_size).unpack("NNa56")
+      def read_memo(start_block)
+        return nil if start_block == 0
+        @memo_file.seek(start_block * @reader.memo_block_size)
+        if @reader.memo_file_format == :fpt
+          memo_type, memo_size, memo_string = @memo_file.read(@reader.memo_block_size).unpack("NNa56")
         
-        memo_block_content_size = @reader.memo_block_size - FPT_BLOCK_HEADER_SIZE
-        if memo_size > memo_block_content_size
-          memo_string << @memo_file.read(memo_size - @reader.memo_block_size + FPT_BLOCK_HEADER_SIZE)
-        elsif memo_size > 0 and memo_size < memo_block_content_size
-          memo_string = memo_string[0, memo_size]
-        end
-      else
-        case @reader.version
-        when "83" # dbase iii
-          memo_string = ""
-          loop do
-            memo_string << block = @memo_file.read(512)
-            break if block.strip.size < 512
+          # skip the memo if it isn't texst
+          return nil unless memo_type == 1
+          
+          memo_block_content_size = @reader.memo_block_size - FPT_BLOCK_HEADER_SIZE
+          if memo_size > memo_block_content_size
+            memo_string << @memo_file.read(memo_size - @reader.memo_block_size + FPT_BLOCK_HEADER_SIZE)
+          elsif memo_size > 0 and memo_size < memo_block_content_size
+            memo_string = memo_string[0, memo_size]
+          end
+        else
+          case @reader.version
+          when "83" # dbase iii
+            memo_string = ""
+            loop do
+              memo_string << block = @memo_file.read(512)
+              break if block.strip.size < 512
+            end
+          when "8b" # dbase iv
+            memo_type, memo_size = @memo_file.read(8).unpack("LL")
+            memo_string = @memo_file.read(memo_size)
           end
-        when "8b" # dbase iv
-          memo_type, memo_size = @memo_file.read(8).unpack("LL")
-          memo_string = @memo_file.read(memo_size)
         end
+        memo_string
       end
-      memo_string
     end
-  end
 end

data/spec/field_spec.rb

@@ -6,19 +6,19 @@ describe DBF::Field, "when initialized" do
     @field = DBF::Field.new "FieldName", "N", 1, 0
   end
   
-  it "should set the 'name' accessor" do
+  it "should set the #name accessor" do
     @field.name.should == "FieldName"
   end
   
-  it "should set the 'type' accessor" do
+  it "should set the #type accessor" do
     @field.type.should == "N"
   end
   
-  it "should set the 'length' accessor" do
+  it "should set the #length accessor" do
     @field.length.should == 1
   end
   
-  it "should set the 'decimal' accessor" do
+  it "should set the #decimal accessor" do
     @field.decimal.should == 0
   end
   

data/spec/reader_spec.rb

@@ -140,3 +140,32 @@ describe DBF::Reader, "find(:first)" do
   end
 end
 
+describe DBF::Reader do
+  
+  before(:each) do
+    @reader = DBF::Reader.new File.dirname(__FILE__) + '/../test/databases/dbase_iii_memo.dbf'
+  end
+  
+  it "should reload all data when sent #reload!" do
+    @reader.records
+    @reader.instance_eval("@records").should be_kind_of(Array)
+    @reader.reload!
+    @reader.instance_eval("@records").should be_nil
+  end
+  
+  it "should return a DBF::Field object when sent #field with a valid field_name given as a string or symbol" do
+    @reader.field("IMAGE").should be_kind_of(DBF::Field)
+    @reader.field(:IMAGE).should be_kind_of(DBF::Field)
+  end
+  
+  it "should return nil when sent #field with an invalid field_name given as a string or symbol" do
+    @reader.field("NOTANIMAGE").should be_nil
+    @reader.field(:NOTANIMAGE).should be_nil
+  end
+  
+  it "should return a text description of the database type when sent #version_description" do
+    @reader.version_description.should == "dBase III with memo file"
+  end
+
+end
+

data/spec/record_spec.rb

@@ -2,8 +2,31 @@ require File.dirname(__FILE__) + "/spec_helper"
 
 describe DBF::Record, "when initialized" do
   
-  it "should convert number fields with 0 decimals to integers" do
-    
+  before(:each) do
+    @reader = DBF::Reader.new File.dirname(__FILE__) + '/../test/databases/dbase_iii_memo.dbf'
+    @record = @reader.record(5)
+  end
+  
+  it "should typecast number fields with decimals == 0 to Integer" do
+    @reader.field("ID").type == "N"
+    @reader.field("ID").decimal.should == 0
+    @record["ID"].should be_kind_of(Integer)
+  end
+  
+  it "should typecast number fields with decimals > 0 to Float" do
+    @reader.field("ID").type == "N"
+    @reader.field("COST").decimal.should == 2
+    @record["COST"].should be_kind_of(Float)
+  end
+  
+  it "should typecast memo fields to String" do
+    @reader.field("DESC").type == "M"
+    @record["DESC"].should be_kind_of(String)
+  end
+  
+  it "should typecast logical fields to True or False" do
+    @reader.field("TAXABLE").type == "L"
+    @record["TAXABLE"].should be_kind_of(FalseClass)
   end
   
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: dbf
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
-date: 2007-05-26 00:00:00 -07:00
+  version: 0.5.1
+date: 2007-06-05 00:00:00 -07:00
 summary: A small fast library for reading dBase, xBase, Clipper and FoxPro database files.
 require_paths: 
 - lib