roo 0.9.0 → 0.9.1

data/History.txt

@@ -1,3 +1,8 @@
+== 0.9.1 2008-03-23
+* 1 enhancement
+  * additional 'sheet' parameter in Google#set_value
+* 1 bugfix
+  * fixed a bug within Google#set_value. thanks to davecahill <dpcahill@gmail.com> for the patch.
 == 0.9.0 2008-01-24
 * 1 enhancement:
   * better support of roo spreadsheets in rails views

data/lib/roo/generic_spreadsheet.rb

@@ -304,7 +304,11 @@ class GenericSpreadsheet
     #-- id
     if args[0].class == Fixnum
       rownum = args[0]
-      tmp = {}
+      if @header_line
+        tmp = {}
+      else
+        tmp = []
+      end
       1.upto(self.row(rownum).size) {|j|
         x = ''
         column_with.each { |key,val|
@@ -312,9 +316,18 @@ class GenericSpreadsheet
             x = key
           end
         }
-        tmp[x] = cell(rownum,j)
+        if @header_line
+          tmp[x] = cell(rownum,j)
+        else
+          tmp[j-1] = cell(rownum,j)
+        end
+
       }
-      result = [ tmp ] # row(rownum)
+      if @header_line
+        result = [ tmp ]
+      else
+        result = tmp 
+      end
       #-- :all
     elsif args[0] == :all
       if args[1].class == Hash

data/lib/roo/google.rb

@@ -27,8 +27,9 @@ module GData
     end
 
     #-- new
-    def save_entry_roo(entry)
-      path = "/feeds/cells/#{@spreadsheet_id}/1/#{@headers ? 'private' : 'public'}/full"
+    #@@ added sheet_no to definition
+    def save_entry_roo(entry, sheet_no)
+      path = "/feeds/cells/#{@spreadsheet_id}/#{sheet_no}/#{@headers ? 'private' : 'public'}/full"
       post(path, entry)
     end
 
@@ -42,8 +43,9 @@ XML
     end
 
     #-- new
-    def add_to_cell_roo(row,col,value)
-      save_entry_roo(entry_roo(value,row,col))
+    #@@ added sheet_no to definition		
+    def add_to_cell_roo(row,col,value, sheet_no=1)
+      save_entry_roo(entry_roo(value,row,col), sheet_no)
     end
 
     #-- new
@@ -261,8 +263,16 @@ class Google < GenericSpreadsheet
 
   # sets the cell to the content of 'value'
   # a formula can be set in the form of '=SUM(...)'
-  def set_value(row,col,value)
-    @gs.add_to_cell_roo(row,col,value)
+  def set_value(row,col,value,sheet=nil)
+    sheet = @default_sheet unless sheet
+    raise RangeError, "sheet not set" unless sheet
+    #@@ Set and pass sheet_no
+    begin
+      sheet_no = sheets.index(sheet)+1
+    rescue
+      raise RangeError, "invalid sheet '"+sheet.to_s+"'"
+    end
+    @gs.add_to_cell_roo(row,col,value,sheet_no)
   end
 
   # returns the first non-empty row in a sheet
@@ -271,7 +281,7 @@ class Google < GenericSpreadsheet
     unless @first_row[sheet]
       sheet_no = sheets.index(sheet) + 1
       @first_row[sheet], @last_row[sheet], @first_column[sheet], @last_column[sheet] = @gs.oben_unten_links_rechts(sheet_no)
-    end
+    end   
     return @first_row[sheet]
   end
 
@@ -314,81 +324,81 @@ class Google < GenericSpreadsheet
   # also in Openofiffe
   # -----------------------------------------------------
   #++
-  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
+  #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 all cells in a sheet

data/lib/roo/openoffice.rb

@@ -252,21 +252,6 @@ class Openoffice < GenericSpreadsheet
     theformulas
   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
-
   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 = 9
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_roo.rb

@@ -20,7 +20,7 @@ def local_only
 end
 
 DISPLAY_LOG = false
-DB_LOG = false
+DB_LOG = true
 
 if DB_LOG
   # gem 'activerecord', '< 2.0.0'
@@ -117,25 +117,22 @@ class TestRoo < Test::Unit::TestCase
   OPENOFFICE = true  	# do Openoffice-Spreadsheet Tests?
   EXCEL      = true  	# do Excel Tests?
   GOOGLE     = true 	# do Google-Spreadsheet Tests?
-
+  GNUMERIC_ODS = false # do gnumeric with ods files Tests?
+ 
   OPENOFFICEWRITE = false # experimental: write access with OO-Documents
-  ONLINE = false
+  ONLINE = true
   LONG_RUN = false
   GLOBAL_TIMEOUT = 2*12*60 # seconds
 
 
   # helper method
   def after(d)
-    if DateTime.now > d
-      yield
-    end
+    yield if DateTime.now > d
   end
 
   # helper method
   def before(d)
-    if DateTime.now <= d
-      yield
-    end
+    yield if DateTime.now <= d
   end
 
   def setup
@@ -209,6 +206,24 @@ class TestRoo < Test::Unit::TestCase
     end
   end
 
+  def test_sheets_gnumeric_ods
+    if GNUMERIC_ODS
+      oo = Openoffice.new(File.join("test","gnumeric_numbers1.ods"))
+      assert_equal ["Tabelle1","Name of Sheet 2","Sheet3","Sheet4","Sheet5"], oo.sheets
+      assert_raise(RangeError) {
+        oo.default_sheet = "no_sheet"
+      }
+      assert_raise(TypeError) {
+        oo.default_sheet = [1,2,3]
+      }
+
+      oo.sheets.each { |sh|
+        oo.default_sheet = sh
+        assert_equal sh, oo.default_sheet
+      }
+    end
+  end
+
   def test_sheets_excel
     if EXCEL
       oo = Excel.new(File.join("test","numbers1.xls"))
@@ -230,14 +245,12 @@ class TestRoo < Test::Unit::TestCase
     if GOOGLE
       oo = Google.new(key_of("numbers1"))
       assert_equal ["Tabelle1","Name of Sheet 2","Sheet3","Sheet4","Sheet5"], oo.sheets
-      after Date.new(2007,12,15) do
-        assert_raise(RangeError) {
-          oo.default_sheet = "no_sheet"
-        }
-        assert_raise(TypeError) {
-          oo.default_sheet = [1,2,3]
-        }
-      end
+      assert_raise(RangeError) {
+        oo.default_sheet = "no_sheet"
+      }
+      assert_raise(TypeError) {
+        oo.default_sheet = [1,2,3]
+      }
       oo.sheets.each { |sh|
         oo.default_sheet = sh
         assert_equal sh, oo.default_sheet
@@ -284,6 +297,45 @@ class TestRoo < Test::Unit::TestCase
     end
   end
 
+  def test_cell_gnumeric_ods
+    if GNUMERIC_ODS
+      oo = Openoffice.new(File.join("test","gnumeric_numbers1.ods"))
+      oo.default_sheet = oo.sheets.first
+      assert_equal 1, oo.cell(1,1)
+      assert_equal 2, oo.cell(1,2)
+      assert_equal 3, oo.cell(1,3)
+      assert_equal 4, oo.cell(1,4)
+      assert_equal 5, oo.cell(2,1)
+      assert_equal 6, oo.cell(2,2)
+      assert_equal 7, oo.cell(2,3)
+      assert_equal 8, oo.cell(2,4)
+      assert_equal 9, oo.cell(2,5)
+      assert_equal "test", oo.cell(2,6)
+      # assert_equal "string", oo.celltype(2,6)
+      assert_equal :string, oo.celltype(2,6)
+      assert_equal 11, oo.cell(2,7)
+      # assert_equal "float", oo.celltype(2,7)
+      assert_equal :float, oo.celltype(2,7)
+
+      assert_equal 10, oo.cell(4,1)
+      assert_equal 11, oo.cell(4,2)
+      assert_equal 12, oo.cell(4,3)
+      assert_equal 13, oo.cell(4,4)
+      assert_equal 14, oo.cell(4,5)
+
+      assert_equal 10, oo.cell(4,'A')
+      assert_equal 11, oo.cell(4,'B')
+      assert_equal 12, oo.cell(4,'C')
+      assert_equal 13, oo.cell(4,'D')
+      assert_equal 14, oo.cell(4,'E')
+
+      # assert_equal "date", oo.celltype(5,1)
+      assert_equal :date, oo.celltype(5,1)
+      assert_equal Date.new(1961,11,21), oo.cell(5,1)
+      assert_equal "1961-11-21", oo.cell(5,1).to_s
+    end
+  end
+
   def test_cell_excel
     if EXCEL
       oo = Excel.new(File.join("test","numbers1.xls"))
@@ -369,6 +421,11 @@ class TestRoo < Test::Unit::TestCase
       oo.default_sheet = oo.sheets.first
       assert_equal :string, oo.celltype(2,6)
     end
+    if GNUMERIC_ODS
+      oo = Openoffice.new(File.join("test","gnumeric_numbers1.ods"))
+      oo.default_sheet = oo.sheets.first
+      assert_equal :string, oo.celltype(2,6)
+    end
     if EXCEL
       oo = Excel.new(File.join("test","numbers1.xls"))
       oo.default_sheet = oo.sheets.first
@@ -406,6 +463,31 @@ class TestRoo < Test::Unit::TestCase
       assert_equal "thisisd9", oo.cell('d',9)
       assert_equal "thisisa11", oo.cell('a',11)
     end
+    
+    if GNUMERIC_ODS
+      oo = Openoffice.new(File.join("test","gnumeric_numbers1.ods"))
+      oo.default_sheet = oo.sheets.first
+      assert_equal "tata", oo.cell(6,1)
+      assert_equal "tata", oo.cell(6,'A')
+      assert_equal "tata", oo.cell('A',6)
+      assert_equal "tata", oo.cell(6,'a')
+      assert_equal "tata", oo.cell('a',6)
+
+      assert_raise(ArgumentError) {
+        assert_equal "tata", oo.cell('a','f')
+      }
+      assert_raise(ArgumentError) {
+        assert_equal "tata", oo.cell('f','a')
+      }
+      assert_equal "thisisc8", oo.cell(8,3)
+      assert_equal "thisisc8", oo.cell(8,'C')
+      assert_equal "thisisc8", oo.cell('C',8)
+      assert_equal "thisisc8", oo.cell(8,'c')
+      assert_equal "thisisc8", oo.cell('c',8)
+
+      assert_equal "thisisd9", oo.cell('d',9)
+      assert_equal "thisisa11", oo.cell('a',11)
+    end
 
     if EXCEL
       oo = Excel.new(File.join("test","numbers1.xls"))
@@ -463,9 +545,14 @@ class TestRoo < Test::Unit::TestCase
   # Version of the (XML) office document
   # please note that "1.0" is returned even if it was created with OpenOffice V. 2.0
   def test_officeversion
-    #-- OpenOffice
-    oo = Openoffice.new(File.join("test","numbers1.ods"))
-    assert_equal "1.0", oo.officeversion
+    if OPENOFFICE
+      oo = Openoffice.new(File.join("test","numbers1.ods"))
+      assert_equal "1.0", oo.officeversion
+    end
+    if GNUMERIC_ODS
+      oo = Openoffice.new(File.join("test","gnumeric_numbers1.ods"))
+      assert_equal "1.0", oo.officeversion
+    end
     if EXCEL
       # excel does not have a officeversion
     end
@@ -492,6 +579,22 @@ class TestRoo < Test::Unit::TestCase
       assert_equal "fuenfundvierzig", oo.cell('e',16)
       assert_equal ["einundvierzig", "zweiundvierzig", "dreiundvierzig", "vierundvierzig", "fuenfundvierzig"], oo.row(16)
     end
+    if GNUMERIC_ODS
+      oo = Openoffice.new(File.join("test","gnumeric_numbers1.ods"))
+      oo.default_sheet = oo.sheets.first
+      assert_equal 41, oo.cell('a',12)
+      assert_equal 42, oo.cell('b',12)
+      assert_equal 43, oo.cell('c',12)
+      assert_equal 44, oo.cell('d',12)
+      assert_equal 45, oo.cell('e',12)
+      assert_equal [41.0,42.0,43.0,44.0,45.0], oo.row(12)
+      assert_equal "einundvierzig", oo.cell('a',16)
+      assert_equal "zweiundvierzig", oo.cell('b',16)
+      assert_equal "dreiundvierzig", oo.cell('c',16)
+      assert_equal "vierundvierzig", oo.cell('d',16)
+      assert_equal "fuenfundvierzig", oo.cell('e',16)
+      assert_equal ["einundvierzig", "zweiundvierzig", "dreiundvierzig", "vierundvierzig", "fuenfundvierzig"], oo.row(16)
+    end
     if EXCEL
       #-- Excel
       oo = Excel.new(File.join("test","numbers1.xls"))
@@ -541,6 +644,11 @@ class TestRoo < Test::Unit::TestCase
       oo.default_sheet = oo.sheets.first
       assert_equal 18, oo.last_row
     end
+    if GNUMERIC_ODS
+      oo = Openoffice.new(File.join("test","gnumeric_numbers1.ods"))
+      oo.default_sheet = oo.sheets.first
+      assert_equal 18, oo.last_row
+    end
     if EXCEL
       oo = Excel.new(File.join("test","numbers1.xls"))
       oo.default_sheet = oo.sheets.first
@@ -559,8 +667,12 @@ class TestRoo < Test::Unit::TestCase
       oo.default_sheet = oo.sheets.first
       assert_equal 7, oo.last_column
     end
+    if GNUMERIC_ODS
+      oo = Openoffice.new(File.join("test","gnumeric_numbers1.ods"))
+      oo.default_sheet = oo.sheets.first
+      assert_equal 7, oo.last_column
+    end
     if EXCEL
-      #-- Excel
       oo = Excel.new(File.join("test","numbers1.xls"))
       oo.default_sheet = oo.sheets.first
       assert_equal 7, oo.last_column
@@ -578,8 +690,12 @@ class TestRoo < Test::Unit::TestCase
       oo.default_sheet = oo.sheets.first
       assert_equal 'G', oo.last_column_as_letter
     end
+    if GNUMERIC_ODS
+      oo = Openoffice.new(File.join("test","gnumeric_numbers1.ods"))
+      oo.default_sheet = oo.sheets.first
+      assert_equal 'G', oo.last_column_as_letter
+    end
     if EXCEL
-      #-- Excel
       oo = Excel.new(File.join("test","numbers1.xls"))
       oo.default_sheet = 1 # oo.sheets.first
       assert_equal 'G', oo.last_column_as_letter
@@ -597,8 +713,12 @@ class TestRoo < Test::Unit::TestCase
       oo.default_sheet = oo.sheets.first
       assert_equal 1, oo.first_row
     end
+    if GNUMERIC_ODS
+      oo = Openoffice.new(File.join("test","gnumeric_numbers1.ods"))
+      oo.default_sheet = oo.sheets.first
+      assert_equal 1, oo.first_row
+    end
     if EXCEL
-      #-- Excel
       oo = Excel.new(File.join("test","numbers1.xls"))
       oo.default_sheet = 1 # oo.sheets.first
       assert_equal 1, oo.first_row
@@ -616,6 +736,11 @@ class TestRoo < Test::Unit::TestCase
       oo.default_sheet = oo.sheets.first
       assert_equal 1, oo.first_column
     end
+    if GNUMERIC_ODS
+      oo = Openoffice.new(File.join("test","gnumeric_numbers1.ods"))
+      oo.default_sheet = oo.sheets.first
+      assert_equal 1, oo.first_column
+    end
     if EXCEL
       #-- Excel
       oo = Excel.new(File.join("test","numbers1.xls"))
@@ -641,9 +766,16 @@ class TestRoo < Test::Unit::TestCase
     end
   end
 
+  def test_first_column_as_letter_gnumeric_ods
+    if GNUMERIC_ODS
+      oo = Openoffice.new(File.join("test","gnumeric_numbers1.ods"))
+      oo.default_sheet = oo.sheets.first
+      assert_equal 'A', oo.first_column_as_letter
+    end
+  end
+
   def test_first_column_as_letter_excel
     if EXCEL
-      #-- Excel
       oo = Excel.new(File.join("test","numbers1.xls"))
       oo.default_sheet = 1 # oo.sheets.first
       assert_equal 'A', oo.first_column_as_letter
@@ -664,6 +796,11 @@ class TestRoo < Test::Unit::TestCase
       oo.default_sheet = "Name of Sheet 2"
       assert_equal 'I am sheet 2', oo.cell('C',5)
     end
+    if GNUMERIC_ODS
+      oo = Openoffice.new(File.join("test","gnumeric_numbers1.ods"))
+      oo.default_sheet = "Name of Sheet 2"
+      assert_equal 'I am sheet 2', oo.cell('C',5)
+    end
     if EXCEL
       oo = Excel.new(File.join("test","numbers1.xls"))
       oo.default_sheet = "Name of Sheet 2"
@@ -677,14 +814,24 @@ class TestRoo < Test::Unit::TestCase
   end
 
   def test_boundaries
-    #-- OpenOffice
-    oo = Openoffice.new(File.join("test","numbers1.ods"))
-    oo.default_sheet = "Name of Sheet 2"
-    assert_equal 2, oo.first_column
-    assert_equal 'B', oo.first_column_as_letter
-    assert_equal 5, oo.first_row
-    assert_equal 'E', oo.last_column_as_letter
-    assert_equal 14, oo.last_row
+    if OPENOFFICE
+      oo = Openoffice.new(File.join("test","numbers1.ods"))
+      oo.default_sheet = "Name of Sheet 2"
+      assert_equal 2, oo.first_column
+      assert_equal 'B', oo.first_column_as_letter
+      assert_equal 5, oo.first_row
+      assert_equal 'E', oo.last_column_as_letter
+      assert_equal 14, oo.last_row
+    end
+    if GNUMERIC_ODS
+      oo = Openoffice.new(File.join("test","gnumeric_numbers1.ods"))
+      oo.default_sheet = "Name of Sheet 2"
+      assert_equal 2, oo.first_column
+      assert_equal 'B', oo.first_column_as_letter
+      assert_equal 5, oo.first_row
+      assert_equal 'E', oo.last_column_as_letter
+      assert_equal 14, oo.last_row
+    end
     if EXCEL
       #-- Excel
       oo = Excel.new(File.join("test","numbers1.xls"))
@@ -698,7 +845,6 @@ class TestRoo < Test::Unit::TestCase
   end
 
   def test_multiple_letters
-    #-- OpenOffice
     if OPENOFFICE
       oo = Openoffice.new(File.join("test","numbers1.ods"))
       oo.default_sheet = "Sheet3"
@@ -708,8 +854,16 @@ class TestRoo < Test::Unit::TestCase
       assert_equal 'BA', oo.last_column_as_letter
       assert_equal "i am BA", oo.cell(1,'BA')
     end
+    if GNUMERIC_ODS
+      oo = Openoffice.new(File.join("test","gnumeric_numbers1.ods"))
+      oo.default_sheet = "Sheet3"
+      assert_equal "i am AA", oo.cell('AA',1)
+      assert_equal "i am AB", oo.cell('AB',1)
+      assert_equal "i am BA", oo.cell('BA',1)
+      assert_equal 'BA', oo.last_column_as_letter
+      assert_equal "i am BA", oo.cell(1,'BA')
+    end
     if EXCEL
-      #-- Excel
       oo = Excel.new(File.join("test","numbers1.xls"))
       oo.default_sheet = 3 # "Sheet3"
       assert_equal "i am AA", oo.cell('AA',1)
@@ -720,10 +874,6 @@ class TestRoo < Test::Unit::TestCase
     end
   end
 
-  def test_setting_cell
-    assert true
-  end
-
   def test_argument_error
     if EXCEL
       oo = Excel.new(File.join("test","numbers1.xls"))
@@ -749,6 +899,13 @@ class TestRoo < Test::Unit::TestCase
       assert ! oo.empty?('a',15)
       assert oo.empty?('a',20)
     end
+    if GNUMERIC_ODS
+      oo = Openoffice.new(File.join("test","gnumeric_numbers1.ods"))
+      oo.default_sheet = oo.sheets.first
+      assert oo.empty?('a',14)
+      assert ! oo.empty?('a',15)
+      assert oo.empty?('a',20)
+    end
     if EXCEL
       #-- Excel
       oo = Excel.new(File.join("test","numbers1.xls"))
@@ -805,6 +962,14 @@ class TestRoo < Test::Unit::TestCase
       oo.reload
       assert_equal 1, oo.cell(1,1)
     end
+    if GNUMERIC_ODS
+      oo = Openoffice.new(File.join("test","gnumeric_numbers1.ods"))
+      oo.default_sheet = oo.sheets.first
+      assert_equal 1, oo.cell(1,1)
+
+      oo.reload
+      assert_equal 1, oo.cell(1,1)
+    end
     if EXCEL
       oo = Excel.new(File.join("test","numbers1.xls"))
       oo.default_sheet = 1 # oo.sheets.first
@@ -825,6 +990,15 @@ class TestRoo < Test::Unit::TestCase
       assert_equal 10, oo.cell('d',1)
       assert_equal 10, oo.cell('e',1)
     end
+    if GNUMERIC_ODS
+      oo = Openoffice.new(File.join("test","gnumeric_numbers1.ods"))
+      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 eigentlich nicht noetig,
     #  # da der Bug nur bei OO-Dokumenten auftrat
@@ -860,6 +1034,24 @@ class TestRoo < Test::Unit::TestCase
       assert_equal 2, oo.cell('a',2)
       assert_equal 3, oo.cell('a',3)
     end
+    if OPENOFFICE
+      oo = Openoffice.new(File.join("test","numbers1.ods"))
+      oo.default_sheet = "Sheet5"
+      assert_equal 1, oo.cell('A',1)
+      assert_equal 5, oo.cell('b',1)
+      assert_equal 5, oo.cell('c',1)
+      assert_equal 2, oo.cell('a',2)
+      assert_equal 3, oo.cell('a',3)
+    end
+    if GNUMERIC_ODS
+      oo = Openoffice.new(File.join("test","gnumeric_numbers1.ods"))
+      oo.default_sheet = "Sheet5"
+      assert_equal 1, oo.cell('A',1)
+      assert_equal 5, oo.cell('b',1)
+      assert_equal 5, oo.cell('c',1)
+      assert_equal 2, oo.cell('a',2)
+      assert_equal 3, oo.cell('a',3)
+    end
     if EXCEL
       oo = Excel.new(File.join("test","numbers1.xls"))
       oo.default_sheet = 5
@@ -879,7 +1071,7 @@ class TestRoo < Test::Unit::TestCase
     #  assert_equal 3, oo.cell('a',3)
     #end
   end
-
+  #2008-01-30
   def test_italo_table
     local_only do
       oo = Openoffice.new(File.join("test","simple_spreadsheet_from_italo.ods"))
@@ -1917,19 +2109,17 @@ class TestRoo < Test::Unit::TestCase
     if OPENOFFICE
       oo = Openoffice.new(File.join("test","numbers1.ods"))
       oo.default_sheet = oo.sheets.first
+      oo.header_line = nil
       rec = oo.find 16
       assert rec
-      oo.header_line = nil
       assert_nil oo.header_line
       # keine Headerlines in diesem Beispiel definiert
-      after Date.new(2008,1,31) do
-        assert_equal "einundvierzig", rec[0]
-        #assert_equal false, rec
+      assert_equal "einundvierzig", rec[0]
+      #assert_equal false, rec
 
-        rec = oo.find 15
-        assert rec
-        assert_equal 41,rec
-      end
+      rec = oo.find 15
+      assert rec
+      assert_equal 41,rec[0]
     end
   end
 
@@ -1937,16 +2127,15 @@ class TestRoo < Test::Unit::TestCase
     if EXCEL
       oo = Excel.new(File.join("test","numbers1.xls"))
       oo.default_sheet = oo.sheets.first
+      oo.header_line = nil
       rec = oo.find 16
       assert rec
       # keine Headerlines in diesem Beispiel definiert
-      after Date.new(2008,1,31) do
-        assert_equal "einundvierzig", rec[0]
+      assert_equal "einundvierzig", rec[0]
 
-        rec = oo.find 15
-        assert rec
-        assert_equal 41,rec[0]
-      end
+      rec = oo.find 15
+      assert rec
+      assert_equal 41,rec[0]
     end
   end
 
@@ -1954,16 +2143,15 @@ class TestRoo < Test::Unit::TestCase
     if GOOGLE
       oo = Google.new(key_of("numbers1"))
       oo.default_sheet = oo.sheets.first
+      oo.header_line = nil
       rec = oo.find 16
       assert rec
       # keine Headerlines in diesem Beispiel definiert
-      after Date.new(2008,1,31) do
-        assert_equal "einundvierzig", rec[0]
+      assert_equal "einundvierzig", rec[0]
 
-        rec = oo.find 15
-        assert rec
-        assert_equal 41,rec[0]
-      end
+      rec = oo.find 15
+      assert rec
+      assert_equal 41,rec[0]
     end
   end
 
@@ -2347,19 +2535,17 @@ class TestRoo < Test::Unit::TestCase
 
   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
+      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
 
@@ -2520,11 +2706,11 @@ class TestRoo < Test::Unit::TestCase
       }
     end
     if GOOGLE
-      after Date.new(2008,1,31) do
-      assert_raise(IOError) {
-        # oo = Google.new(key_of('testnichtvorhanden'+'Bibelbund.ods'))
-        oo = Google.new('testnichtvorhanden')
-      }
+      after Date.new(2008,4,1) do
+        assert_raise(IOError) {
+          # oo = Google.new(key_of('testnichtvorhanden'+'Bibelbund.ods'))
+          oo = Google.new('testnichtvorhanden')
+        }
       end
     end
   end
@@ -2551,6 +2737,48 @@ class TestRoo < Test::Unit::TestCase
       assert_equal "hello from the tests", oo.cell(1,1)
     end
   end
+  
+  def test_bug_set_value_with_more_than_one_sheet_google
+    # write.me: http://spreadsheets.google.com/ccc?key=ptu6bbahNZpY0N0RrxQbWdw&hl=en_GB
+    if GOOGLE
+      content1 = 'AAA'
+      content2 = 'BBB'
+      oo = Google.new('ptu6bbahNZpY0N0RrxQbWdw')
+      oo.default_sheet = oo.sheets.first
+      oo.set_value(1,1,content1)
+      oo.default_sheet = oo.sheets[1]
+      oo.set_value(1,1,content2) # in the second sheet
+      oo.default_sheet = oo.sheets.first
+      assert_equal content1, oo.cell(1,1)
+      oo.default_sheet = oo.sheets[1]
+      assert_equal content2, oo.cell(1,1)
+    end
+  end
+  
+  def test_set_value_with_sheet_argument_google
+    if GOOGLE
+      random_row = rand(10)+1
+      random_column = rand(10)+1
+      oo = Google.new('ptu6bbahNZpY0N0RrxQbWdw')
+      oo.default_sheet = oo.sheets.first
+      content1 = 'ABC'
+      content2 = 'DEF'
+      oo.set_value(random_row,random_column,content1,oo.sheets.first)
+      oo.set_value(random_row,random_column,content2,oo.sheets[1])
+      assert_equal content1, oo.cell(random_row,random_column,oo.sheets.first)
+      assert_equal content2, oo.cell(random_row,random_column,oo.sheets[1])
+    end  
+  end
+  
+  def test_set_value_for_non_existing_sheet_google
+    if GOOGLE
+      oo = Google.new('ptu6bbahNZpY0N0RrxQbWdw')
+      assert_raise(RangeError) {
+        #oo.default_sheet = "no_sheet"
+        oo.set_value(1,1,"dummy","no_sheet")
+      }
+    end # GOOGLE
+  end
 
   def test_bug_bbu_openoffice
     oo = Openoffice.new(File.join('test','bbu.ods'))

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.9.0</a>
+      <a href="http://rubyforge.org/projects/roo" class="numbers">0.9.1</a>
     </div>
     <h2>What</h2>
 
@@ -456,10 +456,7 @@ Only the Openoffice- and Excel-parts of this gem are currently working &#8211; t
 	<p>Read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people&#8217;s code</a> and for section <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups">8b: Submit patch to Google Groups</a>, use the Google Group above.</p>
 
 
-	<p>&lt;!&#8212;
-The trunk repository is <code>svn://rubyforge.org/var/svn/gorank/trunk</code> for anonymous access.
-&#8212;&gt;</p>
-
+<strike>The trunk repository is <code>svn://rubyforge.org/var/svn/gorank/trunk</code> for anonymous access.</strike>
 
 	<h2>License</h2>
 
@@ -482,7 +479,7 @@ The trunk repository is <code>svn://rubyforge.org/var/svn/gorank/trunk</code> fo
 		<li>Dirk Huth f&uuml;rs Testen unter Windows</li>
 	</ul>
     <p class="coda">
-      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 24th January 2008<br>
+      <a href="mailto:thopre@gmail.com">Thomas Preymesser</a>, 27th January 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -313,9 +313,7 @@ h2. How to submit patches
 
 Read the "8 steps for fixing other people's code":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/ and for section "8b: Submit patch to Google Groups":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups, use the Google Group above.
 
-<!--
-The trunk repository is <code>svn://rubyforge.org/var/svn/gorank/trunk</code> for anonymous access.
--->
+<strike>The trunk repository is <code>svn://rubyforge.org/var/svn/gorank/trunk</code> for anonymous access.</strike>
 
 h2. License
 

data/website/template.rhtml

@@ -37,7 +37,7 @@
     </div>
     <%= body %>
     <p class="coda">
-      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, <%= modified.pretty %><br>
+      <a href="mailto:thopre@gmail.com">Thomas Preymesser</a>, <%= modified.pretty %><br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: roo
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Thomas Preymesser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-24 00:00:00 +01:00
+date: 2008-03-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency