roo 0.5.2 → 0.5.3

data/History.txt

@@ -1,3 +1,6 @@
+== 0.5.3 2007-08-26
+  * Excel: can now read zip-ed files
+  * Excel: can now read files from http://-URL over the net
 == 0.5.2 2007-08-26
 * 1 bugfix
   * excel: removed debugging output

data/Manifest.txt

@@ -24,6 +24,7 @@ test/formula.xls
 test/only_one_sheet.ods
 test/only_one_sheet.xls
 test/bode-v1.xls.zip
+test/bode-v1.ods.zip
 website/index.html
 website/index.txt
 website/javascripts/rounded_corners_lite.inc.js

data/README.txt

@@ -3,3 +3,4 @@ README for roo
 
 see http://roo.rubyforge.org for examples
 
+PLEASE DON'T USE THE Google class - its only experimental.

data/lib/roo/excel.rb

@@ -25,12 +25,6 @@ class Excel < Openoffice
     @first_row = @last_row = @first_column = @last_column = nil
   end
 
-  def remove_tmp
-    if File.exists?(@tmpdir)
-      FileUtils::rm_r(@tmpdir)
-    end
-  end
-
   def sheets
     #if DateTime.now < Date.new(2007,6,10)
     #  return  ["Tabelle1", "Name of Sheet 2", "Sheet3"]
@@ -163,37 +157,6 @@ class Excel < Openoffice
     false
   end
 
-  def open_from_uri(uri)
-    require 'open-uri' ;
-
-    script = nil ;
-    result = nil ;
-#uri = "/home/tp/ruby-test/roo/test/numbers1.xls"
-
-    #begin ;
-    #  result = open(page) {|w| script = w.readlines } ;
-    #rescue => e ;
-    #  puts "e=#{e}, e.class=#{e.class}" ;
-    #  result = [] ;
-    #end ;
-#
-#    puts "result class=#{result.class}, count=#{result.length}" ; #,
-#    data=#{result}" ;
-#    puts "result[0] =>#{result[0].chomp}<=" if result[0] ;
-
-    tempfilename = File.join(@tmpdir, File.basename(uri))
-    f = File.open( File.join(@tmpdir, File.basename(uri)),"w")
-    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
-
 private
 
   # check if default_sheet was set
@@ -242,38 +205,4 @@ private
     raise StandardError, "sheet '#{name}' not found"
   end
 
-  def process_zipfile(zip, path='')
-    ret=nil
-    if zip.file.file? path
-      #puts %{#{path}: "#{zip.read(path)}"}
-      puts %{#{path}: }
-      # extract and return filename
-      @tmpdir = "oo_"+$$.to_s
-      unless File.exists?(@tmpdir)
-        FileUtils::mkdir(@tmpdir)
-      end
-      #file = File.new(File.join(@tmpdir, path))
-      file = File.open(File.join(@tmpdir, path),"w")
-      file.write(zip.read(path))
-      file.close
-      return File.join(@tmpdir, path)
-    else
-      unless path.empty?
-        path += '/'
-        puts path
-      end
-      zip.dir.foreach(path) do |filename|
-        ret = process_zipfile(zip, path + filename)
-      end
-    end
-    ret
-  end
-
-  def unzip(filename)
-    ret = nil
-    Zip::ZipFile.open(filename) do |zip|
-      ret = process_zipfile zip 
-    end
-    ret
-  end
 end

data/lib/roo/openoffice.rb

@@ -13,10 +13,15 @@ class Openoffice
 
   @@nr = 0
 
-  # initialization and opening of a spreasheet file
-  # file will be created if 'create' is true
-  # and the file does not exist
+  # initialization and opening of a spreadsheet file
+  # values for packed: :zip
   def initialize(filename, packed=nil) #, create = false)
+    @tmpdir = "oo_"+$$.to_s
+    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
     if filename[-4..-1] != ".ods"
       warn "are you sure, this is an openoffice file?"
     end
@@ -25,10 +30,6 @@ class Openoffice
     #end
     @cells_read = false
     @filename = filename
-    @tmpdir = "oo_"+$$.to_s
-    unless File.exists?(@tmpdir)
-      FileUtils::mkdir(@tmpdir) 
-    end
     @@nr += 1
     @file_nr = @@nr
     extract_content
@@ -60,7 +61,7 @@ class Openoffice
     # the empty files in an openoffice zip-file
     load 'base64include.rb'
     # puts @@empty_spreadsheet
-    f = File.open(filename,'w')
+    f = File.open(filename,'wb')
     f.print(Base64.decode64(@@empty_spreadsheet))
     f.close
   end
@@ -154,6 +155,12 @@ class Openoffice
     end
   end
 
+  def remove_tmp
+    if File.exists?(@tmpdir)
+      FileUtils::rm_r(@tmpdir)
+    end
+  end
+
   # returns an array of sheet names in the spreadsheet
   def sheets
     return_sheets = []
@@ -378,6 +385,39 @@ class Openoffice
     result
   end
 
+protected
+
+  def process_zipfile_packed(zip, path='')
+    ret=nil
+    if zip.file.file? path
+      # extract and return filename
+      @tmpdir = "oo_"+$$.to_s
+      unless File.exists?(@tmpdir)
+        FileUtils::mkdir(@tmpdir)
+      end
+      file = File.open(File.join(@tmpdir, path),"wb")
+      file.write(zip.read(path))
+      file.close
+      return File.join(@tmpdir, path)
+    else
+      unless path.empty?
+        path += '/'
+      end
+      zip.dir.foreach(path) do |filename|
+        ret = process_zipfile_packed(zip, path + filename)
+      end
+    end
+    ret
+  end
+
+  def unzip(filename)
+    ret = nil
+    Zip::ZipFile.open(filename) do |zip|
+      ret = process_zipfile_packed zip
+    end
+    ret
+  end
+
 private
   # read the version of the OO-Version
   def oo_version
@@ -516,7 +556,7 @@ private
   def process_zipfile(zip, path='')
     if zip.file.file? path
       if path == "content.xml"
-        open(@tmpdir+'/'+@file_nr.to_s+'_roo_content.xml','w') {|f|
+        open(@tmpdir+'/'+@file_nr.to_s+'_roo_content.xml','wb') {|f|
           f << zip.read(path) 
         }
       end 
@@ -596,4 +636,20 @@ private
   def Openoffice.oo_type_2_roo_type(ootype)
     return A_ROO_TYPE[ootype]
   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
 end # class

data/lib/roo/version.rb

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

data/test/test_roo.rb

@@ -1057,17 +1057,40 @@ class TestRoo < Test::Unit::TestCase
 
   end
 
-  def test_open_from_uri_and_zipped
-    url = 'http://stiny-leonhard.de/bode-v1.xls.zip'
-    excel = Excel.new(url, :zip)
-    assert_equal 'ist "e" im Nenner von H(s)', excel.cell('b', 5)
-    excel.remove_tmp # don't forget to remove the temporary files
+  def test_excel_open_from_uri_and_zipped
+    after Date.new(2007,8,30) do
+      url = 'http://stiny-leonhard.de/bode-v1.xls.zip'
+      excel = Excel.new(url, :zip)
+      assert_equal 'ist "e" im Nenner von H(s)', excel.cell('b', 5)
+      excel.remove_tmp # don't forget to remove the temporary files
+    end
   end
 
-  def test_zipped
-    excel = Excel.new(File.join("test","bode-v1.xls.zip"), :zip)
-    assert excel
-    assert_equal 'ist "e" im Nenner von H(s)', excel.cell('b', 5)
-    excel.remove_tmp # don't forget to remove the temporary files
+  def test_openoffice_open_from_uri_and_zipped
+    after Date.new(2007,8,30) do
+      url = 'http://spazioinwind.libero.it/s2/rata.ods.zip'
+      sheet = Openoffice.new(url, :zip)
+      assert_equal 'ist "e" im Nenner von H(s)', sheet.cell('b', 5)
+      sheet.remove_tmp # don't forget to remove the temporary files
+    end
+  end
+
+  def test_excel_zipped
+    after Date.new(2007,8,30) do
+      excel = Excel.new(File.join("test","bode-v1.xls.zip"), :zip)
+      assert excel
+      assert_equal 'ist "e" im Nenner von H(s)', excel.cell('b', 5)
+      excel.remove_tmp # don't forget to remove the temporary files
+    end
+  end
+
+  def test_openoffice_zipped
+    after Date.new(2007,8,10) do
+      oo = Openoffice.new(File.join("test","bode-v1.ods.zip"), :zip)
+      assert oo
+      oo.default_sheet = oo.sheets.first
+      assert_equal 'ist "e" im Nenner von H(s)', oo.cell('b', 5)
+      oo.remove_tmp # don't forget to remove the temporary files
+    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.5.2</a>
+      <a href="http://rubyforge.org/projects/roo" class="numbers">0.5.3</a>
     </div>
     <h2>What</h2>
 
@@ -271,15 +271,17 @@ is the setting of the default-worksheet. OpenOffice uses the name of the workshe
 	<h3>Accessing Spreadsheet over the Web</h3>
 
 
-You can even read excel-spreadsheets from a http-address:
+You can even read openoffice or excel-spreadsheets from a http-address:
 <pre>
 <code>oo = Excel.new("http://www.somedomain.com/simple_spreadsheet.xls").
+oo = Openoffice.new("http://www.somedomain.com/simple_spreadsheet.ods").
 </code>
 </pre>
 
 or a zipped file:
 <pre>
 <code>oo = Excel.new("http://www.somedomain.com/simple_spreadsheet.xls.zip",:zip).
+oo = Openoffice.new("http://www.somedomain.com/simple_spreadsheet.ods.zip",:zip).
 </code>
 </pre>
 

data/website/index.txt

@@ -172,15 +172,17 @@ Old .sxc OpenOffice files are currently not supported - please load these files
 
 h3. Accessing Spreadsheet over the Web
 
-You can even read excel-spreadsheets from a http-address:
+You can even read openoffice or excel-spreadsheets from a http-address:
 <pre>
 <code>oo = Excel.new("http://www.somedomain.com/simple_spreadsheet.xls").
+oo = Openoffice.new("http://www.somedomain.com/simple_spreadsheet.ods").
 </code>
 </pre>
 
 or a zipped file:
 <pre>
 <code>oo = Excel.new("http://www.somedomain.com/simple_spreadsheet.xls.zip",:zip).
+oo = Openoffice.new("http://www.somedomain.com/simple_spreadsheet.ods.zip",:zip).
 </code>
 </pre>
 

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: roo
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 date: 2007-08-26 00:00:00 +02:00
 summary: roo can access the contents of OpenOffice-Spreadsheets and Excel-Spreadsheets
 require_paths: 
@@ -55,6 +55,7 @@ files:
 - test/only_one_sheet.ods
 - test/only_one_sheet.xls
 - test/bode-v1.xls.zip
+- test/bode-v1.ods.zip
 - website/index.html
 - website/index.txt
 - website/javascripts/rounded_corners_lite.inc.js