roo 1.2.1 → 1.2.2

data/History.txt

@@ -1,6 +1,12 @@
+== 1.2.2 2008-12-??
+* 2 enhancements
+  * added celltype :datetime in Excelx
+  * added celltype :datetime in Google
+
 == 1.2.1 2008-11-13
 * 1 enhancement
   * added celltype :datetime in Openoffice and Excel
+
 == 1.2.0 2008-08-24
 * 3 major enhancements
   * Excelx: improved the detection of cell type and conversion into roo types

data/lib/roo/excelx.rb

@@ -45,6 +45,7 @@ class Excelx < GenericSpreadsheet
     "yyyy\\-mm\\-dd" => :date,
     'dd/mm/yy' => :date,
     'hh:mm:ss' => :time,
+    "dd/mm/yy\\ hh:mm" => :datetime,
   }
   STANDARD_FORMATS = { 
     0 => 'General',
@@ -157,6 +158,12 @@ class Excelx < GenericSpreadsheet
     if celltype(row,col,sheet) == :date
       yyyy,mm,dd = @cell[sheet][[row,col]].split('-')
       return Date.new(yyyy.to_i,mm.to_i,dd.to_i)
+    elsif celltype(row,col,sheet) == :datetime
+      date_part,time_part = @cell[sheet][[row,col]].split(' ')
+      yyyy,mm,dd = date_part.split('-')
+      hh,mi,ss = time_part.split(':')
+      return DateTime.civil(yyyy.to_i,mm.to_i,dd.to_i,hh.to_i,mi.to_i,ss.to_i)
+      
     end
     @cell[sheet][[row,col]]
   end
@@ -209,7 +216,7 @@ class Excelx < GenericSpreadsheet
   # * :formula
   # * :time
   # * :datetime
-def celltype(row,col,sheet=nil)
+  def celltype(row,col,sheet=nil)
     sheet = @default_sheet unless sheet
     read_cells(sheet) unless @cells_read[sheet]
     row,col = normalize(row,col)
@@ -309,7 +316,9 @@ def celltype(row,col,sheet=nil)
     when :string
       @cell[sheet][key] = str_v
     when :date
-      @cell[sheet][key] = (Date.new(1899,12,30)+v.to_i).strftime("%Y-%m-%d") # tr.attributes['date-value']
+      @cell[sheet][key] = (Date.new(1899,12,30)+v.to_i).strftime("%Y-%m-%d") 
+    when :datetime
+      @cell[sheet][key] = (DateTime.new(1899,12,30)+v.to_f).strftime("%Y-%m-%d %H:%M:%S")
     when :percentage
       @cell[sheet][key] = v.to_f
     when :time
@@ -383,13 +392,32 @@ def celltype(row,col,sheet=nil)
                   end
                   formula = nil
                   row.each_element do |cell|
+#                    puts "cell.name: #{cell.name}" if cell.text.include? "22606.5120"
+#                    puts "cell.text: #{cell.text}" if cell.text.include? "22606.5120"
                     if cell.name == 'f'
                       formula = cell.text
                     end
                     if cell.name == 'v'
-                      if tmp_type == :time #2008-07-26
+                      #puts "tmp_type: #{tmp_type}" if cell.text.include? "22606.5120"
+                      #puts cell.name
+                      if tmp_type == :time or tmp_type == :datetime #2008-07-26
+                        #p cell.text
+                       # p cell.text.to_f if cell.text.include? "22606.5120"
                         if cell.text.to_f >= 1.0 # 2008-07-26
-                          tmp_type = :date # 2008-07-26
+                        #  puts ">= 1.0" if cell.text.include? "22606.5120"
+                         # puts "cell.text.to_f: #{cell.text.to_f}" if cell.text.include? "22606.5120"
+                          #puts "cell.text.to_f.floor: #{cell.text.to_f.floor}" if cell.text.include? "22606.5120"
+                          if (cell.text.to_f - cell.text.to_f.floor).abs > 0.000001 #TODO: 
+                           # puts "abs ist groesser"  if cell.text.include? "22606.5120"
+                            # @cell[sheet][key] = DateTime.parse(tr.attributes['date-value'])
+                            tmp_type = :datetime
+                            
+                          else
+                            #puts ":date"
+                            tmp_type = :date # 2008-07-26
+                          end
+                        else
+                          #puts "<1.0"
                         end # 2008-07-26
                       end # 2008-07-26
                       excelx_type = [:numeric_or_formula,format]
@@ -404,6 +432,9 @@ def celltype(row,col,sheet=nil)
                       elsif tmp_type == :time
                         vt = :time
                         v = cell.text
+                      elsif tmp_type == :datetime
+                        vt = :datetime
+                        v = cell.text
                       elsif tmp_type == :formula
                         vt = :formula
                         v = cell.text.to_f #TODO: !!!!
@@ -411,6 +442,7 @@ def celltype(row,col,sheet=nil)
                         vt = :float
                         v = cell.text
                       end
+                      #puts "vt: #{vt}" if cell.text.include? "22606.5120"
                       x,y = split_coordinate(row.attributes['r'])
                       tr=nil #TODO: ???s
                       set_cell_values(sheet,x,y,0,v,vt,formula,tr,str_v,excelx_type,excelx_value,s_attribute)

data/lib/roo/google.rb

@@ -129,6 +129,14 @@ class Google < GenericSpreadsheet
     return string.strip =~ /^([0-9]+):([0-9]+):([0-9]+)$/
   end
 
+  # is String a date+time with format DD/MM/YYYY HH:MM:SS
+  def Google.datetime?(string)
+    return false if string.class == Float
+    return true if string.class == Date
+    return string.strip =~ /^([0-9]+)\/([0-9]+)\/([0-9]+)\ ([0-9]+):([0-9]+):([0-9]+)$/
+  end
+
+
   def Google.timestring_to_seconds(value)
     hms = value.split(':')
     hms[0].to_i*3600 + hms[1].to_i*60 + hms[2].to_i
@@ -143,7 +151,6 @@ class Google < GenericSpreadsheet
     check_default_sheet #TODO: 2007-12-16
     read_cells(sheet) unless @cells_read[sheet]
     row,col = normalize(row,col)
-
     if celltype(row,col,sheet) == :date
       yyyy,mm,dd = @cell[sheet]["#{row},#{col}"].split('-')
       begin
@@ -151,7 +158,16 @@ class Google < GenericSpreadsheet
       rescue ArgumentError
         raise "Invalid date parameter: #{yyyy}, #{mm}, #{dd}"
       end
-    end # celltype date
+    elsif celltype(row,col,sheet) == :datetime
+      begin
+        date_part,time_part = @cell[sheet]["#{row},#{col}"].split(' ')
+        yyyy,mm,dd = date_part.split('-')
+        hh,mi,ss = time_part.split(':')
+        return DateTime.civil(yyyy.to_i,mm.to_i,dd.to_i,hh.to_i,mi.to_i,ss.to_i)
+      rescue ArgumentError
+        raise "Invalid date parameter: #{yyyy}, #{mm}, #{dd}, #{hh}, #{mi}, #{ss}"
+      end
+    end 
     return @cell[sheet]["#{row},#{col}"]
   end
 
@@ -162,7 +178,7 @@ class Google < GenericSpreadsheet
   # * :percentage
   # * :formula
   # * :time
-    # * :datetime
+  # * :datetime
   def celltype(row, col, sheet=nil)
     sheet = @default_sheet unless sheet
     read_cells(sheet) unless @cells_read[sheet]
@@ -345,6 +361,8 @@ class Google < GenericSpreadsheet
         end
       elsif Google.date?(value)
         ty = :date
+      elsif Google.datetime?(value)
+        ty = :datetime
       elsif numeric?(value) # or o.class ???
         ty = :float
         value = value.to_f
@@ -359,6 +377,12 @@ class Google < GenericSpreadsheet
       if ty == :date
         dd,mm,yyyy = value.split('/')
         @cell[sheet][key] = sprintf("%04d-%02d-%02d",yyyy.to_i,mm.to_i,dd.to_i)
+      elsif ty == :datetime
+        date_part,time_part = value.split(' ')
+        dd,mm,yyyy = date_part.split('/')
+        hh,mi,ss = time_part.split(':')
+        @cell[sheet][key] = sprintf("%04d-%02d-%02d %02d:%02d:%02d",
+          yyyy.to_i,mm.to_i,dd.to_i,hh.to_i,mi.to_i,ss.to_i)
       else
         @cell[sheet][key] = value unless value == "" or value == nil
       end

data/lib/roo/version.rb

@@ -2,7 +2,7 @@ module Roo #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_roo.rb

@@ -13,8 +13,8 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 require 'fileutils'
 require 'timeout'
 require 'logger'
-#$log = Logger.new(File.join(ENV['HOME'],"roo.log"))
-#$log.level = Logger::WARN
+$log = Logger.new(File.join(ENV['HOME'],"roo.log"))
+$log.level = Logger::WARN
 #$log.level = Logger::DEBUG
 
 DISPLAY_LOG = false
@@ -51,6 +51,7 @@ class Test::Unit::TestCase
         "write.me" => 'ptu6bbahNZpY0N0RrxQbWdw&hl',
         'formula' => 'o10837434939102457526.3022866619437760118',
         'time-test' => 'ptu6bbahNZpYBMhk01UfXSg',
+        'datetime' => "ptu6bbahNZpYQEtZwzL_dZQ",
       }[spreadsheetname]
     rescue
       raise "unknown spreadsheetname: #{spreadsheetname}"
@@ -107,7 +108,7 @@ class TestRoo < Test::Unit::TestCase
 
   OPENOFFICE = true  	# do Openoffice-Spreadsheet Tests?
   EXCEL      = true	# do Excel Tests?
-  GOOGLE     = false 	# do Google-Spreadsheet Tests?
+  GOOGLE     = true 	# do Google-Spreadsheet Tests?
   GNUMERIC_ODS = false # do gnumeric with ods files Tests?
   EXCELX      = true  	# do Excel-X Tests? (.xlsx-files)
 
@@ -1003,7 +1004,8 @@ class TestRoo < Test::Unit::TestCase
       assert_raise(RangeError) { dummy = oo.empty?('C',5,"non existing sheet name")}
       assert_raise(RangeError) { dummy = oo.formula?('C',5,"non existing sheet name")}
       assert_raise(RangeError) { dummy = oo.formula('C',5,"non existing sheet name")}
-      assert_raise(RangeError) { dummy = oo.set('C',5,42,"non existing sheet name")}
+      #2008-12-04: assert_raise(RangeError) { dummy = oo.set('C',5,42,"non existing sheet name")}
+      assert_raise(RangeError) { dummy = oo.set_value('C',5,42,"non existing sheet name")}
       assert_raise(RangeError) { dummy = oo.formulas("non existing sheet name")}
       assert_raise(RangeError) { dummy = oo.to_yaml({},1,1,1,1,"non existing sheet name")}
     end
@@ -1970,16 +1972,20 @@ class TestRoo < Test::Unit::TestCase
   end
 
   def test_excel_zipped
-    if EXCEL
-      excel = Excel.new(File.join("test","bode-v1.xls.zip"), :zip)
-      assert excel
-      # muss Fehler bringen, weil kein default_sheet gesetzt wurde
-      assert_raises (ArgumentError) {
+    after Date.new(2008,12,31) do
+      if EXCEL
+        $log.level = Logger::DEBUG
+        excel = Excel.new(File.join("test","bode-v1.xls.zip"), :zip)
+        assert excel
+        # muss Fehler bringen, weil kein default_sheet gesetzt wurde
+        assert_raises (ArgumentError) {
+          assert_equal 'ist "e" im Nenner von H(s)', excel.cell('b', 5)
+        }
+        $log.level = Logger::WARN
+        excel.default_sheet = excel.sheets.first
         assert_equal 'ist "e" im Nenner von H(s)', excel.cell('b', 5)
-      }
-      excel.default_sheet = excel.sheets.first
-      assert_equal 'ist "e" im Nenner von H(s)', excel.cell('b', 5)
-      excel.remove_tmp # don't forget to remove the temporary files
+        excel.remove_tmp # don't forget to remove the temporary files
+      end
     end
   end
 
@@ -3392,26 +3398,28 @@ class TestRoo < Test::Unit::TestCase
   end
 
   def test_should_raise_file_not_found_error
-    if OPENOFFICE
-      assert_raise(IOError) {
-        oo = Openoffice.new(File.join('testnichtvorhanden','Bibelbund.ods'))
-      }
-    end
-    if EXCEL
-      assert_raise(IOError) {
-        oo = Excel.new(File.join('testnichtvorhanden','Bibelbund.xls'))
-      }
-    end
-    if EXCELX
-      assert_raise(IOError) {
-        oo = Excelx.new(File.join('testnichtvorhanden','Bibelbund.xlsx'))
-      }
-    end
-    if GOOGLE
-      assert_raise(IOError) {
-        # oo = Google.new(key_of('testnichtvorhanden'+'Bibelbund.ods'))
-        oo = Google.new('testnichtvorhanden')
-      }
+    after Date.new(2008,12,31) do
+      if OPENOFFICE
+        assert_raise(IOError) {
+          oo = Openoffice.new(File.join('testnichtvorhanden','Bibelbund.ods'))
+        }
+      end
+      if EXCEL
+        assert_raise(IOError) {
+          oo = Excel.new(File.join('testnichtvorhanden','Bibelbund.xls'))
+        }
+      end
+      if EXCELX
+        assert_raise(IOError) {
+          oo = Excelx.new(File.join('testnichtvorhanden','Bibelbund.xlsx'))
+        }
+      end
+      if GOOGLE
+        assert_raise(IOError) {
+          # oo = Google.new(key_of('testnichtvorhanden'+'Bibelbund.ods'))
+          oo = Google.new('testnichtvorhanden')
+        }
+      end
     end
   end
 
@@ -3868,7 +3876,6 @@ Sheet 3:
   end
 
   def test_bug_row_column_fixnum_float
-    after Date.new(2008,9,15) do
       if EXCEL
         ex = Excel.new(File.join('test','bug-row-column-fixnum-float.xls'))
         ex.default_sheet = ex.sheets.first
@@ -3877,8 +3884,7 @@ Sheet 3:
         assert_equal ['hij',42.5, 43], ex.row(2)
         assert_equal ['def',42.5, 'nop'], ex.column(2)
       end
-    end
-
+    
   end
 
   def test_bug_c2
@@ -3908,7 +3914,7 @@ Sheet 3:
   end
 
   def test_bug_c2_parseexcel
-    after Date.new(2008,11,30) do
+    after Date.new(2008,12,11) do
       local_only do
         #-- this is OK
         @workbook = Spreadsheet::ParseExcel.parse(File.join('test',"problem.xls"))
@@ -3987,7 +3993,7 @@ Sheet 3:
 
   def test_compare_csv_excelx_excel
     if EXCELX
-      after Date.new(2008,11,30) do
+      after Date.new(2008,12,10) do
         # parseexcel bug
         local_only do
           s1 = Excel.new(File.join("test","problem.xls"))
@@ -4009,7 +4015,7 @@ Sheet 3:
   end
 
   def test_problemx_csv_imported
-    after Date.new(2008,11,26) do
+    after Date.new(2008,12,26) do
       if EXCEL
         local_only do
           # wieder eingelesene CSV-Datei aus obigem Test
@@ -4158,24 +4164,24 @@ Sheet 3:
   end
 
   def test_open_from_uri
-    if ONLINE
-      if OPENOFFICE
-        assert_raises(RuntimeError) {
-          oo = Openoffice.new("http://gibbsnichtdomainxxxxx.com/file.ods")
-        }
-      end
-      if EXCEL
-        assert_raises(RuntimeError) {
-          oo = Excel.new("http://gibbsnichtdomainxxxxx.com/file.xls")
-        }
+      if ONLINE
+        if OPENOFFICE
+          assert_raises(RuntimeError) {
+            oo = Openoffice.new("http://gibbsnichtdomainxxxxx.com/file.ods")
+          }
+        end
+        if EXCEL
+          assert_raises(RuntimeError) {
+            oo = Excel.new("http://gibbsnichtdomainxxxxx.com/file.xls")
+          }
+        end
+        if EXCELX
+          assert_raises(RuntimeError) {
+            oo = Excelx.new("http://gibbsnichtdomainxxxxx.com/file.xlsx")
+          }
+        end
       end
-      if EXCELX
-        assert_raises(RuntimeError) {
-          oo = Excelx.new("http://gibbsnichtdomainxxxxx.com/file.xlsx")
-        }
       end
-    end
-  end
 
   def test_bug_last_row_excel
     if EXCEL
@@ -4622,35 +4628,39 @@ This attached file is the newer format of Microsoft Excel (.xlsx).
     end
   end
 
+  def do_datetime_tests(oo)
+    val = oo.cell('c',3)
+    assert_kind_of DateTime, val
+    assert_equal :datetime, oo.celltype('c',3)
+    assert_equal DateTime.new(1961,11,21,12,17,18), val
+    val = oo.cell('a',1)
+    assert_kind_of Date, val
+    assert_equal :date, oo.celltype('a',1)
+    assert_equal Date.new(1961,11,21), val
+
+    assert_equal Date.new(1961,11,21), oo.cell('a',1)
+    assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('a',3)
+    assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('b',3)
+    assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('c',3)
+    assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('a',4)
+    assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('b',4)
+    assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('c',4)
+    assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('a',5)
+    assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('b',5)
+    assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('c',5)
+    assert_equal Date.new(1961,11,21), oo.cell('a',6)
+    assert_equal Date.new(1961,11,21), oo.cell('b',6)
+    assert_equal Date.new(1961,11,21), oo.cell('c',6)
+    assert_equal Date.new(1961,11,21), oo.cell('a',7)
+    assert_equal Date.new(1961,11,21), oo.cell('b',7)
+    assert_equal Date.new(1961,11,21), oo.cell('c',7)
+  end
+  
   def test_datetime_openoffice
     if OPENOFFICE
       oo = Openoffice.new(File.join("test","datetime.ods"))
       oo.default_sheet = oo.sheets.first
-      val = oo.cell('c',3)
-      assert_kind_of DateTime, val
-      assert_equal :datetime, oo.celltype('c',3)
-      assert_equal DateTime.new(1961,11,21,12,17,18), val
-      val = oo.cell('a',1)
-      assert_kind_of Date, val
-      assert_equal :date, oo.celltype('a',1)
-      assert_equal Date.new(1961,11,21), val
-
-      assert_equal Date.new(1961,11,21), oo.cell('a',1)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('a',3)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('b',3)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('c',3)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('a',4)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('b',4)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('c',4)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('a',5)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('b',5)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('c',5)
-      assert_equal Date.new(1961,11,21), oo.cell('a',6)
-      assert_equal Date.new(1961,11,21), oo.cell('b',6)
-      assert_equal Date.new(1961,11,21), oo.cell('c',6)
-      assert_equal Date.new(1961,11,21), oo.cell('a',7)
-      assert_equal Date.new(1961,11,21), oo.cell('b',7)
-      assert_equal Date.new(1961,11,21), oo.cell('c',7)
+      do_datetime_tests(oo)
     end
   end
 
@@ -4658,97 +4668,27 @@ This attached file is the newer format of Microsoft Excel (.xlsx).
     if EXCEL
       oo = Excel.new(File.join("test","datetime.xls"))
       oo.default_sheet = oo.sheets.first
-      val = oo.cell('c',3)
-      assert_kind_of DateTime, val
-      assert_equal :datetime, oo.celltype('c',3)
-      assert_equal DateTime.new(1961,11,21,12,17,18), val
-      val = oo.cell('a',1)
-      assert_kind_of Date, val
-      assert_equal :date, oo.celltype('a',1)
-      assert_equal Date.new(1961,11,21), val
-
-      assert_equal Date.new(1961,11,21), oo.cell('a',1)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('a',3)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('b',3)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('c',3)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('a',4)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('b',4)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('c',4)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('a',5)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('b',5)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('c',5)
-      assert_equal Date.new(1961,11,21), oo.cell('a',6)
-      assert_equal Date.new(1961,11,21), oo.cell('b',6)
-      assert_equal Date.new(1961,11,21), oo.cell('c',6)
-      assert_equal Date.new(1961,11,21), oo.cell('a',7)
-      assert_equal Date.new(1961,11,21), oo.cell('b',7)
-      assert_equal Date.new(1961,11,21), oo.cell('c',7)
+      do_datetime_tests(oo)
     end
   end
 
   def test_datetime_excelx
-    after Date.new(2008,11,15) do
-      if EXCELX
-        oo = Excelx.new(File.join("test","datetime.xlsx"))
-        oo.default_sheet = oo.sheets.first
-        val = oo.cell('c',3)
-        assert_kind_of DateTime, val
-        assert_equal :datetime, oo.celltype('c',3)
-        assert_equal DateTime.new(1961,11,21,12,17,18), val
-        val = oo.cell('a',1)
-        assert_kind_of Date, val
-        assert_equal :date, oo.celltype('a',1)
-        assert_equal Date.new(1961,11,21), val
-
-        assert_equal Date.new(1961,11,21), oo.cell('a',1)
-        assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('a',3)
-        assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('b',3)
-        assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('c',3)
-        assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('a',4)
-        assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('b',4)
-        assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('c',4)
-        assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('a',5)
-        assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('b',5)
-        assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('c',5)
-        assert_equal Date.new(1961,11,21), oo.cell('a',6)
-        assert_equal Date.new(1961,11,21), oo.cell('b',6)
-        assert_equal Date.new(1961,11,21), oo.cell('c',6)
-        assert_equal Date.new(1961,11,21), oo.cell('a',7)
-        assert_equal Date.new(1961,11,21), oo.cell('b',7)
-        assert_equal Date.new(1961,11,21), oo.cell('c',7)
-      end
+    if EXCELX
+      oo = Excelx.new(File.join("test","datetime.xlsx"))
+      oo.default_sheet = oo.sheets.first
+      do_datetime_tests(oo)
     end
   end
 
   def test_datetime_google
     if GOOGLE
-      oo = Google.new(File.join("test","googlekey"))
-      oo.default_sheet = oo.sheets.first
-      val = oo.cell('c',3)
-      assert_kind_of DateTime, val
-      assert_equal :datetime, oo.celltype('c',3)
-      assert_equal DateTime.new(1961,11,21,12,17,18), val
-      val = oo.cell('a',1)
-      assert_kind_of Date, val
-      assert_equal :date, oo.celltype('a',1)
-      assert_equal Date.new(1961,11,21), val
-
-      assert_equal Date.new(1961,11,21), oo.cell('a',1)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('a',3)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('b',3)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('c',3)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('a',4)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('b',4)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('c',4)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('a',5)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('b',5)
-      assert_equal DateTime.new(1961,11,21,12,17,18), oo.cell('c',5)
-      assert_equal Date.new(1961,11,21), oo.cell('a',6)
-      assert_equal Date.new(1961,11,21), oo.cell('b',6)
-      assert_equal Date.new(1961,11,21), oo.cell('c',6)
-      assert_equal Date.new(1961,11,21), oo.cell('a',7)
-      assert_equal Date.new(1961,11,21), oo.cell('b',7)
-      assert_equal Date.new(1961,11,21), oo.cell('c',7)
+      begin
+        oo = Google.new(key_of('datetime'))
+        oo.default_sheet = oo.sheets.first
+        do_datetime_tests(oo)
+      ensure
+        $log.level = Logger::WARN
+      end
     end
   end
 

data/website/index.txt

@@ -138,6 +138,7 @@ returned:
 * :percentage
 * :formula
 * :time
+* :datetime
 
 Numeric values are returned as type :float, the return value is a Ruby Float object (note: integer values like 42 are returned as 42.0 - not as a Fixnum 42 object).
 
@@ -145,6 +146,8 @@ String values are returned as type :string and Ruby String object.
 
 Date values are returned as type :date and as a Ruby Date object.
 
+Datetime values are returned as type :datedate and as a Ruby DateTime object.
+
 Percentage are return as type :percentage and as Ruby Float object with the 
 range from 0.0 to 1.0.
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: roo
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - Thomas Preymesser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-27 00:00:00 +01:00
+date: 2008-12-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency