dbf 1.2.1 → 1.2.2

data/History.txt

@@ -1,3 +1,7 @@
+== 1.2.2
+
+* Handle invalid date fields
+
 == 1.2.1
 
 * Add support for F field type (Float)

data/VERSION.yml

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

data/dbf.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dbf}
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Keith Morrison"]
-  s.date = %q{2010-03-30}
+  s.date = %q{2010-04-01}
   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}

data/lib/dbf/column.rb

@@ -28,21 +28,31 @@ module DBF
       case type
       when 'N' # number
         unpack_number(value)
+      when 'I' # integer
+        unpack_integer(value)
       when 'F' # float
         unpack_float(value)
       when 'D' # date
-        value.to_date unless value.blank?
-      when 'L' # logical
-        boolean(value)
-      when 'I' # integer
-        unpack_integer(value)
+        decode_date(value)
       when 'T' # datetime
         decode_datetime(value)
+      when 'L' # logical
+        boolean(value)
       else
         value.to_s.strip
       end
     end
     
+    # Decode a Date value
+    #
+    # @param [String] value
+    # @return [Date]
+    def decode_date(value)
+      unless value.blank?
+        value.to_date rescue nil
+      end
+    end
+    
     # Decode a DateTime value
     #
     # @param [String] value

data/spec/unit/column_spec.rb

@@ -6,7 +6,7 @@ describe DBF::Column do
     before do
       @column = DBF::Column.new "ColumnName", "N", 1, 0
     end
-
+    
     it "should set the #name accessor" do
       @column.name.should == "ColumnName"
     end
@@ -22,83 +22,120 @@ describe DBF::Column do
     it "should set the #decimal accessor" do
       @column.decimal.should == 0
     end
-  
-    it "should raise an error if length is greater than 0" do
-      lambda { DBF::Column.new "ColumnName", "N", -1, 0 }.should raise_error(DBF::ColumnLengthError)
+    
+    context 'with length of 0' do
+      specify { lambda { DBF::Column.new "ColumnName", "N", 0, 0 }.should raise_error(DBF::ColumnLengthError) }
     end
     
-    it "should raise error on emtpy column names" do
-      lambda { DBF::Column.new "\xFF\xFC", "N", 1, 0 }.should raise_error(DBF::ColumnNameError)
+    context 'with length less than 0' do
+      specify { lambda { DBF::Column.new "ColumnName", "N", -1, 0 }.should raise_error(DBF::ColumnLengthError) }
     end
     
+    context 'with empty column name' do
+      specify { lambda { DBF::Column.new "\xFF\xFC", "N", 1, 0 }.should raise_error(DBF::ColumnNameError) }
+    end
   end
   
   context "#type_cast" do
-    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 numbers with no decimals to Integer" do
-      value = "135"
-      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"
-      column = DBF::Column.new "ColumnName", "I", 3, 0
-      column.type_cast(value).should == 135
-    end
-    
-    it "should cast boolean to True" do
-      value = "y"
-      column = DBF::Column.new "ColumnName", "L", 1, 0
-      column.type_cast(value).should == true
-    end
-    
-    it "should cast boolean to False" do
-      value = "n"
-      column = DBF::Column.new "ColumnName", "L", 1, 0
-      column.type_cast(value).should == false
-    end
-    
-    it "should cast datetime columns to DateTime" do
-      value = "Nl%\000\300Z\252\003"
-      column = DBF::Column.new "ColumnName", "T", 16, 0
-      column.type_cast(value).should == "2002-10-10T17:04:56+00:00"
-    end
-    
-    it "should cast invalid datetime columns to nil" do
-      value = "Nl%\000\000A\000\999"
-      column = DBF::Column.new "ColumnName", "T", 16, 0
-      column.type_cast(value).should be_nil
-    end
-    
-    it "should cast date columns to Date" do
-      value = "20050712"
-      column = DBF::Column.new "ColumnName", "D", 8, 0
-      column.type_cast(value).should == Date.new(2005,7,12)
+    context 'with type N (number)' do
+      context 'with 0 decimals' do
+        it "should cast value to Integer" do
+          value = "135"
+          column = DBF::Column.new "ColumnName", "N", 3, 0
+          column.type_cast(value).should == 135
+        end
+      end
+      
+      context 'with more than 0 decimals' do
+        it "should cast value to Float" do
+          value = "13.5"
+          column = DBF::Column.new "ColumnName", "N", 2, 1
+          column.type_cast(value).should == 13.5
+        end
+      end
+    end
+    
+    context 'with type F (float)' do
+      it "should cast value to Float" do
+        value = "135"
+        column = DBF::Column.new "ColumnName", "F", 3, 0
+        column.type_cast(value).should == 135.0
+      end
+    end
+    
+    context 'with type I (integer)' do
+      it "should cast value to Integer" do
+        value = "135"
+        column = DBF::Column.new "ColumnName", "I", 3, 0
+        column.type_cast(value).should == 135
+      end
+    end
+    
+    context 'with type L (logical/boolean)' do
+      it "should cast 'y' to true" do
+        value = "y"
+        column = DBF::Column.new "ColumnName", "L", 1, 0
+        column.type_cast(value).should == true
+      end
+      
+      it "should cast 'n' to false" do
+        value = "n"
+        column = DBF::Column.new "ColumnName", "L", 1, 0
+        column.type_cast(value).should == false
+      end
+    end
+    
+    context 'with type T (datetime)' do
+      context 'with valid datetime' do
+        it "should cast to DateTime" do
+          value = "Nl%\000\300Z\252\003"
+          column = DBF::Column.new "ColumnName", "T", 16, 0
+          column.type_cast(value).should == "2002-10-10T17:04:56+00:00"
+        end
+      end
+      
+      context 'with invalid datetime' do
+        it "should cast to nil" do
+          value = "Nl%\000\000A\000\999"
+          column = DBF::Column.new "ColumnName", "T", 16, 0
+          column.type_cast(value).should be_nil
+        end
+      end
+    end
+    
+    context 'with type D (date)' do
+      context 'with valid date' do
+        it "should cast to Date" do
+          value = "20050712"
+          column = DBF::Column.new "ColumnName", "D", 8, 0
+          column.type_cast(value).should == Date.new(2005,7,12)
+        end
+      end
+      
+      context 'with invalid date' do
+        it "should cast to Date" do
+          value = "0"
+          column = DBF::Column.new "ColumnName", "D", 8, 0
+          column.type_cast(value).should be_nil
+        end
+      end
+    end
+    
+    context 'with type M (memo)' do
+      it "should typecast memo columns to String" do
+        value = 'abc'
+        column = DBF::Column.new "ColumnName", "M", 3, 0
+        column.type_cast(value).should be_a String
+      end
     end
   end
   
   context "#schema_definition" do
-    it "should define an integer column if type is (N)umber with 9 decimals" do
-      column = DBF::Column.new "ColumnName", "N", 1, 0
-      column.schema_definition.should == "\"column_name\", :integer\n"
+    context 'with type N (number)' do
+      it "should output an integer column" do
+        column = DBF::Column.new "ColumnName", "N", 1, 0
+        column.schema_definition.should == "\"column_name\", :integer\n"
+      end
     end
     
     it "should define a float colmn if type is (N)umber with more than 0 decimals" do

data/spec/unit/record_spec.rb

@@ -20,34 +20,6 @@ describe DBF::Record do
     end
   end
   
-  context "when initialized" 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
-      table.record(1).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.record(1).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.record(1).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.record(1).attributes["webinclude"].should satisfy {|v| v == true || v == false}
-    end
-  end
-  
   describe '#memo_block_content_size' do
     it "should equal the difference between the table's memo_block_size and 8" do
       table = mock_table
@@ -68,20 +40,35 @@ describe DBF::Record do
   end
   
   describe '#read_memo' do
-    it 'should return nil if start_block is less than 1' do
-      table = mock_table
-      record = DBF::Record.new(table)
-      
-      record.send(:read_memo, 0).should be_nil
-      record.send(:read_memo, -1).should be_nil
+    before do
+      @table = mock_table
+      @record = DBF::Record.new(@table)
     end
     
-    it 'should return nil if memo file is missing' do
-      table = mock_table
-      table.should_receive(:has_memo_file?).and_return(false)
-      record = DBF::Record.new(table)
+    context 'with start_block of 0' do
+      specify { @record.send(:read_memo, 0).should be_nil }
+    end
+    
+    context 'with start_block less than 0' do
+      specify { @record.send(:read_memo, -1).should be_nil }
+    end
+    
+    context 'with valid start_block' do
+      before do
+        @table.stub!(:memo_file_format).and_return(:fpt)
+      end
       
-      record.send(:read_memo, 5).should be_nil
+      it 'should build the fpt memo' do
+        @record.should_receive(:build_fpt_memo)
+        @record.send(:read_memo, 1)
+      end 
+    end
+    
+    context 'with no memo file' do
+      specify do 
+        @table.should_receive(:has_memo_file?).and_return(false)
+        @record.send(:read_memo, 5).should be_nil
+      end
     end
   end
   

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Keith Morrison
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-30 00:00:00 -07:00
+date: 2010-04-01 00:00:00 -07:00
 default_executable: dbf
 dependencies: 
 - !ruby/object:Gem::Dependency