roo 1.3.11 → 1.9.0

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
 
@@ -100,27 +104,33 @@ 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
@@ -192,7 +202,7 @@ class Excelx < GenericSpreadsheet
     end
         
     def italic? 
-     @italic == true
+      @italic == true
     end
     
     def underline?
@@ -202,13 +212,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
@@ -281,8 +291,10 @@ class Excelx < GenericSpreadsheet
   # 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
@@ -374,8 +386,8 @@ 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
@@ -390,22 +402,34 @@ class Excelx < GenericSpreadsheet
     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|
+    @sheet_doc[n].xpath("//*[local-name()='c']").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,7 +441,7 @@ 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
@@ -443,7 +467,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
@@ -523,17 +548,19 @@ class Excelx < GenericSpreadsheet
 
   # read the shared strings xml document
   def read_shared_strings(doc)
-    doc.find("//*[local-name()='si']").each do |si|
+    #TODO: doc.find("//*[local-name()='si']").each do |si|
+    doc.xpath("//*[local-name()='si']").each do |si|
       shared_table_entry = ''
-      si.each_element do |elem|
-        if (elem.name == 'r')
+      #TODO:  si.each_element do |elem|
+      si.children.each do |elem|
+        if elem.name == 'r'
           elem.each_element do |r_elem|
-            if (r_elem.name == 't')
+            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 +574,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 +621,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)

data/lib/roo/google.rb

@@ -1,100 +1,10 @@
-require 'gdata/spreadsheet'
-require 'xml'
+#require 'xml'
+require "google_spreadsheet"
 
 class GoogleHTTPError < RuntimeError; end
 class GoogleReadError < RuntimeError; end
 class GoogleWriteError < RuntimeError; end
 
-# overwrite some methods from the gdata-gem:
-module GData
-  class Spreadsheet < GData::Base
-    
-    def visibility
-      @headers ? "private" : "public"
-    end
-   
-    def projection
-      @headers ? "full" : "values"
-    end
-    
-    #-- modified
-    def evaluate_cell(cell, sheet_no=1)
-      raise ArgumentError, "invalid cell: #{cell}" unless cell
-      raise ArgumentError, "invalid sheet_no: #{sheet_no}" unless sheet_no >0 and sheet_no.class == Fixnum
-      path = "/feeds/cells/#{@spreadsheet_id}/#{sheet_no}/#{visibility}/#{projection}/#{cell}"
-      doc = Hpricot(request(path))
-      result = (doc/"content").inner_html
-    end
-
-    #-- new
-    def sheetlist
-      path = "/feeds/worksheets/#{@spreadsheet_id}/#{visibility}/#{projection}"
-      doc = Hpricot(request(path))
-      result = []
-      (doc/"content").each { |elem|
-        result << elem.inner_html
-      }
-      if result.size == 0 
-        if (doc/"h2").inner_html =~ /Error/
-          raise GoogleHTTPError, "#{(doc/'h2').inner_html}: #{(doc/'title').inner_html} [key '#{@spreadsheet_id}']"
-        else
-          raise GoogleReadError, "#{doc} [key '#{@spreadsheet_id}']"
-        end  
-      end
-      result
-    end
-
-    #-- new
-    #@@ added sheet_no to definition
-    def save_entry_roo(entry, sheet_no)
-      raise GoogleWriteError, "unable to write to public spreadsheets" if visibility == 'public'
-      path = "/feeds/cells/#{@spreadsheet_id}/#{sheet_no}/#{visibility}/#{projection}"
-      post(path, entry)
-    end
-
-    #-- new
-    def entry_roo(formula, row=1, col=1)
-    <<-XML
-    <entry xmlns='http://www.w3.org/2005/Atom' xmlns:gs='http://schemas.google.com/spreadsheets/2006'>
-      <gs:cell row='#{row}' col='#{col}' inputValue='#{formula}' />
-    </entry>
-    XML
-    end
-
-    #-- new
-    #@@ added sheet_no to definition		
-    def add_to_cell_roo(row,col,value, sheet_no=1)
-      save_entry_roo(entry_roo(value,row,col), sheet_no)
-    end
-   
-    #-- new
-    def get_one_sheet
-      path = "/feeds/cells/#{@spreadsheet_id}/1/#{visibility}/#{projection}"
-      doc = Hpricot(request(path))
-    end
-
-    #new
-    def oben_unten_links_rechts(sheet_no)
-      path = "/feeds/cells/#{@spreadsheet_id}/#{sheet_no}/#{visibility}/#{projection}"
-      doc = Hpricot(request(path))
-      rows = []
-      cols = []
-      (doc/"gs:cell").each {|item|
-        rows.push item['row'].to_i
-        cols.push item['col'].to_i
-      }
-      return rows.min, rows.max, cols.min, cols.max
-    end
-
-    def fulldoc(sheet_no)
-      path = "/feeds/cells/#{@spreadsheet_id}/#{sheet_no}/#{visibility}/#{projection}"
-      doc = Hpricot(request(path))
-      return doc
-    end
-
-  end # class
-end # module
-
 class Google < GenericSpreadsheet
   attr_accessor :date_format, :datetime_format
   
@@ -122,10 +32,13 @@ class Google < GenericSpreadsheet
     @date_format = '%d/%m/%Y'
     @datetime_format = '%d/%m/%Y %H:%M:%S' 
     @time_format = '%H:%M:%S'
-    @gs = GData::Spreadsheet.new(spreadsheetkey)
-    @gs.authenticate(user, password) unless user.empty? || password.empty?
-    @sheetlist = @gs.sheetlist
+    session = GoogleSpreadsheet.login(user, password)
+    @sheetlist = []
+    session.spreadsheet_by_key(@spreadsheetkey).worksheets.each { |sheet|
+      @sheetlist << sheet.title
+    }
     @default_sheet = self.sheets.first
+    @worksheets = session.spreadsheet_by_key(@spreadsheetkey).worksheets
   end
 
   # returns an array of sheet names in the spreadsheet
@@ -182,6 +95,8 @@ class Google < GenericSpreadsheet
     value = @cell[sheet]["#{row},#{col}"]
     if celltype(row,col,sheet) == :date
       begin
+        $log.debug "cell() value: #{value} @date_format: #{@date_format}"
+        $log.debug "returns #{Date.strptime(value, @date_format).inspect}"
         return  Date.strptime(value, @date_format)
       rescue ArgumentError
         raise "Invalid Date #{sheet}[#{row},#{col}] #{value} using format '{@date_format}'"
@@ -276,7 +191,7 @@ class Google < GenericSpreadsheet
       raise RangeError, "invalid sheet '"+sheet.to_s+"'"
     end
     row,col = normalize(row,col)
-    @gs.add_to_cell_roo(row,col,value,sheet_no)
+    add_to_cell_roo(row,col,value,sheet_no)
     # re-read the portion of the document that has changed
     if @cells_read[sheet]
       key = "#{row},#{col}"
@@ -291,7 +206,8 @@ class Google < GenericSpreadsheet
     sheet = @default_sheet unless sheet
     unless @first_row[sheet]
       sheet_no = sheets.index(sheet) + 1
-      @first_row[sheet], @last_row[sheet], @first_column[sheet], @last_column[sheet] = @gs.oben_unten_links_rechts(sheet_no)
+      @first_row[sheet], @last_row[sheet], @first_column[sheet], @last_column[sheet] =
+          oben_unten_links_rechts(sheet_no)
     end   
     return @first_row[sheet]
   end
@@ -301,7 +217,8 @@ class Google < GenericSpreadsheet
     sheet = @default_sheet unless sheet
     unless @last_row[sheet]
       sheet_no = sheets.index(sheet) + 1
-      @first_row[sheet], @last_row[sheet], @first_column[sheet], @last_column[sheet] = @gs.oben_unten_links_rechts(sheet_no)
+      @first_row[sheet], @last_row[sheet], @first_column[sheet], @last_column[sheet] =
+          oben_unten_links_rechts(sheet_no)
     end
     return @last_row[sheet]
   end
@@ -311,7 +228,8 @@ class Google < GenericSpreadsheet
     sheet = @default_sheet unless sheet
     unless @first_column[sheet]
       sheet_no = sheets.index(sheet) + 1
-      @first_row[sheet], @last_row[sheet], @first_column[sheet], @last_column[sheet] = @gs.oben_unten_links_rechts(sheet_no)
+      @first_row[sheet], @last_row[sheet], @first_column[sheet], @last_column[sheet] =
+          oben_unten_links_rechts(sheet_no)
     end
     return @first_column[sheet]
   end
@@ -321,7 +239,8 @@ class Google < GenericSpreadsheet
     sheet = @default_sheet unless sheet
     unless @last_column[sheet]
       sheet_no = sheets.index(sheet) + 1
-      @first_row[sheet], @last_row[sheet], @first_column[sheet], @last_column[sheet] = @gs.oben_unten_links_rechts(sheet_no)
+      @first_row[sheet], @last_row[sheet], @first_column[sheet], @last_column[sheet] =
+        oben_unten_links_rechts(sheet_no)
     end
     return @last_column[sheet]
   end
@@ -332,25 +251,37 @@ class Google < GenericSpreadsheet
   def read_cells(sheet=nil)
     sheet = @default_sheet unless sheet
     raise RangeError, "illegal sheet <#{sheet}>" unless sheets.index(sheet)
-    sheet_no = sheets.index(sheet)+1
-    xml = @gs.fulldoc(sheet_no).to_s
-    doc = XML::Parser.string(xml).parse
-    doc.find("//*[local-name()='cell']").each do |item|
-      row = item['row']
-      col = item['col']
-      key = "#{row},#{col}"
-      string_value =  item['inputvalue'] ||  item['inputValue'] 
-      numeric_value = item['numericvalue']  ||  item['numericValue'] 
-      (value, value_type) = determine_datatype(string_value, numeric_value)
-      @cell[sheet][key] = value unless value == "" or value == nil
-      @cell_type[sheet][key] = value_type 
-      @formula[sheet] = {} unless @formula[sheet]
-      @formula[sheet][key] = string_value if value_type == :formula
+    sheet_no = sheets.index(sheet)
+    $log.debug "sheet: #{sheet}"
+    $log.debug "sheet_no: #{sheet_no}"
+    ws = @worksheets[sheet_no]
+    $log.debug "#{ws.inspect}"
+    for row in 1..ws.num_rows
+      for col in 1..ws.num_cols
+        key = "#{row},#{col}"
+        string_value = ws.input_value(row,col) # item['inputvalue'] ||  item['inputValue']
+        numeric_value = ws[row,col] #item['numericvalue']  ||  item['numericValue']
+        (value, value_type) = determine_datatype(string_value, numeric_value)
+        @cell[sheet][key] = value unless value == "" or value == nil
+        if value_type == :date
+          $log.debug "date erkannt. value: #{value}"
+        end
+        @cell_type[sheet][key] = value_type
+        @formula[sheet] = {} unless @formula[sheet]
+        @formula[sheet][key] = string_value if value_type == :formula
+        ############
+        #$log.debug("key: #{key}")
+        #$log.debug "#{ws[row,col].inspect}"
+        #@cell[sheet][key] = ws[row,col]
+        #$log.debug "@cell[sheet][key]: #{@cell[sheet][key]}"
+        ############
+      end
     end
     @cells_read[sheet] = true
   end
   
   def determine_datatype(val, numval=nil)
+#    $log.debug "val: #{val} numval: #{numval}"
     if val.nil? || val[0,1] == '='
       ty = :formula
       if numeric?(numval)
@@ -372,8 +303,31 @@ class Google < GenericSpreadsheet
       else
         ty = :string
       end
-    end  
+    end
+    $log.debug "val: #{val} ty: #{ty}" if ty == :date
     return val, ty 
   end
-  
-end # class
+
+  def add_to_cell_roo(row,col,value, sheet_no=1)
+    sheet_no -= 1
+    @worksheets[sheet_no][row,col] = value
+    @worksheets[sheet_no].save
+  end
+  def entry_roo(value,row,col)
+    return value,row,col
+  end
+
+  def oben_unten_links_rechts(sheet_no)
+    ws = @worksheets[sheet_no-1]
+    rows = []
+    cols = []
+    for row in 1..ws.num_rows
+      for col in 1..ws.num_cols
+        rows << row if ws[row,col] and ws[row,col] != '' #TODO: besser?
+        cols << col if ws[row,col] and ws[row,col] != '' #TODO: besser?
+      end
+    end
+    return rows.min, rows.max, cols.min, cols.max
+  end
+
+end # class