trying to upgrade zip plugin

gorn · Jun 10, 2014 · 0e98b8c · 0e98b8c
1 parent 6168b56
commit 0e98b8c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/lib/rspreadsheet/workbook.rb b/lib/rspreadsheet/workbook.rb
@@ -1,4 +1,4 @@
-require 'zip/zipfilesystem'
+require 'zip'
 require 'libxml'
 
 module Rspreadsheet
@@ -9,7 +9,7 @@ def initialize afilename=nil
     @filename = afilename
     if filename.nil?
     else
-      @content_xml = Zip::ZipFile.open(filename) do |zip|
+      @content_xml = Zip::File.open(filename) do |zip|
         LibXML::XML::Document.io zip.get_input_stream('content.xml')
       end
 
@@ -29,7 +29,7 @@ def save(new_filename=nil)
       FileUtils.cp(@filename || './lib/rspreadsheet/empty_file_template.ods', new_filename)
       @filename = new_filename
     end
-    Zip::ZipFile.open(@filename) do |zip|
+    Zip::File.open(@filename) do |zip|
       # it is easy, because @content_xml in in sync with contents all the time
       zip.get_output_stream('content.xml') do |f|
         f.write @content_xml

diff --git a/spec/rspreadsheet_spec.rb b/spec/rspreadsheet_spec.rb
@@ -36,10 +36,10 @@
     book.save(tmp_filename)                    # and save it as temp file
 
     # now compare them
-    @content_xml1 = Zip::ZipFile.open($test_filename) do |zip|
+    @content_xml1 = Zip::File.open($test_filename) do |zip|
       LibXML::XML::Document.io zip.get_input_stream('content.xml')
     end
-    @content_xml2 = Zip::ZipFile.open(tmp_filename) do |zip|
+    @content_xml2 = Zip::File.open(tmp_filename) do |zip|
       LibXML::XML::Document.io zip.get_input_stream('content.xml')
     end
     @content_doc1.eql?(@content_doc2).should == true
@@ -54,10 +54,10 @@
     book.save(tmp_filename)                    # and save it as temp file
 
     # now compare them
-    @content_doc1 = Zip::ZipFile.open($test_filename) do |zip|
+    @content_doc1 = Zip::File.open($test_filename) do |zip|
       LibXML::XML::Document.io zip.get_input_stream('content.xml')
     end
-    @content_doc2 = Zip::ZipFile.open(tmp_filename) do |zip|
+    @content_doc2 = Zip::File.open(tmp_filename) do |zip|
       LibXML::XML::Document.io zip.get_input_stream('content.xml')
     end
     @content_doc1.eql?(@content_doc2).should == false