roo 0.0.3 → 0.1.0

data/History.txt

@@ -1,3 +1,9 @@
+== 0.1.0 2007-05-31
+
+* 1 major enhancement:
+  * new methods first/last row/column
+  * new method officeversion
+
 == 0.0.3 2007-05-30
 
 * 1 minor enhancement:

data/lib/roo/openoffice.rb

@@ -4,6 +4,7 @@ require 'rexml/document'
 # require 'matrix'
 require 'fileutils'
 require 'zip/zipfilesystem'
+require 'date'
 
 class Openoffice
 
@@ -19,7 +20,9 @@ class Openoffice
     @doc = REXML::Document.new file
     @cell = Hash.new
     @cell_type = Hash.new
-    FileUtils::rm_r(@tmpdir)
+    if DateTime.now < Date.new(2007,6,1)
+      FileUtils::rm_r(@tmpdir)
+    end
     @default_sheet = nil
   end
 
@@ -54,26 +57,17 @@ class Openoffice
   # returns an array of sheets in the spreadsheet
   def sheets
     return_sheets = []
-    # p valid_xml?(doc)
     oo_document_count = 0
     @doc.each_element do |oo_document|
       oo_document_count += 1
-      #p oo_document
       oo_element_count = 0
       oo_document.each_element do |oo_element|
         oo_element_count += 1
-        # p oo_element.name
         if oo_element.name == "body"
-          # puts "Body gefunden "
           oo_element.each_element do |be|
-            # p be.name
             if be.name == "spreadsheet"
               be.each_element do |se|
-                # p se
                 if se.name == "table"
-                  # puts "table gefunden"
-                  #se.each_element
-                  # p se.attributes['name']
                   return_sheets << se.attributes['name']
                 end
               end
@@ -81,9 +75,7 @@ class Openoffice
           end
         end
       end
-      # puts oo_element_count.to_s+" oo_element_count "
     end
-    # puts oo_document_count.to_s+" oo_document_count "
     return_sheets
   end
 
@@ -92,12 +84,14 @@ class Openoffice
     @default_sheet = s
   end
 
+  # version of the openoffice document 
   def officeversion
     read_cells unless @cells_read
     @officeversion
   end
 
   def to_s
+    read_cells unless @cells_read
     @cell.inspect
   end
 
@@ -116,9 +110,69 @@ class Openoffice
     }
     result
   end
+  
+  # returns the number of the last non-empty row
+  def last_row
+    read_cells unless @cells_read
+    result = 0
+    @cell.each_pair {|key,value|
+      y,x = key.split(',')
+      y = y.to_i
+      result = [result, y].max
+    }
+    result
+  end
+
+  # returns the number of the last non-empty column
+  def last_column
+    read_cells unless @cells_read
+    result = 0
+    @cell.each_pair {|key,value|
+      y,x = key.split(',')
+      x = x.to_i
+      result = [result, x].max
+    }
+    result
+  end
+
+  # returns the number of the first non-empty row
+  def first_row
+    read_cells unless @cells_read
+    result = 999_999 # more than a spreadsheet can hold
+    @cell.each_pair {|key,value|
+      y,x = key.split(',')
+      y = y.to_i
+      result = [result, y].min
+    }
+    result
+  end
+
+  # returns the number of the first non-empty column
+  def first_column
+    read_cells unless @cells_read
+    result = 999_999 # more than a spreadsheet can hold
+    @cell.each_pair {|key,value|
+      y,x = key.split(',')
+      x = x.to_i
+      result = [result, x].min
+    }
+    result
+  end
+
+  def first_column_as_letter
+    number_to_letter(first_column)
+  end
+
+  def last_column_as_letter
+    number_to_letter(last_column)
+  end
 
 private
 
+  def number_to_letter(n)
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"[n-1,1]
+  end
+
   # read all cells in the selected sheet
   def read_cells
     oo_document_count = 0
@@ -150,6 +204,10 @@ private
                       rep = te.attributes["number-columns-repeated"]
                       # p "rep = "+rep.to_s
                     elsif te.name == "table-row"
+                      if te.attributes['number-rows-repeated']
+                        skip_y = te.attributes['number-rows-repeated'].to_i 
+                        y = y + skip_y - 1 # minus 1 because this line will be counted as a line element
+                      end
                       # p te
                       te.each_element do |tr|
                         # p tr

data/lib/roo/version.rb

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

data/test/test_roo.rb

@@ -76,4 +76,39 @@ class TestRoo < Test::Unit::TestCase
     assert_equal [41.0,42.0,43.0,44.0,45.0], oo.row(12)
   end
 
+  def test_last_row
+    oo = Openoffice.new("test/numbers1.ods")
+    oo.default_sheet = oo.sheets.first
+    assert_equal 18, oo.last_row
+  end
+
+  def test_last_column
+    oo = Openoffice.new("test/numbers1.ods")
+    oo.default_sheet = oo.sheets.first
+    assert_equal 7, oo.last_column
+  end
+
+  def test_last_column_as_letter
+    oo = Openoffice.new("test/numbers1.ods")
+    oo.default_sheet = oo.sheets.first
+    assert_equal 'G', oo.last_column_as_letter
+  end
+
+  def test_first_row
+    oo = Openoffice.new("test/numbers1.ods")
+    oo.default_sheet = oo.sheets.first
+    assert_equal 1, oo.first_row
+  end
+
+  def test_first_column
+    oo = Openoffice.new("test/numbers1.ods")
+    oo.default_sheet = oo.sheets.first
+    assert_equal 1, oo.first_column
+  end
+
+  def test_first_column_as_letter
+    oo = Openoffice.new("test/numbers1.ods")
+    oo.default_sheet = oo.sheets.first
+    assert_equal 'A', oo.first_column_as_letter
+  end
 end

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.0.3</a>
+      <a href="http://rubyforge.org/projects/roo" class="numbers">0.1.0</a>
     </div>
     <h2>What</h2>
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: roo
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
-date: 2007-05-30 00:00:00 +02:00
+  version: 0.1.0
+date: 2007-05-31 00:00:00 +02:00
 summary: roo can access the contents of OpenOffice-Spreadsheets
 require_paths: 
 - lib