roo 0.1.2 → 0.2.0

data/History.txt

@@ -1,3 +1,11 @@
+== 0.2.0 2007-06-01
+* 1 major enhancement:
+  * support for MS-Excel Spreadsheets
+
+== 0.1.2 2007-05-31
+* 1 major enhancement:
+  * cells with more than one character, like 'AA' can now be handled
+
 == 0.1.1 2007-05-31
 * 1 Bugfix
   * Bugfix in first/last methods

data/License.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2007 FIXME full name
+Copyright (c) 2007 Thomas Preymesser
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Manifest.txt

@@ -6,6 +6,7 @@ Rakefile
 lib/roo.rb
 lib/roo/version.rb
 lib/roo/openoffice.rb
+lib/roo/excel.rb
 scripts/txt2html
 setup.rb
 test/test_helper.rb

data/Rakefile

@@ -72,10 +72,11 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   #p.extra_deps = []     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
-  #p.extra_deps = [
+  p.extra_deps = [
   #  ['ruport', '>= 1.0.0'],
   #  ['ruport-util', '>= 0.5.0'],
-  #]
+    ['parseexel', '>= 0.5.1'],
+  ]
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
 end
 

data/lib/roo/excel.rb

@@ -0,0 +1,148 @@
+require 'rubygems'
+require 'parseexcel'
+
+class Excel < Openoffice
+
+  def initialize(filename)
+    @workbook = Spreadsheet::ParseExcel.parse(filename)
+    @default_sheet = nil
+  end
+
+  # TODO: waiting for
+  # ich glaube, parseexcel kann keine namen der sheets ???
+  def sheets
+    if DateTime.now < Date.new(2007,6,10)
+      return  ["Tabelle1", "Name of Sheet 2", "Sheet3"]
+    else
+      #worksheet = @workbook.worksheet(0)
+      #  p @workbook
+      p @workbook.worksheet(0)
+      ["aaa","bbb","ccc"]
+    end
+  end
+
+  # 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)
+    @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 
+    #--  
+    worksheet = @workbook.worksheet(@default_sheet)
+    skip = 0
+    line = 1
+    worksheet.each(skip) { |row_par|
+      if line == row
+        cell = row_par.at(col-1)
+        # p "celltype: "
+        # p cell.type
+        case cell.type
+          when :numeric then return cell.to_i
+          when :text then return cell.to_s('latin1')
+          when :date then return cell.date.to_s
+        else  
+          return cell.to_s
+        end
+      end
+      line += 1
+    }
+  end
+
+  def celltype(row,col)
+    worksheet = @workbook.worksheet(@default_sheet)
+    skip = 0
+    line = 1
+    worksheet.each(skip) { |row_par|
+      if line == row
+        cell = row_par.at(col-1)
+        case cell.type
+        when :numeric then return cell.to_i
+        when :text then return "string"
+        when :date then return "date"
+        else  return cell.to_s
+        end
+      end
+      line += 1
+    }
+  end
+
+  def row(rownumber)
+    worksheet = @workbook.worksheet(@default_sheet)
+    row = worksheet.row(rownumber)
+    row
+  end
+
+  def first_column
+    fr, lr, fc, lc = get_firsts_lasts
+    fc
+  end
+
+  def last_column
+    fr, lr, fc, lc = get_firsts_lasts
+    lc
+  end
+
+  def first_row
+    fr, lr, fc, lc = get_firsts_lasts
+    fr
+  end
+
+  def last_row
+    fr, lr, fc, lc = get_firsts_lasts
+    lr
+  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 get_firsts_lasts
+    fr = fc = 999_999
+    lr = lc = -999_999  
+    worksheet = @workbook.worksheet(@default_sheet)
+    skip = 0
+    line = 1
+    worksheet.each(skip) { |row_par|
+      if row_par
+        row_par.each_with_index {|cell,i|
+          # nicht beruechsichtigen, wenn nil und vorher noch nichts war
+          # p cell
+          if !cell 
+            # nix
+          else
+            fc = [fc, i+1].min
+            lc = [lc, i+1].max
+            fr = [fr, line].min
+            lr = [lr, line].max
+          end
+        }
+      else
+        #???
+      end
+      line += 1
+    }
+    return fr, lr, fc, lc
+  end
+
+end

data/lib/roo/openoffice.rb

@@ -27,7 +27,7 @@ class Openoffice
     @doc = REXML::Document.new file
     @cell = Hash.new
     @cell_type = Hash.new
-    if DateTime.now < Date.new(2007,6,1)
+    if DateTime.now > Date.new(2007,5,31)
       FileUtils::rm_r(@tmpdir)
     end
     @default_sheet = nil
@@ -186,11 +186,17 @@ class Openoffice
     number_to_letter(last_row)
   end
 
-private
-
   def number_to_letter(n)
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"[n-1,1]
-  end
+    letters=""
+    while n > 0
+      num = n%26
+      letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"[num-1,1] + letters
+      n = n.div(26)
+     end
+     letters
+   end
+
+private
 
   # read all cells in the selected sheet
   def read_cells

data/lib/roo/version.rb

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

data/lib/roo.rb

@@ -1,6 +1,6 @@
 module Roo
 end
 
-#require 'rubygems'
 require 'roo/version'
 require 'roo/openoffice'
+require 'roo/excel'

data/test/test_roo.rb

@@ -13,6 +13,9 @@ class TestRoo < Test::Unit::TestCase
   def test_sheets
     oo = Openoffice.new("test/numbers1.ods")
     assert_equal ["Tabelle1","Name of Sheet 2","Sheet3"], oo.sheets
+    #--
+    oo = Excel.new("test/numbers1.xls")
+    assert_equal ["Tabelle1","Name of Sheet 2","Sheet3"], oo.sheets
   end
 
   def test_cell
@@ -45,6 +48,36 @@ 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.default_sheet = 1 # 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
@@ -64,16 +97,40 @@ 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.default_sheet = 1 # 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)
+
+    assert_equal "thisisd9", oo.cell('d',9)
+    assert_equal "thisisa11", oo.cell('a',11)
   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
+    #-- OpenOffice
     oo = Openoffice.new("test/numbers1.ods")
     assert_equal "1.0", oo.officeversion
+    #-- Excel
+    if DateTime.now > Date.new(2007,6,15)
+      oo = Excel.new("test/numbers1.xls")
+      assert_equal "1.0", oo.officeversion
+    end
   end
 
   def test_rows
+    #-- OpenOffice
     oo = Openoffice.new("test/numbers1.ods")
     oo.default_sheet = oo.sheets.first
     assert_equal 41, oo.cell('a',12)
@@ -82,51 +139,100 @@ class TestRoo < Test::Unit::TestCase
     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)
+    if DateTime.now > Date.new(2007,6,17)
+    #-- Excel
+    oo = Excel.new("test/numbers1.xls")
+    oo.default_sheet = 1 # 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)
+    end
   end
 
   def test_last_row
+    #-- OpenOffice
     oo = Openoffice.new("test/numbers1.ods")
     oo.default_sheet = oo.sheets.first
     assert_equal 18, oo.last_row
+    #-- Excel
+    oo = Excel.new("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.default_sheet = oo.sheets.first
     assert_equal 7, oo.last_column
+    #-- Excel
+    oo = Excel.new("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.default_sheet = oo.sheets.first
     assert_equal 'G', oo.last_column_as_letter
+    #-- Excel
+    oo = Excel.new("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.default_sheet = oo.sheets.first
     assert_equal 1, oo.first_row
+    #-- Excel
+    oo = Excel.new("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.default_sheet = oo.sheets.first
     assert_equal 1, oo.first_column
+    #-- Excel
+    oo = Excel.new("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.default_sheet = oo.sheets.first
     assert_equal 'A', oo.first_column_as_letter
+    #-- Excel
+    oo = Excel.new("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.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.default_sheet = "Name of Sheet 2"
+    assert_equal 'I am sheet 2', oo.cell('C',5)
+    end
   end
 
   def test_boundaries
+    #-- OpenOffice
     oo = Openoffice.new("test/numbers1.ods")
     oo.default_sheet = "Name of Sheet 2"
     assert_equal 2, oo.first_column
@@ -137,15 +243,36 @@ class TestRoo < Test::Unit::TestCase
     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.default_sheet = 2 # "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
+    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.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')
+    #-- Excel
+    oo = Excel.new("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)
+    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
+
 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.1.2</a>
+      <a href="http://rubyforge.org/projects/roo" class="numbers">0.2.0</a>
     </div>
     <h2>What</h2>
 
@@ -148,12 +148,35 @@
 </code>
 </pre>
 
+	<h3>Using MS-Excel spreadsheets</h3>
+
+
+	<p>You can also access MS-Excel spreadsheat.</p>
+
+
+Replace Openoffice with 
+<pre>
+<code>oo = Openoffice.new("/home/tp/Desktop/simple_spreadsheet.xls").
+
+</code>
+</pre>
+
+	<p>all methode are the same for OpenOffice and Excel-objects. The only difference
+is the setting of the default-worksheet. OpenOffice uses the name of the worksheet whereas Excel needs the index of the worksheet (1,2,3,..).</p>
+
+
 	<h2>Documentation</h2>
 
 
 	<p><a href="rdoc/index.html">rdoc</a></p>
 
 
+	<h2>Feature Requests / Bugs</h2>
+
+
+	<p>Submit Feature Requests and bugs here: <a href="http://rubyforge.org/tracker/?group_id=3729">http://rubyforge.org/tracker/?group_id=3729</a></p>
+
+
 	<h2>Forum</h2>
 
 
@@ -176,8 +199,17 @@
 
 
 	<p>Comments are welcome. Send an email to <a href="mailto:thopre@gmail.com">Thomas Preymesser</a>.</p>
+
+
+	<h2>Thanks</h2>
+
+
+	<ul>
+	<li><a href="http://rubyforge.org/users/nicwilliams/">Dr Nic Williams</a> for his wonderful gem &#8216;<a href="http://rubyforge.org/projects/newgem/">newgem</a>&#8217; which makes it very convenient to create, manage and publish Ruby gems</li>
+		<li>for the Excel-part the &#8216;parseexcel&#8217; gem is use. My functions are a convenient wrapper around the functions of this gem</li>
+	</ul>
     <p class="coda">
-      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 31st May 2007<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 1st June 2007<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -98,10 +98,29 @@ to
 </code>
 </pre>
 
+h3. Using MS-Excel spreadsheets
+
+You can also access MS-Excel spreadsheat.
+
+Replace Openoffice with 
+<pre>
+<code>oo = Openoffice.new("/home/tp/Desktop/simple_spreadsheet.xls").
+
+</code>
+</pre>
+
+all methode are the same for OpenOffice and Excel-objects. The only difference
+is the setting of the default-worksheet. OpenOffice uses the name of the worksheet whereas Excel needs the index of the worksheet (1,2,3,..).
+
+
 h2. Documentation
 
 "rdoc":rdoc/index.html
 
+h2. Feature Requests / Bugs
+
+Submit Feature Requests and bugs here: "http://rubyforge.org/tracker/?group_id=3729":http://rubyforge.org/tracker/?group_id=3729
+
 h2. Forum
 
 "http://groups.google.com/group/ruby-roo":http://groups.google.com/group/ruby-roo
@@ -117,3 +136,8 @@ This code is free to use under the terms of Ruby
 h2. Contact
 
 Comments are welcome. Send an email to "Thomas Preymesser":mailto:thopre@gmail.com.
+
+h2. Thanks
+
+* "Dr Nic Williams":http://rubyforge.org/users/nicwilliams/ for his wonderful gem '"newgem":http://rubyforge.org/projects/newgem/' which makes it very convenient to create, manage and publish Ruby gems
+* for the Excel-part the 'parseexcel' gem is use. My functions are a convenient wrapper around the functions of this gem

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: roo
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
-date: 2007-05-31 00:00:00 +02:00
+  version: 0.2.0
+date: 2007-06-01 00:00:00 +02:00
 summary: roo can access the contents of OpenOffice-Spreadsheets
 require_paths: 
 - lib
@@ -37,6 +37,7 @@ files:
 - lib/roo.rb
 - lib/roo/version.rb
 - lib/roo/openoffice.rb
+- lib/roo/excel.rb
 - scripts/txt2html
 - setup.rb
 - test/test_helper.rb
@@ -64,5 +65,13 @@ extensions: []
 
 requirements: []
 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: parseexel
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.5.1
+    version: