tabular 0.0.4 → 0.0.5

data/README

@@ -54,6 +54,11 @@ Tests
 There's basic test coverage. More comprehensive test coverage needs to be extracted from original projects. Run 'rake test'.
 
 
+Changes
+-------
+0.0.5 Parse 'invalid' m/d/yy dates
+
+
 Copyright
 ---------
 

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/tabular/row.rb

@@ -1,3 +1,5 @@
+require "date"
+
 module Tabular
   # Associate list of cells. Each Table has a list of Rows. Access Row cells via symbols. Ex: row[:city]
   class Row
@@ -78,7 +80,16 @@ module Tabular
               if @array[index].is_a?(Date) || @array[index].is_a?(DateTime) || @array[index].is_a?(Time)
                 @hash[column.key] = @array[index]
               else
-                @hash[column.key] = Date.parse(@array[index], true)
+                begin
+                  @hash[column.key] = Date.parse(@array[index], true)
+                rescue ArgumentError => e
+                  date = parse_invalid_date(@array[index])
+                  if date
+                    @hash[column.key] = date
+                  else
+                    raise ArgumentError, "'#{@array[index]}' is not a valid date"
+                  end
+                end
               end
             else
               @hash[column.key] = @array[index]
@@ -88,5 +99,33 @@ module Tabular
       end
       @hash
     end
+    
+    
+    private
+    
+    # Handle common m/d/yy case that Date.parse dislikes
+    def parse_invalid_date(value)
+      return unless value
+      
+      parts = value.split("/")
+      return unless parts.size == 3
+
+      month = parts[0].to_i
+      day = parts[1].to_i
+      year = parts[2].to_i
+      return unless month >=1 && month <= 12 && day >= 1 && day <= 31
+
+      if year == 0
+        year = 2000
+      elsif year > 0 && year < 69
+        year = 2000 + year
+      elsif year > 69 && year < 100
+        year = 1900 + year
+      elsif year < 1900 || year > 2050
+        return nil
+      end
+      
+      Date.new(year, month, day)
+    end
   end
 end

data/tabular.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tabular}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Willson"]
-  s.date = %q{2010-06-09}
+  s.date = %q{2010-10-16}
   s.description = %q{Tabular is a Ruby library for reading, writing, and manipulating CSV, tab-delimited and Excel data.}
   s.email = %q{scott.willson@gmail.cpm}
   s.extra_rdoc_files = [

data/test/row_test.rb

@@ -44,7 +44,8 @@ module Tabular
     def test_inspect
       table = Table.new([[ "planet", "star" ]])
       row = Row.new(table, [ "Mars", "Sun" ])
-      assert_equal "{:planet=>\"Mars\", :star=>\"Sun\"}", row.inspect, "inspect"
+      assert_match %r{:planet=>"Mars"}, row.inspect, "inspect"
+      assert_match %r{:star=>"Sun"}, row.inspect, "inspect"
     end
     
     def test_to_s
@@ -60,6 +61,21 @@ module Tabular
       assert_equal nil, table.rows.first.previous, "previous of first Row"
       assert_equal "Mars", table.rows.last.previous[:planet], "previous"
     end
+    
+    def test_invalid_date_raises_exception
+      table = Table.new([[ "launched" ]], :columns => { :launched => { :column_type => :date } })
+      row = Row.new(table, [ "99/z/99" ])
+      assert_raise ArgumentError do
+        row[:launched]
+      end
+    end
+    
+    def test_parse_compact_american_dates
+      table = Table.new([[ "launched" ]], :columns => { :launched => { :column_type => :date } })
+      assert_equal Date.new(1999, 1, 1), Row.new(table, [ "1/1/99" ])[:launched], "1/1/99"
+      assert_equal Date.new(2000, 8, 28), Row.new(table, [ "8/28/00" ])[:launched], "8/28/00"
+      assert_equal Date.new(2008, 12, 31), Row.new(table, [ "12/31/08" ])[:launched], "12/31/08"
+    end
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Scott Willson
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-09 00:00:00 -07:00
+date: 2010-10-16 00:00:00 -07:00
 default_executable: 
 dependencies: []