update roo to use ruby-spreadsheet from parseexcel

Author: --unset

.gitignore

@@ -0,0 +1 @@
+pkg/

Rakefile

@@ -17,7 +17,7 @@ begin
     s.has_rdoc = true
     s.extra_rdoc_files = ["README.txt", "History.txt"]
     s.rdoc_options = ["--main","README.txt"]
-    s.add_dependency "parseexcel", [">= 0.5.3"]
+    s.add_dependency "spreadsheet", [">= 0.6.3.1"]
     s.add_dependency "rubyzip", [">= 0.9.1"]
     s.add_dependency "hpricot", [">= 0.5"]
     s.add_dependency "GData", [">= 0.0.3"]

VERSION.yml

@@ -0,0 +1,4 @@
+--- 
+:patch: 4
+:major: 1
+:minor: 2

lib/roo/excel.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
-gem 'parseexcel', '>= 0.5.3'
-require 'parseexcel'
+gem 'spreadsheet', '>= 0.6.3.1'
+require 'spreadsheet'
 CHARGUESS = false
 require 'charguess' if CHARGUESS
 
@@ -37,7 +37,7 @@ def initialize(filename, packed = nil, file_warning = :error)
       unless File.file?(@filename)
         raise IOError, "file #{@filename} does not exist"
       end
-      @workbook = Spreadsheet::ParseExcel.parse(filename)
+      @workbook = Spreadsheet.open(filename)
       @default_sheet = nil
       # no need to set default_sheet if there is only one sheet in the document
       if self.sheets.size == 1
@@ -63,19 +63,18 @@ def initialize(filename, packed = nil, file_warning = :error)
   # returns an array of sheet names in the spreadsheet
   def sheets
     result = []
-    #0.upto(@workbook.worksheets.size - 1) do |i| # spreadsheet
-    0.upto(@workbook.sheet_count - 1) do |i| # parseexcel
+    @workbook.worksheets.each do |worksheet| 
       # TODO: is there a better way to do conversion?
       if CHARGUESS
-        encoding = CharGuess::guess(@workbook.worksheet(i).name)
+        encoding = CharGuess::guess(worksheet.name)
         encoding = 'unicode' unless encoding
 
 
         result << Iconv.new('utf-8',encoding).iconv(
-          @workbook.worksheet(i).name
+          worksheet.name
         )
       else
-        result << platform_specific_iconv(@workbook.worksheet(i).name)
+        result << platform_specific_iconv(worksheet.name)
       end
     end
     return result
@@ -181,17 +180,23 @@ def cell_font(row, col, sheet=nil)
 
    # true if the cell style is bold
    def bold?(*args)
-     cell_font(*args)[:bold]
+     #From ruby-spreadsheet doc: 100 <= weight <= 1000, bold => 700, normal => 400
+     case cell_font(*args).weight
+     when 700    
+       true
+     else
+       false
+     end   
    end
 
    # true if the cell style is italic
    def italic?(*args)
-     cell_font(*args)[:italic]
+     cell_font(*args).italic
    end
 
    # true if the cell style is underline
    def underline?(*args)
-     cell_font(*args)[:underline]
+     cell_font(*args).underline != :none
    end
 
   # shows the internal representation of all cells
@@ -243,14 +248,15 @@ def get_firsts_lasts(sheet=nil)
   # converts name of a sheet to index (0,1,2,..)
   def sheet_no(name)
     return name-1 if name.kind_of?(Fixnum)
-    0.upto(@workbook.sheet_count - 1) do |i|
-      #0.upto(@workbook.worksheets.size - 1) do |i|
+    i = 0
+    @workbook.worksheets.each do |worksheet|
       # TODO: is there a better way to do conversion?
       return i if name == platform_specific_iconv(
-        @workbook.worksheet(i).name)
+        worksheet.name)
       #Iconv.new('utf-8','unicode').iconv(
       #        @workbook.worksheet(i).name
       #      )
+      i += 1
     end
     raise StandardError, "sheet '#{name}' not found"
   end
@@ -316,9 +322,9 @@ def remove_every_second_null(str)
   end
 
   # helper function to set the internal representation of cells
-  def set_cell_values(sheet,x,y,i,v,vt,formula,tr,str_v, font)
+  def set_cell_values(sheet,row,col,i,v,vt,formula,tr,font)
     #key = "#{y},#{x+i}"
-    key = [y,x+i]
+    key = [row,col+i]
     @cell_type[sheet] = {} unless @cell_type[sheet]
     @cell_type[sheet][key] = vt 
     @formula[sheet] = {} unless @formula[sheet]
@@ -331,7 +337,7 @@ def set_cell_values(sheet,x,y,i,v,vt,formula,tr,str_v, font)
     when :float
       @cell[sheet][key] = v.to_f
     when :string
-      @cell[sheet][key] = str_v
+      @cell[sheet][key] = v
     when :date
       @cell[sheet][key] = v 
     when :datetime
@@ -356,67 +362,89 @@ def read_cells(sheet=nil)
     end
 
     worksheet = @workbook.worksheet(sheet_no(sheet))
-    skip = 0
-    x =1
-    y=1
-    i=0
-    worksheet.each(skip) { |row_par| 
-      if row_par
-        x =1
-        row_par.each do # |void|
-          cell = row_par.at(x-1)
-          if cell
-            case cell.type
-            when :numeric
-              vt = :float
-              v = cell.to_f
-            when :text
-              vt = :string
-              if cell.to_s.downcase == 'true'
-                str_v = cell.to_s
-              else
-                str_v = cell.to_s('utf-8')
-              end       
-            when :date
-              if cell.to_s.to_f < 1.0
-                vt = :time
-                f = cell.to_s.to_f*24.0*60.0*60.0
-                secs = f.round
-                h = (secs / 3600.0).floor
-                secs = secs - 3600*h
-                m = (secs / 60.0).floor
-                secs = secs - 60*m
-                s = secs
-                v = h*3600+m*60+s
-              else
-                if cell.datetime.hour != 0 or
-                    cell.datetime.min  != 0 or
-                    cell.datetime.sec  != 0 or
-                    cell.datetime.msec != 0
-                  vt = :datetime
-                  v = cell.datetime
-                else
-                  vt = :date
-                  v = cell.date
-                  v = sprintf("%04d-%02d-%02d",v.year,v.month,v.day)
-                end
-              end
-            else
-              vt = cell.type.to_s.downcase.to_sym
-              v = nil
-            end # case
-            formula = tr = nil #TODO:???
-            set_cell_values(sheet,x,y,i,v,vt,formula,tr,str_v, cell.font)
-          end # if cell
-          
-          x += 1
+    row_index=1
+    worksheet.each(0) do |row| 
+      (0..row.size).each do |cell_index|
+        cell = row.at(cell_index)
+        next if cell.nil?  #skip empty cells
+        next if cell.class == Spreadsheet::Formula
+        if date_or_time?(row, cell_index)
+          vt, v = read_cell_date_or_time(row, cell_index)
+        else
+          vt, v = read_cell(row, cell_index)
         end
-      end
-      y += 1
-    }
+        formula = tr = nil #TODO:???
+        col_index = cell_index + 1
+        font = row.format(cell_index).font
+#puts [row_index, col_index].inspect
+#puts vt, v
+        set_cell_values(sheet,row_index,col_index,0,v,vt,formula,tr,font)
+      end #row
+      row_index += 1
+    end # worksheets
     @cells_read[sheet] = true
   end
-
+  
+  # Test the cell to see if it's a valid date/time. 
+  def date_or_time?(row, idx)
+    format = row.format(idx)
+    if format.date_or_time?
+      cell = row.at(idx)
+      cell.to_s.to_f > 0 ? true : false # cell value must be numeric
+    else
+      false
+    end  
+  end
+  private :date_or_time?
+  
+  def read_cell_date_or_time(row, idx)
+    cell = row.at(idx).to_s.to_f
+    if cell < 1.0
+      value_type = :time
+      f = cell*24.0*60.0*60.0
+      secs = f.round
+      h = (secs / 3600.0).floor
+      secs = secs - 3600*h
+      m = (secs / 60.0).floor
+      secs = secs - 60*m
+      s = secs
+      value = h*3600+m*60+s
+    else
+      datetime = row.datetime(idx)
+      if datetime.hour != 0 or
+         datetime.min != 0 or
+         datetime.sec != 0 
+        value_type = :datetime
+        value = datetime
+      else
+        value_type = :date
+        value = row.date(idx)
+        value = sprintf("%04d-%02d-%02d",value.year,value.month,value.day)
+      end
+    end  
+    return value_type, value
+  end
+  private :read_cell_date_or_time
+  
+  # Read the cell and based on the class, 
+  # return the value and value types for Roo
+  def read_cell(row, idx)
+    cell = row.at(idx)
+    case cell
+    when Float, Integer, Fixnum, Bignum 
+      value_type = :float
+      value = cell.to_f
+    when String, TrueClass, FalseClass
+      value_type = :string
+      value = cell.to_s
+    else
+      value_type = cell.class.to_s.downcase.to_sym
+      value = nil
+    end # case
+    return value_type, value
+  end
+  private :read_cell
+  
   #TODO: testing only
   #  def inject_null_characters(str)
   #    if str.class != String

roo.gemspec

@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{roo}
+  s.version = "1.2.4"
+  s.platform = %q{universal-darwin-9}
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Thomas Preymesser"]
+  s.date = %q{2009-02-21}
+  s.description = %q{roo can access the contents of OpenOffice-, Excel- or Google-Spreadsheets}
+  s.email = %q{[email protected]}
+  s.extra_rdoc_files = ["README.txt", "History.txt"]
+  s.files = ["lib/roo", "lib/roo/excel.rb", "lib/roo/excelx.rb", "lib/roo/generic_spreadsheet.rb", "lib/roo/google.rb", "lib/roo/openoffice.rb", "lib/roo/roo_rails_helper.rb", "lib/roo/version.rb", "lib/roo.rb", "test/bbu.ods", "test/bbu.xls", "test/bbu.xlsx", "test/Bibelbund.csv", "test/Bibelbund.ods", "test/Bibelbund.xls", "test/Bibelbund.xlsx", "test/Bibelbund1.ods", "test/bode-v1.ods.zip", "test/bode-v1.xls.zip", "test/boolean.ods", "test/boolean.xls", "test/boolean.xlsx", "test/borders.ods", "test/borders.xls", "test/borders.xlsx", "test/bug-row-column-fixnum-float.xls", "test/datetime.ods", "test/datetime.xls", "test/datetime.xlsx", "test/emptysheets.ods", "test/emptysheets.xls", "test/false_encoding.xls", "test/formula.ods", "test/formula.xls", "test/formula.xlsx", "test/html-escape.ods", "test/no_spreadsheet_file.txt", "test/numbers1.csv", "test/numbers1.ods", "test/numbers1.xls", "test/numbers1.xlsx", "test/numbers1_excel.csv", "test/only_one_sheet.ods", "test/only_one_sheet.xls", "test/only_one_sheet.xlsx", "test/ric.ods", "test/simple_spreadsheet.ods", "test/simple_spreadsheet.xls", "test/simple_spreadsheet.xlsx", "test/simple_spreadsheet_from_italo.ods", "test/simple_spreadsheet_from_italo.xls", "test/style.ods", "test/style.xls", "test/style.xlsx", "test/test_helper.rb", "test/test_roo.rb", "test/time-test.csv", "test/time-test.ods", "test/time-test.xls", "test/time-test.xlsx", "README.txt", "History.txt"]
+  s.has_rdoc = true
+  s.homepage = %q{http://raa.ruby-lang.org/project/parseexcel/}
+  s.rdoc_options = ["--main", "README.txt", "--inline-source", "--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{roo}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{roo}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<spreadsheet>, [">= 0.6.3.1"])
+      s.add_runtime_dependency(%q<rubyzip>, [">= 0.9.1"])
+      s.add_runtime_dependency(%q<hpricot>, [">= 0.5"])
+      s.add_runtime_dependency(%q<GData>, [">= 0.0.3"])
+    else
+      s.add_dependency(%q<spreadsheet>, [">= 0.6.3.1"])
+      s.add_dependency(%q<rubyzip>, [">= 0.9.1"])
+      s.add_dependency(%q<hpricot>, [">= 0.5"])
+      s.add_dependency(%q<GData>, [">= 0.0.3"])
+    end
+  else
+    s.add_dependency(%q<spreadsheet>, [">= 0.6.3.1"])
+    s.add_dependency(%q<rubyzip>, [">= 0.9.1"])
+    s.add_dependency(%q<hpricot>, [">= 0.5"])
+    s.add_dependency(%q<GData>, [">= 0.0.3"])
+  end
+end