Drop our Roo::ZipFile abstraction in favor of more recent dependencies.

CHANGELOG

@@ -3,6 +3,7 @@
 * enhancements
   * Extend Roo::Spreadsheet.open to accept Tempfiles and other arguments responding to #path. Note they require an :extension option to be declared, as the tempfile mangles the extension. #84.
   * Remove deprecated code.
+  * Remove the Roo::ZipFile abstraction. Roo now depends on rubyzip 1.0.0+
   * Extract Roo::Excel and Roo::Excel2003XML to roo-xls
   * Extract Roo::Google to roo-google
   * Accept the tmpdir_root option in Roo::Excelx

lib/roo/base.rb

@@ -3,7 +3,6 @@
 require 'tmpdir'
 require 'stringio'
 require 'nokogiri'
-require 'roo/zip_file'
 require 'roo/utils'
 
 # Base class for all other types of spreadsheets
@@ -634,7 +633,9 @@ def open_from_stream(stream, tmpdir)
   end
 
   def unzip(filename, tmpdir)
-    Roo::ZipFile.open(filename) do |zip|
+    require 'zip/filesystem'
+
+    Zip::File.open(filename) do |zip|
       process_zipfile_packed(zip, tmpdir)
     end
   end

lib/roo/excelx.rb

@@ -1,6 +1,7 @@
 require 'date'
 require 'nokogiri'
 require 'roo/link'
+require 'zip/filesystem'
 
 class Roo::Excelx < Roo::Base
   autoload :Workbook, 'roo/excelx/workbook'
@@ -427,7 +428,7 @@ def comments(sheet=nil)
   # Extracts all needed files from the zip file
   def process_zipfile(tmpdir, zipfilename)
     @sheet_files = []
-    Roo::ZipFile.foreach(zipfilename) do |entry|
+    Zip::File.foreach(zipfilename) do |entry|
       path =
         case entry.name.downcase
         when /workbook.xml$/

lib/roo/open_office.rb

@@ -1,6 +1,7 @@
 require 'date'
 require 'nokogiri'
 require 'cgi'
+require 'zip/filesystem'
 
 class Roo::OpenOffice < Roo::Base
   # initialization and opening of a spreadsheet file
@@ -13,7 +14,7 @@ def initialize(filename, options={})
     @tmpdir = make_tmpdir(filename.split('/').last, options[:tmpdir_root])
     @filename = local_filename(filename, @tmpdir, packed)
     #TODO: @cells_read[:default] = false
-    Roo::ZipFile.open(@filename) do |zip_file|
+    Zip::File.open(@filename) do |zip_file|
       if content_entry = zip_file.glob("content.xml").first
         content_entry.extract(File.join(@tmpdir, 'roo_content.xml'))
       else

roo.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'nokogiri'
-  spec.add_dependency 'rubyzip', '~> 1'
+  spec.add_dependency 'rubyzip', '>= 1.0.0'
 
   spec.add_development_dependency 'bundler', '>= 1.7'
   spec.add_development_dependency 'rake', '>= 10.0'