aunderwo-roo 1.0.0 → 1.1.0

data/lib/roo/excel.rb

@@ -112,11 +112,7 @@ class Excel < GenericSpreadsheet
   def initialize(filename, packed = nil, file_warning = :error)
     super()
     @file_warning = file_warning
-    @tmpdir = "oo_"+$$.to_s
-    @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 = open_from_stream(filename[7..-1]) if filename[0,7] == "stream:"
     filename = unzip(filename) if packed and packed == :zip

data/lib/roo/excel2003xml.rb

@@ -14,11 +14,6 @@ class Excel2003XML < GenericSpreadsheet
   def initialize(filename, packed=nil, file_warning=:error) 
     @file_warning = file_warning
     super()
-    @tmpdir = "oo_"+$$.to_s
-    @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

data/lib/roo/excelx.rb

@@ -82,11 +82,7 @@ class Excelx < GenericSpreadsheet
   def initialize(filename, packed=nil, file_warning = :error) #, create = false)
     super()
     @file_warning = file_warning
-    @tmpdir = "oo_"+$$.to_s
-    @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

data/lib/roo/generic_spreadsheet.rb

@@ -11,6 +11,14 @@ class GenericSpreadsheet
 
   def initialize
   end
+  
+  def initialise_tmp
+    @tmpdir = "oo_"+$$.to_s
+    @tmpdir = File.join(ENV['ROO_TMP'], @tmpdir) if ENV['ROO_TMP'] 
+    unless File.exists?(@tmpdir)
+      FileUtils::mkdir(@tmpdir)
+    end
+  end
 
   # set the working sheet in the document
   def default_sheet=(sheet)
@@ -425,41 +433,9 @@ 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'
+    initialise_tmp
     response = ''
     begin
       open(uri, "User-Agent" => "Ruby/#{RUBY_VERSION}") { |net| 
@@ -476,6 +452,7 @@ class GenericSpreadsheet
   end
   
   def open_from_stream(stream)
+    initialise_tmp
     tempfilename = File.join(@tmpdir, "spreadsheet")
     f = File.open(tempfilename,"wb")
     f.write(stream[7..-1])
@@ -533,10 +510,7 @@ 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
+      initialise_tmp
       file = File.open(File.join(@tmpdir, path),"wb")
       file.write(zip.read(path))
       file.close

data/lib/roo/openoffice.rb

@@ -14,11 +14,7 @@ class Openoffice < GenericSpreadsheet
   def initialize(filename, packed=nil, file_warning=:error) #, create = false)
     @file_warning = file_warning
     super()
-    @tmpdir = "oo_"+$$.to_s
-    @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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aunderwo-roo
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Anthony Underwood
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-09 00:00:00 +00:00
+date: 2010-02-26 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -197,9 +197,9 @@ signing_key:
 specification_version: 3
 summary: based on roo
 test_files: 
+- test/test_helper.rb
 - test/test_roo.rb
 - test/skipped_tests.rb
-- test/test_helper.rb
-- examples/roo_soap_server.rb
 - examples/roo_soap_client.rb
+- examples/roo_soap_server.rb
 - examples/write_me.rb