roo 0.2.2 → 0.2.3

data/History.txt

@@ -1,3 +1,17 @@
+== 0.2.3 2007-06-02
+* 3 enhancements:
+  * more robust call att Excel#default_sheet= when called with a name
+  * new method empty?
+  * refactoring
+* 1 bugfix:
+  * bugfix in Excel#celltype
+  * bugfix (running under windows only) in closing the temp file before removing it
+
+== 0.2.2 2007-06-01
+* 1 bugfix:
+  * correct pathname for running with windows
+
+
 == 0.2.2 2007-06-01
 * 1 bugfix:
   * incorrect dependencies fixed 

data/Manifest.txt

@@ -11,6 +11,8 @@ scripts/txt2html
 setup.rb
 test/test_helper.rb
 test/test_roo.rb
+test/numbers1.ods
+test/numbers1.xls
 website/index.html
 website/index.txt
 website/javascripts/rounded_corners_lite.inc.js

data/Rakefile

@@ -76,6 +76,7 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   #  ['ruport', '>= 1.0.0'],
   #  ['ruport-util', '>= 0.5.0'],
     ['parseexcel', '>= 0.5.1.1'],
+    ['rubyzip', '>= 0.9.1'],
   ]
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
 end

data/lib/roo/excel.rb

@@ -21,33 +21,29 @@ class Excel < Openoffice
     end
   end
 
+  # sets the working sheet (1,2,3,..)
+  #--
   # im Excel-Bereich muesste man wahrscheinlich intern mit Nummern arbeiten
   # von aussen arbeite ich mit (1,2,3... intern wird Index 0,1,2,...
   # verwendet.
+
   def default_sheet=(n)
+    unless n.kind_of?(Fixnum)
+      fail ArgumentError.new("Number expected")
+    end
     @default_sheet = n-1
   end
 
   def cell(row,col)
-    #TODO: refactoring with normalize
-    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 = Openoffice.letter_to_number(col)
-    end 
-    #--  
+    row,col = normalize(row,col)
     worksheet = @workbook.worksheet(@default_sheet)
     skip = 0
     line = 1
     worksheet.each(skip) { |row_par|
       if line == row
+        if row_par == nil
+          return nil
+        end
         cell = row_par.at(col-1)
         # p "celltype: "
         # p cell.type
@@ -64,6 +60,7 @@ class Excel < Openoffice
   end
 
   def celltype(row,col)
+    row,col = normalize(row,col)
     worksheet = @workbook.worksheet(@default_sheet)
     skip = 0
     line = 1
@@ -71,10 +68,10 @@ class Excel < Openoffice
       if line == row
         cell = row_par.at(col-1)
         case cell.type
-        when :numeric then return cell.to_i
+        when :numeric then return "float"
         when :text then return "string"
         when :date then return "date"
-        else  return cell.to_s
+        else  return cell.type
         end
       end
       line += 1
@@ -107,12 +104,18 @@ class Excel < Openoffice
     lr
   end
 
-  def first_column_as_letter
-    number_to_letter(first_column)
-  end
-
-  def last_column_as_letter
-    number_to_letter(last_column)
+  def empty?(row, col)
+    row,col = normalize(row,col)
+    return true if row < first_row || row > last_row || col < first_column || col > last_column
+    # read_cells unless @cells_read
+    return true unless cell(row, col)
+    # p celltype(row,col)
+    #p cell(row,col)
+    return true if celltype(row, col) == "string" && cell(row, col) == ""
+          #when :text then return cell.to_s('latin1')
+    # p celltype(row,col)
+    # return true if cell(row, col) == ""
+    false
   end
 
 private
@@ -126,7 +129,7 @@ private
     worksheet.each(skip) { |row_par|
       if row_par
         row_par.each_with_index {|cell,i|
-          # nicht beruechsichtigen, wenn nil und vorher noch nichts war
+          # nicht beruecksichtigen, wenn nil und vorher noch nichts war
           # p cell
           if !cell 
             # nix

data/lib/roo/openoffice.rb

@@ -1,7 +1,6 @@
 
 require 'rubygems'
 require 'rexml/document'
-# require 'matrix'
 require 'fileutils'
 require 'zip/zipfilesystem'
 require 'date'
@@ -14,17 +13,17 @@ end
 
 class Openoffice
 
-
   def initialize(filename)
     @cells_read = false
     @filename = filename
     @tmpdir = "oo_"+$$.to_s
     unless File.exists?(@tmpdir)
-      FileUtils::mkdir(@tmpdir) #TODO:
+      FileUtils::mkdir(@tmpdir) 
     end
     extract_content
-    file = File.new(@tmpdir+"/"+"roo_content.xml") # TODO:
+    file = File.new(File.join(@tmpdir, "roo_content.xml")) 
     @doc = REXML::Document.new file
+    file.close
     @cell = Hash.new
     @cell_type = Hash.new
     if DateTime.now > Date.new(2007,5,31)
@@ -38,25 +37,15 @@ class Openoffice
   # (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 = Openoffice.letter_to_number(col)
-    end
     read_cells unless @cells_read
+    row,col = normalize(row,col)
     @cell["#{row},#{col}"]
   end
 
   # returns the open-office type of a cell
   def celltype(row,col)
     read_cells unless @cells_read
+    row,col = normalize(row,col)
     @cell_type["#{row},#{col}"]
   end
 
@@ -97,6 +86,8 @@ class Openoffice
     @officeversion
   end
 
+  # shows the internal representation of all cells
+  # mainly for debugging purposes
   def to_s
     read_cells unless @cells_read
     @cell.inspect
@@ -194,7 +185,14 @@ class Openoffice
       n = n.div(26)
      end
      letters
-   end
+  end
+
+  def empty?(row, col)
+    read_cells unless @cells_read
+    return true unless cell(row, col)
+    return true if celltype(row, col) == "string" && cell(row, col).empty?
+    false
+  end
 
 private
 
@@ -310,5 +308,22 @@ private
     end
     result
   end
-    
+
+  # converts cell coordinate to numeric values of row,col
+  def normalize(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 = Openoffice.letter_to_number(col)
+    end 
+    return row,col
+  end 
+
 end

data/lib/roo/version.rb

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

data/test/test_roo.rb

@@ -11,15 +11,15 @@ class TestRoo < Test::Unit::TestCase
   end
 
   def test_sheets
-    oo = Openoffice.new("test/numbers1.ods")
+    oo = Openoffice.new(File.join("test","numbers1.ods"))
     assert_equal ["Tabelle1","Name of Sheet 2","Sheet3"], oo.sheets
     #--
-    oo = Excel.new("test/numbers1.xls")
+    oo = Excel.new(File.join("test","numbers1.xls"))
     assert_equal ["Tabelle1","Name of Sheet 2","Sheet3"], oo.sheets
   end
 
   def test_cell
-    oo = Openoffice.new("test/numbers1.ods")
+    oo = Openoffice.new(File.join("test","numbers1.ods"))
     oo.default_sheet = oo.sheets.first
     assert_equal 1, oo.cell(1,1)
     assert_equal 2, oo.cell(1,2)
@@ -33,6 +33,7 @@ class TestRoo < Test::Unit::TestCase
     assert_equal "test", oo.cell(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 10, oo.cell(4,1)
     assert_equal 11, oo.cell(4,2)
@@ -49,7 +50,7 @@ class TestRoo < Test::Unit::TestCase
     assert_equal "date", oo.celltype(5,1)
     assert_equal "1961-11-21", oo.cell(5,1)
 
-    oo = Excel.new("test/numbers1.xls")
+    oo = Excel.new(File.join("test","numbers1.xls"))
     oo.default_sheet = 1 # oo.sheets.first
     assert_equal 1, oo.cell(1,1)
     assert_equal 2, oo.cell(1,2)
@@ -63,6 +64,7 @@ class TestRoo < Test::Unit::TestCase
     assert_equal "test", oo.cell(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 10, oo.cell(4,1)
     assert_equal 11, oo.cell(4,2)
@@ -81,7 +83,7 @@ class TestRoo < Test::Unit::TestCase
   end
 
   def test_cell_address
-    oo = Openoffice.new("test/numbers1.ods")
+    oo = Openoffice.new(File.join("test/numbers1.ods"))
     oo.default_sheet = oo.sheets.first
     assert_equal "tata", oo.cell(6,1)
     assert_equal "tata", oo.cell(6,'A')
@@ -98,7 +100,7 @@ class TestRoo < Test::Unit::TestCase
     assert_equal "thisisd9", oo.cell('d',9)
     assert_equal "thisisa11", oo.cell('a',11)
 
-    oo = Excel.new("test/numbers1.xls")
+    oo = Excel.new(File.join("test","numbers1.xls"))
     oo.default_sheet = 1 # oo.sheets.first
     assert_equal "tata", oo.cell(6,1)
     assert_equal "tata", oo.cell(6,'A')
@@ -120,18 +122,18 @@ class TestRoo < Test::Unit::TestCase
   # please note that "1.0" is returned even if it was created with OpenOffice V. 2.0
   def test_officeversion
     #-- OpenOffice
-    oo = Openoffice.new("test/numbers1.ods")
+    oo = Openoffice.new(File.join("test","numbers1.ods"))
     assert_equal "1.0", oo.officeversion
     #-- Excel
     if DateTime.now > Date.new(2007,6,15)
-      oo = Excel.new("test/numbers1.xls")
+      oo = Excel.new(File.join("test","numbers1.xls"))
       assert_equal "1.0", oo.officeversion
     end
   end
 
   def test_rows
     #-- OpenOffice
-    oo = Openoffice.new("test/numbers1.ods")
+    oo = Openoffice.new(File.join("test","numbers1.ods"))
     oo.default_sheet = oo.sheets.first
     assert_equal 41, oo.cell('a',12)
     assert_equal 42, oo.cell('b',12)
@@ -141,7 +143,7 @@ class TestRoo < Test::Unit::TestCase
     assert_equal [41.0,42.0,43.0,44.0,45.0], oo.row(12)
     if DateTime.now > Date.new(2007,6,17)
     #-- Excel
-    oo = Excel.new("test/numbers1.xls")
+    oo = Excel.new(File.join("test","numbers1.xls"))
     oo.default_sheet = 1 # oo.sheets.first
     assert_equal 41, oo.cell('a',12)
     assert_equal 42, oo.cell('b',12)
@@ -154,78 +156,78 @@ class TestRoo < Test::Unit::TestCase
 
   def test_last_row
     #-- OpenOffice
-    oo = Openoffice.new("test/numbers1.ods")
+    oo = Openoffice.new(File.join("test","numbers1.ods"))
     oo.default_sheet = oo.sheets.first
     assert_equal 18, oo.last_row
     #-- Excel
-    oo = Excel.new("test/numbers1.xls")
+    oo = Excel.new(File.join("test","numbers1.xls"))
     oo.default_sheet = 1 # oo.sheets.first
     assert_equal 18, oo.last_row
   end
 
   def test_last_column
     #-- OpenOffice
-    oo = Openoffice.new("test/numbers1.ods")
+    oo = Openoffice.new(File.join("test","numbers1.ods"))
     oo.default_sheet = oo.sheets.first
     assert_equal 7, oo.last_column
     #-- Excel
-    oo = Excel.new("test/numbers1.xls")
+    oo = Excel.new(File.join("test","numbers1.xls"))
     oo.default_sheet = 1 # oo.sheets.first
     assert_equal 7, oo.last_column
   end
 
   def test_last_column_as_letter
     #-- OpenOffice
-    oo = Openoffice.new("test/numbers1.ods")
+    oo = Openoffice.new(File.join("test","numbers1.ods"))
     oo.default_sheet = oo.sheets.first
     assert_equal 'G', oo.last_column_as_letter
     #-- Excel
-    oo = Excel.new("test/numbers1.xls")
+    oo = Excel.new(File.join("test","numbers1.xls"))
     oo.default_sheet = 1 # oo.sheets.first
     assert_equal 'G', oo.last_column_as_letter
   end
 
   def test_first_row
     #-- OpenOffice
-    oo = Openoffice.new("test/numbers1.ods")
+    oo = Openoffice.new(File.join("test","numbers1.ods"))
     oo.default_sheet = oo.sheets.first
     assert_equal 1, oo.first_row
     #-- Excel
-    oo = Excel.new("test/numbers1.xls")
+    oo = Excel.new(File.join("test","numbers1.xls"))
     oo.default_sheet = 1 # oo.sheets.first
     assert_equal 1, oo.first_row
   end
 
   def test_first_column
     #-- OpenOffice
-    oo = Openoffice.new("test/numbers1.ods")
+    oo = Openoffice.new(File.join("test","numbers1.ods"))
     oo.default_sheet = oo.sheets.first
     assert_equal 1, oo.first_column
     #-- Excel
-    oo = Excel.new("test/numbers1.xls")
+    oo = Excel.new(File.join("test","numbers1.xls"))
     oo.default_sheet = 1 # oo.sheets.first
     assert_equal 1, oo.first_column
   end
 
   def test_first_column_as_letter
     #-- OpenOffice
-    oo = Openoffice.new("test/numbers1.ods")
+    oo = Openoffice.new(File.join("test","numbers1.ods"))
     oo.default_sheet = oo.sheets.first
     assert_equal 'A', oo.first_column_as_letter
     #-- Excel
-    oo = Excel.new("test/numbers1.xls")
+    oo = Excel.new(File.join("test","numbers1.xls"))
     oo.default_sheet = 1 # oo.sheets.first
     assert_equal 'A', oo.first_column_as_letter
   end
 
   def test_sheetname
     #-- OpenOffice
-    oo = Openoffice.new("test/numbers1.ods")
+    oo = Openoffice.new(File.join("test","numbers1.ods"))
     oo.default_sheet = "Name of Sheet 2"
     assert_equal 'I am sheet 2', oo.cell('C',5)
     if DateTime.now > Date.new(2007,6,16)
     #-- Excel
-    oo = Excel.new("test/numbers1.xls")
+    oo = Excel.new(File.join("test","numbers1.xls"))
     oo.default_sheet = "Name of Sheet 2"
     assert_equal 'I am sheet 2', oo.cell('C',5)
     end
@@ -233,7 +235,7 @@ class TestRoo < Test::Unit::TestCase
 
   def test_boundaries
     #-- OpenOffice
-    oo = Openoffice.new("test/numbers1.ods")
+    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
@@ -242,9 +244,8 @@ class TestRoo < Test::Unit::TestCase
     assert_equal 14, oo.last_row
     assert_equal 'E', oo.first_row_as_letter
     assert_equal 'N', oo.last_row_as_letter
-    assert_equal 'N', oo.last_row.as_letter
     #-- Excel
-    oo = Excel.new("test/numbers1.xls")
+    oo = Excel.new(File.join("test","numbers1.xls"))
     oo.default_sheet = 2 # "Name of Sheet 2"
     assert_equal 2, oo.first_column
     assert_equal 'B', oo.first_column_as_letter
@@ -253,12 +254,11 @@ class TestRoo < Test::Unit::TestCase
     assert_equal 14, oo.last_row
     assert_equal 'E', oo.first_row_as_letter
     assert_equal 'N', oo.last_row_as_letter
-    assert_equal 'N', oo.last_row.as_letter
   end
 
   def test_multiple_letters
     #-- OpenOffice
-    oo = Openoffice.new("test/numbers1.ods")
+    oo = Openoffice.new(File.join("test","numbers1.ods"))
     oo.default_sheet = "Sheet3"
     assert_equal "i am AA", oo.cell('AA',1)
     assert_equal "i am AB", oo.cell('AB',1)
@@ -266,7 +266,7 @@ class TestRoo < Test::Unit::TestCase
     assert_equal 'BA', oo.last_column_as_letter
     assert_equal "i am BA", oo.cell(1,'BA')
     #-- Excel
-    oo = Excel.new("test/numbers1.xls")
+    oo = Excel.new(File.join("test","numbers1.xls"))
     oo.default_sheet = 3 # "Sheet3"
     assert_equal "i am AA", oo.cell('AA',1)
     assert_equal "i am AB", oo.cell('AB',1)
@@ -275,4 +275,33 @@ class TestRoo < Test::Unit::TestCase
     assert_equal "i am BA", oo.cell(1,'BA')
   end
 
+  def test_setting_cell
+assert true
+  end
+
+  def test_argument_error
+    oo = Excel.new(File.join("test","numbers1.xls"))
+    assert_raise(ArgumentError) {
+      oo.default_sheet = "first sheet"
+    }
+    assert_nothing_raised(ArgumentError) {
+      oo.default_sheet = 1
+    }
+  end
+
+  def test_empty_eh
+    #-- OpenOffice
+    oo = Openoffice.new(File.join("test","numbers1.ods"))
+    oo.default_sheet = oo.sheets.first
+    assert oo.empty?('a',14)
+    assert ! oo.empty?('a',15)
+    assert oo.empty?('a',20)
+    #-- Excel
+    oo = Excel.new(File.join("test","numbers1.xls"))
+    oo.default_sheet = 1
+    assert oo.empty?('a',14)
+    assert ! oo.empty?('a',15)
+    assert oo.empty?('a',20)
+
+  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.2.2</a>
+      <a href="http://rubyforge.org/projects/roo" class="numbers">0.2.3</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.2.2
-date: 2007-06-01 00:00:00 +02:00
+  version: 0.2.3
+date: 2007-06-02 00:00:00 +02:00
 summary: roo can access the contents of OpenOffice-Spreadsheets
 require_paths: 
 - lib
@@ -42,6 +42,8 @@ files:
 - setup.rb
 - test/test_helper.rb
 - test/test_roo.rb
+- test/numbers1.ods
+- test/numbers1.xls
 - website/index.html
 - website/index.txt
 - website/javascripts/rounded_corners_lite.inc.js
@@ -75,3 +77,12 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.5.1.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rubyzip
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.1
+    version: