donibuchanan-roo 1.3.12 → 1.9.1.4

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
@@ -276,7 +189,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 +204,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 +215,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 +226,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 +237,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 +249,31 @@ 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)
+    ws = @worksheets[sheet_no]
+    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
+        @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 +295,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

data/lib/roo/openoffice.rb

@@ -1,9 +1,9 @@
-require 'xml'
+require 'rubygems'
 require 'fileutils'
 require 'zip/zipfilesystem'
 require 'date'
 require 'base64'
-require 'cgi'
+require 'nokogiri'
 
 class Openoffice < GenericSpreadsheet
 
@@ -36,7 +36,8 @@ class Openoffice < GenericSpreadsheet
       @file_nr = @@nr
       extract_content
       file = File.new(File.join(@tmpdir, @file_nr.to_s+"_roo_content.xml"))
-      @doc = XML::Parser.io(file).parse
+      #TODO: @doc = XML::Parser.io(file).parse
+      @doc = Nokogiri::XML(file)
       file.close
     ensure
       #if ENV["roo_local"] != "thomas-p"
@@ -55,6 +56,7 @@ class Openoffice < GenericSpreadsheet
     @style_defaults = Hash.new { |h,k| h[k] = [] }
     @style_definitions = Hash.new 
     @header_line = 1
+    @labels = {}
   end
 
   # creates a new empty openoffice-spreadsheet file
@@ -78,7 +80,8 @@ class Openoffice < GenericSpreadsheet
     read_cells(sheet) unless @cells_read[sheet]
     row,col = normalize(row,col)
     if celltype(row,col,sheet) == :date
-      yyyy,mm,dd = @cell[sheet][[row,col]].split('-')
+      #TODO: yyyy,mm,dd = @cell[sheet][[row,col]].split('-')
+      yyyy,mm,dd = @cell[sheet][[row,col]].to_s.split('-')
       return Date.new(yyyy.to_i,mm.to_i,dd.to_i)
     end
     @cell[sheet][[row,col]]
@@ -170,8 +173,10 @@ class Openoffice < GenericSpreadsheet
 
   def sheets
     return_sheets = []
-    @doc.find("//*[local-name()='table']").each do |sheet|
-      return_sheets << sheet.attributes['name']
+    #TODO: @doc.find("//*[local-name()='table']").each do |sheet|
+    @doc.xpath("//*[local-name()='table']").each do |sheet|
+      #TODO: return_sheets << sheet.attributes['name']
+      return_sheets << sheet['name']
     end
     return_sheets
   end
@@ -213,12 +218,29 @@ class Openoffice < GenericSpreadsheet
     theformulas
   end
 
+  # returns the row,col values of the labelled cell
+  # (nil,nil) if label is not defined
+  # sheet parameter is not really needed because label names are global
+  # to the whole spreadsheet
+  def label(labelname,sheet=nil)
+    sheet = @default_sheet unless sheet
+    read_cells(sheet) unless @cells_read[sheet]
+    if @labels.has_key? labelname
+      return @labels[labelname][1].to_i,
+        GenericSpreadsheet.letter_to_number(@labels[labelname][2]),
+        @labels[labelname][0]
+    else
+      return nil,nil,nil
+    end
+  end
+
   private
 
   # read the version of the OO-Version
   def oo_version
-    @doc.find("//*[local-name()='document-content']").each do |office|
-      @officeversion = office.attributes['version']
+    #TODO: @doc.find("//*[local-name()='document-content']").each do |office|
+    @doc.xpath("//*[local-name()='document-content']").each do |office|
+      @officeversion = office.attributes['version'].to_s
     end
   end
 
@@ -238,10 +260,11 @@ class Openoffice < GenericSpreadsheet
     when :string
       @cell[sheet][key] = str_v
     when :date
-      if table_cell.attributes['date-value'].size != "XXXX-XX-XX".size
+      #TODO: if table_cell.attributes['date-value'].size != "XXXX-XX-XX".size
+      if table_cell.attributes['date-value'].to_s.size != "XXXX-XX-XX".size
         #-- dann ist noch eine Uhrzeit vorhanden
         #-- "1961-11-21T12:17:18"
-        @cell[sheet][key] = DateTime.parse(table_cell.attributes['date-value'])
+        @cell[sheet][key] = DateTime.parse(table_cell.attributes['date-value'].to_s)
         @cell_type[sheet][key] = :datetime
       else
         @cell[sheet][key] = table_cell.attributes['date-value']
@@ -267,31 +290,59 @@ class Openoffice < GenericSpreadsheet
     raise ArgumentError, "Error: sheet '#{sheet||'nil'}' not valid" if @default_sheet == nil and sheet==nil
     raise RangeError unless self.sheets.include? sheet
 
-    @doc.find("//*[local-name()='table']").each do |ws|
-      if sheet == ws.attributes['name']
+    #-
+    # Labels
+    # should be factored out in separate method because labels are global
+    # to the whole spreadsheet file (and not to specific sheet)
+    #+
+    @doc.xpath("//table:named-range").each do |ne|
+      #-
+      # $Sheet1.$C$5
+      #+
+      name = ne.attribute('name').to_s
+      sheetname,coords = ne.attribute('cell-range-address').to_s.split('.')
+      col = coords.split('$')[1]
+      row = coords.split('$')[2]
+      sheetname = sheetname[1..-1] if sheetname[0,1] == '$'
+      @labels[name] = [sheetname,row,col]
+    end
+    
+    #TODO: @doc.find("//*[local-name()='table']").each do |ws|
+    @doc.xpath("//*[local-name()='table']").each do |ws|
+      #TODO: if sheet == ws.attributes['name']
+      if sheet == ws['name']
         sheet_found = true
         col = 1
         row = 1
-        ws.each_element do |table_element|
+        #TODO: ws.each_element do |table_element|
+        ws.children.each do |table_element|
           case table_element.name
           when 'table-column'
             @style_defaults[sheet] << table_element.attributes['default-cell-style-name'] 
           when 'table-row'
             if table_element.attributes['number-rows-repeated']
-              skip_row = table_element.attributes['number-rows-repeated'].to_i
+              #TODO: skip_row = table_element.attributes['number-rows-repeated'].to_i
+              skip_row = table_element.attributes['number-rows-repeated'].to_s.to_i
               row = row + skip_row - 1
             end
-            table_element.each_element do |cell|
-              skip_col = cell.attributes['number-columns-repeated']
-              formula = cell.attributes['formula']
-              vt = cell.attributes['value-type']
-              v =  cell.attributes['value']
-              style_name = cell.attributes['style-name']
+            #TODO: table_element.each_element do |cell|
+            table_element.children.each do |cell|
+              #TODO: skip_col = cell.attributes['number-columns-repeated']
+              skip_col = cell['number-columns-repeated']
+              #TODO: formula = cell.attributes['formula']
+              formula = cell['formula']
+              #TODO: vt = cell.attributes['value-type']
+              vt = cell['value-type']
+              #TODO: v =  cell.attributes['value']
+              v =  cell['value']
+              #TODO: style_name = cell.attributes['style-name']
+              style_name = cell['style-name']
               if vt == 'string'
                 str_v  = ''
                 # insert \n if there is more than one paragraph
                 para_count = 0
-                cell.each_element do |str|
+                #TODO: cell.each_element do |str|
+                cell.children.each do |str|
                   if str.name == 'p'
                     v = str.content
                     str_v += "\n" if para_count > 0
@@ -306,9 +357,10 @@ class Openoffice < GenericSpreadsheet
                     str_v.gsub!(/&apos;/,"'")  # special case not supported by unescapeHTML
                     str_v = CGI.unescapeHTML(str_v)
                   end # == 'p'
-                 end
+                end
               elsif vt == 'time'
-                cell.each_element do |str|
+                #TODO: cell.each_element do |str|
+                cell.children.each do |str|
                   if str.name == 'p'
                     v = str.content
                   end
@@ -322,8 +374,7 @@ class Openoffice < GenericSpreadsheet
               elsif vt == 'float'
                 #
               elsif vt == 'boolean'
-                v = cell.attributes['boolean-value']
-                #
+                v = cell.attributes['boolean-value'].to_s
               else
                 # raise "unknown type #{vt}"
               end
@@ -345,7 +396,8 @@ class Openoffice < GenericSpreadsheet
       end
     end
     
-    @doc.find("//*[local-name()='automatic-styles']").each do |style|
+    #TODO: @doc.find("//*[local-name()='automatic-styles']").each do |style|
+    @doc.xpath("//*[local-name()='automatic-styles']").each do |style|
       read_styles(style)
     end
     if !sheet_found
@@ -434,7 +486,7 @@ class Openoffice < GenericSpreadsheet
         result = result + child.content
       else
         if child.name == 's'
-          compressed_spaces = child.attributes['c'].to_i
+          compressed_spaces = child.attributes['c'].to_s.to_i
           # no explicit number means a count of 1:
           if compressed_spaces == 0
             compressed_spaces = 1

data/lib/roo/version.rb

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

data/lib/roo.rb

@@ -1,4 +1,48 @@
+
 module Roo
+
+  # :stopdoc:
+  VERSION = '1.9.2'
+  LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
+  PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
+  # :startdoc:
+
+  # Returns the version string for the library.
+  #
+  def self.version
+    VERSION
+  end
+
+  # Returns the library path for the module. If any arguments are given,
+  # they will be joined to the end of the libray path using
+  # <tt>File.join</tt>.
+  #
+  def self.libpath( *args )
+    args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
+  end
+
+  # Returns the lpath for the module. If any arguments are given,
+  # they will be joined to the end of the path using
+  # <tt>File.join</tt>.
+  #
+  def self.path( *args )
+    args.empty? ? PATH : ::File.join(PATH, args.flatten)
+  end
+
+  # Utility method used to require all files ending in .rb that lie in the
+  # directory below this file that has the same name as the filename passed
+  # in. Optionally, a specific _directory_ name can be passed in such that
+  # the _filename_ does not have to be equivalent to the directory.
+  #
+  def self.require_all_libs_relative_to( fname, dir = nil )
+    dir ||= ::File.basename(fname, '.*')
+    search_me = ::File.expand_path(
+      ::File.join(::File.dirname(fname), dir, '**', '*.rb'))
+    Dir.glob(search_me).sort.each {|rb|
+      puts "DEBUG: require #{rb}"
+      require rb}
+  end
+
   class Spreadsheet
     class << self
       def open(file)
@@ -9,24 +53,23 @@ module Roo
           Excelx.new(file)
         when '.ods'
           Openoffice.new(file)
-        when '.xml'
-          Excel2003XML.new(file)
-        when ''
-          Google.new(file)
+          # when ''
         else
-          raise ArgumentError, "Don't know how to open file #{file}"
-        end      
+          Google.new(file)
+          # else
+          # raise ArgumentError, "Don't know how to open file #{file}"
+        end
       end
     end
   end
-end
+end  # module Roo
 
-require 'roo/version'
-# require 'roo/spreadsheetparser' TODO:
-require 'roo/generic_spreadsheet' 
+require 'roo/generic_spreadsheet'
 require 'roo/openoffice'
 require 'roo/excel'
 require 'roo/excelx'
-require 'roo/google'
-require 'roo/excel2003xml'
-require 'roo/roo_rails_helper'
+#require 'roo/google'
+
+#Roo.require_all_libs_relative_to(__FILE__)
+
+# EOF

data/test/test_helper.rb

@@ -16,4 +16,4 @@ def local_only
   if ENV["roo_local"] == "thomas-p"
     yield
   end
-end
+end