roo 1.9.3 → 1.9.4

data/History.txt

@@ -1,3 +1,15 @@
+== 1.9.4 2011-06-23
+
+* 1 enhancement
+  * removed gem 'builder'. Functionality goes to gem 'nokogiri'.
+* 3 bugfixes
+  * Excel: remove temporary files if spreadsheed-file is not an excel file 
+    and an exception was raised
+  * Excelx: a referenced cell with a string had the content 0.0 not the
+    correct string
+  * Fixed a problem with a date cell which was not recognized as a Date 
+    object (see 2011-05-21 in excelx.rb)
+
 == 1.9.3 2010-02-12
 
 * 1 enhancements

data/README.txt

@@ -20,6 +20,9 @@ under Linux without having to install the MS office suite.
 Roo implements read access for all spreadsheet types and read/write access for
 Google spreadsheets.
 
+== SUPPORT ROO DEVELOPMENT:
+
+If you want to support the further development of the Roo gem, send Bitcoins to the address <code>1KecEuitSFZwx2towBcwbBXmaY5eYjJC9h</code>
 
 == SYNOPSIS:
 

data/Rakefile

@@ -1,95 +1,31 @@
-begin
-  require 'bones'
-rescue LoadError
-  abort '### Please install the "bones" gem ###'
-end
-
-ensure_in_path 'lib'
-require 'roo'
-
-task :default => 'test:run'
-# task 'gem:release' => 'test:run'
-
-Bones {
-  name  'roo'
-  authors  'Thomas Preymesser'
-  email  'thopre@gmail.com'
-  url  'http://roo.rubyforge.org/'
-  version  Roo::VERSION
-  dependencies = [
-    # ['xmlsimple', '>= 0.0.1'],
-  ['spreadsheet', '> 0.6.4'],
-  #--
-  # rel. 0.6.4 causes an invalid Date error if we
-  # have a datetime value of 2006-02-02 10:00:00
-  #++
-  ['nokogiri', '>= 0.0.1'],
-  ['builder', '>= 2.1.2'],
-  ['gimite-google-spreadsheet-ruby','>= 0.0.5'],
-  ['febeling-rubyzip','>= 0.9.2'], # meine aktuelle Version
-  ]
-}
-
-=begin
-PROJ.gem.dependencies = [
-  # ['xmlsimple', '>= 0.0.1'],
-  ['spreadsheet', '> 0.6.4'],
-  #--
-  # rel. 0.6.4 causes an invalid Date error if we
-  # have a datetime value of 2006-02-02 10:00:00
-  #++
-  ['nokogiri', '>= 0.0.1'],
-  ['builder', '>= 2.1.2'],
-  ['gimite-google-spreadsheet-ruby','>= 0.0.5'],
-  ['febeling-rubyzip','>= 0.9.2'], # meine aktuelle Version
-  ]
-=end
-
-# EOF
-__END__
-# Look in the tasks/setup.rb file for the various options that can be
-# configured in this Rakefile. The .rake files in the tasks directory
-# are where the options are used.
-
-begin
-  require 'bones'
-#  Bones.setup
-rescue LoadError
-  begin
-    load 'tasks/setup.rb'
-  rescue LoadError
-    raise RuntimeError, '### please install the "bones" gem ###'
-  end
-end
-
-ensure_in_path 'lib'
-module GData
-  class Base
-  end
-end
-require 'roo'
-
-task :default => 'spec:run'
-
-PROJ.name = 'roo'
-PROJ.authors = 'Thomas Preymesser'
-PROJ.email = 'thopre@gmail.com'
-PROJ.url = 'http://roo.rubyforge.org/'
-PROJ.version = Roo::VERSION
-PROJ.rubyforge.name = 'roo'
-PROJ.gem.dependencies = [
-  # ['xmlsimple', '>= 0.0.1'],
-  ['spreadsheet', '> 0.6.4'],
-  #--
-  # rel. 0.6.4 causes an invalid Date error if we
-  # have a datetime value of 2006-02-02 10:00:00
-  #++
-  ['nokogiri', '>= 0.0.1'],
-  ['builder', '>= 2.1.2'],
-  ['gimite-google-spreadsheet-ruby','>= 0.0.5'],
-  ['febeling-rubyzip','>= 0.9.2'], # meine aktuelle Version
-]
-
-PROJ.spec.opts << '--color'
-
-# EOF
+begin
+  require 'bones'
+rescue LoadError
+  puts '### Please install the "bones" gem ###'
+end
+
+ensure_in_path 'lib'
+require 'roo'
+
+task :default => 'test:run'
+# task 'gem:release' => 'test:run'
+
+Bones {
+  name  'roo'
+  authors  'Thomas Preymesser'
+  email  'thopre@gmail.com'
+  url  'http://roo.rubyforge.org/'
+  version  Roo::VERSION
+  depend_on 'spreadsheet', '> 0.6.4'
+  #--
+  # rel. 0.6.4 causes an invalid Date error if we
+  # have a datetime value of 2006-02-02 10:00:00
+  #++
+  depend_on 'nokogiri' #, '>= 0.0.1'
+  #TODO: brauchen wir das noch? depend_on 'gimite-google-spreadsheet-ruby','>= 0.0.5'
+  #depend_on 'febeling-rubyzip','>= 0.9.2' # meine aktuelle Version
+  #TODO: warum brauchen wir das? es lief doch auch vorher ohne dieses spezielle gem
+  depend_on 'google-spreadsheet-ruby'
+}
+
+# EOF

data/TODO

@@ -0,0 +1,2 @@
+- replace builder gem with Nokogiri:Builder
+- New parameter at #new specifying the name of the directory for the roo temporary files

data/bin/roo

@@ -4,5 +4,5 @@ require File.expand_path(
     File.join(File.dirname(__FILE__), %w[.. lib roo]))
 
 # Put your code here
-
+puts "the executable #{$0} does currently nothing"
 # EOF

data/lib/roo.rb

@@ -1,8 +1,9 @@
+# require 'todo_gem'
 
 module Roo
 
   # :stopdoc:
-  VERSION = '1.9.3'
+  VERSION = '1.9.4'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/lib/roo/excel.rb

@@ -109,16 +109,33 @@ class Excel < GenericSpreadsheet
     filename = open_from_stream(filename[7..-1]) if filename[0,7] == "stream:"
     filename = unzip(filename) if packed and packed == :zip
     begin
+	    begin
       file_type_check(filename,'.xls','an Excel')
+	    rescue TypeError
+		    FileUtils::rm_r @tmpdir
+		    raise
+	    end
       @filename = filename
       unless File.file?(@filename)
         raise IOError, "file #{@filename} does not exist"
       end
-      @workbook = Spreadsheet.open(filename)
+      begin
+        @workbook = Spreadsheet.open(filename)
+      rescue Ole::Storage::FormatError
+        FileUtils::rm_r(@tmpdir)
+        raise # nach aussen weiterhin sichtbar
+      end
       @default_sheet = self.sheets.first
     ensure
       #if ENV["roo_local"] != "thomas-p"
-      FileUtils::rm_r(@tmpdir)
+	    # ich glaube ich darf hier noch nicht die temporaere
+      # Datei loeschen, weil
+      #to do
+        #"Loeschen temp. Directory anpassen"
+      #end
+      #if fremdrechner?
+        #FileUtils::rm_r(@tmpdir)
+	    #end
       #end
     end
     @cell = Hash.new
@@ -156,7 +173,12 @@ class Excel < GenericSpreadsheet
     if celltype(row,col,sheet) == :string
       return platform_specific_iconv(@cell[sheet][[row,col]])
     else
-      return @cell[sheet][[row,col]]
+      #return @cell[sheet][[row,col]]
+      if @cell[sheet] and @cell[sheet][[row,col]]
+        return @cell[sheet][[row,col]]
+      else
+        return nil
+      end
     end
   end
 
@@ -173,10 +195,15 @@ class Excel < GenericSpreadsheet
     read_cells(sheet) unless @cells_read[sheet]
     row,col = normalize(row,col)
     begin
-      if @formula[sheet][[row,col]]
+      if @formula[sheet] and @formula[sheet][[row,col]]
         return :formula
       else
-        @cell_type[sheet][[row,col]]
+        # @cell_type[sheet][[row,col]]
+        if @cell_type[sheet] and @cell_type[sheet][[row,col]]
+          return @cell_type[sheet][[row,col]]
+        else
+          return nil
+        end
       end
     rescue
       puts "Error in sheet #{sheet}, row #{row}, col #{col}"
@@ -215,7 +242,7 @@ class Excel < GenericSpreadsheet
     @cell[sheet].inspect
   end
 
-   # returns the row,col values of the labelled cell
+  # 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

data/lib/roo/excelx.rb

@@ -48,6 +48,7 @@ class Excelx < GenericSpreadsheet
     'dd/mm/yy' => :date,
     'hh:mm:ss' => :time,
     "dd/mm/yy\\ hh:mm" => :datetime,
+    'dd/mmm/yy' => :date, # 2011-05-21
   }
   STANDARD_FORMATS = { 
     0 => 'General',
@@ -416,12 +417,16 @@ class Excelx < GenericSpreadsheet
         #TODO: elsif (c.attributes.to_h['t'] == 'b')
       elsif c['t'] == 'b'
         tmp_type = :boolean
+        # 2011-02-25 BEGIN
+      elsif c['t'] == 'str'
+        tmp_type = :string
+        # 2011-02-25 END
       else
-         #s_attribute = c.attributes.to_h['s'].to_i     # was here
+        #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
+        format = attribute2format(s_attribute)
+        tmp_type = format2type(format)
+      end
       formula = nil
       #TODO:      c.each_element do |cell|
       c.children.each do |cell|
@@ -462,6 +467,12 @@ class Excelx < GenericSpreadsheet
           elsif tmp_type == :formula
             vt = :formula
             v = cell.content.to_f #TODO: !!!!
+            # 2011-02-25 BEGIN
+          elsif tmp_type == :string
+            vt = :string
+            str_v = cell.content
+            excelx_type = :string
+            # 2011-02-25 END
           else
             vt = :float
             v = cell.content
@@ -609,7 +620,7 @@ class Excelx < GenericSpreadsheet
     doc.xpath("//*[local-name()='cellXfs']").each do |xfs|
       xfs.children.each do |xf|
         #TODO:        numFmtId = xf.attributes.to_h['numFmtId']
-  numFmtId = xf['numFmtId']
+        numFmtId = xf['numFmtId']
         @cellXfs << [numFmtId]
         #TODO:        fontId = xf.attributes.to_h['fontId'].to_i
         fontId = xf['fontId'].to_i

data/lib/roo/generic_spreadsheet.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 require 'matrix'
-require 'rubygems'
-require 'builder'
 
 # Base class for all other types of spreadsheets
 class GenericSpreadsheet
@@ -11,10 +9,28 @@ class GenericSpreadsheet
   # sets the line with attribute names (default: 1)
   attr_accessor :header_line
 
-  def initialize
-  end
+  protected
 
-  # set the working sheet in the document
+  # Helper function for development
+  def fremdrechner? #nodoc
+    eigener = [
+      'C:\Users\thopre',
+      'c:/Users/thopre',
+      '/c/Users/thopre',
+      '/home/tp',
+    ].include? ENV['HOME']
+    #  if eigener
+    #	  puts "fremdrechner? ==> false"
+    #  else
+    #	  puts "fremdrechner? ==> true"
+    #  end
+    ! eigener
+  end
+
+  public
+
+  # sets the working sheet in the document
+  # 'sheet' can be a number (0 = first sheet) or the name of a sheet.
   def default_sheet=(sheet)
     if sheet.kind_of? Fixnum
       if sheet >= 0 and sheet <= sheets.length
@@ -300,10 +316,11 @@ class GenericSpreadsheet
 
   # reopens and read a spreadsheet document
   def reload
+    # von Abfrage der Klasse direkt auf .to_s == '..' umgestellt
     ds = @default_sheet
-    initialize(@filename) if self.class == Openoffice or
-      self.class == Excel
-    initialize(@spreadsheetkey,@user,@password) if self.class == Google
+    initialize(@filename) if self.class.to_s == 'Openoffice' or
+      self.class.to_s == 'Excel'
+    initialize(@spreadsheetkey,@user,@password) if self.class.to_s == 'Google'
     self.default_sheet = ds
     #@first_row = @last_row = @first_column = @last_column = nil
   end
@@ -322,7 +339,13 @@ class GenericSpreadsheet
   # recursively removes the current temporary directory
   # this is only needed if you work with zipped files or files via the web
   def remove_tmp
+    #to do
+    #  "remove_tmp wieder aktivieren"
+    #end
+    #return
+    #$log.debug("remove_tmp('#{@tmpdir}')")
     if File.exists?(@tmpdir)
+      #$log.debug("#{@tmpdir} exists")
       FileUtils::rm_r(@tmpdir)
     end
   end
@@ -352,30 +375,29 @@ class GenericSpreadsheet
   end
 
   def to_xml
-    xml_document = ''
-    xml = Builder::XmlMarkup.new(:target => xml_document, :indent => 2)
-    xml.instruct! :xml, :version =>"1.0", :encoding => "utf-8"
-    xml.spreadsheet {
-      self.sheets.each do |sheet|
-        self.default_sheet = sheet
-        xml.sheet(:name => sheet) { |x|
-          if first_row and last_row and first_column and last_column
-            # sonst gibt es Fehler bei leeren Blaettern
-            first_row.upto(last_row) do |row|
-              first_column.upto(last_column) do |col|
-                unless empty?(row,col)
-                  x.cell(cell(row,col),
-                    :row =>row,
-                    :column => col,
-                    :type => celltype(row,col))
+    builder = Nokogiri::XML::Builder.new do |xml|
+      xml.spreadsheet {
+        self.sheets.each do |sheet|
+          self.default_sheet = sheet
+          xml.sheet(:name => sheet) { |x|
+            if first_row and last_row and first_column and last_column
+              # sonst gibt es Fehler bei leeren Blaettern
+              first_row.upto(last_row) do |row|
+                first_column.upto(last_column) do |col|
+                  unless empty?(row,col)
+                    x.cell(cell(row,col),
+                      :row =>row,
+                      :column => col,
+                      :type => celltype(row,col))
+                  end
                 end
               end
             end
-          end
-        }
-      end
-    }
-    xml_document
+          }
+        end
+      }
+    end
+    return builder.to_xml
   end
 
   # when a method like spreadsheet.a42 is called
@@ -391,18 +413,9 @@ class GenericSpreadsheet
       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)
+    else
+      super
     end
-    raise ArgumentError, "Method #{m} missing. Args: #{args}"
   end
   
   protected
@@ -470,39 +483,6 @@ class GenericSpreadsheet
     return row,col
   end
 
-  #  def open_from_uri(uri)
-  #    require 'open-uri' ;
-  #    tempfilename = File.join(@tmpdir, File.basename(uri))
-  #    f = File.open(tempfilename,"wb")
-  #    begin
-  #      open(uri) do |net|
-  #        f.write(net.read)
-  #      end
-  #    rescue
-  #      raise "could not open #{uri}"
-  #    end
-  #    f.close
-  #    File.join(@tmpdir, File.basename(uri))
-  #  end
-
-  #  OpenURI::HTTPError
-  #  def open_from_uri(uri)
-  #    require 'open-uri'
-  #    #existiert URL?
-  #    r = Net::HTTP.get_response(URI.parse(uri))
-  #    raise "URL nicht verfuegbar" unless r.is_a? Net::HTTPOK
-  #    tempfilename = File.join(@tmpdir, File.basename(uri))
-  #    f = File.open(tempfilename,"wb")
-  #    open(uri) do |net|
-  #      f.write(net.read)
-  #    end
-  #    #   rescue
-  #    #    raise "could not open #{uri}"
-  #    # end
-  #    f.close
-  #    File.join(@tmpdir, File.basename(uri))
-  #  end
-  
   def open_from_uri(uri)
     require 'open-uri'
     response = ''