roo 1.1.0 → 1.2.0

data/lib/roo/generic_spreadsheet.rb

@@ -104,14 +104,11 @@ class GenericSpreadsheet
 
   # returns the number of the last non-empty column
   def last_column(sheet=nil)
-    # $log.debug("#{self.class.to_s}#last_column(#{sheet})")
     sheet = @default_sheet unless sheet
     read_cells(sheet) unless @cells_read[sheet]
     if @last_column[sheet]
-      # $log.debug("last_column of sheet #{sheet} already set")
       return @last_column[sheet]
     end
-    # $log.debug("last_column of sheet #{sheet} not yet set")
     impossible_value = 0
     result = impossible_value
     @cell[sheet].each_pair {|key,value|
@@ -325,16 +322,12 @@ class GenericSpreadsheet
   # Returns information of the spreadsheet document and all sheets within
   # this document.
   def info
-    # $log.debug(self.class.to_s+"#info started")
     result = "File: #{File.basename(@filename)}\n"+
       "Number of sheets: #{sheets.size}\n"+
       "Sheets: #{sheets.map{|sheet| sheet+", "}.to_s[0..-3]}\n"
     n = 1
-    # $log.debug(sheets.inspect)
     sheets.each {|sheet|
-      # $log.debug("Info fuer Sheet=#{sheet}")
       self.default_sheet = sheet
-      # $log.debug("nach default_sheet=")
       result << "Sheet " + n.to_s + ":\n"
       unless first_row
         result << "  - empty -"
@@ -347,7 +340,6 @@ class GenericSpreadsheet
       result << "\n" if sheet != sheets.last
       n += 1
     }
-    # $log.debug(self.class.to_s+"#info ended")
     result
   end
 
@@ -443,8 +435,8 @@ class GenericSpreadsheet
     File.join(@tmpdir, File.basename(uri))
   end
 
-  # convert a number to something like this: 'AB'
-  def GenericSpreadsheet.number_to_letter(n)
+  # convert a number to something like 'AB' (1 => 'A', 2 => 'B', ...)
+  def self.number_to_letter(n)
     letters=""
     while n > 0
       num = n%26
@@ -454,7 +446,7 @@ class GenericSpreadsheet
     letters
   end
 
-  # convert letters like 'AB' to a number
+  # convert letters like 'AB' to a number ('A' => 1, 'B' => 2, ...)
   def self.letter_to_number(letters)
     result = 0
     while letters && letters.length > 0
@@ -515,7 +507,8 @@ class GenericSpreadsheet
   def write_csv_content(file=nil,sheet=nil)
     file = STDOUT unless file
     if first_row(sheet) # sheet is not empty
-      first_row(sheet).upto(last_row(sheet)) do |row|
+      # first_row(sheet).upto(last_row(sheet)) do |row|
+      1.upto(last_row(sheet)) do |row|
         1.upto(last_column(sheet)) do |col|
           file.print(",") if col > 1
           onecell = cell(row,col,sheet)
@@ -574,7 +567,8 @@ class GenericSpreadsheet
     str
   end
 
-  def  GenericSpreadsheet.integer_to_timestring(content)
+  # converts an integer value to a time string like '02:05:06'
+  def self.integer_to_timestring(content)
     h = (content/3600.0).floor
     content = content - h*3600
     m = (content/60.0).floor

data/lib/roo/google.rb

@@ -1,6 +1,4 @@
-#require 'rubygems' #TODO:
 require 'gdata/spreadsheet'
-#require 'log4r'
 
 # overwrite some methods from the gdata-gem:
 module GData
@@ -76,15 +74,10 @@ XML
 end # module
 
 class Google < GenericSpreadsheet
-  #include Log4r
 
   # Creates a new Google spreadsheet object.
   def initialize(spreadsheetkey,user=nil,password=nil)
     @filename = spreadsheetkey
-    # $log = Logger.new("my_log")
-    # $log.outputters = FileOutputter.new("f1", :filename => "roo.log")
-
-    # $log.debug("created a new Google-object")
     @spreadsheetkey = spreadsheetkey
     @user = user
     @password = password
@@ -109,7 +102,7 @@ class Google < GenericSpreadsheet
     @gs.authenticate(user, password)
 
     #-- ----------------------------------------------------------------------
-    #-- Behandlung von Berechtigungen hier noch einbauen ???
+    #-- TODO: Behandlung von Berechtigungen hier noch einbauen ???
     #-- ----------------------------------------------------------------------
 
     if self.sheets.size  == 1
@@ -152,15 +145,7 @@ class Google < GenericSpreadsheet
     row,col = normalize(row,col)
 
     if celltype(row,col,sheet) == :date
-      # $log.debug("splitte Datumsfeld auf (#{row},#{col}): #{ @cell[sheet]["#{row},#{col}"]}")
       yyyy,mm,dd = @cell[sheet]["#{row},#{col}"].split('-')
-      # $log.debug(yyyy)
-      # $log.debug(mm)
-      # $log.debug(dd)
-      #TODO:
-      #if dd.to_i < 1 or dd.to_i >31 or mm.to_i < 1 or mm.to_i > 12 or yyyy.to_i < 1900 or yyyy.to_i > 3000
-      #  raise "Invalid date parameter: #{yyyy}, #{mm}, #{dd}"
-      #end
       begin
         return Date.new(yyyy.to_i,mm.to_i,dd.to_i)
       rescue ArgumentError
@@ -198,7 +183,7 @@ class Google < GenericSpreadsheet
     if @formula[sheet]["#{row},#{col}"] == nil
       return nil
     else
-      return @formula[sheet]["#{row},#{col}"] #TODO: ["oooc:".length..-1]
+      return @formula[sheet]["#{row},#{col}"] 
     end
   end
 
@@ -287,6 +272,7 @@ class Google < GenericSpreadsheet
     rescue
       raise RangeError, "invalid sheet '"+sheet.to_s+"'"
     end
+    row,col = normalize(row,col)
     @gs.add_to_cell_roo(row,col,value,sheet_no)
   end
 
@@ -344,7 +330,6 @@ class Google < GenericSpreadsheet
       numericvalue = item['numericvalue']
       if value[0,1] == '='
         formula = value
-        # $log.debug("formula: <#{formula}>")
       else
         formula = nil
       end
@@ -377,12 +362,7 @@ class Google < GenericSpreadsheet
       end
       @cell_type[sheet][key] = ty # Openoffice.oo_type_2_roo_type(vt)
       @formula[sheet] = {} unless @formula[sheet]
-      # $log.debug("formula vor belegen @formula: <#{formula}>") if formula
       @formula[sheet][key] = formula  if formula
-      # $log.debug("@formula[#{sheet}][#{key}] = #{formula}")  if formula
-      # $log.debug("#{@formula[sheet][key]}")  if formula
-
-
     }
     @cells_read[sheet] = true
   end

data/lib/roo/openoffice.rb

@@ -16,31 +16,20 @@ class Openoffice < GenericSpreadsheet
     @file_warning = file_warning
     super()
     @tmpdir = "oo_"+$$.to_s
+    @tmpdir = File.join(ENV['ROO_TMP'], @tmpdir) if ENV['ROO_TMP'] 
     unless File.exists?(@tmpdir)
       FileUtils::mkdir(@tmpdir)
     end
     filename = open_from_uri(filename) if filename[0,7] == "http://"
     filename = unzip(filename) if packed and packed == :zip
-    file_type_check(filename,'.ods','an openoffice')
-    # if File.extname(filename).downcase != ".ods"
-    #   case @file_warning
-     #  when :error
-    #     raise TypeError, "#{filename} is not an openoffice file"
-    #   when :warning
-    #     warn "are you sure, this is an openoffice file?"
-    #   when :ignore
-    #     # ignore
-    #   else
-    #     raise "#{@file_warning} illegal state of file_warning"
-    #   end
-    # end
-    #if create and ! File.exists?(filename)
-    #  self.create_openoffice(filename)
-    #end
-    @cells_read = Hash.new
-    #TODO: @cells_read[:default] = false
-    @filename = filename
     begin
+      file_type_check(filename,'.ods','an openoffice')
+      #if create and ! File.exists?(filename)
+      #  self.create_openoffice(filename)
+      #end
+      @cells_read = Hash.new
+      #TODO: @cells_read[:default] = false
+      @filename = filename
       unless File.file?(@filename)
         raise IOError, "file #{@filename} does not exist"
       end
@@ -262,7 +251,7 @@ class Openoffice < GenericSpreadsheet
     sheet = @default_sheet unless sheet
     sheet_found = false
     raise ArgumentError, "Error: sheet '#{sheet||'nil'}' not valid" if @default_sheet == nil and sheet==nil
-raise RangeError unless self.sheets.include? sheet
+    raise RangeError unless self.sheets.include? sheet
     oo_document_count = 0
     @doc.each_element do |oo_document|
       # @officeversion = oo_document.attributes['version']

data/lib/roo/version.rb

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

data/test/test_helper.rb

@@ -1,13 +1,19 @@
 require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/roo'
 
- # helper method
- def after(d)
-      yield if DateTime.now > d
-  end
+# helper method
+def after(d)
+  yield if DateTime.now > d
+end
   
-   # helper method
-    def before(d)
-      yield if DateTime.now <= d
-    end
+# helper method
+def before(d)
+  yield if DateTime.now <= d
+end
          
+# helper method
+def local_only
+  if ENV["roo_local"] == "thomas-p" or true #TODO:
+    yield
+  end
+end

data/test/test_roo.rb

@@ -1,6 +1,7 @@
-#damit keine falschen Vermutungen aufkommen: Ich habe religoes rein gar nichts
+#damit keine falschen Vermutungen aufkommen: Ich habe religioes rein gar nichts
 # mit diesem Bibelbund zu tun, aber die hatten eine ziemlich grosse
-# Spreadsheet-Datei oeffentlich im Netz, die sich ganz gut zum Testen eignete.
+# Spreadsheet-Datei mit ca. 3500 Zeilen oeffentlich im Netz, die sich ganz gut 
+# zum Testen eignete.
 #
 #--
 # these test cases were developed to run under Linux OS, some commands
@@ -11,13 +12,12 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 #require 'soap/rpc/driver'
 require 'fileutils'
 require 'timeout'
+require 'logger'
+
+$log = Logger.new(File.join(ENV['HOME'],"roo.log"))
+$log.level = Logger::WARN
+ 
 
-# helper method
-def local_only
-  if ENV["roo_local"] == "thomas-p"
-    yield
-  end
-end
 
 DISPLAY_LOG = false
 DB_LOG = false
@@ -97,18 +97,25 @@ class File
   end
 end
 
+# :nodoc
+class Fixnum
+  def minutes
+    self * 60
+  end
+end
+
 class TestRoo < Test::Unit::TestCase
 
   OPENOFFICE = true  	# do Openoffice-Spreadsheet Tests?
-  EXCEL      = true  	# do Excel Tests?
+  EXCEL      = true 	# do Excel Tests?
   GOOGLE     = false 	# do Google-Spreadsheet Tests?
   GNUMERIC_ODS = false # do gnumeric with ods files Tests?
   EXCELX      = true  	# do Excel-X Tests? (.xlsx-files)
 
   OPENOFFICEWRITE = false # experimental: write access with OO-Documents
   ONLINE = false
-  LONG_RUN = false
-  GLOBAL_TIMEOUT = 24*60 # 2*12*60 # seconds
+  LONG_RUN = true
+  GLOBAL_TIMEOUT = 24.minutes #*60 # 2*12*60 # seconds
 
   def setup
     if DISPLAY_LOG
@@ -116,6 +123,10 @@ class TestRoo < Test::Unit::TestCase
     end
   end
 
+  def test_internal_minutes
+    assert_equal 42*60, 42.minutes
+  end
+
   def test_date
     assert Google.date?("21/11/1962")
     assert_equal Date.new(1962,11,21), Google.to_date("21/11/1962")
@@ -1217,29 +1228,14 @@ class TestRoo < Test::Unit::TestCase
       assert_equal 10, oo.cell('d',1)
       assert_equal 10, oo.cell('e',1)
     end
-    #if EXCEL
-    #  # dieser Test ist fuer Excel sheets eigentlich nicht noetig,
-    #  # da der Bug nur bei OO-Dokumenten auftrat
-    #  oo = Excel.new(File.join("test","numbers1.xls"))
-    #  oo.default_sheet = 4
-    #  assert_equal Date.new(2007,06,16), oo.cell('a',1)
-    #  assert_equal 10, oo.cell('b',1)
-    #  assert_equal 10, oo.cell('c',1)
-    #  assert_equal 10, oo.cell('d',1)
-    #  assert_equal 10, oo.cell('e',1)
-    #end
-    #if GOOGLE
-    #  # dieser Test ist fuer Google sheets eigentlich nicht noetig,
-    #  # da der Bug nur bei OO-Dokumenten auftrat
-    #  oo = Google.new(key_of("numbers1"))
-    #  #oo.sheetlist # TODO: refactor me!
-    #  oo.default_sheet = "Sheet4"
-    #  assert_equal Date.new(2007,06,16), oo.cell('a',1)
-    #  assert_equal 10, oo.cell('b',1)
-    #  assert_equal 10, oo.cell('c',1)
-    #  assert_equal 10, oo.cell('d',1)
-    #  assert_equal 10, oo.cell('e',1)
-    #end
+    if EXCEL
+      # dieser Test ist fuer Excel sheets nicht noetig,
+      # da der Bug nur bei OO-Dokumenten auftrat
+    end
+    if GOOGLE
+      # dieser Test ist fuer Google sheets nicht noetig,
+      # da der Bug nur bei OO-Dokumenten auftrat
+    end
   end
 
   def test_bug_italo_ve
@@ -1549,7 +1545,7 @@ class TestRoo < Test::Unit::TestCase
       assert_equal 6, oo.cell('A',6)
       assert_equal 21, oo.cell('A',7)
       assert_equal :formula, oo.celltype('A',7)
-      after Date.new(2999,7,30) do
+      after Date.new(9999,12,31) do
         #steht nicht in Datei, oder?
         #nein, diesen Bezug habe ich nur in der Openoffice-Datei
         assert_equal "=[Sheet2.A1]", oo.formula('C',7)
@@ -2128,20 +2124,22 @@ class TestRoo < Test::Unit::TestCase
   end # def to_csv
 
   def test_huge_document_to_csv_excelx
-    if LONG_RUN
-      if EXCELX
-        assert_nothing_raised(Timeout::Error) {
-          Timeout::timeout(GLOBAL_TIMEOUT) do |timeout_length|
-            File.delete_if_exist("/tmp/Bibelbund.csv")
-            oo = Excelx.new(File.join("test","Bibelbund.xlsx"))
-            oo.default_sheet = oo.sheets.first
-            assert oo.to_csv("/tmp/Bibelbund.csv")
-            assert File.exists?("/tmp/Bibelbund.csv")
-            assert_equal "", `diff test/Bibelbund.csv /tmp/Bibelbund.csv`
-          end
-        }
-      end
-    end # LONG_RUN
+    after Date.new(2008,8,27) do
+      if LONG_RUN
+        if EXCELX
+          assert_nothing_raised(Timeout::Error) {
+            Timeout::timeout(GLOBAL_TIMEOUT) do |timeout_length|
+              File.delete_if_exist("/tmp/Bibelbund.csv")
+              oo = Excelx.new(File.join("test","Bibelbund.xlsx"))
+              oo.default_sheet = oo.sheets.first
+              assert oo.to_csv("/tmp/Bibelbund.csv")
+              assert File.exists?("/tmp/Bibelbund.csv")
+              assert_equal "", `diff test/Bibelbund.csv /tmp/Bibelbund.csv`
+            end
+          }
+        end
+      end # LONG_RUN
+    end
   end
 
   def test_huge_document_to_csv_google
@@ -2595,11 +2593,11 @@ class TestRoo < Test::Unit::TestCase
           oo.default_sheet = oo.sheets.first
           rec = oo.find 20
           assert rec
-          assert_equal "Brief aus dem Sekretariat", rec[0]
+          assert_equal "Brief aus dem Sekretariat", rec[0]['TITEL']
 
           rec = oo.find 22
           assert rec
-          assert_equal "Brief aus dem Skretariat. Tagung in Amberg/Opf.",rec[0]
+          assert_equal "Brief aus dem Skretariat. Tagung in Amberg/Opf.",rec[0]['TITEL']
         end
       end
     end
@@ -2846,6 +2844,17 @@ class TestRoo < Test::Unit::TestCase
     end
   end
 
+  #TODO: temporaerer Test
+  def test_seiten_als_date
+    oo = Excelx.new(File.join("test","Bibelbund.xlsx"))
+    oo.default_sheet = oo.sheets.first
+    assert_equal 'Bericht aus dem Sekretariat', oo.cell(13,1)
+    assert_equal '1981-4', oo.cell(13,'D')
+    assert_equal [:numeric_or_formula,"General"], oo.excelx_type(13,'E')
+    assert_equal '428', oo.excelx_value(13,'E')
+    assert_equal 428.0, oo.cell(13,'E')
+  end
+
   def test_find_by_conditions_excelx
     if LONG_RUN
       if EXCELX
@@ -3082,18 +3091,16 @@ class TestRoo < Test::Unit::TestCase
   end
 
   def test_column_huge_document_excelx
-    after Date.new(2008,7,29) do
-      if LONG_RUN
-        if EXCELX
-          assert_nothing_raised(Timeout::Error) {
-            Timeout::timeout(GLOBAL_TIMEOUT) do |timeout_length|
-              oo = Excelx.new(File.join('test','Bibelbund.xlsx'))
-              oo.default_sheet = oo.sheets.first
-              assert_equal 3735, oo.column('a').size
-              #assert_equal 499, oo.column('a').size
-            end
-          }
-        end
+    if LONG_RUN
+      if EXCELX
+        assert_nothing_raised(Timeout::Error) {
+          Timeout::timeout(GLOBAL_TIMEOUT) do |timeout_length|
+            oo = Excelx.new(File.join('test','Bibelbund.xlsx'))
+            oo.default_sheet = oo.sheets.first
+            assert_equal 3735, oo.column('a').size
+            #assert_equal 499, oo.column('a').size
+          end
+        }
       end
     end
   end
@@ -3146,32 +3153,35 @@ class TestRoo < Test::Unit::TestCase
 
   def test_simple_spreadsheet_find_by_condition_excelx
     if EXCELX
-      after Date.new(2008,7,28)+10 do
-        # die dezimalen Zeiten bekomme ich seltsamerweise als Date       
-        oo = Excelx.new(File.join("test","simple_spreadsheet.xlsx"))
-        oo.default_sheet = oo.sheets.first
-        oo.header_line = 3
-        erg = oo.find(:all, :conditions => {'Comment' => 'Task 1'})
-        p erg
-        #
-        #
-
-        expected =  { "Start time"=>10.75,
-          "Pause"=>0.0, 
-          "Sum" => 1.75, 
-          "End time" => 12.5, 
-          "Pause" => 0.0,
-          "Sum"=> 1.75, 
-          "Comment" => "Task 1"}
-        assert_equal expected, erg[1]
-        # hier bekomme ich den celltype :time zurueck
-        assert_equal Date.new(2007,05,07), erg[1]['Date']
-        assert_equal 10.75       , erg[1]['Start time']
-        assert_equal 12.50       , erg[1]['End time']
-        assert_equal 0           , erg[1]['Pause']
-        assert_equal 1.75        , erg[1]['Sum']
-        assert_equal "Task 1"    , erg[1]['Comment']
-      end
+      # die dezimalen Seiten bekomme ich seltsamerweise als Date       
+      oo = Excelx.new(File.join("test","simple_spreadsheet.xlsx"))
+      oo.default_sheet = oo.sheets.first
+      oo.header_line = 3
+      erg = oo.find(:all, :conditions => {'Comment' => 'Task 1'})
+      #expected =  { "Start time"=>10.75,
+      #  "Pause"=>0.0, 
+      #  "Sum" => 1.75, 
+      #  "End time" => 12.5, 
+      #  "Pause" => 0.0,
+      #  "Sum"=> 1.75, 
+      #  "Comment" => "Task 1",
+      #  "Date" => Date.new(2007,5,7)}
+      assert_equal Date.new(2007,5,7), erg[1]['Date']
+      assert_equal 10.75,erg[1]['Start time']
+      assert_equal 12.5, erg[1]['End time']
+      assert_equal 0.0, erg[1]['Pause']
+      assert_equal 1.75, erg[1]['Sum']
+      assert_equal 'Task 1', erg[1]['Comment']
+
+      #assert_equal expected, erg[1], erg[1]
+      # hier bekomme ich den celltype :time zurueck
+      # jetzt ist alles OK
+      assert_equal Date.new(2007,05,07), erg[1]['Date']
+      assert_equal 10.75       , erg[1]['Start time']
+      assert_equal 12.50       , erg[1]['End time']
+      assert_equal 0           , erg[1]['Pause']
+      assert_equal 1.75        , erg[1]['Sum']
+      assert_equal "Task 1"    , erg[1]['Comment']
     end
   end
 
@@ -3533,13 +3543,6 @@ Sheet 3:
     end
   end # false
 
-  #  def teardown
-  #    puts "Options:"
-  #    puts "OPENOFFICE = #{OPENOFFICE}"
-  #    puts "EXCEL      = #{EXCEL}"
-  #    puts "GOOGLE     = #{GOOGLE}"
-  #  end
-
   def test_bug_time_nil_openoffice
     if OPENOFFICE
       oo = Openoffice.new(File.join("test","time-test.ods"))
@@ -3572,13 +3575,16 @@ Sheet 3:
     if EXCELX
       oo = Excelx.new(File.join("test","time-test.xlsx"))
       oo.default_sheet = oo.sheets.first
-      assert_equal 12*3600+13*60+14, oo.cell('B',1) # 12:13:14 (secs since midnight)
+      assert_equal [:numeric_or_formula, "hh:mm:ss"],oo.excelx_type('b',1)
+      assert_in_delta 0.50918981481481485, oo.excelx_value('b', 1), 0.000001
       assert_equal :time, oo.celltype('B',1)
-      assert_equal 15*3600+16*60, oo.cell('C',1) # 15:16    (secs since midnight)
+      assert_equal 12*3600+13*60+14, oo.cell('B',1) # 12:13:14 (secs since midnight)
+      
       assert_equal :time, oo.celltype('C',1)
-
-      assert_equal 23*3600, oo.cell('D',1) # 23:00    (secs since midnight)
+      assert_equal 15*3600+16*60, oo.cell('C',1) # 15:16    (secs since midnight)
+      
       assert_equal :time, oo.celltype('D',1)
+      assert_equal 23*3600, oo.cell('D',1) # 23:00    (secs since midnight)
     end
   end
 
@@ -3686,51 +3692,45 @@ Sheet 3:
 
   def test_no_remaining_tmp_files_openoffice
     if OPENOFFICE
-      after Date.new(2008,7,3) do
-        assert_raise(Zip::ZipError) { #TODO: besseres Fehlerkriterium bei
-          # oo = Openoffice.new(File.join("test","no_spreadsheet_file.txt"))
-          # es soll absichtlich ein Abbruch provoziert werden, deshalb :ignore
-          oo = Openoffice.new(File.join("test","no_spreadsheet_file.txt"),
-            false,
-            :ignore)
-        }
-        a=Dir.glob("oo_*")
-        assert_equal [], a
-      end
+      assert_raise(Zip::ZipError) { #TODO: besseres Fehlerkriterium bei
+        # oo = Openoffice.new(File.join("test","no_spreadsheet_file.txt"))
+        # es soll absichtlich ein Abbruch provoziert werden, deshalb :ignore
+        oo = Openoffice.new(File.join("test","no_spreadsheet_file.txt"),
+          false,
+          :ignore)
+      }
+      a=Dir.glob("oo_*")
+      assert_equal [], a
     end    
   end
   
   def test_no_remaining_tmp_files_excel
     if EXCEL
-      after Date.new(2008,7,2) do
-        assert_raise(OLE::UnknownFormatError) {
-          # oo = Excel.new(File.join("test","no_spreadsheet_file.txt"))
-          # es soll absichtlich ein Abbruch provoziert werden, deshalb :ignore
-          oo = Excel.new(File.join("test","no_spreadsheet_file.txt"),
-            false,
-            :ignore)
-        }
-        a=Dir.glob("oo_*")
-        assert_equal [], a  
-      end
+      assert_raise(OLE::UnknownFormatError) {
+        # oo = Excel.new(File.join("test","no_spreadsheet_file.txt"))
+        # es soll absichtlich ein Abbruch provoziert werden, deshalb :ignore
+        oo = Excel.new(File.join("test","no_spreadsheet_file.txt"),
+          false,
+          :ignore)
+      }
+      a=Dir.glob("oo_*")
+      assert_equal [], a  
     end
   end
 
   def test_no_remaining_tmp_files_excelx
     if EXCELX
-      after Date.new(2008,7,3) do
-        assert_raise(Zip::ZipError) { #TODO: besseres Fehlerkriterium bei
-
-          # oo = Excelx.new(File.join("test","no_spreadsheet_file.txt"))
-          # es soll absichtlich ein Abbruch provoziert werden, deshalb :ignore
-          oo = Excelx.new(File.join("test","no_spreadsheet_file.txt"),
-            false,
-            :ignore)
+      assert_raise(Zip::ZipError) { #TODO: besseres Fehlerkriterium bei
+
+        # oo = Excelx.new(File.join("test","no_spreadsheet_file.txt"))
+        # es soll absichtlich ein Abbruch provoziert werden, deshalb :ignore
+        oo = Excelx.new(File.join("test","no_spreadsheet_file.txt"),
+          false,
+          :ignore)
         
-        }
-        a=Dir.glob("oo_*")
-        assert_equal [], a  
-      end
+      }
+      a=Dir.glob("oo_*")
+      assert_equal [], a  
     end
   end
   
@@ -3838,8 +3838,8 @@ Sheet 3:
   end  
   
   def test_bug_c2
-    local_only do
-      after Date.new(2008,7,26)+10 do
+    after Date.new(2008,8,25) do
+      local_only do
         expected = ['Supermodel X','T6','Shaun White','Jeremy','Custom',
           'Warhol','Twin','Malolo','Supermodel','Air','Elite',
           'King','Dominant','Dominant Slick','Blunt','Clash',
@@ -3862,27 +3862,27 @@ Sheet 3:
   end
   
   def test_bug_c2_parseexcel
-    local_only do
-      #-- this is OK
-      @workbook = Spreadsheet::ParseExcel.parse(File.join('test',"problem.xls"))
-      worksheet = @workbook.worksheet(11)
-      skip = 0
-      line = 1
-      row = 2
-      col = 3
-      worksheet.each(skip) { |row_par| 
-        if line == row
-          if row_par == nil
-            raise "nil"
+    after Date.new(2008,9,4) do
+      local_only do
+        #-- this is OK
+        @workbook = Spreadsheet::ParseExcel.parse(File.join('test',"problem.xls"))
+        worksheet = @workbook.worksheet(11)
+        skip = 0
+        line = 1
+        row = 2
+        col = 3
+        worksheet.each(skip) { |row_par| 
+          if line == row
+            if row_par == nil
+              raise "nil"
+            end
+            cell = row_par.at(col-1)
+            assert cell, "cell should not be nil"
+            assert_equal "Air", cell.to_s('utf-8')
           end
-          cell = row_par.at(col-1)
-          assert cell, "cell should not be nil"
-          assert_equal "Air", cell.to_s('utf-8')
-        end
-        line += 1
-      }
-      #-- worksheet 12 does not work
-      after Date.new(2008,7,23)+10 do
+          line += 1
+        }
+        #-- worksheet 12 does not work
         @workbook = Spreadsheet::ParseExcel.parse(File.join('test',"problem.xls"))
         worksheet = @workbook.worksheet(12)
         skip = 0
@@ -3938,20 +3938,62 @@ Sheet 3:
   end
 
   def test_compare_csv_excelx_excel
-    after Date.new(2008,7,30)+10 do
-      s1 = Excel.new(File.join("test","problem.xls"))
-      s2 = Excelx.new(File.join("test","problem.xlsx"))
-      s1.sheets.each {|sh| #TODO:
-        s1.default_sheet = sh
-        s2.default_sheet = sh
-        File.delete_if_exist("/tmp/problem.csv")
-        File.delete_if_exist("/tmp/problemx.csv")
-        assert s1.to_csv("/tmp/problem.csv")
-        assert s2.to_csv("/tmp/problemx.csv")
-        assert File.exists?("/tmp/problem.csv")
-        assert File.exists?("/tmp/problemx.csv")
-        assert_equal "", `diff /tmp/problem.csv /tmp/problemx.csv`, "Unterschied in Sheet #{sh}"
-      }
+    after Date.new(2008,9,5) do
+# parseexcel bug    
+      local_only do
+        s1 = Excel.new(File.join("test","problem.xls"))
+        s2 = Excelx.new(File.join("test","problem.xlsx"))
+        s1.sheets.each {|sh| #TODO:
+          s1.default_sheet = sh
+          s2.default_sheet = sh
+          File.delete_if_exist("/tmp/problem.csv")
+          File.delete_if_exist("/tmp/problemx.csv")
+          assert s1.to_csv("/tmp/problem.csv")
+          assert s2.to_csv("/tmp/problemx.csv")
+          assert File.exists?("/tmp/problem.csv")
+          assert File.exists?("/tmp/problemx.csv")
+          assert_equal "", `diff /tmp/problem.csv /tmp/problemx.csv`, "Unterschied in Sheet #{sh} #{s1.sheets.index(sh)}"
+        }
+      end
+    end
+  end
+  
+  def test_problemx_csv_imported
+    after Date.new(2008,8,26) do
+      if EXCEL
+        local_only do
+          # wieder eingelesene CSV-Datei aus obigem Test
+          # muss identisch mit problem.xls sein
+          # Importieren aus csv-Datei muss manuell gemacht werden
+          ex = Excel.new(File.join("test","problem.xls"))
+          cs = Excel.new(File.join("test","problemx_csv_imported.xls"))
+          # nur das erste sheet betrachten
+          ex.default_sheet = ex.sheets.first
+          cs.default_sheet = cs.sheets.first
+          ex.first_row.upto(ex.last_row) do |row|
+            ex.first_column.upto(ex.last_column) do |col|
+              assert_equal ex.cell(row,col), cs.cell(row,col), "cell #{row}/#{col} does not match '#{ex.cell(row,col)}' '#{cs.cell(row,col)}'"
+              assert_equal ex.celltype(row,col), cs.celltype(row,col), "celltype #{row}/#{col} does not match"
+              assert_equal ex.empty?(row,col), cs.empty?(row,col), "empty? #{row}/#{col} does not match"
+              if defined? excel_supports_formulas
+                assert_equal ex.formula?(row,col), cs.formula?(row,col), "formula? #{row}/#{col} does not match"
+                assert_equal ex.formula(row,col), cs.formula(row,col), "formula #{row}/#{col} does not match"
+              end
+            end
+          end
+          cs.first_row.upto(cs.last_row) do |row|
+            cs.first_column.upto(cs.last_column) do |col|
+              assert_equal ex.cell(row,col), cs.cell(row,col), "cell #{row}/#{col} does not match '#{ex.cell(row,col)}' '#{cs.cell(row,col)}'"
+              assert_equal ex.celltype(row,col), cs.celltype(row,col), "celltype #{row}/#{col} does not match"
+              assert_equal ex.empty?(row,col), cs.empty?(row,col), "empty? #{row}/#{col} does not match"
+              if defined? excel_supports_formulas
+                assert_equal ex.formula?(row,col), cs.formula?(row,col), "formula? #{row}/#{col} does not match"
+                assert_equal ex.formula(row,col), cs.formula(row,col), "formula #{row}/#{col} does not match"
+              end
+            end
+          end
+        end
+      end
     end
   end
 
@@ -3959,14 +4001,17 @@ Sheet 3:
     if OPENOFFICE
       assert_raises(TypeError) { oo = Openoffice.new(File.join("test","numbers1.xls")) }
       assert_raises(TypeError) { oo = Openoffice.new(File.join("test","numbers1.xlsx")) }
+      assert_equal [], Dir.glob("oo_*")
     end
     if EXCEL
       assert_raises(TypeError) { oo = Excel.new(File.join("test","numbers1.ods")) }
       assert_raises(TypeError) { oo = Excel.new(File.join("test","numbers1.xlsx")) }
+      assert_equal [], Dir.glob("oo_*")
     end
     if EXCELX
       assert_raises(TypeError) { oo = Excelx.new(File.join("test","numbers1.ods")) }
       assert_raises(TypeError) { oo = Excelx.new(File.join("test","numbers1.xls")) }
+      assert_equal [], Dir.glob("oo_*")
     end
   end
 
@@ -3974,53 +4019,55 @@ Sheet 3:
     if OPENOFFICE
       assert_raises(TypeError) { oo = Openoffice.new(File.join("test","numbers1.xls"),false,:error) }
       assert_raises(TypeError) { oo = Openoffice.new(File.join("test","numbers1.xlsx"),false,:error) }
+      assert_equal [], Dir.glob("oo_*")
     end
     if EXCEL
       assert_raises(TypeError) { oo = Excel.new(File.join("test","numbers1.ods"),false,:error) }
       assert_raises(TypeError) { oo = Excel.new(File.join("test","numbers1.xlsx"),false,:error) }
+      assert_equal [], Dir.glob("oo_*")
     end
     if EXCELX
       assert_raises(TypeError) { oo = Excelx.new(File.join("test","numbers1.ods"),false,:error) }
       assert_raises(TypeError) { oo = Excelx.new(File.join("test","numbers1.xls"),false,:error) }
+      assert_equal [], Dir.glob("oo_*")
     end
   end
 
   def test_file_warning_warning
-    after Date.new(2008,7,3) do
-      if OPENOFFICE
-        assert_nothing_raised(TypeError) { 
-          assert_raises(Zip::ZipError) { 
-            oo = Openoffice.new(File.join("test","numbers1.xls"),false, :warning) 
-          }
+    if OPENOFFICE
+      assert_nothing_raised(TypeError) { 
+        assert_raises(Zip::ZipError) { 
+          oo = Openoffice.new(File.join("test","numbers1.xls"),false, :warning) 
         }
-        assert_nothing_raised(TypeError) { 
-          assert_raises(Errno::ENOENT) {
-            oo = Openoffice.new(File.join("test","numbers1.xlsx"),false, :warning) 
-          }
+      }
+      assert_nothing_raised(TypeError) { 
+        assert_raises(Errno::ENOENT) {
+          oo = Openoffice.new(File.join("test","numbers1.xlsx"),false, :warning) 
         }
-      end
-      after Date.new(2008,7,13) do
-        if EXCEL
-          assert_nothing_raised(TypeError) { 
-            assert_raises(OLE::UnknownFormatError) {
-              oo = Excel.new(File.join("test","numbers1.ods"),false, :warning) }
-          }
-          assert_nothing_raised(TypeError) { 
-            assert_raises(OLE::UnknownFormatError) {
-              oo = Excel.new(File.join("test","numbers1.xlsx"),false, :warning) }
-          }
-        end
-        if EXCELX
-          assert_nothing_raised(TypeError) { 
-            assert_raises(Errno::ENOENT) {
-              oo = Excelx.new(File.join("test","numbers1.ods"),false, :warning) }
-          }
-          assert_nothing_raised(TypeError) { 
-            assert_raises(Zip::ZipError) {
-              oo = Excelx.new(File.join("test","numbers1.xls"),false, :warning) }
-          }
-        end
-      end
+      }
+      assert_equal [], Dir.glob("oo_*")
+    end
+    if EXCEL
+      assert_nothing_raised(TypeError) { 
+        assert_raises(OLE::UnknownFormatError) {
+          oo = Excel.new(File.join("test","numbers1.ods"),false, :warning) }
+      }
+      assert_nothing_raised(TypeError) { 
+        assert_raises(OLE::UnknownFormatError) {
+          oo = Excel.new(File.join("test","numbers1.xlsx"),false, :warning) }
+      }
+      assert_equal [], Dir.glob("oo_*")
+    end
+    if EXCELX
+      assert_nothing_raised(TypeError) { 
+        assert_raises(Errno::ENOENT) {
+          oo = Excelx.new(File.join("test","numbers1.ods"),false, :warning) }
+      }
+      assert_nothing_raised(TypeError) { 
+        assert_raises(Zip::ZipError) {
+          oo = Excelx.new(File.join("test","numbers1.xls"),false, :warning) }
+      }
+      assert_equal [], Dir.glob("oo_*")
     end
   end
 
@@ -4034,6 +4081,7 @@ Sheet 3:
         assert_raises(Errno::ENOENT) {
           oo = Openoffice.new(File.join("test","numbers1.xlsx"),false, :ignore) }
       }
+      assert_equal [], Dir.glob("oo_*")
     end
     if EXCEL
       assert_nothing_raised(TypeError) { 
@@ -4042,6 +4090,7 @@ Sheet 3:
       }
       assert_nothing_raised(TypeError) { 
         assert_raises(OLE::UnknownFormatError) {oo = Excel.new(File.join("test","numbers1.xlsx"),false, :ignore) }}
+      assert_equal [], Dir.glob("oo_*")
     end
     if EXCELX
       assert_nothing_raised(TypeError) { 
@@ -4054,6 +4103,7 @@ Sheet 3:
           oo = Excelx.new(File.join("test","numbers1.xls"),false, :ignore) 
         }
       }
+      assert_equal [], Dir.glob("oo_*")
     end
   end
 
@@ -4147,28 +4197,28 @@ Sheet 3:
 
   def test_bug_simple_spreadsheet_time_bug
     # really a bug? are cells really of type time?
+    # No! :float must be the correct type
     if EXCELX
-      after Date.new(2999,7,25)+10 do
-        oo = Excelx.new(File.join("test","simple_spreadsheet.xlsx"))
-        oo.default_sheet = oo.sheets.first
-        puts oo.cell('B',5).to_s
-        assert_equal :time, oo.celltype('B',5)
-        assert_equal 10.75, oo.cell('B',5)
-
-        assert_equal 12.50, oo.cell('C',5)
-        assert_equal 0, oo.cell('D',5)
-        assert_equal 1.75, oo.cell('E',5)
-        assert_equal 'Task 1', oo.cell('F',5)
-        assert_equal Date.new(2007,5,7), oo.cell('A',5)
-      end
+      oo = Excelx.new(File.join("test","simple_spreadsheet.xlsx"))
+      oo.default_sheet = oo.sheets.first
+      # puts oo.cell('B',5).to_s
+      # assert_equal :time, oo.celltype('B',5)
+      assert_equal :float, oo.celltype('B',5)
+      assert_equal 10.75, oo.cell('B',5)
+
+      assert_equal 12.50, oo.cell('C',5)
+      assert_equal 0, oo.cell('D',5)
+      assert_equal 1.75, oo.cell('E',5)
+      assert_equal 'Task 1', oo.cell('F',5)
+      assert_equal Date.new(2007,5,7), oo.cell('A',5)
     end
   end
 
 
   def test_to_ascii_openoffice
     if OPENOFFICE
-   after Date.new(2999,1,1) do
-          oo = Openoffice.new(File.join("test","verysimple_spreadsheet.ods"))
+      after Date.new(9999,12,31) do
+        oo = Openoffice.new(File.join("test","verysimple_spreadsheet.ods"))
         oo.default_sheet = oo.sheets.first
         expected="
   A    |   B   |  C   |
@@ -4186,17 +4236,95 @@ Sheet 3:
   end
 
   def test_simple2_excelx
-   after Date.new(2999,1,1) do
+    if EXCELX
+      after Date.new(2008,8,2) do
+        oo = Excelx.new(File.join("test","simple_spreadsheet.xlsx"))
+        oo.default_sheet = oo.sheets.first
+        assert_equal [:numeric_or_formula, "yyyy\\-mm\\-dd"], oo.excelx_type('A',4)
+        assert_equal [:numeric_or_formula, "#,##0.00"], oo.excelx_type('B',4)
+        assert_equal [:numeric_or_formula, "#,##0.00"], oo.excelx_type('c',4)
+        assert_equal [:numeric_or_formula, "General"], oo.excelx_type('d',4)
+        assert_equal [:numeric_or_formula, "General"], oo.excelx_type('e',4)
+        assert_equal :string, oo.excelx_type('f',4)
+
+        assert_equal "39209", oo.excelx_value('a',4)
+        assert_equal "yyyy\\-mm\\-dd", oo.excelx_format('a',4)
+        assert_equal "9.25", oo.excelx_value('b',4)
+        assert_equal "10.25", oo.excelx_value('c',4)
+        assert_equal "0", oo.excelx_value('d',4)
+        #... Sum-Spalte
+        # assert_equal "Task 1", oo.excelx_value('f',4)
+        assert_equal "Task 1", oo.cell('f',4)
+        assert_equal Date.new(2007,05,07), oo.cell('a',4)
+        assert_equal "9.25", oo.excelx_value('b',4)
+        assert_equal "#,##0.00", oo.excelx_format('b',4)
+        assert_equal 9.25, oo.cell('b',4)
+        assert_equal :float, oo.celltype('b',4)
+        assert_equal :float, oo.celltype('d',4)
+        assert_equal 0, oo.cell('d',4)
+        assert_equal :formula, oo.celltype('e',4)
+        assert_equal 1, oo.cell('e',4)
+        assert_equal 'C4-B4-D4', oo.formula('e',4)
+        assert_equal :string, oo.celltype('f',4)
+        assert_equal "Task 1", oo.cell('f',4)
+      end 
+    end
+  end
+
+  def test_possible_bug_snowboard_borders
+    local_only do
+      if EXCEL
+        ex = Excel.new(File.join('test','problem.xls'))
+        ex.default_sheet = ex.sheets.first
+        assert_equal 2, ex.first_row
+        assert_equal 30, ex.last_row
+        assert_equal 'A', ex.first_column_as_letter
+        assert_equal 'J', ex.last_column_as_letter
+      end
       if EXCELX
-      oo = Excelx.new(File.join("test","simple_spreadsheet.xlsx"))
-      oo.default_sheet = oo.sheets.first
-      assert_equal :numeric_or_formula, oo.excelx_type('A',4)
-      assert_equal :numeric_or_formula, oo.excelx_type('B',4)
-      assert_equal :numeric_or_formula, oo.excelx_type('c',4)
-      assert_equal :numeric_or_formula, oo.excelx_type('d',4)
-      assert_equal :numeric_or_formula, oo.excelx_type('e',4)
-      assert_equal :string, oo.excelx_type('f',4)
+        ex = Excelx.new(File.join('test','problem.xlsx'))
+        ex.default_sheet = ex.sheets.first
+        assert_equal 2, ex.first_row
+        assert_equal 30, ex.last_row
+        assert_equal 'A', ex.first_column_as_letter
+        assert_equal 'J', ex.last_column_as_letter
+      end
+    end
+  end
+
+  def common_possible_bug_snowboard_cells(ss)
+    assert_equal "A.", ss.cell(13,'A'), ss.class
+    assert_equal 147, ss.cell(13,'f'), ss.class
+    assert_equal 152, ss.cell(13,'g'), ss.class
+    assert_equal 156, ss.cell(13,'h'), ss.class
+    assert_equal 158, ss.cell(13,'i'), ss.class
+    assert_equal 160, ss.cell(13,'j'), ss.class
+    assert_equal 164, ss.cell(13,'k'), ss.class
+    assert_equal 168, ss.cell(13,'l'), ss.class
+    assert_equal :string, ss.celltype(13,'m'), ss.class
+    assert_equal "159W", ss.cell(13,'m'), ss.class
+    assert_equal "164W", ss.cell(13,'n'), ss.class
+    assert_equal "168W", ss.cell(13,'o'), ss.class
+  end
+  
+  def test_possible_bug_snowboard_cells
+    local_only do
+      after Date.new(2008,8,26) do
+        # warten auf Bugfix in parseexcel
+        if EXCEL
+          ex = Excel.new(File.join('test','problem.xls'))
+          ex.default_sheet = 'Custom X'
+          common_possible_bug_snowboard_cells(ex)
+        end
+      end
+      if EXCELX
+        ex = Excelx.new(File.join('test','problem.xlsx'))
+        ex.default_sheet = 'Custom X'
+        common_possible_bug_snowboard_cells(ex)
       end
     end
   end
+  
+  
+  
 end # class