roo 0.0.1 → 0.0.2

data/lib/roo.rb

@@ -1,7 +1,8 @@
 module Roo
 end
 
+require 'rubygems'
 require 'ruport'
 require 'ruport/util'
 require 'roo/version'
-require 'openoffice'
+require 'roo/openoffice'

data/lib/roo/openoffice.rb

@@ -7,36 +7,106 @@ require 'zip/zipfilesystem'
 
 class Openoffice
 
-  def initialize(filename=nil)
+  def initialize(filename)
+    @cells_read = false
     @filename = filename
-    unless File.exists?("/tmp/oo_"+$$.to_s)
-      FileUtils::mkdir("/tmp/oo_"+$$.to_s) #TODO:
+    @tmpdir = "oo_"+$$.to_s
+    unless File.exists?(@tmpdir)
+      FileUtils::mkdir(@tmpdir) #TODO:
     end
-    # `unzip -o "#{filename}"`
     extract_content
-    file = File.new("roo_content.xml")
+    file = File.new(@tmpdir+"/"+"roo_content.xml") # TODO:
     @doc = REXML::Document.new file
     @cell = Hash.new
     @cell_type = Hash.new
+    FileUtils::rm_r(@tmpdir)
+    @default_sheet = nil
   end
 
+  # return the content of a spreadsheet-cell
+  # (1,1) is the upper left corner
+  # (1,1), (1,'A'), ('A',1), ('a',1) all refers to the
+  # cell at first line, first row
   def cell(row,col)
+    if row.class == String
+      if col.class == Fixnum
+        # ('A',1):
+        # ('B', 5) -> (5, 2)
+        row, col = col, row
+      else
+        raise FormatError
+      end
+    end
     if col.class == String
-      col = "ABCDEFGHIJKLMNOPQRSTUVWXYZ".index(col)+1
+      col = "ABCDEFGHIJKLMNOPQRSTUVWXYZ".index(col.upcase)+1
     end
     read_cells unless @cells_read
     @cell["#{row},#{col}"]
   end
 
+  # returns the open-office type of a cell
   def celltype(row,col)
     read_cells unless @cells_read
     @cell_type["#{row},#{col}"]
   end
 
+
+  # 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
+            end
+          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
+
+  # set the working sheet in the document
+  def default_sheet=(s)
+    @default_sheet = s
+  end
+
+  def officeversion
+    read_cells unless @cells_read
+    @officeversion
+  end
+
+  def to_s
+    @cell.inspect
+  end
+private
+
   # read all cells in the selected sheet
   def read_cells
     oo_document_count = 0
     @doc.each_element do |oo_document|
+      @officeversion = oo_document.attributes['version']
       oo_document_count += 1
       oo_element_count = 0
       oo_document.each_element do |oo_element|
@@ -67,6 +137,10 @@ class Openoffice
                       te.each_element do |tr|
                         # p tr
                         if tr.name == 'table-cell'
+                           skip = tr.attributes['number-columns-repeated']
+                           if skip
+                             x += (skip.to_i - 1)
+                           end
                            vt = tr.attributes['value-type']
                            v  = tr.attributes['value']
                            # puts "#{vt} #{v}"
@@ -107,55 +181,13 @@ class Openoffice
     @cells_read = true
   end
 
-  # returns a list of sheets in this document
-  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
-            end
-          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
-
-  def default_sheet=(s)
-    @default_sheet = s
-  end
-
-private
-
   def process_zipfile(zip, path='')
     if zip.file.file? path
       # puts %{#{path}: "#{zip.read(path)}"}
       # puts %{#{path}:}
      
       if path == "content.xml"
-        open('roo_content.xml','w') {|f|
+        open(@tmpdir+'/'+'roo_content.xml','w') {|f|
           f << zip.read(path) 
         }
       end 

data/lib/roo/version.rb

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

data/test/test_roo.rb

@@ -2,10 +2,63 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestRoo < Test::Unit::TestCase
 
-  def setup
+  def test_sheets
+    oo = Openoffice.new("test/numbers1.ods")
+    assert_equal ["Tabelle1","Sheet2","Sheet3"], oo.sheets
   end
-  
-  def test_truth
-    assert true
+
+  def test_cell
+    oo = Openoffice.new("test/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 11, oo.cell(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 "1961-11-21", oo.cell(5,1)
   end
+
+  def test_cell_address
+    oo = Openoffice.new("test/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_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)
+  end
+
+  # 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
+    oo = Openoffice.new("test/numbers1.ods")
+    assert_equal "1.0", oo.officeversion
+  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.1</a>
+      <a href="http://rubyforge.org/projects/roo" class="numbers">0.0.2</a>
     </div>
     <h1>&#x2192; &#8216;roo&#8217;</h1>
 
@@ -105,10 +105,7 @@ def test_sheets
 	<h2>Forum</h2>
 
 
-	<p><a href="http://groups.google.com/group/roo">http://groups.google.com/group/roo</a></p>
-
-
-	<p><span class="caps">TODO</span> &#8211; create Google Group &#8211; roo</p>
+	<p><a href="http://groups.google.com/group/ruby-roo">http://groups.google.com/group/ruby-roo</a></p>
 
 
 	<h2>License</h2>

data/website/index.txt

@@ -64,9 +64,7 @@ def test_sheets
 
 h2. Forum
 
-"http://groups.google.com/group/roo":http://groups.google.com/group/roo
-
-TODO - create Google Group - roo
+"http://groups.google.com/group/ruby-roo":http://groups.google.com/group/ruby-roo
 
 h2. License
 

metadata

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