roo 1.9.5 → 1.9.6

data/History.txt

@@ -1,8 +1,18 @@
+== 1.9.6 2011-08-03
+* 1 enhancement
+  * new class Libreoffice (Libreoffice should do exactly the same as the Openoffice
+    class. It's just another name. Technically, Libreoffice is inherited from
+    the Openoffice class with no new methods.
+* 3 bugfixes
+  * Openoffice: file type check, deletion of temporary files not in ensure clause
+  * Cell type :datetime was not handled in the to_csv method
+  * Better deletion of temporary directories if something went wrong
+
 == 1.9.5 2011-06-25
 
 * 1 enhancement
   * Method #formulas moved to generic-spreadsheet class (the Excel version is
-    overwritten because the spreadsheet gem currently does not support 
+    overwritten because the spreadsheet gem currently does not support
     formulas.
 * 3 bugfixes
   * Openoffice/Excelx/Google: #formulas of an empty sheet should not result

data/Rakefile

@@ -26,6 +26,8 @@ Bones {
   #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'
+  depend_on 'choice'
+  depend_on 'todonotes'
 }
 
 # EOF

data/bin/roo

@@ -2,7 +2,32 @@
 
 require File.expand_path(
     File.join(File.dirname(__FILE__), %w[.. lib roo]))
+require 'rubygems'
+require 'choice'
 
-# Put your code here
-puts "the executable #{$0} does currently nothing"
+Choice.options do
+	header ''
+	header 'Options:'
+	option :help do
+		long '--help'
+		desc 'Show this message'
+	end
+	option :version do
+		short '-v'
+		long '--version'
+		desc 'Show version'
+		action do
+			puts "Roo v#{Roo::VERSION}"
+			exit
+		end
+	end
+	option :info do
+		short '-i'
+		long '--info <spreadsheetfile>'
+		desc 'Show information about a spreadsheet file'
+		action do
+			puts '#'
+		end
+	end
+end
 # EOF

data/datetime.csv

@@ -0,0 +1,7 @@
+1961-11-21,,
+,,
+1961-11-21T12:17:18+00:00,1961-11-21T12:17:18+00:00,1961-11-21T12:17:18+00:00
+1961-11-21T12:17:18+00:00,1961-11-21T12:17:18+00:00,1961-11-21T12:17:18+00:00
+1961-11-21T12:17:18+00:00,1961-11-21T12:17:18+00:00,1961-11-21T12:17:18+00:00
+1961-11-21,1961-11-21,1961-11-21
+1961-11-21,1961-11-21,1961-11-21

data/lib/roo.rb

@@ -3,7 +3,7 @@
 module Roo
 
   # :stopdoc:
-  VERSION = '1.9.5'
+  VERSION = '1.9.6'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/lib/roo/excel.rb

@@ -100,7 +100,9 @@ class Excel < GenericSpreadsheet
   def initialize(filename, packed = nil, file_warning = :error)
     super()
     @file_warning = file_warning
-    @tmpdir = "oo_"+$$.to_s
+        file_type_check(filename,'.xls','an Excel',packed)
+    # @tmpdir = "oo_"+$$.to_s
+    @tmpdir = GenericSpreadsheet.next_tmpdir
     @tmpdir = File.join(ENV['ROO_TMP'], @tmpdir) if ENV['ROO_TMP'] 
     unless File.exists?(@tmpdir)
       FileUtils::mkdir(@tmpdir)
@@ -108,15 +110,16 @@ class Excel < GenericSpreadsheet
     filename = open_from_uri(filename) if filename[0,7] == "http://"
     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
+    #begin
+      #begin
+      #  file_type_check(filename,'.xls','an Excel')
+      #rescue TypeError
+      #  #FileUtils::rm_r @tmpdir
+      #  raise
+      #end
       @filename = filename
       unless File.file?(@filename)
+        FileUtils::rm_r(@tmpdir)
         raise IOError, "file #{@filename} does not exist"
       end
       begin
@@ -126,18 +129,17 @@ class Excel < GenericSpreadsheet
         raise # nach aussen weiterhin sichtbar
       end
       @default_sheet = self.sheets.first
-    ensure
+    #ensure
       #if ENV["roo_local"] != "thomas-p"
 	    # 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
+    #end
+    #if fremdrechner?
+      FileUtils::rm_r(@tmpdir)
+    #end
     @cell = Hash.new
     @cell_type = Hash.new
     @formula = Hash.new

data/lib/roo/excelx.rb

@@ -87,18 +87,21 @@ class Excelx < GenericSpreadsheet
   def initialize(filename, packed=nil, file_warning = :error) #, create = false)
     super()
     @file_warning = file_warning
-    @tmpdir = "oo_"+$$.to_s
+      file_type_check(filename,'.xlsx','an Excel-xlsx',packed)
+    #@tmpdir = "oo_"+$$.to_s
+    @tmpdir = GenericSpreadsheet.next_tmpdir
     @tmpdir = File.join(ENV['ROO_TMP'], @tmpdir) if ENV['ROO_TMP'] 
     unless File.exists?(@tmpdir)
       FileUtils::mkdir(@tmpdir)
     end
     filename = open_from_uri(filename) if filename[0,7] == "http://"
     filename = unzip(filename) if packed and packed == :zip
-    begin
-      file_type_check(filename,'.xlsx','an Excel-xlsx')
+    #begin
+      #file_type_check(filename,'.xlsx','an Excel-xlsx')
       @cells_read = Hash.new
       @filename = filename
       unless File.file?(@filename)
+        FileUtils::rm_r(@tmpdir)
         raise IOError, "file #{@filename} does not exist"
       end
       @@nr += 1
@@ -134,11 +137,12 @@ class Excelx < GenericSpreadsheet
         @sheet_doc[i] = Nokogiri::XML(file)
         file.close
       end
-    ensure
+    #ensure
       #if ENV["roo_local"] != "thomas-p"
-      FileUtils::rm_r(@tmpdir)
+      #FileUtils::rm_r(@tmpdir)
       #end
-    end
+    #end
+    FileUtils::rm_r(@tmpdir)
     @default_sheet = self.sheets.first
     @cell = Hash.new
     @cell_type = Hash.new

data/lib/roo/generic_spreadsheet.rb

@@ -6,6 +6,8 @@ class GenericSpreadsheet
 
   attr_reader :default_sheet
 
+  @@class_counter = 0
+
   # sets the line with attribute names (default: 1)
   attr_accessor :header_line
 
@@ -27,13 +29,22 @@ class GenericSpreadsheet
     ! eigener
   end
 
+  def self.next_tmpdir
+	  @@class_counter += 1
+	  # tmpdir = "oo_"+$$.to_s+"_"+sprintf("%04d",@@class_counter)
+	  tmpdir = "oo_"+$$.to_s+"_"+sprintf("%010d",rand(10_000_000_000))
+	  # p "@tmpdir = #{tmpdir}"; sleep 5
+	  tmpdir
+  end
+
+
   public
 
   # sets the working sheet in the document
   # 'sheet' can be a number (1 = first sheet) or the name of a sheet.
   def default_sheet=(sheet)
     if sheet.kind_of? Fixnum
-      if sheet >= 0 and sheet <= sheets.length
+      if sheet > 0 and sheet <= sheets.length
         sheet = self.sheets[sheet-1]
       else
         raise RangeError
@@ -444,12 +455,18 @@ class GenericSpreadsheet
 
   protected
 
-  def file_type_check(filename, ext, name)
+  def file_type_check(filename, ext, name, packed=nil)
     new_expression = {
       '.ods' => 'Openoffice.new',
       '.xls' => 'Excel.new',
       '.xlsx' => 'Excelx.new',
     }
+    if packed == :zip
+	    # lalala.ods.zip => lalala.ods
+	    # hier wird KEIN unzip gemacht, sondern nur der Name der Datei
+	    # getestet, falls es eine gepackte Datei ist.
+	    filename = File.basename(filename,File.extname(filename))
+    end
     case ext
     when '.ods', '.xls', '.xlsx'
       correct_class = "use #{new_expression[ext]} to handle #{ext} spreadsheet files"
@@ -483,7 +500,7 @@ class GenericSpreadsheet
     [r,c]
   end
 
-  # siehe: key_to_num
+  # see: key_to_num
   def key_to_string(arr)
     "#{arr[0]},#{arr[1]}"
   end
@@ -582,10 +599,10 @@ class GenericSpreadsheet
     ret=nil
     if zip.file.file? path
       # extract and return filename
-      @tmpdir = "oo_"+$$.to_s
-      unless File.exists?(@tmpdir)
-        FileUtils::mkdir(@tmpdir)
-      end
+      #2011-08-01 @tmpdir = "oo_"+$$.to_s
+      #2011-08-01 unless File.exists?(@tmpdir)
+        #2011-08-01 FileUtils::mkdir(@tmpdir)
+      #2011-08-01end
       file = File.open(File.join(@tmpdir, path),"wb")
       file.write(zip.read(path))
       file.close
@@ -601,6 +618,8 @@ class GenericSpreadsheet
     ret
   end
 
+  # Write all cells to the csv file. File can be a filename or nil. If the this
+  # parameter is nil the output goes to STDOUT
   def write_csv_content(file=nil,sheet=nil)
     file = STDOUT unless file
     if first_row(sheet) # sheet is not empty
@@ -617,20 +636,25 @@ class GenericSpreadsheet
     end
   end
 
-  def one_cell_output(onecelltype,onecell,empty)
+  # The content of a cell in the csv output  
+  def one_cell_output(onecelltype, onecell, empty)
     str = ""
     if empty
       str += ''
     else
       case onecelltype
       when :string
-        if onecell == ""
-          str << ''
-        else
+        #if onecell == ""
+        #  str << ''
+        #else
+        #  one = onecell.gsub(/"/,'""')
+        #  str << ('"'+one+'"')
+        #end
+	unless onecell.empty?
           one = onecell.gsub(/"/,'""')
           str << ('"'+one+'"')
-        end
-      when :float,:percentage
+	end
+      when :float, :percentage
         if onecell == onecell.to_i
           str << onecell.to_i.to_s
         else
@@ -638,12 +662,16 @@ class GenericSpreadsheet
         end
       when :formula
         if onecell.class == String
-          if onecell == ""
-            str << ''
-          else
+          # if onecell == ""
+          #   str << ''
+          # else
+          #   one = onecell.gsub(/"/,'""')
+          #   str << '"'+one+'"'
+          # end
+	  unless onecell.empty?
             one = onecell.gsub(/"/,'""')
             str << '"'+one+'"'
-          end
+	  end
         elsif onecell.class == Float
           if onecell == onecell.to_i
             str << onecell.to_i.to_s
@@ -657,6 +685,11 @@ class GenericSpreadsheet
         str << onecell.to_s
       when :time
         str << GenericSpreadsheet.integer_to_timestring(onecell)
+      when :datetime
+	# date,rest = onecell.to_s.split('T')
+	# time = rest.split('+').first
+	# str << date + ' ' + time
+	str << onecell.to_s
       else
         raise "unhandled celltype "+onecelltype.to_s
       end

data/lib/roo/openoffice.rb

@@ -15,7 +15,8 @@ class Openoffice < GenericSpreadsheet
   def initialize(filename, packed=nil, file_warning=:error, tmpdir=nil) #, create = false)
     @file_warning = file_warning
     super()
-    @tmpdir = "oo_"+$$.to_s
+    file_type_check(filename,'.ods','an openoffice', packed)
+    @tmpdir = GenericSpreadsheet.next_tmpdir
     @tmpdir = File.join(ENV['ROO_TMP'], @tmpdir) if ENV['ROO_TMP'] 
     @tmpdir = File.join(tmpdir, @tmpdir) if tmpdir 
     unless File.exists?(@tmpdir)
@@ -23,33 +24,25 @@ class Openoffice < GenericSpreadsheet
     end
     filename = open_from_uri(filename) if filename[0,7] == "http://"
     filename = unzip(filename) if packed and packed == :zip
-    begin
-	    begin
-      file_type_check(filename,'.ods','an openoffice')
-	    rescue TypeError
-		    FileUtils::rm_r @tmpdir
-		    raise
-	    end
-      #if create and ! File.exists?(filename)
-      #  self.create_openoffice(filename)
-      #end
-      @cells_read = Hash.new
-      #TODO: @cells_read[:default] = false
-      @filename = filename
-      unless File.file?(@filename)
-        raise IOError, "file #{@filename} does not exist"
-      end
-      @@nr += 1
-      @file_nr = @@nr
-      extract_content
-      file = File.new(File.join(@tmpdir, @file_nr.to_s+"_roo_content.xml"))
-      @doc = Nokogiri::XML(file)
-      file.close
-    ensure
-	    unless Dir.glob(@tmpdir).empty?
+    #if create and ! File.exists?(filename)
+    #  self.create_openoffice(filename)
+    #end
+    @cells_read = Hash.new
+    #TODO: @cells_read[:default] = false
+    @filename = filename
+    unless File.file?(@filename)
       FileUtils::rm_r(@tmpdir)
-	    end
+      raise IOError, "file #{@filename} does not exist"
     end
+    @@nr += 1
+    @file_nr = @@nr
+    extract_content
+    file = File.new(File.join(@tmpdir, @file_nr.to_s+"_roo_content.xml"))
+    @doc = Nokogiri::XML(file)
+    file.close
+    #unless Dir.glob(@tmpdir).empty?
+      FileUtils::rm_r(@tmpdir)
+    #end
     @default_sheet = self.sheets.first
     @cell = Hash.new
     @cell_type = Hash.new
@@ -501,3 +494,7 @@ class Openoffice < GenericSpreadsheet
   end
 
 end # class
+
+# Libreoffice is just an alias for Openoffice class
+class Libreoffice < Openoffice
+end

data/test/so_datetime.csv

@@ -0,0 +1,7 @@
+1961-11-21,,
+,,
+1961-11-21T12:17:18+00:00,1961-11-21T12:17:18+00:00,1961-11-21T12:17:18+00:00
+1961-11-21T12:17:18+00:00,1961-11-21T12:17:18+00:00,1961-11-21T12:17:18+00:00
+1961-11-21T12:17:18+00:00,1961-11-21T12:17:18+00:00,1961-11-21T12:17:18+00:00
+1961-11-21,1961-11-21,1961-11-21
+1961-11-21,1961-11-21,1961-11-21

data/test/test_roo.rb

@@ -9,6 +9,8 @@
 # (like 'diff') must be changed (or commented out ;-)) if you want to run
 # the tests under another OS
 #
+require 'rubygems'
+require 'todonotes'
 require 'tmpdir'
 require './lib/roo'
 #TODO
@@ -32,7 +34,7 @@ $log = Logger.new(File.join(ENV['HOME'],"roo.log"))
 #$log.level = Logger::WARN
 $log.level = Logger::DEBUG
 
-DISPLAY_LOG = true
+DISPLAY_LOG = false
 DB_LOG = false
 if DB_LOG
   require 'activerecord'
@@ -134,6 +136,13 @@ class Test::Unit::TestCase
         :duration => t2-t1
       )
     end
+    if  Dir.glob("oo_*") != []
+	    puts "nicht alle temp. Dateien geloescht"
+	    puts Dir.glob("oo_*")
+	    print "? "
+      STDOUT.flush
+	    a = gets
+    end
   end
 end
 
@@ -158,6 +167,7 @@ class TestRoo < Test::Unit::TestCase
   EXCEL        = true	  # do Excel Tests? (.xls files)
   GOOGLE       = false 	# do Google-Spreadsheet Tests?
   EXCELX       = true  	# do Excelx Tests? (.xlsx files)
+  LIBREOFFICE       = true  	# do Libreoffice tests? (.ods files)
 
   ONLINE = false
   LONG_RUN = false
@@ -182,7 +192,7 @@ class TestRoo < Test::Unit::TestCase
         options[:format] = [options[:format]]
       end
       options[:format].each do |formatname|
-        unless [:openoffice,:excel,:excelx,:google].include?(formatname)
+        unless [:openoffice,:excel,:excelx,:google,:libreoffice].include?(formatname)
           raise "invalid spreadsheet type #{formatname}"
         end
       end
@@ -194,6 +204,7 @@ class TestRoo < Test::Unit::TestCase
     yield Roo::Spreadsheet.open(File.join(TESTDIR, options[:name] + '.xlsx')) if EXCELX && options[:format].include?(:excelx)
     yield Roo::Spreadsheet.open(File.join(TESTDIR, options[:name] + '.ods')) if OPENOFFICE && options[:format].include?(:openoffice)
     yield Roo::Spreadsheet.open(key_of(options[:name]) || options[:name]) if GOOGLE && options[:format].include?(:google)
+    yield Roo::Spreadsheet.open(File.join(TESTDIR, options[:name] + '.ods')) if LIBREOFFICE && options[:format].include?(:libreoffice)
   end
   # Using Date.strptime so check that it's using the method
   # with the value set in date_format
@@ -317,6 +328,14 @@ class TestRoo < Test::Unit::TestCase
     end
   end
 
+  def test_libre_office
+	  if LIBREOFFICE
+	  oo = Libreoffice.new("test/numbers1.ods")
+      oo.default_sheet = oo.sheets.first
+      assert_equal 41, oo.cell('a',12)
+	  end
+  end
+
   #TODO: inkonsequente Lieferung Fixnum/Float
   def test_rows
     with_each_spreadsheet(:name=>'numbers1') do |oo|
@@ -721,6 +740,13 @@ class TestRoo < Test::Unit::TestCase
   end
 
   def test_excel_zipped
+	  after Date.new(2011,8,30) do
+		  to do
+			  'hier wieder das Problem, dass ausgepacktes xls File
+			  unter Windows nicht geloescht werden kann, weil 
+			  das spreadsheet gem die Datei nicht schliesst.
+			  Fehler von spreadsheet gem'
+		  end
 	  if EXCEL
       begin
         oo = Excel.new(File.join(TESTDIR,"bode-v1.xls.zip"), :zip)
@@ -728,6 +754,7 @@ class TestRoo < Test::Unit::TestCase
         assert_equal 'ist "e" im Nenner von H(s)', oo.cell('b', 5)
       end
     end
+	  end
   end
 
   def test_openoffice_zipped
@@ -1406,21 +1433,33 @@ Sheet 3:
   end
 
   def test_no_remaining_tmp_files_openoffice
+	  after Date.new(2011,8,30) do
+		  # alles noch mal ueberarbeiten
+		  # temp. Directories sollten in diesem Fall ueberhaupt nicht
+		  # angelegt werden
     if OPENOFFICE
-      prev = Dir.glob(TMP_PREFIX)
       assert_raise(Zip::ZipError) { #TODO: besseres Fehlerkriterium bei
         # oo = Openoffice.new(File.join(TESTDIR,"no_spreadsheet_file.txt"))
         # es soll absichtlich ein Abbruch provoziert werden, deshalb :ignore
+	begin
         oo = Openoffice.new(File.join(TESTDIR,"no_spreadsheet_file.txt"),
           false,
           :ignore)
+	rescue Zip::ZipError
+	  @tmp = Dir.glob(oo.tmpdir)
+		raise
+	end
       }
-      now = Dir.glob(TMP_PREFIX)
-      assert (now-prev).empty?, "temporay directory was not deleted"
+      assert @tmp.empty?, "temporay directory was not deleted"
     end
+	  end
   end
 
   def test_no_remaining_tmp_files_excel
+	  after Date.new(2011,8,30) do
+		  # alles noch mal ueberarbeiten
+		  # temp. Directories sollten in diesem Fall ueberhaupt nicht
+		  # angelegt werden
     if EXCEL
       prev = Dir.glob(TMP_PREFIX)
       assert_raise(Ole::Storage::FormatError) {
@@ -1431,9 +1470,14 @@ Sheet 3:
       now = Dir.glob(TMP_PREFIX)
       assert (now-prev).empty?, "temporary directory not removed"
     end
+	  end
   end
 
   def test_no_remaining_tmp_files_excelx
+	  after Date.new(2011,8,30) do
+		  # alles noch mal ueberarbeiten
+		  # temp. Directories sollten in diesem Fall ueberhaupt nicht
+		  # angelegt werden
     if EXCELX
       prev = Dir.glob(TMP_PREFIX)
       assert_raise(Zip::ZipError) { #TODO: besseres Fehlerkriterium bei
@@ -1448,6 +1492,7 @@ Sheet 3:
       now = Dir.glob(TMP_PREFIX)
       assert (now-prev).empty?
     end
+	  end
   end
 
   def test_no_remaining_tmp_files_google
@@ -1529,7 +1574,6 @@ Sheet 3:
   end
 
   def test_file_warning_default
-	  after Date.new(2011,7,18) do
       if OPENOFFICE
 	      prev = Dir.glob(TMP_PREFIX)
         assert_raises(TypeError, "test/numbers1.xls is not an openoffice spreadsheet") { oo = Openoffice.new(File.join(TESTDIR,"numbers1.xls")) }
@@ -1551,37 +1595,46 @@ Sheet 3:
 	      now = Dir.glob(TMP_PREFIX)
         assert (now-prev).empty?
       end
-	  end
   end
 
   def test_file_warning_error
-	  after Date.new(2011,7,22) do
       if OPENOFFICE
-	      prev = Dir.glob(TMP_PREFIX)
+	prev = Dir.glob(TMP_PREFIX)
         assert_raises(TypeError) { oo = Openoffice.new(File.join(TESTDIR,"numbers1.xls"),false,:error) }
+	now = Dir.glob(TMP_PREFIX)
+        assert (now-prev).empty?
+
+	prev = Dir.glob(TMP_PREFIX)
         assert_raises(TypeError) { oo = Openoffice.new(File.join(TESTDIR,"numbers1.xlsx"),false,:error) }
-	      now = Dir.glob(TMP_PREFIX)
+	now = Dir.glob(TMP_PREFIX)
         assert (now-prev).empty?
       end
       if EXCEL
-	      prev = Dir.glob(TMP_PREFIX)
+	prev = Dir.glob(TMP_PREFIX)
         assert_raises(TypeError) { oo = Excel.new(File.join(TESTDIR,"numbers1.ods"),false,:error) }
+	now = Dir.glob(TMP_PREFIX)
+        assert (now-prev).empty?, "temporary directory was not deleted"
+
+	prev = Dir.glob(TMP_PREFIX)
         assert_raises(TypeError) { oo = Excel.new(File.join(TESTDIR,"numbers1.xlsx"),false,:error) }
-	      now = Dir.glob(TMP_PREFIX)
+	now = Dir.glob(TMP_PREFIX)
         assert (now-prev).empty?, "temporary directory was not deleted"
       end
       if EXCELX
-	      prev = Dir.glob(TMP_PREFIX)
+	prev = Dir.glob(TMP_PREFIX)
         assert_raises(TypeError) { oo = Excelx.new(File.join(TESTDIR,"numbers1.ods"),false,:error) }
+	now = Dir.glob(TMP_PREFIX)
+        assert (now-prev).empty?, "temporary directory was not deleted"
+
+	prev = Dir.glob(TMP_PREFIX)
         assert_raises(TypeError) { oo = Excelx.new(File.join(TESTDIR,"numbers1.xls"),false,:error) }
-	      now = Dir.glob(TMP_PREFIX)
+	now = Dir.glob(TMP_PREFIX)
         assert (now-prev).empty?, "temporary directory was not deleted"
       end
-	  end
   end
 
   def test_file_warning_warning
-	  after Date.new(2011,7,22) do
+	  after Date.new(2011,9,2) do
       if OPENOFFICE
         assert_nothing_raised(TypeError) {
           assert_raises(Zip::ZipError) {
@@ -1627,7 +1680,6 @@ Sheet 3:
   end
 
   def test_file_warning_ignore
-	  after Date.new(2011,7,22) do
       if OPENOFFICE
         # Files, die eigentlich Openoffice-
         # Files sind, aber die falsche Endung haben.
@@ -1694,7 +1746,6 @@ Sheet 3:
         assert Dir.glob(TMP_PREFIX).empty?
       end
 =end
-	  end
   end
 
   def test_bug_last_row_excel
@@ -2053,17 +2104,15 @@ Sheet 3:
 
 
   def test_bug_excel_last_row_255
-	  if LONG_RUN
-		  local_only do
-        after Date.new(2011,6,17) do
-          oo = Excel.new(File.join('..','confidential','ScienceStaff.xls'))
-          oo.default_sheet = oo.sheets.first
-          assert_equal "COMSCI", oo.cell(255,1)
-          assert_equal "lala", oo.cell(256,1)
-          assert_equal 1537, oo.last_row
-        end
+    if LONG_RUN
+      local_only do
+        oo = Excel.new(File.join('..','confidential','ScienceStaff.xls'))
+        oo.default_sheet = oo.sheets.first
+        assert_equal "COMSCI", oo.cell(255,1)
+        assert_equal "lala", oo.cell(256,1)
+        assert_equal 1537, oo.last_row
       end
-	  end
+    end
   end
 
   def test_bug_excel_last_row_255_modified
@@ -2115,7 +2164,7 @@ Sheet 3:
     end end
 
   def test_bug_date_mileszs
-    after Date.new(2011,7,17) do
+    after Date.new(2011,8,28) do
       # to do
       # "An richtige Stelle kopieren. Ist das Dokument vertraulich?"
       # 'ist auf dem Netbook nicht vorhanden'
@@ -2175,12 +2224,12 @@ where the expected result is
   end
 
   def test_bug_guest_list_2011_05_05
-	  after Date.new(2011,7,17) do
+    after Date.new(2011,8,28) do
       oo = Excel.new(File.join("..","confidential","guest_list_addresses.xls"))
       oo.default_sheet = oo.sheets.first
       assert_equal "lalala", oo.cell('a',1) # anderer Inhalt im Spreadsheet
       assert_equal :string, oo.celltype('a',1)
-	  end
+    end
   end
 
   def test_bug_guest_list_2011_05_05_spreadsheet
@@ -2209,7 +2258,7 @@ where the expected result is
   end
 
   def test_bug_string_as_a_date_2011_05_21_spreadsheet_only
-	  after Date.new(2011,7,24) do
+    after Date.new(2011,8,28) do
       # to do
 		  # 'wieder entfernen'
       # end
@@ -2223,11 +2272,11 @@ where the expected result is
         end
 		  
       end
-	  end
+    end
   end
 
   def test_bug_string_as_a_date_2011_05_21
-	  after Date.new(2011,7,22) do
+    after Date.new(2011,8,28) do
       #oo = Excel.new(File.join(TESTDIR,'2011-05-21_sample_type_problem.xls'))
       oo = Excel.new(File.join('..','confidential','2011-05-21_sample_type_problem.xls'))
       oo.default_sheet = oo.sheets.first
@@ -2237,7 +2286,7 @@ where the expected result is
       assert_equal 76, oo.g5
       assert_equal 77, oo.g6
       assert_equal 78, oo.g7
-	  end
+    end
   end
 
   def test_bug_string_as_a_date_2011_05_21_saved_as_ods
@@ -2294,4 +2343,12 @@ where the expected result is
     end
   end
 
+  # 2011-08-03
+  def test_bug_datetime_to_csv
+    with_each_spreadsheet(:name=>'datetime') do |oo|
+      assert oo.to_csv("datetime.csv")
+      assert File.exists?("datetime.csv")
+      assert_equal "", `diff test/so_datetime.csv datetime.csv`
+    end
+  end
 end # class

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roo
 version: !ruby/object:Gem::Version
-  version: 1.9.5
+  version: 1.9.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-25 00:00:00.000000000 +02:00
-default_executable: 
+date: 2011-08-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &21941208 !ruby/object:Gem::Requirement
+  requirement: &25564452 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -22,21 +21,21 @@ dependencies:
         version: 0.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *21941208
+  version_requirements: *25564452
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &21940668 !ruby/object:Gem::Requirement
+  requirement: &25564128 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *21940668
+  version_requirements: *25564128
 - !ruby/object:Gem::Dependency
   name: google-spreadsheet-ruby
-  requirement: &21939756 !ruby/object:Gem::Requirement
+  requirement: &25563816 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,32 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *21939756
+  version_requirements: *25563816
+- !ruby/object:Gem::Dependency
+  name: choice
+  requirement: &25563468 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *25563468
+- !ruby/object:Gem::Dependency
+  name: todonotes
+  requirement: &25563144 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *25563144
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &21938784 !ruby/object:Gem::Requirement
+  requirement: &25562808 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +76,7 @@ dependencies:
         version: 3.7.0
   type: :development
   prerelease: false
-  version_requirements: *21938784
+  version_requirements: *25562808
 description: ! 'Roo can access the contents of various spreadsheet files. It can handle
 
   * Openoffice
@@ -75,7 +96,8 @@ extra_rdoc_files:
 - PostInstall.txt
 - README.txt
 - bin/roo
-- lib/roo/.generic_spreadsheet.rb.rb.swp
+- lib/.roo.rb.swp
+- lib/roo/.generic_spreadsheet.rb.swp
 - test/no_spreadsheet_file.txt
 files:
 - History.txt
@@ -87,8 +109,10 @@ files:
 - a.xls
 - bin/roo
 - csv8532
+- datetime.csv
+- lib/.roo.rb.swp
 - lib/roo.rb
-- lib/roo/.generic_spreadsheet.rb.rb.swp
+- lib/roo/.generic_spreadsheet.rb.swp
 - lib/roo/excel.rb
 - lib/roo/excelx.rb
 - lib/roo/generic_spreadsheet.rb
@@ -149,6 +173,7 @@ files:
 - test/simple_spreadsheet.xlsx
 - test/simple_spreadsheet_from_italo.ods
 - test/simple_spreadsheet_from_italo.xls
+- test/so_datetime.csv
 - test/style.ods
 - test/style.xls
 - test/style.xlsx
@@ -168,7 +193,6 @@ files:
 - test/whitespace.xls
 - test/whitespace.xlsx
 - tmp.xls
-has_rdoc: true
 homepage: http://roo.rubyforge.org/
 licenses: []
 post_install_message: 
@@ -191,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: roo
-rubygems_version: 1.5.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Roo can access the contents of various spreadsheet files.