roo 0.8.2 → 0.8.3

data/History.txt

@@ -1,3 +1,7 @@
+== 0.8.3 2007-12-31
+* 2 bugfixes
+  * another fix for the encoding issue in excel sheet-names
+  * reactived the Excel#find method which has been disappeared in the last restructoring, moved to GenericSpreadsheet
 == 0.8.2 2007-12-28
 * 1 enhancement:
   * basename() only in method #info

data/lib/roo/excel.rb

@@ -65,6 +65,7 @@ class Excel < GenericSpreadsheet
           @workbook.worksheet(i).name
         )
       else
+        # result << platform_specific_iconv(inject_null_characters(@workbook.worksheet(i).name))
         result << platform_specific_iconv(@workbook.worksheet(i).name)
         #case RUBY_PLATFORM.downcase
         #when /darwin/
@@ -81,6 +82,19 @@ class Excel < GenericSpreadsheet
     return result
   end
 
+  #TODO: testing only
+  def inject_null_characters(str)
+    if str.class != String
+      return str
+    end
+    new_str=''
+    0.upto(str.size-1) do |i|
+      new_str += str[i,1]
+      new_str += "\000"
+    end
+    new_str
+  end
+
   # sets the working sheet (1,2,3,..)
   def default_sheet=(n)
     if n.kind_of?(Fixnum)
@@ -311,10 +325,10 @@ class Excel < GenericSpreadsheet
     0.upto(@workbook.sheet_count - 1) do |i|
       # TODO: is there a better way to do conversion?
       return i if name == platform_specific_iconv(
-                            @workbook.worksheet(i).name)
-#Iconv.new('utf-8','unicode').iconv(
-#        @workbook.worksheet(i).name
-#      )
+        @workbook.worksheet(i).name)
+      #Iconv.new('utf-8','unicode').iconv(
+      #        @workbook.worksheet(i).name
+      #      )
     end
     raise StandardError, "sheet '#{name}' not found"
   end
@@ -330,16 +344,41 @@ class Excel < GenericSpreadsheet
     ! content
   end
 
-def platform_specific_iconv(value)
-        case RUBY_PLATFORM.downcase
-        when /darwin/
-          result = Iconv.new('utf-8','utf-8').iconv(value)
-        when /mswin32/
-          result = Iconv.new('utf-8','iso-8859-1').iconv(value)
-        else
-          result = Iconv.new('utf-8','unicode').iconv(value)
-        end # case
- result
-end
+  def platform_specific_iconv(value)
+    case RUBY_PLATFORM.downcase
+    when /darwin/
+      result = Iconv.new('utf-8','utf-8').iconv(value)
+    when /mswin32/
+      result = Iconv.new('utf-8','iso-8859-1').iconv(value)
+    else
+      result = Iconv.new('utf-8','unicode').iconv(value)
+    end # case
+    if every_second_null?(result)
+      result = remove_every_second_null(result)
+    end
+    result
+  end
+
+  def every_second_null?(str)
+    result = true
+    0.upto(str.length/2-1) do |i|
+      c = str[i*2,1]
+      n = str[i*2+1,1]
+      if n != "\000"
+        result = false 
+        break
+      end
+    end
+    result
+  end
+
+  def remove_every_second_null(str)
+    result = ''
+    0.upto(str.length/2-1) do |i|
+      c = str[i*2,1]
+      result += c
+    end
+    result
+  end
 
 end

data/lib/roo/generic_spreadsheet.rb

@@ -258,7 +258,7 @@ class GenericSpreadsheet
     result
   end
 
-    # write the current spreadsheet to stdout or into a file
+  # write the current spreadsheet to stdout or into a file
   #TODO: refactoring --> GenericSpreadsheet
 
   def to_csv(filename=nil,sheet=nil)
@@ -273,6 +273,85 @@ class GenericSpreadsheet
     true
   end
 
+  # find a row either by row number or a condition
+  # Caution: this works only within the default sheet -> set default_sheet before you call this method
+  # (experimental. see examples in the test_roo.rb file)
+  def find(*args) # :nodoc
+    result_array = false
+    args.each {|arg,val|
+      if arg.class == Hash
+        arg.each { |hkey,hval|
+          if hkey == :array and hval == true
+            result_array = true
+          end
+        }
+      end
+    }
+    column_with = {}
+    1.upto(last_column) do |col|
+      column_with[cell(@header_line,col)] = col
+    end
+    result = Array.new
+    #-- id
+    if args[0].class == Fixnum
+      rownum = args[0]
+      tmp = {}
+      1.upto(self.row(rownum).size) {|j|
+        x = ''
+        column_with.each { |key,val|
+          if val == j
+            x = key
+          end
+        }
+        tmp[x] = cell(rownum,j)
+      }
+      result = [ tmp ] # row(rownum)
+      #-- :all
+    elsif args[0] == :all
+      if args[1].class == Hash
+        args[1].each {|key,val|
+          if key == :conditions
+            column_with = {}
+            1.upto(last_column) do |col|
+              column_with[cell(@header_line,col)] = col
+            end
+            conditions = val
+            first_row.upto(last_row) do |i|
+              # are all conditions met?
+              found = 1
+              conditions.each { |key,val|
+                if cell(i,column_with[key]) == val
+                  found *= 1
+                else
+                  found *= 0
+                end
+              }
+              # p self.row(i) if found > 0
+              if found > 0
+                tmp = {}
+                1.upto(self.row(i).size) {|j|
+                  x = ''
+                  column_with.each { |key,val|
+                    if val == j
+                      x = key
+                    end
+                  }
+                  tmp[x] = cell(i,j)
+                }
+                if result_array
+                  result << self.row(i)
+                else
+                  result << tmp
+                end
+              end
+            end
+          end # :conditions
+        }
+      end
+    end
+    result
+  end
+
   protected
 
   def unzip(filename)

data/lib/roo/google.rb

@@ -323,22 +323,6 @@ class Google < GenericSpreadsheet
     return @last_column[sheet]
   end
 
-#  # write the current spreadsheet to stdout or into a file
-#  #--
-#  #TODO: refactoring --> GenericSpreadsheet
-#  def to_csv(filename=nil,sheet=nil)
-#    sheet = @default_sheet unless sheet
-#    if filename
-#      file = File.open(filename,"w") # do |file|
-#      write_csv_content(file,sheet)
-#      file.close
-#    else
-#      write_csv_content(STDOUT,sheet)
-#    end
-#    true
-#  end
-
-
   # find a row either by row number or a condition
   # Caution: this works only within the default sheet -> set default_sheet before you call this method
   # (experimental. see examples in the test_roo.rb file)
@@ -504,67 +488,5 @@ class Google < GenericSpreadsheet
     end
   end
 
-#  #TODO: refactoring to GenericSpreadsheet?
-#  def write_csv_content(file=nil,sheet=nil)
-#    file = STDOUT unless file
-#    if first_row # sheet is not empty
-#      first_row(sheet).upto(last_row(sheet)) do |row|
-#        1.upto(last_column(sheet)) do |col|
-#          file.print(",") if col > 1
-#          onecell = cell(row,col,sheet)
-#          onecelltype = celltype(row,col,sheet)
-#          file.print one_cell_output(onecelltype,onecell,empty?(row,col,sheet))
-#        end
-#        file.print("\n")
-#      end # sheet not empty
-#    end
-#  end
-
-#  #TODO: refactor to Generic....
-#  def one_cell_output(onecelltype,onecell,empty)
-#    str = ""
-#    if empty
-#      str += ''
-#    else
-#      case onecelltype
-#      when :string
-#        if onecell == ""
-#          str << ''
-#        else
-#          onecell.gsub!(/"/,'""')
-#          str << ('"'+onecell+'"')
-#        end
-#      when :float,:percentage
-#        if onecell == onecell.to_i
-#          str << onecell.to_i.to_s
-#        else
-#          str << onecell.to_s
-#        end
-#      when :formula
-#        if onecell.class == String
-#          if onecell == ""
-#            str << ''
-#          else
-#            onecell.gsub!(/"/,'""')
-#            str << '"'+onecell+'"'
-#          end
-#        elsif onecell.class == Float
-#          if onecell == onecell.to_i
-#            str << onecell.to_i.to_s
-#          else
-#            str << onecell.to_s
-#          end
-#        else
-#          raise "unhandled onecell-class "+onecell.class.to_s
-#        end
-#      when :date
-#        str << '"'+onecell.to_s+'"'
-#      else
-#        raise "unhandled celltype "+onecelltype.to_s
-#      end
-#    end
-#    #cells << onecell
-#    str
-#  end
 
 end # class

data/lib/roo/openoffice.rb

@@ -283,86 +283,6 @@ class Openoffice < GenericSpreadsheet
 #    true
 #  end
 
-  # find a row either by row number or a condition
-  # Caution: this works only within the default sheet -> set default_sheet before you call this method
-  # (experimental. see examples in the test_roo.rb file)
-  def find(*args)
-    result_array = false
-    args.each {|arg,val|
-      if arg.class == Hash
-        arg.each { |hkey,hval|
-          if hkey == :array and hval == true
-            result_array = true
-          end
-        }
-      end
-    }
-    column_with = {}
-    1.upto(last_column) do |col|
-      column_with[cell(@header_line,col)] = col
-    end
-    result = Array.new
-    #-- id
-    if args[0].class == Fixnum
-      rownum = args[0]
-      tmp = {}
-      1.upto(self.row(rownum).size) {|j|
-        x = ''
-        column_with.each { |key,val|
-          if val == j
-            x = key
-          end
-        }
-        tmp[x] = cell(rownum,j)
-      }
-      result = [ tmp ] # row(rownum)
-      #-- :all
-    elsif args[0] == :all
-      if args[1].class == Hash
-        args[1].each {|key,val|
-          if key == :conditions
-            column_with = {}
-            1.upto(last_column) do |col|
-              column_with[cell(@header_line,col)] = col
-            end
-            conditions = val
-            first_row.upto(last_row) do |i|
-              # are all conditions met?
-              found = 1
-              conditions.each { |key,val|
-                if cell(i,column_with[key]) == val
-                  found *= 1
-                else
-                  found *= 0
-                end
-              }
-              # p self.row(i) if found > 0
-              if found > 0
-                tmp = {}
-                1.upto(self.row(i).size) {|j|
-                  x = ''
-                  column_with.each { |key,val|
-                    if val == j
-                      x = key
-                    end
-                  }
-                  tmp[x] = cell(i,j)
-                }
-                if result_array
-                  result << self.row(i)
-                else
-                  result << tmp
-                end
-              end
-            end
-          end # :conditions
-        }
-      end
-    end
-    result
-  end
-
-
   private
 
   # read the version of the OO-Version

data/lib/roo/version.rb

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

data/test/test_roo.rb

@@ -27,7 +27,7 @@ if DB_LOG
   # require 'activerecord'
   # require_gem 'activerecord', '< 2.0.0'
   #gem 'activerecord', '< 2.0.0'
-  require 'activerecord' 
+  require 'activerecord'
 end
 
 include FileUtils
@@ -59,7 +59,7 @@ class Test::Unit::TestCase
       }[spreadsheetname]
     rescue
       raise "unknown spreadsheetname: #{spreadsheetname}"
-    end  
+    end
   end
 
   if DB_LOG
@@ -106,7 +106,7 @@ class File
 
   def File.delete_if_exist(filename)
     if File.exist?(filename)
-      File.delete(filename) 
+      File.delete(filename)
     end
   end
 
@@ -121,7 +121,6 @@ class TestRoo < Test::Unit::TestCase
   OPENOFFICEWRITE = false # experimental: write access with OO-Documents
   ONLINE = true
   LONG_RUN = false
-  LONG_RUN_EXCEL = false
   GLOBAL_TIMEOUT = 2*12*60 # seconds
 
 
@@ -475,7 +474,7 @@ class TestRoo < Test::Unit::TestCase
     end
   end
 
-#TODO: inkonsequente Lieferung Fixnum/Float
+  #TODO: inkonsequente Lieferung Fixnum/Float
   def test_rows
     if OPENOFFICE
       oo = Openoffice.new(File.join("test","numbers1.ods"))
@@ -624,18 +623,18 @@ class TestRoo < Test::Unit::TestCase
       assert_equal 1, oo.first_column
     end
     if GOOGLE
-        assert_nothing_raised(Timeout::Error) {
-          Timeout::timeout(GLOBAL_TIMEOUT) do |timeout_length|
-      oo = Google.new(key_of("numbers1"))
-      oo.default_sheet = oo.sheets.first
-      assert_equal 1, oo.first_column
-end
-}
+      assert_nothing_raised(Timeout::Error) {
+        Timeout::timeout(GLOBAL_TIMEOUT) do |timeout_length|
+          oo = Google.new(key_of("numbers1"))
+          oo.default_sheet = oo.sheets.first
+          assert_equal 1, oo.first_column
+        end
+      }
     end
   end
 
   def test_first_column_as_letter_openoffice
-    if OPENOFFICE 
+    if OPENOFFICE
       oo = Openoffice.new(File.join("test","numbers1.ods"))
       oo.default_sheet = oo.sheets.first
       assert_equal 'A', oo.first_column_as_letter
@@ -734,11 +733,11 @@ end
           oo.default_sheet = "Tabelle1"
         }
       end
-        assert_nothing_raised(ArgumentError) {
-          # oo.default_sheet = 1
-          #oo.default_sheet = "first sheet"
-          oo.default_sheet = "Tabelle1"
-        }
+      assert_nothing_raised(ArgumentError) {
+        # oo.default_sheet = 1
+        #oo.default_sheet = "first sheet"
+        oo.default_sheet = "Tabelle1"
+      }
     end
   end
 
@@ -1081,32 +1080,32 @@ end
       end
     end
     if GOOGLE
-        oo = Google.new(key_of("formula"))
-        oo.default_sheet = oo.sheets.first
-        assert_equal 1, oo.cell('A',1)
-        assert_equal 2, oo.cell('A',2)
-        assert_equal 3, oo.cell('A',3)
-        assert_equal 4, oo.cell('A',4)
-        assert_equal 5, oo.cell('A',5)
-        assert_equal 6, oo.cell('A',6)
-        # assert_equal 21, oo.cell('A',7)
-        assert_equal 21.0, oo.cell('A',7) #TODO: better solution Fixnum/Float
-        assert_equal :formula, oo.celltype('A',7)
-        # assert_equal "=[Sheet2.A1]", oo.formula('C',7)
-        # !!! different from formulas in Openoffice
-        assert_equal "=sheet2!R[-6]C[-2]", oo.formula('C',7)
-        assert_nil oo.formula('A',6)
-        # assert_equal [[7, 1, "=SUM([.A1:.A6])"],
-        #   [7, 2, "=SUM([.$A$1:.B6])"],
-        #   [7, 3, "=[Sheet2.A1]"],
-        #   [8, 2, "=SUM([.$A$1:.B7])"],
-        # ], oo.formulas(oo.sheets.first)
-        # different format than in openoffice spreadsheets:
-        assert_equal [[7, 1, "=SUM(R[-6]C[0]:R[-1]C[0])"],
-                      [7, 2, "=SUM(R1C1:R[-1]C[0])"],
-                      [7, 3, "=sheet2!R[-6]C[-2]"],
-                      [8, 2, "=SUM(R1C1:R[-1]C[0])"]], 
-                 oo.formulas(oo.sheets.first)
+      oo = Google.new(key_of("formula"))
+      oo.default_sheet = oo.sheets.first
+      assert_equal 1, oo.cell('A',1)
+      assert_equal 2, oo.cell('A',2)
+      assert_equal 3, oo.cell('A',3)
+      assert_equal 4, oo.cell('A',4)
+      assert_equal 5, oo.cell('A',5)
+      assert_equal 6, oo.cell('A',6)
+      # assert_equal 21, oo.cell('A',7)
+      assert_equal 21.0, oo.cell('A',7) #TODO: better solution Fixnum/Float
+      assert_equal :formula, oo.celltype('A',7)
+      # assert_equal "=[Sheet2.A1]", oo.formula('C',7)
+      # !!! different from formulas in Openoffice
+      assert_equal "=sheet2!R[-6]C[-2]", oo.formula('C',7)
+      assert_nil oo.formula('A',6)
+      # assert_equal [[7, 1, "=SUM([.A1:.A6])"],
+      #   [7, 2, "=SUM([.$A$1:.B6])"],
+      #   [7, 3, "=[Sheet2.A1]"],
+      #   [8, 2, "=SUM([.$A$1:.B7])"],
+      # ], oo.formulas(oo.sheets.first)
+      # different format than in openoffice spreadsheets:
+      assert_equal [[7, 1, "=SUM(R[-6]C[0]:R[-1]C[0])"],
+        [7, 2, "=SUM(R1C1:R[-1]C[0])"],
+        [7, 3, "=sheet2!R[-6]C[-2]"],
+        [8, 2, "=SUM(R1C1:R[-1]C[0])"]],
+        oo.formulas(oo.sheets.first)
     end # GOOGLE
   end
 
@@ -1154,36 +1153,36 @@ end
       assert_equal 5, oo.first_column
       assert_equal 9, oo.last_column
     end
-  end 
+  end
 
   def test_borders_sheets_google
     if GOOGLE
-        assert_nothing_raised(Timeout::Error) {
-          Timeout::timeout(GLOBAL_TIMEOUT) do |timeout_length|
-      oo = Google.new(key_of("borders"))
-      oo.default_sheet = oo.sheets[0]
-      assert_equal oo.sheets.first, oo.default_sheet
-      assert_equal 5, oo.first_row
-      oo.default_sheet = oo.sheets[1]
-      assert_equal 'Sheet2', oo.default_sheet
-      assert_equal 6, oo.first_row
-      assert_equal 11, oo.last_row
-      assert_equal 4, oo.first_column
-      assert_equal 8, oo.last_column
-
-      oo.default_sheet = oo.sheets.first
-      assert_equal 5, oo.first_row
-      assert_equal 10, oo.last_row
-      assert_equal 3, oo.first_column
-      assert_equal 7, oo.last_column
+      assert_nothing_raised(Timeout::Error) {
+        Timeout::timeout(GLOBAL_TIMEOUT) do |timeout_length|
+          oo = Google.new(key_of("borders"))
+          oo.default_sheet = oo.sheets[0]
+          assert_equal oo.sheets.first, oo.default_sheet
+          assert_equal 5, oo.first_row
+          oo.default_sheet = oo.sheets[1]
+          assert_equal 'Sheet2', oo.default_sheet
+          assert_equal 6, oo.first_row
+          assert_equal 11, oo.last_row
+          assert_equal 4, oo.first_column
+          assert_equal 8, oo.last_column
 
-      oo.default_sheet = oo.sheets[2]
-      assert_equal 7, oo.first_row
-      assert_equal 12, oo.last_row
-      assert_equal 5, oo.first_column
-      assert_equal 9, oo.last_column
-end
-}
+          oo.default_sheet = oo.sheets.first
+          assert_equal 5, oo.first_row
+          assert_equal 10, oo.last_row
+          assert_equal 3, oo.first_column
+          assert_equal 7, oo.last_column
+
+          oo.default_sheet = oo.sheets[2]
+          assert_equal 7, oo.first_row
+          assert_equal 12, oo.last_row
+          assert_equal 5, oo.first_column
+          assert_equal 9, oo.last_column
+        end
+      }
     end
   end
 
@@ -1554,7 +1553,7 @@ end
   end
 
   def test_huge_document_to_csv_excel
-    if LONG_RUN_EXCEL
+    if LONG_RUN
       if EXCEL
         assert_nothing_raised(Timeout::Error) {
           Timeout::timeout(GLOBAL_TIMEOUT) do |timeout_length|
@@ -1571,64 +1570,64 @@ end
   end # def to_csv
 
   def test_huge_document_to_csv_google
-# maybe a better example... TODO:
-after Date.new(2008,1,30) do
-    if GOOGLE
-      assert_nothing_raised(Timeout::Error) {
-        Timeout::timeout(GLOBAL_TIMEOUT) do |timeout_length|
-          File.delete("/tmp/numbers1.csv") if File.exists?("/tmp/numbers1.csv")
-          oo = Google.new(key_of('numbers1'))
-          oo.default_sheet = oo.sheets.first
-          #?? assert_equal "Tagebuch des Sekret\303\244rs.    Letzte Tagung 15./16.11.75 Schweiz", oo.cell(45,'A')
-          #?? assert_equal "Tagebuch des Sekret\303\244rs.  Nachrichten aus Chile", oo.cell(46,'A')
-          #?? assert_equal "Tagebuch aus Chile  Juli 1977", oo.cell(55,'A')
-          assert oo.to_csv("/tmp/numbers1.csv")
-          assert File.exists?("/tmp/numbers1.csv")
-          assert_equal "", `diff test/numbers1.csv /tmp/numbers1.csv`
-        end # Timeout
-      } # nothing_raised
-    end # GOOGLE
-end # after
-  end
-  
-def test_to_csv_openoffice
-      if OPENOFFICE
-        #assert_nothing_raised(Timeout::Error) {
+    # maybe a better example... TODO:
+    after Date.new(2008,1,30) do
+      if GOOGLE
+        assert_nothing_raised(Timeout::Error) {
           Timeout::timeout(GLOBAL_TIMEOUT) do |timeout_length|
-            File.delete_if_exist("/tmp/numbers1.csv")
-            oo = Openoffice.new(File.join("test","numbers1.ods"))
+            File.delete("/tmp/numbers1.csv") if File.exists?("/tmp/numbers1.csv")
+            oo = Google.new(key_of('numbers1'))
             oo.default_sheet = oo.sheets.first
-            #assert_equal "Tagebuch des Sekret\303\244rs.    Letzte Tagung 15./16.11.75 Schweiz", oo.cell(45,'A')
-            #assert_equal "Tagebuch des Sekret\303\244rs.  Nachrichten aus Chile", oo.cell(46,'A')
-            #assert_equal "Tagebuch aus Chile  Juli 1977", oo.cell(55,'A')
+            #?? assert_equal "Tagebuch des Sekret\303\244rs.    Letzte Tagung 15./16.11.75 Schweiz", oo.cell(45,'A')
+            #?? assert_equal "Tagebuch des Sekret\303\244rs.  Nachrichten aus Chile", oo.cell(46,'A')
+            #?? assert_equal "Tagebuch aus Chile  Juli 1977", oo.cell(55,'A')
             assert oo.to_csv("/tmp/numbers1.csv")
             assert File.exists?("/tmp/numbers1.csv")
             assert_equal "", `diff test/numbers1.csv /tmp/numbers1.csv`
           end # Timeout
-        #} # nothing_raised
-      end # OPENOFFICE
+        } # nothing_raised
+      end # GOOGLE
+    end # after
+  end
+
+  def test_to_csv_openoffice
+    if OPENOFFICE
+      #assert_nothing_raised(Timeout::Error) {
+      Timeout::timeout(GLOBAL_TIMEOUT) do |timeout_length|
+        File.delete_if_exist("/tmp/numbers1.csv")
+        oo = Openoffice.new(File.join("test","numbers1.ods"))
+        oo.default_sheet = oo.sheets.first
+        #assert_equal "Tagebuch des Sekret\303\244rs.    Letzte Tagung 15./16.11.75 Schweiz", oo.cell(45,'A')
+        #assert_equal "Tagebuch des Sekret\303\244rs.  Nachrichten aus Chile", oo.cell(46,'A')
+        #assert_equal "Tagebuch aus Chile  Juli 1977", oo.cell(55,'A')
+        assert oo.to_csv("/tmp/numbers1.csv")
+        assert File.exists?("/tmp/numbers1.csv")
+        assert_equal "", `diff test/numbers1.csv /tmp/numbers1.csv`
+      end # Timeout
+      #} # nothing_raised
+    end # OPENOFFICE
   end
 
   def test_to_csv_excel
-      if EXCEL
-        #assert_nothing_raised(Timeout::Error) {
-          Timeout::timeout(GLOBAL_TIMEOUT) do |timeout_length|
-            File.delete_if_exist("/tmp/numbers1_excel.csv")
-            oo = Excel.new(File.join("test","numbers1.xls"))
-            oo.default_sheet = oo.sheets.first
-            assert oo.to_csv("/tmp/numbers1_excel.csv")
-            assert File.exists?("/tmp/numbers1_excel.csv")
-            assert_equal "", `diff test/numbers1_excel.csv /tmp/numbers1_excel.csv`
-          end
-        #}
+    if EXCEL
+      #assert_nothing_raised(Timeout::Error) {
+      Timeout::timeout(GLOBAL_TIMEOUT) do |timeout_length|
+        File.delete_if_exist("/tmp/numbers1_excel.csv")
+        oo = Excel.new(File.join("test","numbers1.xls"))
+        oo.default_sheet = oo.sheets.first
+        assert oo.to_csv("/tmp/numbers1_excel.csv")
+        assert File.exists?("/tmp/numbers1_excel.csv")
+        assert_equal "", `diff test/numbers1_excel.csv /tmp/numbers1_excel.csv`
       end
+      #}
+    end
   end # def to_csv
 
   def test_to_csv_google
-# maybe a better example... TODO:
-after Date.new(2008,1,30) do
-    if GOOGLE
-      #assert_nothing_raised(Timeout::Error) {
+    # maybe a better example... TODO:
+    after Date.new(2008,1,30) do
+      if GOOGLE
+        #assert_nothing_raised(Timeout::Error) {
         Timeout::timeout(GLOBAL_TIMEOUT) do |timeout_length|
           File.delete_if_exist("/tmp/numbers1.csv") if File.exists?("/tmp/numbers1.csv")
           oo = Google.new(key_of('numbers1'))
@@ -1640,9 +1639,9 @@ after Date.new(2008,1,30) do
           assert File.exists?("/tmp/numbers1.csv")
           assert_equal "", `diff test/numbers1.csv /tmp/numbers1.csv`
         end # Timeout
-      #} # nothing_raised
-    end # GOOGLE
-end # after
+        #} # nothing_raised
+      end # GOOGLE
+    end # after
   end
 
   def test_bug_mehrere_datum
@@ -1891,6 +1890,55 @@ end # after
     end
   end
 
+  def test_find_by_row_openoffice
+    if OPENOFFICE
+      oo = Openoffice.new(File.join("test","numbers1.ods"))
+      oo.default_sheet = oo.sheets.first
+      rec = oo.find 16
+      assert rec
+      after Date.new(2008,1,15) do
+        #          assert_equal "einundvierzig", rec[0]
+        assert_equal false, rec
+
+        rec = oo.find 15
+        assert rec
+        assert_equal 41,rec
+      end
+    end
+  end
+
+  def test_find_by_row_excel
+    if EXCEL
+      oo = Excel.new(File.join("test","numbers1.xls"))
+      oo.default_sheet = oo.sheets.first
+      rec = oo.find 16
+      assert rec
+      after Date.new(2008,1,15) do
+        assert_equal "einundvierzig", rec[0]
+
+        rec = oo.find 15
+        assert rec
+        assert_equal 41,rec[0]
+      end
+    end
+  end
+
+  def test_find_by_row_google
+    if GOOGLE
+      oo = Excel.new(key_of("numbers1"))
+      oo.default_sheet = oo.sheets.first
+      rec = oo.find 16
+      assert rec
+      after Date.new(2008,1,15) do
+        assert_equal "einundvierzig", rec[0]
+
+        rec = oo.find 15
+        assert rec
+        assert_equal 41,rec[0]
+      end
+    end
+  end
+
   def test_find_by_row_huge_document_google
     if LONG_RUN
       if GOOGLE
@@ -2215,12 +2263,10 @@ end # after
       if EXCEL
         assert_nothing_raised(Timeout::Error) {
           Timeout::timeout(GLOBAL_TIMEOUT) do |timeout_length|
-            #puts Time.now.to_s + "column Excel gestartet"
             oo = Excel.new(File.join('test','Bibelbund.xls'))
             oo.default_sheet = oo.sheets.first
-            #assert_equal 3735, oo.column('a').size
-            assert_equal 499, oo.column('a').size
-            #puts Time.now.to_s + "column Excel beendet"
+            assert_equal 3735, oo.column('a').size
+            #assert_equal 499, oo.column('a').size
           end
         }
       end
@@ -2257,21 +2303,34 @@ end # after
     assert_equal "Task 1"    , erg[1]['Comment']
   end
 
+  def test_simple_spreadsheet_find_by_condition_excel
+    oo = Excel.new(File.join("test","simple_spreadsheet.xls"))
+    oo.default_sheet = oo.sheets.first
+    oo.header_line = 3
+    erg = oo.find(:all, :conditions => {'Comment' => 'Task 1'})
+    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
+
   def test_simple_spreadsheet_find_by_condition_google
     if GOOGLE
-after Date.new(2007,12,15) do
-      oo = Google.new(key_of("simple_spreadsheet"))
-      oo.default_sheet = oo.sheets.first
-      oo.header_line = 3
-      erg = oo.find(:all, :conditions => {'Comment' => 'Task 1'})
-      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_kind_of Float, erg[1]['Sum']
-      assert_equal 1.75        , erg[1]['Sum']
-      assert_equal "Task 1"    , erg[1]['Comment']
-end
+      after Date.new(2007,12,15) do
+        oo = Google.new(key_of("simple_spreadsheet"))
+        oo.default_sheet = oo.sheets.first
+        oo.header_line = 3
+        erg = oo.find(:all, :conditions => {'Comment' => 'Task 1'})
+        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_kind_of Float, erg[1]['Sum']
+        assert_equal 1.75        , erg[1]['Sum']
+        assert_equal "Task 1"    , erg[1]['Comment']
+      end
     end
   end
 
@@ -2386,7 +2445,7 @@ end
       ext = ""
       expected = sprintf(expected_templ,ext)
       oo = Google.new(key_of("numbers1"))
-#$log.debug(expected)
+      #$log.debug(expected)
       assert_equal expected.gsub(/numbers1/,key_of("numbers1")), oo.info
     end
   end
@@ -2432,11 +2491,11 @@ end
       }
     end
     if GOOGLE
-after Date.new(2008,1,1) do
-      assert_raise(IOError) {
-        oo = Google.new(key_of('testnichtvorhanden'+'Bibelbund.ods'))
-      }
-end
+      after Date.new(2008,1,1) do
+        assert_raise(IOError) {
+          oo = Google.new(key_of('testnichtvorhanden'+'Bibelbund.ods'))
+        }
+      end
     end
   end
 
@@ -2453,7 +2512,7 @@ end
   end
 
   def test_write_google
-# write.me: http://spreadsheets.google.com/ccc?key=ptu6bbahNZpY0N0RrxQbWdw&hl=en_GB
+    # write.me: http://spreadsheets.google.com/ccc?key=ptu6bbahNZpY0N0RrxQbWdw&hl=en_GB
     if GOOGLE
       oo = Google.new('ptu6bbahNZpY0N0RrxQbWdw')
       oo.default_sheet = oo.sheets.first
@@ -2511,12 +2570,12 @@ Sheet 3:
     assert_nil oo.last_column
   end
 
-if false
-  # there is no google spreadsheet for this test
-  def test_bug_bbu_google
-    oo = Excel.new(key_of('bbu'))
-    assert_nothing_raised() {
-      assert_equal "File: test/bbu.xls
+  if false
+    # there is no google spreadsheet for this test
+    def test_bug_bbu_google
+      oo = Excel.new(key_of('bbu'))
+      assert_nothing_raised() {
+        assert_equal "File: test/bbu.xls
 Number of sheets: 3
 Sheets: 2007_12, Tabelle2, Tabelle3
 Sheet 1:
@@ -2528,21 +2587,21 @@ Sheet 2:
   - empty -
 Sheet 3:
   - empty -", oo.info
-    }
+      }
 
-    oo.default_sheet = oo.sheets[1] # empty sheet
-    assert_nil oo.first_row
-    assert_nil oo.last_row
-    assert_nil oo.first_column
-    assert_nil oo.last_column
-  end
-end # false
+      oo.default_sheet = oo.sheets[1] # empty sheet
+      assert_nil oo.first_row
+      assert_nil oo.last_row
+      assert_nil oo.first_column
+      assert_nil oo.last_column
+    end
+  end # false
 
-#  def teardown
-#    puts "Options:"
-#    puts "OPENOFFICE = #{OPENOFFICE}"
-#    puts "EXCEL      = #{EXCEL}"
-#    puts "GOOGLE     = #{GOOGLE}"
-#  end
+  #  def teardown
+  #    puts "Options:"
+  #    puts "OPENOFFICE = #{OPENOFFICE}"
+  #    puts "EXCEL      = #{EXCEL}"
+  #    puts "GOOGLE     = #{GOOGLE}"
+  #  end
 
 end # class

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>roo</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/roo"; return false'>
       Get Version
-      <a href="http://rubyforge.org/projects/roo" class="numbers">0.8.2</a>
+      <a href="http://rubyforge.org/projects/roo" class="numbers">0.8.3</a>
     </div>
     <h2>What</h2>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: roo
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors: 
 - Thomas Preymesser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-12-28 00:00:00 +01:00
+date: 2007-12-31 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency