roo 0.1.1 → 0.1.2

data/lib/roo/openoffice.rb

@@ -6,8 +6,15 @@ require 'fileutils'
 require 'zip/zipfilesystem'
 require 'date'
 
+class Fixnum
+  def as_letter
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"[self-1,1]
+  end
+end
+
 class Openoffice
 
+
   def initialize(filename)
     @cells_read = false
     @filename = filename
@@ -41,7 +48,7 @@ class Openoffice
       end
     end
     if col.class == String
-      col = "ABCDEFGHIJKLMNOPQRSTUVWXYZ".index(col.upcase)+1
+      col = Openoffice.letter_to_number(col)
     end
     read_cells unless @cells_read
     @cell["#{row},#{col}"]
@@ -167,6 +174,18 @@ class Openoffice
     number_to_letter(last_column)
   end
 
+  def first_row_as_letter
+    number_to_letter(first_row)
+  end
+
+  def last_row_as_letter
+    number_to_letter(last_row)
+  end
+
+  def as_letter(n)
+    number_to_letter(last_row)
+  end
+
 private
 
   def number_to_letter(n)
@@ -240,27 +259,19 @@ private
                       x = 1
                     end
                   end
-                  # p se.attributes['name']
-     #             return_sheets << se.attributes['name']
-                end # richtiges sheet
+                end # sheet 
                 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 "
-    # p @cell
     @cells_read = true
   end
 
   def process_zipfile(zip, path='')
     if zip.file.file? path
-      # puts %{#{path}: "#{zip.read(path)}"}
-      # puts %{#{path}:}
-     
       if path == "content.xml"
         open(@tmpdir+'/'+'roo_content.xml','w') {|f|
           f << zip.read(path) 
@@ -269,7 +280,6 @@ private
     else
       unless path.empty?
         path += '/' 
-        # puts path
       end 
       zip.dir.foreach(path) do |filename|
         process_zipfile(zip, path+filename)
@@ -283,5 +293,16 @@ private
       process_zipfile(zip)
     end
   end
+
+  def Openoffice.letter_to_number(letters)
+    result = 0
+    while letters && letters.length > 0
+      character = letters[0,1].upcase
+      num = "ABCDEFGHIJKLMNOPQRSTUVWXYZ".index(character)+1
+      result = result * 26 + num
+      letters = letters[1..-1]
+    end
+    result
+  end
     
 end

data/lib/roo/version.rb

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

data/test/test_roo.rb

@@ -2,6 +2,14 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestRoo < Test::Unit::TestCase
 
+  def test_letters
+    assert_equal 1, Openoffice.letter_to_number('A')
+    assert_equal 1, Openoffice.letter_to_number('a')
+    assert_equal 2, Openoffice.letter_to_number('B')
+    assert_equal 26, Openoffice.letter_to_number('Z')
+    assert_equal 27, Openoffice.letter_to_number('AA')
+  end
+
   def test_sheets
     oo = Openoffice.new("test/numbers1.ods")
     assert_equal ["Tabelle1","Name of Sheet 2","Sheet3"], oo.sheets
@@ -121,11 +129,23 @@ class TestRoo < Test::Unit::TestCase
   def test_boundaries
     oo = Openoffice.new("test/numbers1.ods")
     oo.default_sheet = "Name of Sheet 2"
-    assert true
     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
+    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 "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.1</a>
+      <a href="http://rubyforge.org/projects/roo" class="numbers">0.1.2</a>
     </div>
     <h2>What</h2>
 
@@ -120,6 +120,32 @@
 2007-05-18      3.0     370.35  G��stebuch
 2007-05-18      1.75    216.0375        G��stebuch
 </code>
+</pre>
+
+	<p>With the newly written methods</p>
+
+
+<code>first_column</code>,
+<code>last_column</code>,
+<code>first_row</code> and
+<code>last_row</code>
+
+	<p>you can change line 8 from</p>
+
+
+<pre>
+<code>
+  8 4.upto(1000) do |line|
+</code>
+</pre>
+
+	<p>to</p>
+
+
+<pre>
+<code>
+  8 4.upto(oo.last_row) do |line|
+</code>
 </pre>
 
 	<h2>Documentation</h2>
@@ -151,7 +177,7 @@
 
 	<p>Comments are welcome. Send an email to <a href="mailto:thopre@gmail.com">Thomas Preymesser</a>.</p>
     <p class="coda">
-      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 30th May 2007<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 31st May 2007<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -75,6 +75,29 @@ which produces this output
 </code>
 </pre>
 
+With the newly written methods 
+
+<code>first_column</code>,
+<code>last_column</code>,
+<code>first_row</code> and
+<code>last_row</code>
+
+you can change line 8 from
+
+<pre>
+<code>
+  8 4.upto(1000) do |line|
+</code>
+</pre>
+
+to
+
+<pre>
+<code>
+  8 4.upto(oo.last_row) do |line|
+</code>
+</pre>
+
 h2. Documentation
 
 "rdoc":rdoc/index.html

metadata

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