donibuchanan-roo 1.3.12 → 1.9.1.4

data/lib/roo/excelx.rb

@@ -1,11 +1,15 @@
-require 'xml'
+#TODO: require 'xml'
 require 'fileutils'
 require 'zip/zipfilesystem'
 require 'date'
+require 'rubygems'
+require 'nokogiri'
 
-class  String
-  def end_with?(str)
-    self[-str.length,str.length] == str
+if RUBY_VERSION < '1.9.0'
+  class  String
+    def end_with?(str)
+      self[-str.length,str.length] == str
+    end
   end
 end
 
@@ -92,6 +96,7 @@ class Excelx < GenericSpreadsheet
     begin
       file_type_check(filename,'.xlsx','an Excel-xlsx')
       @cells_read = Hash.new
+      @read_first_100_rows = Hash.new
       @filename = filename
       unless File.file?(@filename)
         raise IOError, "file #{@filename} does not exist"
@@ -100,27 +105,30 @@ class Excelx < GenericSpreadsheet
       @file_nr = @@nr
       extract_content(@filename)
       file = File.new(File.join(@tmpdir, @file_nr.to_s+"_roo_workbook.xml"))
-      @workbook_doc = XML::Parser.io(file).parse
+      # TODO: @workbook_doc = XML::Parser.io(file).parse
+      @workbook_doc = Nokogiri::XML(file)
       file.close
-      @shared_table = []
+      
       if File.exist?(File.join(@tmpdir, @file_nr.to_s+'_roo_sharedStrings.xml'))
         file = File.new(File.join(@tmpdir, @file_nr.to_s+'_roo_sharedStrings.xml'))
-        @sharedstring_doc = XML::Parser.io(file).parse
+        #TODO: @sharedstring_doc = XML::Parser.io(file).parse
+        @sharedstring_doc = Nokogiri::XML(file)
         file.close
-        read_shared_strings(@sharedstring_doc)
       end
       @styles_table = []
-      @style_definitions = Array.new { |h,k| h[k] = {} }
+      @style_definitions = Array.new # TODO: ??? { |h,k| h[k] = {} }
       if File.exist?(File.join(@tmpdir, @file_nr.to_s+'_roo_styles.xml'))
         file = File.new(File.join(@tmpdir, @file_nr.to_s+'_roo_styles.xml'))
-        @styles_doc = XML::Parser.io(file).parse
+        #TODO: @styles_doc = XML::Parser.io(file).parse
+        @styles_doc = Nokogiri::XML(file)
         file.close
         read_styles(@styles_doc)
       end
       @sheet_doc = []
       @sheet_files.each_with_index do |item, i|
         file = File.new(item)
-        @sheet_doc[i] = XML::Parser.io(file).parse
+        #TODO: @sheet_doc[i] = XML::Parser.io(file).parse
+        @sheet_doc[i] = Nokogiri::XML(file)
         file.close
       end
     ensure
@@ -148,7 +156,9 @@ class Excelx < GenericSpreadsheet
   # cell at the first line and first row.
   def cell(row, col, sheet=nil)
     sheet = @default_sheet unless sheet
-    read_cells(sheet) unless @cells_read[sheet]
+    unless @cells_read[sheet] or (@read_first_100_rows[sheet] and row <= 100)
+      read_cells(sheet) 
+    end
     row,col = normalize(row,col)
     if celltype(row,col,sheet) == :date
       yyyy,mm,dd = @cell[sheet][[row,col]].split('-')
@@ -161,6 +171,20 @@ class Excelx < GenericSpreadsheet
     end
     @cell[sheet][[row,col]]
   end
+  
+    # returns all values in this row as an array
+  # row numbers are 1,2,3,... like in the spreadsheet
+  def row(rownumber,sheet=nil)
+    sheet = @default_sheet unless sheet
+    unless @cells_read[sheet] or (@read_first_100_rows[sheet] and rownumber <= 100)
+      read_cells(sheet) 
+    end
+    result = []
+    first_column(sheet).upto(last_column(sheet)) do |col|
+      result << cell(rownumber,col,sheet)
+    end
+    result
+  end
 
   # Returns the formula at (row,col).
   # Returns nil if there is no formula.
@@ -192,7 +216,7 @@ class Excelx < GenericSpreadsheet
     end
         
     def italic? 
-     @italic == true
+      @italic == true
     end
     
     def underline?
@@ -202,13 +226,13 @@ class Excelx < GenericSpreadsheet
   
   # Given a cell, return the cell's style
   def font(row, col, sheet=nil)
-   sheet = @default_sheet unless sheet
-   read_cells(sheet) unless @cells_read[sheet]
-   row,col = normalize(row,col)
-   s_attribute = @s_attribute[sheet][[row,col]]
-   s_attribute ||= 0
-   s_attribute = s_attribute.to_i
-   @style_definitions[s_attribute]
+    sheet = @default_sheet unless sheet
+    read_cells(sheet) unless @cells_read[sheet]
+    row,col = normalize(row,col)
+    s_attribute = @s_attribute[sheet][[row,col]]
+    s_attribute ||= 0
+    s_attribute = s_attribute.to_i
+    @style_definitions[s_attribute]
   end 
 
   # set a cell to a certain value
@@ -239,7 +263,9 @@ class Excelx < GenericSpreadsheet
   # * :datetime
   def celltype(row,col,sheet=nil)
     sheet = @default_sheet unless sheet
-    read_cells(sheet) unless @cells_read[sheet]
+    unless @cells_read[sheet] or (@read_first_100_rows[sheet] and row <= 100)
+        read_cells(sheet) 
+    end
     row,col = normalize(row,col)
     if @formula[sheet][[row,col]]
       return :formula
@@ -274,15 +300,17 @@ class Excelx < GenericSpreadsheet
     read_cells(sheet) unless @cells_read[sheet]
     row,col = normalize(row,col)
     s = @s_attribute[sheet][[row,col]]
-    result = attribute2format(s)
+    result = attribute2format(s).to_s
     result
   end
   
   # returns an array of sheet names in the spreadsheet
   def sheets
     return_sheets = []
-    @workbook_doc.find("//*[local-name()='sheet']").each do |sheet|
-      return_sheets << sheet.attributes.to_h['name']
+    #TODO:    @workbook_doc.find("//*[local-name()='sheet']").each do |sheet|
+    @workbook_doc.xpath("//*[local-name()='sheet']").each do |sheet|
+      #TODO:      return_sheets << sheet.attributes.to_h['name']
+      return_sheets << sheet['name']
     end
     return_sheets
   end
@@ -310,6 +338,93 @@ class Excelx < GenericSpreadsheet
     }
     theformulas
   end
+  
+  def first_row(sheet=nil)
+    if sheet == nil
+      sheet = @default_sheet
+    end
+    read_first_100_rows(sheet) unless @read_first_100_rows[sheet] or @cells_read[sheet]
+    if @first_row[sheet]
+      return @first_row[sheet]
+    end
+    impossible_value = 999_999 # more than a spreadsheet can hold
+    result = impossible_value
+    @cell[sheet].each_pair {|key,value|
+      y,x = key # _to_string(key).split(',')
+      y = y.to_i
+      result = [result, y].min if value
+    } if @cell[sheet]
+    result = nil if result == impossible_value
+    @first_row[sheet] = result
+    result
+  end
+  
+  # returns the number of the last non-empty row
+  def last_row(sheet=nil)
+    sheet = @default_sheet unless sheet
+    if @last_row[sheet]
+      return @last_row[sheet]
+    end
+    # read a few columns
+    unless @cells_read[sheet]
+      fst_column = first_column(sheet)
+      read_column(sheet,GenericSpreadsheet.number_to_letter(fst_column),3)
+    end
+    impossible_value = 0
+    result = impossible_value
+    @cell[sheet].each_pair {|key,value|
+      y,x = key # _to_string(key).split(',')
+      y = y.to_i
+      result = [result, y].max if value
+    } if @cell[sheet]
+    result = nil if result == impossible_value
+    @last_row[sheet] = result
+    result
+  end
+  
+  def first_column(sheet=nil)
+    if sheet == nil
+      sheet = @default_sheet
+    end
+    read_first_100_rows(sheet) unless @read_first_100_rows[sheet]
+    if @first_row[sheet]
+      return @first_row[sheet]
+    end
+    if @first_column[sheet]
+      return @first_column[sheet]
+    end
+    impossible_value = 999_999 # more than a spreadsheet can hold
+    result = impossible_value
+    @cell[sheet].each_pair {|key,value|
+      y,x = key # _to_string(key).split(',')
+      x = x # .to_i
+      result = [result, x].min if value
+    } if @cell[sheet]
+    result = nil if result == impossible_value
+    @first_column[sheet] = result
+    result
+  end
+  
+  
+    # returns the number of the last non-empty column
+  def last_column(sheet=nil)
+    sheet = @default_sheet unless sheet
+    read_first_100_rows(sheet) unless @read_first_100_rows[sheet]
+    if @last_column[sheet]
+      return @last_column[sheet]
+    end
+    impossible_value = 0
+    result = impossible_value
+    @cell[sheet].each_pair {|key,value|
+      y,x = key # _to_string(key).split(',')
+      x = x.to_i
+      result = [result, x].max if value
+    } if @cell[sheet]
+    result = nil if result == impossible_value
+    @last_column[sheet] = result
+    result
+  end
+
 
   private
 
@@ -374,38 +489,73 @@ class Excelx < GenericSpreadsheet
     return x,y
   end
 
-  # read all cells in the selected sheet
   def format2type(format)
+    format = format.to_s # weil von Typ Nokogiri::XML::Attr
     if FORMATS.has_key? format
       FORMATS[format]
     else
       :float
     end
   end
-
+  def read_first_100_rows(sheet=nil)
+    read_cells(sheet, 100)
+    @cells_read[sheet] = false
+    @read_first_100_rows[sheet] = true
+  end
+  
+  def read_column(sheet=nil, column='A', number_columns=2)
+    read_cells(sheet, nil,column,number_columns)
+    @cells_read[sheet] = false
+  end
   # read all cells in the selected sheet
-  def read_cells(sheet=nil)
+  def read_cells(sheet=nil, limit=nil, column_letter=nil, number_columns=nil)
     sheet = @default_sheet unless sheet
     sheet_found = false
     raise ArgumentError, "Error: sheet '#{sheet||'nil'}' not valid" if @default_sheet == nil and sheet==nil
     raise RangeError unless self.sheets.include? sheet
     n = self.sheets.index(sheet)
-    @sheet_doc[n].find("//*[local-name()='c']").each do |c|
-       s_attribute = c.attributes.to_h['s'].to_i   # should be here
-       if (c.attributes.to_h['t'] == 's')
-         tmp_type = :shared
-       elsif (c.attributes.to_h['t'] == 'b')
-         tmp_type = :boolean
-       else
-       #  s_attribute = c.attributes.to_h['s'].to_i     # was here
-         format = attribute2format(s_attribute)
-         tmp_type = format2type(format)
-       end
+    #TODO:    @sheet_doc[n].find("//*[local-name()='c']").each do |c|
+    xpath_limit = ''
+    if limit
+      xpath_limit = "and ( number(substring(@r,2)) <= #{limit} or ( not (number(substring(@r,2)) > 0) and (number(substring(@r,3)) <= #{limit})))"
+    end
+    if column_letter
+      xpath_limit += " and ("
+      column_number = GenericSpreadsheet.letter_to_number(column_letter)
+      number_columns.times do |column_index|
+        letter  = GenericSpreadsheet.number_to_letter(column_number + column_index)
+        xpath_limit += " or " if column_index > 0
+        xpath_limit += "( substring(@r,1,1) = '#{letter}' and substring(@r,2,1) > 0 )"
+      end
+      xpath_limit += ")" 
+    end 
+    @sheet_doc[n].xpath("//*[local-name()='c' #{xpath_limit}]").each do |c|
+      #TODO:      s_attribute = c.attributes.to_h['s'].to_i   # should be here
+      s_attribute = c['s'].to_i   # should be here
+      #TODO: if (c.attributes.to_h['t'] == 's')
+      # c: <c r="A5" s="2">
+      # <v>22606</v>
+      # </c>, format: , tmp_type: float
+
+      if c['t'] == 's'
+        tmp_type = :shared
+        #TODO: elsif (c.attributes.to_h['t'] == 'b')
+      elsif c['t'] == 'b'
+        tmp_type = :boolean
+      else
+         #s_attribute = c.attributes.to_h['s'].to_i     # was here
+        s_attribute = c['s'].to_i     # was here
+          format = attribute2format(s_attribute)
+          tmp_type = format2type(format)
+        end
       formula = nil
-      c.each_element do |cell|
+      #TODO:      c.each_element do |cell|
+      c.children.each do |cell|
+        #TODO: if cell.name == 'f'
         if cell.name == 'f'
           formula = cell.content
         end
+        #TODO:        if cell.name == 'v'
         if cell.name == 'v'
           if tmp_type == :time or tmp_type == :datetime
             if cell.content.to_f >= 1.0 
@@ -417,10 +567,12 @@ class Excelx < GenericSpreadsheet
             else
             end 
           end
-          excelx_type = [:numeric_or_formula,format]
+          excelx_type = [:numeric_or_formula,format.to_s]
           excelx_value = cell.content
           if tmp_type == :shared
             vt = :string
+            read_shared_strings(@sharedstring_doc,limit) if @shared_table.nil?
+            
             str_v = @shared_table[cell.content.to_i]
             excelx_type = :string
           elsif tmp_type == :boolean
@@ -443,7 +595,8 @@ class Excelx < GenericSpreadsheet
             v = cell.content
           end
           #puts "vt: #{vt}" if cell.text.include? "22606.5120"
-          x,y = split_coordinate(c.attributes.to_h['r'])
+          #TODO: x,y = split_coordinate(c.attributes.to_h['r'])
+          x,y = split_coordinate(c['r'])
           tr=nil #TODO: ???s
           set_cell_values(sheet,x,y,0,v,vt,formula,tr,str_v,excelx_type,excelx_value,s_attribute)
         end
@@ -522,18 +675,25 @@ class Excelx < GenericSpreadsheet
   end
 
   # read the shared strings xml document
-  def read_shared_strings(doc)
-    doc.find("//*[local-name()='si']").each do |si|
+  def read_shared_strings(doc, limit=nil)
+    #TODO: doc.find("//*[local-name()='si']").each do |si|
+    @shared_table = []
+    if limit
+        xpath_limit = " and position() < #{limit*30}"
+    end
+    doc.xpath("//*[local-name()='si' #{xpath_limit}]").each do |si|
       shared_table_entry = ''
-      si.each_element do |elem|
-        if (elem.name == 'r')
-          elem.each_element do |r_elem|
-            if (r_elem.name == 't')
+      #TODO:  si.each_element do |elem|
+      si.children.each do |elem|
+        if elem.name == 'r' and elem.children
+          # elem.each_element do |r_elem|
+          elem.children.each do |r_elem|
+            if r_elem.name == 't'
               shared_table_entry << r_elem.content
             end
           end
         end
-        if (elem.name == 't')
+        if elem.name == 't'
           shared_table_entry = elem.content
         end
       end
@@ -547,37 +707,46 @@ class Excelx < GenericSpreadsheet
     @cellXfs = []
     fonts = []
     
-    doc.find("//*[local-name()='numFmt']").each do |numFmt|
-      numFmtId = numFmt.attributes.to_h['numFmtId']
-      formatCode = numFmt.attributes.to_h['formatCode']
+    #TODO:     doc.find("//*[local-name()='numFmt']").each do |numFmt|
+    doc.xpath("//*[local-name()='numFmt']").each do |numFmt|
+      # TODO: numFmtId = numFmt.attributes.to_h['numFmtId']
+      numFmtId = numFmt.attributes['numFmtId']
+      #TODO: formatCode = numFmt.attributes.to_h['formatCode']
+      formatCode = numFmt.attributes['formatCode']
       @numFmts << [numFmtId, formatCode]
     end
-    doc.find("//*[local-name()='fonts']").each do |fonts_el|
-      fonts_el.each_element do |font_el|
-        if font_el.name == 'font'
+    #TODO:    doc.find("//*[local-name()='fonts']").each do |fonts_el|
+    doc.xpath("//*[local-name()='fonts']").each do |fonts_el|
+      #TODO: fonts_el.each_element do |font_el|
+      fonts_el.children.each do |font_el|
+        #TODO: if font_el.name == 'font'
+        if font_el == 'font'
           font = Excelx::Font.new
           font_el.each_element do |font_sub_el|
             case font_sub_el.name
-              when 'b'
-                font.bold = true
-              when 'i'
-                font.italic = true
-              when 'u'
-                font.underline = true
-              end
+            when 'b'
+              font.bold = true
+            when 'i'
+              font.italic = true
+            when 'u'
+              font.underline = true
+            end
           end
           fonts << font
         end
       end
     end
     
-    doc.find("//*[local-name()='cellXfs']").each do |xfs|
-        xfs.each do |xf|
-          numFmtId = xf.attributes.to_h['numFmtId']
-          @cellXfs << [numFmtId]
-          fontId = xf.attributes.to_h['fontId'].to_i
-          @style_definitions << fonts[fontId]
-        end
+    #TODO:    doc.find("//*[local-name()='cellXfs']").each do |xfs|
+    doc.xpath("//*[local-name()='cellXfs']").each do |xfs|
+      xfs.children.each do |xf|
+        #TODO:        numFmtId = xf.attributes.to_h['numFmtId']
+  numFmtId = xf['numFmtId']
+        @cellXfs << [numFmtId]
+        #TODO:        fontId = xf.attributes.to_h['fontId'].to_i
+        fontId = xf['fontId'].to_i
+        @style_definitions << fonts[fontId]
+      end
     end
   end
 
@@ -585,7 +754,10 @@ class Excelx < GenericSpreadsheet
   def attribute2format(s)
     result = nil
     @numFmts.each {|nf|
-      if nf.first == @cellXfs[s.to_i].first
+      #TODO: if nf.first == @cellXfs[s.to_i].first
+      # to_s weil das eine Nokogiri::XML::Attr und das
+      # andere ein String ist
+      if nf.first.to_s == @cellXfs[s.to_i].first
         result = nf[1]
         break
       end

data/lib/roo/generic_spreadsheet.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'rubygems'
 require 'builder'
 
@@ -313,7 +314,7 @@ class GenericSpreadsheet
   def info
     result = "File: #{File.basename(@filename)}\n"+
       "Number of sheets: #{sheets.size}\n"+
-      "Sheets: #{sheets.map{|sheet| sheet+", "}.to_s[0..-3]}\n"
+      "Sheets: #{sheets.join(', ')}\n"
     n = 1
     sheets.each {|sheet|
       self.default_sheet = sheet
@@ -359,6 +360,33 @@ class GenericSpreadsheet
     xml_document
   end
 
+  # when a method like spreadsheet.a42 is called
+  # convert it to a call of spreadsheet.cell('a',42)
+  def method_missing(m, *args)
+    # #aa42 => #cell('aa',42)
+    # #aa42('Sheet1')  => #cell('aa',42,'Sheet1')
+    if m =~ /^([a-z]+)(\d)$/
+      col = GenericSpreadsheet.letter_to_number($1)
+      row = $2.to_i
+      if args.size > 0
+        return cell(row,col,args[0])
+      else
+        return cell(row,col)
+      end
+#    else
+#      geht noch nicht, weil label unterhalb (in Openoffice) dieser Klasse
+#      es definiert ist
+#      p "Label #{m} angesprochen?"
+#        row,col,sheet = label('anton')
+#      # row,col,sheet = label(m)
+#      p "row: #{row}"
+#      p "col: #{col}"
+#      p "sheet: #{sheet}"
+#      return cell(row,col)
+    end
+    raise ArgumentError, "Method #{m} missing. Args: #{args}"
+  end
+  
   protected
 
   def file_type_check(filename, ext, name)
@@ -366,10 +394,9 @@ class GenericSpreadsheet
       '.ods' => 'Openoffice.new',
       '.xls' => 'Excel.new',
       '.xlsx' => 'Excelx.new',
-      '.xml' => 'Excel2003.new'
     }
     case ext
-    when '.ods', '.xls', '.xlsx', '.xml'
+    when '.ods', '.xls', '.xlsx'
       correct_class = "use #{new_expression[ext]} to handle #{ext} spreadsheet files"
     else
       raise "unknown file type: #{ext}"
@@ -578,8 +605,8 @@ class GenericSpreadsheet
         if onecell == ""
           str << ''
         else
-          onecell.gsub!(/"/,'""')
-          str << ('"'+onecell+'"')
+          one = onecell.gsub(/"/,'""')
+          str << ('"'+one+'"')
         end
       when :float,:percentage
         if onecell == onecell.to_i
@@ -592,8 +619,8 @@ class GenericSpreadsheet
           if onecell == ""
             str << ''
           else
-            onecell.gsub!(/"/,'""')
-            str << '"'+onecell+'"'
+            one = onecell.gsub(/"/,'""')
+            str << '"'+one+'"'
           end
         elsif onecell.class == Float
           if onecell == onecell.to_i
@@ -617,7 +644,6 @@ class GenericSpreadsheet
 
   # converts an integer value to a time string like '02:05:06'
   def self.integer_to_timestring(content)
-    return content if String === content
     h = (content/3600.0).floor
     content = content - h*3600
     m = (content/60.0).floor