roo 0.9.2 → 0.9.3

data/History.txt

@@ -1,3 +1,6 @@
+== 0.9.3 2008-03-25
+* 1 bugfix
+  * no more tmp directories if an invalid spreadsheet file was openend
 == 0.9.2 2008-03-24
 * 1 enhancement
   * new celltype :time

data/Manifest.txt

@@ -23,6 +23,7 @@ test/Bibelbund.xls
 test/Bibelbund.csv
 test/bbu.xls
 test/bbu.ods
+test/no_spreadsheet_file.txt
 test/simple_spreadsheet.ods
 test/simple_spreadsheet.xls
 test/simple_spreadsheet_from_italo.ods

data/lib/roo/excel.rb

@@ -31,19 +31,22 @@ class Excel < GenericSpreadsheet
       warn "are you sure, this is an excel file?"
     end
     @filename = filename
-    unless File.file?(@filename)
-      raise IOError, "file #{@filename} does not exist"
-    end
-    @workbook = Spreadsheet::ParseExcel.parse(filename)
-    @default_sheet = nil
-    # no need to set default_sheet if there is only one sheet in the document
-    if self.sheets.size == 1
-      @default_sheet = self.sheets.first
-    end
-    # @first_row = @last_row = @first_column = @last_column = nil
-    #if ENV["roo_local"] != "thomas-p"
-    FileUtils::rm_r(@tmpdir)
+    begin
+      unless File.file?(@filename)
+        raise IOError, "file #{@filename} does not exist"
+      end
+      @workbook = Spreadsheet::ParseExcel.parse(filename)
+      @default_sheet = nil
+      # no need to set default_sheet if there is only one sheet in the document
+      if self.sheets.size == 1
+        @default_sheet = self.sheets.first
+      end
+      # @first_row = @last_row = @first_column = @last_column = nil
+      #if ENV["roo_local"] != "thomas-p"
+    ensure
+      FileUtils::rm_r(@tmpdir)
     #end
+    end
     @first_row = Hash.new
     @last_row = Hash.new
     @first_column = Hash.new

data/lib/roo/openoffice.rb

@@ -28,18 +28,21 @@ class Openoffice < GenericSpreadsheet
     @cells_read = Hash.new
     #TODO: @cells_read[:default] = false
     @filename = filename
-    unless File.file?(@filename)
-      raise IOError, "file #{@filename} does not exist"
+    begin
+      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 = REXML::Document.new file
+      file.close
+    ensure
+      #if ENV["roo_local"] != "thomas-p"
+      FileUtils::rm_r(@tmpdir)
+      #end
     end
-    @@nr += 1
-    @file_nr = @@nr
-    extract_content
-    file = File.new(File.join(@tmpdir, @file_nr.to_s+"_roo_content.xml"))
-    @doc = REXML::Document.new file
-    file.close
-    #if ENV["roo_local"] != "thomas-p"
-    FileUtils::rm_r(@tmpdir)
-    #end
     @default_sheet = nil
     # no need to set default_sheet if there is only one sheet in the document
     if self.sheets.size == 1

data/lib/roo/version.rb

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

data/test/no_spreadsheet_file.txt

@@ -0,0 +1 @@
+this is intionally not a spreadsheet file

data/test/test_roo.rb

@@ -1773,7 +1773,7 @@ class TestRoo < Test::Unit::TestCase
   def test_huge_document_to_csv_google
     # maybe a better example... TODO:
     after Date.new(2008,1,30) do
-      if GOOGLE
+      if GOOGLE and LONG_RUN
         assert_nothing_raised(Timeout::Error) {
           Timeout::timeout(GLOBAL_TIMEOUT) do |timeout_length|
             File.delete("/tmp/numbers1.csv") if File.exists?("/tmp/numbers1.csv")
@@ -1837,7 +1837,7 @@ class TestRoo < Test::Unit::TestCase
 
   def test_to_csv_google
     # maybe a better example... TODO:
-    after Date.new(2008,1,30) do
+    after Date.new(2008,3,30) do
       if GOOGLE
         #assert_nothing_raised(Timeout::Error) {
         Timeout::timeout(GLOBAL_TIMEOUT) do |timeout_length|
@@ -2972,4 +2972,34 @@ Sheet 3:
     end  
   end
 
+  def test_no_remaining_tmp_files_openoffice
+    if OPENOFFICE
+      assert_raise(Zip::ZipError) { #TODO: besseres Fehlerkriterium bei
+        oo = Openoffice.new(File.join("test","no_spreadsheet_file.txt"))
+      }
+      a=Dir.glob("oo_*")
+      assert_equal [], a
+    end    
+  end
+  
+  def test_no_remaining_tmp_files_excel
+    if EXCEL
+      assert_raise(OLE::UnknownFormatError) {
+        oo = Excel.new(File.join("test","no_spreadsheet_file.txt"))
+      }
+      a=Dir.glob("oo_*")
+      assert_equal [], a  
+    end
+  end
+  
+  def test_no_remaining_tmp_files_google
+    if GOOGLE
+      assert_nothing_raised() {
+        oo = Google.new(key_of("no_spreadsheet_file.txt"))
+      }
+      a=Dir.glob("oo_*")
+      assert_equal [], a  
+    end
+  end
+  
 end # class

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>roo</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/roo"; return false'>
       Get Version
-      <a href="http://rubyforge.org/projects/roo" class="numbers">0.9.2</a>
+      <a href="http://rubyforge.org/projects/roo" class="numbers">0.9.3</a>
     </div>
     <h2>What</h2>
 
@@ -428,6 +428,12 @@ Only the Openoffice- and Excel-parts of this gem are currently working &#8211; t
 	<p>Google spreadsheet can now be used.</p>
 
 
+	<h2>Tests and test data</h2>
+
+
+	<p>There are many test files within the test directory. If you don&#8217;t want to run unit tests and don&#8217;t want the test data you can completely delete the &#8216;test&#8217; directory within the hierarchy of this gem.</p>
+
+
 	<h2>Feature Requests / Bugs</h2>
 
 
@@ -481,7 +487,7 @@ Only the Openoffice- and Excel-parts of this gem are currently working &#8211; t
 		<li>Thanks to davecahill for a bug-fix patch within the google part</li>
 	</ul>
     <p class="coda">
-      <a href="mailto:thopre@gmail.com">Thomas Preymesser</a>, 24th March 2008<br>
+      <a href="mailto:thopre@gmail.com">Thomas Preymesser</a>, 25th March 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -294,6 +294,10 @@ Only the Openoffice- and Excel-parts of this gem are currently working - the Goo
 
 Google spreadsheet can now be used.
 
+h2. Tests and test data
+
+There are many test files within the test directory. If you don't want to run unit tests and don't want the test data you can completely delete the 'test' directory within the hierarchy of this gem.
+ 
 h2. Feature Requests / Bugs
 
 Submit Feature Requests and bugs here: "http://rubyforge.org/tracker/?group_id=3729":http://rubyforge.org/tracker/?group_id=3729

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: roo
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Thomas Preymesser
@@ -59,6 +59,7 @@ extra_rdoc_files:
 - License.txt
 - Manifest.txt
 - README.txt
+- test/no_spreadsheet_file.txt
 - website/index.txt
 files: 
 - History.txt
@@ -86,6 +87,7 @@ files:
 - test/Bibelbund.csv
 - test/bbu.xls
 - test/bbu.ods
+- test/no_spreadsheet_file.txt
 - test/simple_spreadsheet.ods
 - test/simple_spreadsheet.xls
 - test/simple_spreadsheet_from_italo.ods