rubyzip 1.1.6 → 1.1.7

data/test/deflater_test.rb

@@ -1,12 +1,17 @@
 require 'test_helper'
 
-class DeflaterTest < MiniTest::Unit::TestCase
+class DeflaterTest < MiniTest::Test
   include CrcTest
 
+  DEFLATER_TEST_FILE = 'test/data/generated/deflatertest.bin'
+  BEST_COMP_FILE = 'test/data/generated/compressiontest_best_compression.bin'
+  DEFAULT_COMP_FILE = 'test/data/generated/compressiontest_default_compression.bin'
+  NO_COMP_FILE = 'test/data/generated/compressiontest_no_compression.bin'
+
   def test_outputOperator
     txt = load_file("test/data/file2.txt")
-    deflate(txt, "deflatertest.bin")
-    inflatedTxt = inflate("deflatertest.bin")
+    deflate(txt, DEFLATER_TEST_FILE)
+    inflatedTxt = inflate(DEFLATER_TEST_FILE)
     assert_equal(txt, inflatedTxt)
   end
 
@@ -14,15 +19,15 @@ class DeflaterTest < MiniTest::Unit::TestCase
     txt = load_file("test/data/file2.txt")
 
     Zip.default_compression = ::Zlib::BEST_COMPRESSION
-    deflate(txt, "compressiontest_best_compression.bin")
+    deflate(txt, BEST_COMP_FILE)
     Zip.default_compression = ::Zlib::DEFAULT_COMPRESSION
-    deflate(txt, "compressiontest_default_compression.bin")
+    deflate(txt, DEFAULT_COMP_FILE)
     Zip.default_compression = ::Zlib::NO_COMPRESSION
-    deflate(txt, "compressiontest_no_compression.bin")
+    deflate(txt, NO_COMP_FILE)
 
-    best    = File.size("compressiontest_best_compression.bin")
-    default = File.size("compressiontest_default_compression.bin")
-    no      = File.size("compressiontest_no_compression.bin")
+    best    = File.size(BEST_COMP_FILE)
+    default = File.size(DEFAULT_COMP_FILE)
+    no      = File.size(NO_COMP_FILE)
 
     assert(best < default)
     assert(best < no)

data/test/encryption_test.rb

@@ -0,0 +1,42 @@
+require 'test_helper'
+
+class EncryptionTest < MiniTest::Test
+  ENCRYPT_ZIP_TEST_FILE = 'test/data/zipWithEncryption.zip'
+  INPUT_FILE1 = 'test/data/file1.txt'
+
+  def setup
+    @default_compression = Zip.default_compression
+    Zip.default_compression = ::Zlib::DEFAULT_COMPRESSION
+  end
+
+  def teardown
+    Zip.default_compression = @default_compression
+  end
+
+  def test_encrypt
+    test_file = open(ENCRYPT_ZIP_TEST_FILE, 'rb').read
+
+    @rand = [250, 143, 107, 13, 143, 22, 155, 75, 228, 150, 12]
+    @output = ::Zip::DOSTime.stub(:now, ::Zip::DOSTime.new(2014, 12, 17, 15, 56, 24)) do
+      Random.stub(:rand, lambda { |range| @rand.shift }) do
+        Zip::OutputStream.write_buffer(::StringIO.new(''), Zip::TraditionalEncrypter.new('password')) do |zos|
+          zos.put_next_entry('file1.txt')
+          zos.write open(INPUT_FILE1).read
+        end.string
+      end
+    end
+
+    @output.unpack("C*").each_with_index do |c, i|
+      assert_equal test_file[i].ord, c
+    end
+  end
+
+  def test_decrypt
+    Zip::InputStream.open(ENCRYPT_ZIP_TEST_FILE, 0, Zip::TraditionalDecrypter.new('password')) do |zis|
+      entry = zis.get_next_entry
+      assert_equal 'file1.txt', entry.name
+      assert_equal 1327, entry.size
+      assert_equal open(INPUT_FILE1, 'r').read, zis.read
+    end
+  end
+end

data/test/entry_set_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ZipEntrySetTest < MiniTest::Unit::TestCase
+class ZipEntrySetTest < MiniTest::Test
   ZIP_ENTRIES = [
       ::Zip::Entry.new("zipfile.zip", "name1", "comment1"),
       ::Zip::Entry.new("zipfile.zip", "name3", "comment1"),
@@ -14,6 +14,10 @@ class ZipEntrySetTest < MiniTest::Unit::TestCase
     @zipEntrySet = ::Zip::EntrySet.new(ZIP_ENTRIES)
   end
 
+  def teardown
+    ::Zip.reset!
+  end
+
   def test_include
     assert(@zipEntrySet.include?(ZIP_ENTRIES.first))
     assert(!@zipEntrySet.include?(::Zip::Entry.new("different.zip", "different", "aComment")))
@@ -68,6 +72,15 @@ class ZipEntrySetTest < MiniTest::Unit::TestCase
     assert_equal(ZIP_ENTRIES, @zipEntrySet.entries)
   end
 
+  def test_entries_sorted_in_each
+    ::Zip.sort_entries = true
+    arr = []
+    @zipEntrySet.each do |entry|
+      arr << entry
+    end
+    assert_equal(ZIP_ENTRIES.sort, arr)
+  end
+
   def test_compound
     newEntry = ::Zip::Entry.new("zf.zip", "new entry", "new entry's comment")
     assert_equal(ZIP_ENTRIES.size, @zipEntrySet.size)

data/test/entry_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ZipEntryTest < MiniTest::Unit::TestCase
+class ZipEntryTest < MiniTest::Test
   TEST_ZIPFILE = "someZipFile.zip"
   TEST_COMMENT = "a comment"
   TEST_COMPRESSED_SIZE = 1234
@@ -131,7 +131,7 @@ class ZipEntryTest < MiniTest::Unit::TestCase
   end
 
   def test_store_file_without_compression
-    File.delete('/tmp/no_compress.zip') if File.exists?('/tmp/no_compress.zip')
+    File.delete('/tmp/no_compress.zip') if File.exist?('/tmp/no_compress.zip')
     files = Dir[File.join('test/data/globTest', '**', '**')]
 
     Zip.setup do |z|

data/test/errors_test.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'test_helper'
 
-class ErrorsTest < MiniTest::Unit::TestCase
+class ErrorsTest < MiniTest::Test
 
   def test_rescue_legacy_zip_error
     raise ::Zip::Error

data/test/extra_field_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ZipExtraFieldTest < MiniTest::Unit::TestCase
+class ZipExtraFieldTest < MiniTest::Test
   def test_new
     extra_pure = ::Zip::ExtraField.new("")
     extra_withstr = ::Zip::ExtraField.new("foo")
@@ -17,6 +17,15 @@ class ZipExtraFieldTest < MiniTest::Unit::TestCase
     assert_equal(extra.to_s, "fooabarbaz")
   end
 
+  def test_ntfs
+    str = "\x0A\x00 \x00\x00\x00\x00\x00\x01\x00\x18\x00\xC0\x81\x17\xE8B\xCE\xCF\x01\xC0\x81\x17\xE8B\xCE\xCF\x01\xC0\x81\x17\xE8B\xCE\xCF\x01"
+    extra = ::Zip::ExtraField.new(str)
+    assert(extra.member?("NTFS"))
+    t = ::Zip::DOSTime.at(1410496497.405178)
+    assert_equal(t, extra['NTFS'].mtime)
+    assert_equal(t, extra['NTFS'].atime)
+    assert_equal(t, extra['NTFS'].ctime)
+  end
 
   def test_merge
     str = "UT\x5\0\x3\250$\r@Ux\0\0"

data/test/file_extract_directory_test.rb

@@ -1,8 +1,9 @@
 require 'test_helper'
 
-class ZipFileExtractDirectoryTest < MiniTest::Unit::TestCase
+class ZipFileExtractDirectoryTest < MiniTest::Test
   include CommonZipFileFixture
-  TEST_OUT_NAME = "emptyOutDir"
+
+  TEST_OUT_NAME = "test/data/generated/emptyOutDir"
 
   def open_zip(&aProc)
     assert(aProc != nil)

data/test/file_extract_test.rb

@@ -1,8 +1,8 @@
 require 'test_helper'
 
-class ZipFileExtractTest < MiniTest::Unit::TestCase
+class ZipFileExtractTest < MiniTest::Test
   include CommonZipFileFixture
-  EXTRACTED_FILENAME = "extEntry"
+  EXTRACTED_FILENAME = "test/data/generated/extEntry"
   ENTRY_TO_EXTRACT, *REMAINING_ENTRIES = TEST_ZIP.entry_names.reverse
 
   def setup

data/test/file_split_test.rb

@@ -1,9 +1,9 @@
 require 'test_helper'
 
-class ZipFileSplitTest < MiniTest::Unit::TestCase
+class ZipFileSplitTest < MiniTest::Test
   TEST_ZIP = TestZipFile::TEST_ZIP2.clone
   TEST_ZIP.zip_name = "large_zip_file.zip"
-  EXTRACTED_FILENAME = "test/data/generated/extEntry"
+  EXTRACTED_FILENAME = "test/data/generated/extEntrySplit"
   UNSPLITTED_FILENAME = "test/data/generated/unsplitted.zip"
   ENTRY_TO_EXTRACT = TEST_ZIP.entry_names.first
 

data/test/file_test.rb

@@ -1,9 +1,12 @@
 require 'test_helper'
 
 
-class ZipFileTest < MiniTest::Unit::TestCase
+class ZipFileTest < MiniTest::Test
   include CommonZipFileFixture
 
+  OK_DELETE_FILE = 'test/data/generated/okToDelete.txt'
+  OK_DELETE_MOVED_FILE = 'test/data/generated/okToDeleteMoved.txt'
+
   def teardown
     ::Zip.write_zip64_support = false
   end
@@ -87,19 +90,17 @@ class ZipFileTest < MiniTest::Unit::TestCase
   end
 
   def test_cleans_up_tempfiles_after_close
-    comment = "a short comment"
-
     zf = ::Zip::File.new(EMPTY_FILENAME, ::Zip::File::CREATE)
     zf.get_output_stream("myFile") do |os|
       @tempfile_path = os.path
       os.write "myFile contains just this"
     end
 
-    assert_equal(true, File.exists?(@tempfile_path))
+    assert_equal(true, File.exist?(@tempfile_path))
 
     zf.close
 
-    assert_equal(false, File.exists?(@tempfile_path))
+    assert_equal(false, File.exist?(@tempfile_path))
   end
 
   def test_add
@@ -386,13 +387,13 @@ class ZipFileTest < MiniTest::Unit::TestCase
   # can delete the file you used to add the entry to the zip file
   # with
   def test_commitUseZipEntry
-    FileUtils.cp(TestFiles::RANDOM_ASCII_FILE1, "okToDelete.txt")
+    FileUtils.cp(TestFiles::RANDOM_ASCII_FILE1, OK_DELETE_FILE)
     zf = ::Zip::File.open(TEST_ZIP.zip_name)
-    zf.add("okToDelete.txt", "okToDelete.txt")
+    zf.add("okToDelete.txt", OK_DELETE_FILE)
     assert_contains(zf, "okToDelete.txt")
     zf.commit
-    File.rename("okToDelete.txt", "okToDeleteMoved.txt")
-    assert_contains(zf, "okToDelete.txt", "okToDeleteMoved.txt")
+    File.rename(OK_DELETE_FILE, OK_DELETE_MOVED_FILE)
+    assert_contains(zf, "okToDelete.txt", OK_DELETE_MOVED_FILE)
   end
 
 #  def test_close
@@ -534,10 +535,12 @@ class ZipFileTest < MiniTest::Unit::TestCase
     end
 
     data = nil
-    Zip::File.open_buffer(File.binread(zname)) do |zipfile|
-      zipfile.each do |entry|
-        next unless entry.name =~ /README.md/
-        data = zipfile.read(entry)
+    File.open(zname, 'rb') do |f|
+      Zip::File.open_buffer(f) do |zipfile|
+        zipfile.each do |entry|
+          next unless entry.name =~ /README.md/
+          data = zipfile.read(entry)
+        end
       end
     end
     assert data

data/test/filesystem/dir_iterator_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'zip/filesystem'
 
-class ZipFsDirIteratorTest < MiniTest::Unit::TestCase
+class ZipFsDirIteratorTest < MiniTest::Test
 
   FILENAME_ARRAY = [ "f1", "f2", "f3", "f4", "f5", "f6"  ]
 

data/test/filesystem/directory_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'zip/filesystem'
 
-class ZipFsDirectoryTest < MiniTest::Unit::TestCase
+class ZipFsDirectoryTest < MiniTest::Test
   TEST_ZIP = "test/data/generated/zipWithDirs_copy.zip"
 
   def setup

data/test/filesystem/file_mutating_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'zip/filesystem'
 
-class ZipFsFileMutatingTest < MiniTest::Unit::TestCase
+class ZipFsFileMutatingTest < MiniTest::Test
   TEST_ZIP = "test/data/generated/zipWithDirs_copy.zip"
   def setup
     FileUtils.cp("test/data/zipWithDirs.zip", TEST_ZIP)

data/test/filesystem/file_nonmutating_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'zip/filesystem'
 
-class ZipFsFileNonmutatingTest < MiniTest::Unit::TestCase
+class ZipFsFileNonmutatingTest < MiniTest::Test
   def setup
     @zipsha = Digest::SHA1.file("test/data/zipWithDirs.zip")
     @zip_file = ::Zip::File.new("test/data/zipWithDirs.zip")
@@ -307,6 +307,15 @@ class ZipFsFileNonmutatingTest < MiniTest::Unit::TestCase
     assert_nil(@zip_file.file.stat("file1").atime)
   end
 
+  def test_ntfs_time
+    ::Zip::File.open("test/data/ntfs.zip") do |zf|
+      t = ::Zip::DOSTime.at(1410496497.405178)
+      assert_equal(zf.file.mtime("data.txt"), t)
+      assert_equal(zf.file.atime("data.txt"), t)
+      assert_equal(zf.file.ctime("data.txt"), t)
+    end
+  end
+
   def test_readable?
     assert(! @zip_file.file.readable?("noSuchFile"))
     assert(@zip_file.file.readable?("file1"))

data/test/filesystem/file_stat_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'zip/filesystem'
 
-class ZipFsFileStatTest < MiniTest::Unit::TestCase
+class ZipFsFileStatTest < MiniTest::Test
 
   def setup
     @zip_file = ::Zip::File.new("test/data/zipWithDirs.zip")

data/test/inflater_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-class InflaterTest < MiniTest::Unit::TestCase
+class InflaterTest < MiniTest::Test
   include DecompressorTests
 
   def setup

data/test/input_stream_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ZipInputStreamTest < MiniTest::Unit::TestCase
+class ZipInputStreamTest < MiniTest::Test
   include AssertEntry
 
   def test_new

data/test/ioextras/abstract_input_stream_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'zip/ioextras'
 
-class AbstractInputStreamTest < MiniTest::Unit::TestCase
+class AbstractInputStreamTest < MiniTest::Test
   # AbstractInputStream subclass that provides a read method
 
   TEST_LINES = ["Hello world#{$/}",

data/test/ioextras/abstract_output_stream_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'zip/ioextras'
 
-class AbstractOutputStreamTest < MiniTest::Unit::TestCase
+class AbstractOutputStreamTest < MiniTest::Test
   class TestOutputStream
     include ::Zip::IOExtras::AbstractOutputStream
 

data/test/ioextras/fake_io_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'zip/ioextras'
 
-class FakeIOTest < MiniTest::Unit::TestCase
+class FakeIOTest < MiniTest::Test
   class FakeIOUsingClass
     include ::Zip::IOExtras::FakeIO
   end

data/test/local_entry_test.rb

@@ -1,6 +1,9 @@
 require 'test_helper'
 
-class ZipLocalEntryTest < MiniTest::Unit::TestCase
+class ZipLocalEntryTest < MiniTest::Test
+
+  CEH_FILE = 'test/data/generated/centralEntryHeader.bin'
+  LEH_FILE = 'test/data/generated/localEntryHeader.bin'
 
   def teardown
     ::Zip.write_zip64_support = false
@@ -54,8 +57,8 @@ class ZipLocalEntryTest < MiniTest::Unit::TestCase
     entry = ::Zip::Entry.new("file.zip", "entryName", "my little comment",
                              "thisIsSomeExtraInformation", 100, 987654,
                              ::Zip::Entry::DEFLATED, 400)
-    write_to_file("localEntryHeader.bin", "centralEntryHeader.bin", entry)
-    entryReadLocal, entryReadCentral = read_from_file("localEntryHeader.bin", "centralEntryHeader.bin")
+    write_to_file(LEH_FILE, CEH_FILE, entry)
+    entryReadLocal, entryReadCentral = read_from_file(LEH_FILE, CEH_FILE)
     assert(entryReadCentral.extra['Zip64Placeholder'].nil?, 'zip64 placeholder should not be used in central directory')
     compare_local_entry_headers(entry, entryReadLocal)
     compare_c_dir_entry_headers(entry, entryReadCentral)
@@ -66,8 +69,8 @@ class ZipLocalEntryTest < MiniTest::Unit::TestCase
     entry = ::Zip::Entry.new("file.zip", "entryName", "my little comment",
                              "thisIsSomeExtraInformation", 100, 987654,
                              ::Zip::Entry::DEFLATED, 400)
-    write_to_file("localEntryHeader.bin", "centralEntryHeader.bin", entry)
-    entryReadLocal, entryReadCentral = read_from_file("localEntryHeader.bin", "centralEntryHeader.bin")
+    write_to_file(LEH_FILE, CEH_FILE, entry)
+    entryReadLocal, entryReadCentral = read_from_file(LEH_FILE, CEH_FILE)
     assert(entryReadLocal.extra['Zip64Placeholder'], 'zip64 placeholder should be used in local file header')
     entryReadLocal.extra.delete('Zip64Placeholder') # it was removed when writing the c_dir_entry, so remove from compare
     assert(entryReadCentral.extra['Zip64Placeholder'].nil?, 'zip64 placeholder should not be used in central directory')
@@ -81,8 +84,8 @@ class ZipLocalEntryTest < MiniTest::Unit::TestCase
                              "malformed extra field because why not",
                              0x7766554433221100, 0xDEADBEEF, ::Zip::Entry::DEFLATED,
                              0x9988776655443322)
-    write_to_file("localEntryHeader.bin", "centralEntryHeader.bin", entry)
-    entryReadLocal, entryReadCentral = read_from_file("localEntryHeader.bin", "centralEntryHeader.bin")
+    write_to_file(LEH_FILE, CEH_FILE, entry)
+    entryReadLocal, entryReadCentral = read_from_file(LEH_FILE, CEH_FILE)
     compare_local_entry_headers(entry, entryReadLocal)
     compare_c_dir_entry_headers(entry, entryReadCentral)
   end
@@ -106,9 +109,9 @@ class ZipLocalEntryTest < MiniTest::Unit::TestCase
   def test_readLocalOffset
     entry = ::Zip::Entry.new("file.zip", "entryName")
     entry.local_header_offset = 12345
-    ::File.open('centralEntryHeader.bin', 'wb') { |f| entry.write_c_dir_entry(f) }
+    ::File.open(CEH_FILE, 'wb') { |f| entry.write_c_dir_entry(f) }
     read_entry = nil
-    ::File.open('centralEntryHeader.bin', 'rb') { |f| read_entry = ::Zip::Entry.read_c_dir_entry(f) }
+    ::File.open(CEH_FILE, 'rb') { |f| read_entry = ::Zip::Entry.read_c_dir_entry(f) }
     compare_c_dir_entry_headers(entry, read_entry)
   end
 
@@ -116,9 +119,9 @@ class ZipLocalEntryTest < MiniTest::Unit::TestCase
     ::Zip.write_zip64_support = true
     entry = ::Zip::Entry.new("file.zip", "entryName")
     entry.local_header_offset = 0x0123456789ABCDEF
-    ::File.open('centralEntryHeader.bin', 'wb') { |f| entry.write_c_dir_entry(f) }
+    ::File.open(CEH_FILE, 'wb') { |f| entry.write_c_dir_entry(f) }
     read_entry = nil
-    ::File.open('centralEntryHeader.bin', 'rb') { |f| read_entry = ::Zip::Entry.read_c_dir_entry(f) }
+    ::File.open(CEH_FILE, 'rb') { |f| read_entry = ::Zip::Entry.read_c_dir_entry(f) }
     compare_c_dir_entry_headers(entry, read_entry)
   end