roo 1.0.1 → 1.0.2

data/History.txt

@@ -1,3 +1,7 @@
+== 1.0.2 2008-07-04
+* 2 bugfixes
+  * Excelx: fixed a bug when there are .xml.rels files in the XLSX archive
+  * Excelx: fixed a bug with celltype recognition (see comment with "2008-07-03")
 == 1.0.1 2008-06-30
 * 1 bugfix
   * Excel: row/column method Fixnum/Float confusion

data/lib/roo/excelx.rb

@@ -5,7 +5,7 @@ require 'fileutils'
 require 'zip/zipfilesystem'
 require 'date'
 #require 'base64'
-
+require 'logger'
 class  String
   def end_with?(str)
     self[-str.length,str.length] == str
@@ -13,7 +13,8 @@ class  String
 end
 
 class Excelx < GenericSpreadsheet
-
+  #$log = Logger.new("excelx.log",5,100*1024)
+  #$log.level = Logger::DEBUG
   @@nr = 0
 
   # initialization and opening of a spreadsheet file
@@ -137,7 +138,7 @@ class Excelx < GenericSpreadsheet
     sheet = @default_sheet unless sheet
     read_cells(sheet) unless @cells_read[sheet]
     row,col = normalize(row,col)
-    if @formula[sheet]["#{row},#{col}"]
+    if @formula and @formula[sheet] and @formula[sheet]["#{row},#{col}"]
       return :formula
     else
       @cell_type[sheet]["#{row},#{col}"]
@@ -292,7 +293,7 @@ class Excelx < GenericSpreadsheet
                   end
                   if row.attributes['s'] == '2'
                     tmp_type = :date
-                  elsif row.attributes['s'] == '1'
+                  elsif row.attributes['s'] == '1' and row.attributes['t'] == nil # and ergaenzt 2008-07-03
                     tmp_type = :formula
                   end
                   formula = nil
@@ -323,8 +324,9 @@ class Excelx < GenericSpreadsheet
                         v = cell.text
                       end
                       x,y = split_coordinate(row.attributes['r'])
-                      tr=nil #TODO: ???
+                      tr=nil #TODO: ???s
                       set_cell_values(sheet,x,y,0,v,vt,formula,tr,str_v)
+                    #$log.debug "#{sheet},#{x},#{y},0,#{v},#{vt},#{formula},#{tr},#{str_v})"
                     end
                   end
                 end
@@ -378,7 +380,7 @@ class Excelx < GenericSpreadsheet
             f << zip.read(entry)
           }
         end
-        if entry.to_s =~ /sheet([0-9]+).xml/
+        if entry.to_s =~ /sheet([0-9]+).xml$/
           nr = $1
           #  entry.extract("xaxa_sheet#{nr}.xml")
           open(@tmpdir+'/'+@file_nr.to_s+"_roo_sheet#{nr}",'wb') {|f|

data/lib/roo/version.rb

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

data/test/test_roo.rb

@@ -3098,19 +3098,19 @@ class TestRoo < Test::Unit::TestCase
   end
 
   def test_simple_spreadsheet_find_by_condition_excel
-if EXCEL
-    oo = Excel.new(File.join("test","simple_spreadsheet.xls"))
-    oo.default_sheet = oo.sheets.first
-    oo.header_line = 3
-    erg = oo.find(:all, :conditions => {'Comment' => 'Task 1'})
-    assert_equal Date.new(2007,05,07), erg[1]['Date']
-    assert_equal 10.75       , erg[1]['Start time']
-    assert_equal 12.50       , erg[1]['End time']
-    assert_equal 0           , erg[1]['Pause']
-    #cannot be tested because excel cannot return the result of formulas:
-    #                    assert_equal 1.75        , erg[1]['Sum']
-    assert_equal "Task 1"    , erg[1]['Comment']
-end
+    if EXCEL
+      oo = Excel.new(File.join("test","simple_spreadsheet.xls"))
+      oo.default_sheet = oo.sheets.first
+      oo.header_line = 3
+      erg = oo.find(:all, :conditions => {'Comment' => 'Task 1'})
+      assert_equal Date.new(2007,05,07), erg[1]['Date']
+      assert_equal 10.75       , erg[1]['Start time']
+      assert_equal 12.50       , erg[1]['End time']
+      assert_equal 0           , erg[1]['Pause']
+      #cannot be tested because excel cannot return the result of formulas:
+      #                    assert_equal 1.75        , erg[1]['Sum']
+      assert_equal "Task 1"    , erg[1]['Comment']
+    end
   end
 
   def test_simple_spreadsheet_find_by_condition_excelx
@@ -4097,4 +4097,82 @@ Sheet 3:
     assert_equal ['def',42.5, 'nop'], ex.column(2)
     
   end  
+  
+  def test_bug_c2
+      @e = Excel.new(File.join('test',"problem.xls"))
+      #@e.sheets[2..@e.sheets.length].each do |s|
+      (13..13).each do |s|
+        @e.default_sheet = s
+        name = @e.cell(2,'C')
+        #puts "#{name} (sheet: #{s})"
+        assert_equal "whatever (sheet: 13)",          "#{name} (sheet: #{s})"
+      end
+  end
+  
+  def test_bug_c2_parseexcel
+      #-- this is OK
+      @workbook = Spreadsheet::ParseExcel.parse(File.join('test',"problem.xls"))
+      worksheet = @workbook.worksheet(11)
+      skip = 0
+      line = 1
+      row = 2
+      col = 3
+      worksheet.each(skip) { |row_par| 
+        if line == row
+          if row_par == nil
+            raise "nil"
+          end
+          cell = row_par.at(col-1)
+          assert cell, "cell should not be nil"
+          assert_equal "Air", cell.to_s('utf-8')
+        end
+        line += 1
+      }
+      #-- worksheet 12 does not work
+      @workbook = Spreadsheet::ParseExcel.parse(File.join('test',"problem.xls"))
+      worksheet = @workbook.worksheet(12)
+      skip = 0
+      line = 1
+      row = 2
+      col = 3
+      worksheet.each(skip) { |row_par| 
+        if line == row
+          if row_par == nil
+            raise "nil"
+          end
+          cell = row_par.at(col-1)
+          assert cell, "cell should not be nil"
+          assert_equal "Elite", cell.to_s('utf-8')
+        end
+        line += 1
+      }
+  end
+  
+  def test_bug_c2_excelx
+    expected = ['Vapor']
+    result = []
+    @e = Excelx.new(File.join('test',"problem.xlsx"))
+    @e.sheets[2..@e.sheets.length].each do |s|
+      @e.default_sheet = s
+    #  assert_equal "A.",@e.cell('a',13)
+      name = @e.cell(2,'C',s)
+      result << name
+      #puts "#{name} (sheet: #{s})"
+      #assert_equal :string, @e.celltype('c',2)
+      #assert_equal "Vapor (sheet: Vapor)", "#{name} (sheet: #{@e.sheets.first})"
+      assert @e.cell(2,'c')
+    end
+    #assert_equal expected, result
+
+    @e = Excelx.new(File.join('test',"problem.xlsx"))
+    #@e.sheets[2..@e.sheets.length].each do |s|
+    (13..13).each do |s|
+      @e.default_sheet = s
+      name = @e.cell(2,'C')
+      #puts "#{name} (sheet: #{s})"
+      assert_equal "Elite (sheet: 13)",          "#{name} (sheet: #{s})"
+    end
+  end
+  
+ 
 end # class

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: roo
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Thomas Preymesser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-30 00:00:00 +02:00
+date: 2008-07-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,6 +52,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.0.3
     version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
+    version: 
 description: roo can access the contents of OpenOffice-, Excel- or Google-Spreadsheets
 email: thopre@gmail.com
 executables: []