archive-zip 0.6.0 → 0.7.0

data/spec/archive/zip/codec/deflate/compress/crc32_spec.rb

@@ -1,7 +1,9 @@
 # encoding: UTF-8
 
-require File.dirname(__FILE__) + '/../../../../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require 'minitest/autorun'
+
+require File.expand_path('../../fixtures/classes', __FILE__)
+
 require 'archive/zip/codec/deflate'
 require 'archive/support/binary_stringio'
 
@@ -13,9 +15,9 @@ describe "Archive::Zip::Codec::Deflate::Compress#crc32" do
     ) do |compressor|
       compressor.write(DeflateSpecs.test_data)
       compressor.flush
-      compressor.crc32.should == Zlib.crc32(DeflateSpecs.test_data)
+      compressor.crc32.must_equal Zlib.crc32(DeflateSpecs.test_data)
       compressor
     end
-    closed_compressor.crc32.should == Zlib.crc32(DeflateSpecs.test_data)
+    closed_compressor.crc32.must_equal Zlib.crc32(DeflateSpecs.test_data)
   end
 end

data/spec/archive/zip/codec/deflate/compress/data_descriptor_spec.rb

@@ -1,7 +1,9 @@
 # encoding: UTF-8
 
-require File.dirname(__FILE__) + '/../../../../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require 'minitest/autorun'
+
+require File.expand_path('../../fixtures/classes', __FILE__)
+
 require 'archive/zip/codec/deflate'
 require 'archive/support/binary_stringio'
 
@@ -14,11 +16,12 @@ describe "Archive::Zip::Codec::Deflate::Compress#data_descriptor" do
     ) do |compressor|
       compressor.write(test_data)
       compressor.flush
-      compressor.data_descriptor.class.should == Archive::Zip::DataDescriptor
+      compressor.data_descriptor.class.must_equal(Archive::Zip::DataDescriptor)
       compressor
     end
-    closed_compressor.data_descriptor.class.should ==
+    closed_compressor.data_descriptor.class.must_equal(
       Archive::Zip::DataDescriptor
+    )
   end
 
   it "has a crc32 attribute containing the CRC32 checksum" do
@@ -29,10 +32,10 @@ describe "Archive::Zip::Codec::Deflate::Compress#data_descriptor" do
     ) do |compressor|
       compressor.write(test_data)
       compressor.flush
-      compressor.data_descriptor.crc32.should == Zlib.crc32(test_data)
+      compressor.data_descriptor.crc32.must_equal(Zlib.crc32(test_data))
       compressor
     end
-    closed_compressor.data_descriptor.crc32.should == Zlib.crc32(test_data)
+    closed_compressor.data_descriptor.crc32.must_equal(Zlib.crc32(test_data))
   end
 
   it "has a compressed_size attribute containing the size of the compressed data" do
@@ -43,12 +46,14 @@ describe "Archive::Zip::Codec::Deflate::Compress#data_descriptor" do
     ) do |compressor|
       compressor.write(test_data)
       compressor.flush
-      compressor.data_descriptor.compressed_size.should ==
+      compressor.data_descriptor.compressed_size.must_equal(
         compressed_data.size
+      )
       compressor
     end
-    closed_compressor.data_descriptor.compressed_size.should ==
+    closed_compressor.data_descriptor.compressed_size.must_equal(
       compressed_data.size
+    )
   end
 
   it "has an uncompressed_size attribute containing the size of the input data" do
@@ -59,9 +64,11 @@ describe "Archive::Zip::Codec::Deflate::Compress#data_descriptor" do
     ) do |compressor|
       compressor.write(test_data)
       compressor.flush
-      compressor.data_descriptor.uncompressed_size.should == test_data.size
+      compressor.data_descriptor.uncompressed_size.must_equal(test_data.size)
       compressor
     end
-    closed_compressor.data_descriptor.uncompressed_size.should == test_data.size
+    closed_compressor.data_descriptor.uncompressed_size.must_equal(
+      test_data.size
+    )
   end
 end

data/spec/archive/zip/codec/deflate/compress/new_spec.rb

@@ -1,7 +1,9 @@
 # encoding: UTF-8
 
-require File.dirname(__FILE__) + '/../../../../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require 'minitest/autorun'
+
+require File.expand_path('../../fixtures/classes', __FILE__)
+
 require 'archive/zip/codec/deflate'
 require 'archive/support/binary_stringio'
 
@@ -10,7 +12,7 @@ describe "Archive::Zip::Codec::Deflate::Compress.new" do
     c = Archive::Zip::Codec::Deflate::Compress.new(
       BinaryStringIO.new, Zlib::DEFAULT_COMPRESSION
     )
-    c.class.should == Archive::Zip::Codec::Deflate::Compress
+    c.must_be_instance_of(Archive::Zip::Codec::Deflate::Compress)
     c.close
   end
 
@@ -23,7 +25,7 @@ describe "Archive::Zip::Codec::Deflate::Compress.new" do
     c.write(data)
     c.close
 
-    compressed_data.string.should == DeflateSpecs.compressed_data
+    compressed_data.string.must_equal(DeflateSpecs.compressed_data)
 
     compressed_data = BinaryStringIO.new
     c = Archive::Zip::Codec::Deflate::Compress.new(
@@ -32,6 +34,6 @@ describe "Archive::Zip::Codec::Deflate::Compress.new" do
     c.write(data)
     c.close
 
-    compressed_data.string.should == DeflateSpecs.compressed_data_nocomp
+    compressed_data.string.must_equal(DeflateSpecs.compressed_data_nocomp)
   end
 end

data/spec/archive/zip/codec/deflate/compress/open_spec.rb

@@ -1,7 +1,9 @@
 # encoding: UTF-8
 
-require File.dirname(__FILE__) + '/../../../../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require 'minitest/autorun'
+
+require File.expand_path('../../fixtures/classes', __FILE__)
+
 require 'archive/zip/codec/deflate'
 require 'archive/support/binary_stringio'
 
@@ -10,20 +12,20 @@ describe "Archive::Zip::Codec::Deflate::Compress.open" do
     c = Archive::Zip::Codec::Deflate::Compress.open(
       BinaryStringIO.new, Zlib::DEFAULT_COMPRESSION
     )
-    c.class.should == Archive::Zip::Codec::Deflate::Compress
+    c.must_be_instance_of(Archive::Zip::Codec::Deflate::Compress)
     c.close
   end
 
   it "executes a block with a new instance as an argument" do
     Archive::Zip::Codec::Deflate::Compress.open(
       BinaryStringIO.new, Zlib::DEFAULT_COMPRESSION
-    ) { |c| c.class.should == Archive::Zip::Codec::Deflate::Compress }
+    ) { |c| c.must_be_instance_of(Archive::Zip::Codec::Deflate::Compress) }
   end
 
   it "closes the object after executing a block" do
     Archive::Zip::Codec::Deflate::Compress.open(
       BinaryStringIO.new, Zlib::DEFAULT_COMPRESSION
-    ) { |c| c }.closed?.should.be_true
+    ) { |c| c }.closed?.must_equal(true)
   end
 
   it "allows level to be set" do
@@ -33,7 +35,7 @@ describe "Archive::Zip::Codec::Deflate::Compress.open" do
       compressed_data, Zlib::DEFAULT_COMPRESSION
     ) { |c| c.write(data) }
 
-    compressed_data.string.should == DeflateSpecs.compressed_data
+    compressed_data.string.must_equal(DeflateSpecs.compressed_data)
 
     data = DeflateSpecs.test_data
     compressed_data = BinaryStringIO.new
@@ -41,6 +43,6 @@ describe "Archive::Zip::Codec::Deflate::Compress.open" do
       compressed_data, Zlib::NO_COMPRESSION
     ) { |c| c.write(data) }
 
-    compressed_data.string.should == DeflateSpecs.compressed_data_nocomp
+    compressed_data.string.must_equal(DeflateSpecs.compressed_data_nocomp)
   end
 end

data/spec/archive/zip/codec/deflate/compress/write_spec.rb

@@ -1,19 +1,19 @@
 # encoding: UTF-8
 
-require File.dirname(__FILE__) + '/../../../../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require 'minitest/autorun'
+
+require File.expand_path('../../fixtures/classes', __FILE__)
+
 require 'archive/zip/codec/deflate'
 require 'archive/support/binary_stringio'
 
 describe "Archive::Zip::Codec::Deflate::Compress#write" do
   it "calls the write method of the delegate" do
-    delegate = mock('delegate')
-    # RSpec's mocking facility supposedly supports this, but MSpec's does not as
-    # of version 1.5.10.
-    #delegate.should_receive(:write).with(an_instance_of(String)).at_least(:once).and_return { |s| s.length }
-    # Use the following instead for now.
-    delegate.should_receive(:write).at_least(:once).and_return(1)
-    delegate.should_receive(:close).once.and_return(nil)
+    delegate = MiniTest::Mock.new
+    delegate.expect(
+      :write, DeflateSpecs.compressed_data.size, [DeflateSpecs.compressed_data]
+    )
+    delegate.expect(:close, nil)
     Archive::Zip::Codec::Deflate::Compress.open(
       delegate, Zlib::DEFAULT_COMPRESSION
     ) do |compressor|
@@ -28,7 +28,7 @@ describe "Archive::Zip::Codec::Deflate::Compress#write" do
     ) do |compressor|
       compressor.write(DeflateSpecs.test_data)
     end
-    compressed_data.string.should == DeflateSpecs.compressed_data
+    compressed_data.string.must_equal(DeflateSpecs.compressed_data)
   end
 
   it "writes compressed data to a delegate that only performs partial writes" do
@@ -46,13 +46,13 @@ describe "Archive::Zip::Codec::Deflate::Compress#write" do
     ) do |compressor|
       compressor.write(DeflateSpecs.test_data)
     end
-    compressed_data.string.should == DeflateSpecs.compressed_data
+    compressed_data.string.must_equal(DeflateSpecs.compressed_data)
   end
 
   it "writes compressed data to a delegate that raises Errno::EAGAIN" do
     compressed_data = BinaryStringIO.new
-    # Override compressed_data.write to raise Errno::EAGAIN every other time it's
-    # called.
+    # Override compressed_data.write to raise Errno::EAGAIN every other time
+    # it's called.
     class << compressed_data
       alias :write_orig :write
       def write(buffer)
@@ -75,7 +75,7 @@ describe "Archive::Zip::Codec::Deflate::Compress#write" do
         retry
       end
     end
-    compressed_data.string.should == DeflateSpecs.compressed_data
+    compressed_data.string.must_equal(DeflateSpecs.compressed_data)
   end
 
   it "writes compressed data to a delegate that raises Errno::EINTR" do
@@ -104,6 +104,6 @@ describe "Archive::Zip::Codec::Deflate::Compress#write" do
         retry
       end
     end
-    compressed_data.string.should == DeflateSpecs.compressed_data
+    compressed_data.string.must_equal(DeflateSpecs.compressed_data)
   end
 end

data/spec/archive/zip/codec/deflate/decompress/checksum_spec.rb

@@ -1,7 +1,9 @@
 # encoding: UTF-8
 
-require File.dirname(__FILE__) + '/../../../../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require 'minitest/autorun'
+
+require File.expand_path('../../fixtures/classes', __FILE__)
+
 require 'archive/zip/codec/deflate'
 
 describe "Archive::Zip::Deflate::Decompress#checksum" do
@@ -9,10 +11,10 @@ describe "Archive::Zip::Deflate::Decompress#checksum" do
     closed_decompressor = DeflateSpecs.compressed_data do |f|
       Archive::Zip::Codec::Deflate::Decompress.open(f) do |decompressor|
         decompressor.read
-        decompressor.checksum.should == Zlib.crc32(DeflateSpecs.test_data)
+        decompressor.checksum.must_equal(Zlib.crc32(DeflateSpecs.test_data))
         decompressor
       end
     end
-    closed_decompressor.checksum.should == Zlib.crc32(DeflateSpecs.test_data)
+    closed_decompressor.checksum.must_equal(Zlib.crc32(DeflateSpecs.test_data))
   end
 end

data/spec/archive/zip/codec/deflate/decompress/close_spec.rb

@@ -1,7 +1,9 @@
 # encoding: UTF-8
 
-require File.dirname(__FILE__) + '/../../../../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require 'minitest/autorun'
+
+require File.expand_path('../../fixtures/classes', __FILE__)
+
 require 'archive/zip/codec/deflate'
 require 'archive/support/binary_stringio'
 
@@ -9,24 +11,23 @@ describe "Archive::Zip::Codec::Deflate::Decompress#close" do
   it "closes the stream" do
     c = Archive::Zip::Codec::Deflate::Decompress.new(BinaryStringIO.new)
     c.close
-    c.closed?.should be_true
+    c.closed?.must_equal(true)
   end
 
   it "closes the delegate stream by default" do
-    delegate = mock('delegate')
-    delegate.should_receive(:close).and_return(nil)
+    delegate = MiniTest::Mock.new
+    delegate.expect(:close, nil)
     c = Archive::Zip::Codec::Deflate::Decompress.new(delegate)
     c.close
   end
 
   it "optionally leaves the delegate stream open" do
-    delegate = mock('delegate')
-    delegate.should_receive(:close).and_return(nil)
+    delegate = MiniTest::Mock.new
+    delegate.expect(:close, nil)
     c = Archive::Zip::Codec::Deflate::Decompress.new(delegate)
     c.close(true)
 
-    delegate = mock('delegate')
-    delegate.should_not_receive(:close)
+    delegate = MiniTest::Mock.new
     c = Archive::Zip::Codec::Deflate::Decompress.new(delegate)
     c.close(false)
   end

data/spec/archive/zip/codec/deflate/decompress/crc32_spec.rb

@@ -1,7 +1,9 @@
 # encoding: UTF-8
 
-require File.dirname(__FILE__) + '/../../../../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require 'minitest/autorun'
+
+require File.expand_path('../../fixtures/classes', __FILE__)
+
 require 'archive/zip/codec/deflate'
 
 describe "Archive::Zip::Deflate::Decompress#crc32" do
@@ -9,10 +11,10 @@ describe "Archive::Zip::Deflate::Decompress#crc32" do
     closed_decompressor = DeflateSpecs.compressed_data do |f|
       Archive::Zip::Codec::Deflate::Decompress.open(f) do |decompressor|
         decompressor.read
-        decompressor.crc32.should == Zlib.crc32(DeflateSpecs.test_data)
+        decompressor.crc32.must_equal(Zlib.crc32(DeflateSpecs.test_data))
         decompressor
       end
     end
-    closed_decompressor.crc32.should == Zlib.crc32(DeflateSpecs.test_data)
+    closed_decompressor.crc32.must_equal(Zlib.crc32(DeflateSpecs.test_data))
   end
 end

data/spec/archive/zip/codec/deflate/decompress/data_descriptor_spec.rb

@@ -1,7 +1,9 @@
 # encoding: UTF-8
 
-require File.dirname(__FILE__) + '/../../../../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require 'minitest/autorun'
+
+require File.expand_path('../../fixtures/classes', __FILE__)
+
 require 'archive/zip/codec/deflate'
 
 describe "Archive::Zip::Codec::Deflate::Decompress#data_descriptor" do
@@ -11,12 +13,14 @@ describe "Archive::Zip::Codec::Deflate::Decompress#data_descriptor" do
         cd
       ) do |decompressor|
         decompressor.read
-        decompressor.data_descriptor.class.should ==
+        decompressor.data_descriptor.must_be_instance_of(
           Archive::Zip::DataDescriptor
+        )
         decompressor
       end
-      closed_decompressor.data_descriptor.class.should ==
+      closed_decompressor.data_descriptor.must_be_instance_of(
         Archive::Zip::DataDescriptor
+      )
     end
   end
 
@@ -27,10 +31,10 @@ describe "Archive::Zip::Codec::Deflate::Decompress#data_descriptor" do
         cd
       ) do |decompressor|
         decompressor.read
-        decompressor.data_descriptor.crc32.should == crc32
+        decompressor.data_descriptor.crc32.must_equal(crc32)
         decompressor
       end
-      closed_decompressor.data_descriptor.crc32.should == crc32
+      closed_decompressor.data_descriptor.crc32.must_equal(crc32)
     end
   end
 
@@ -41,11 +45,12 @@ describe "Archive::Zip::Codec::Deflate::Decompress#data_descriptor" do
         cd
       ) do |decompressor|
         decompressor.read
-        decompressor.data_descriptor.compressed_size.should == compressed_size
+        decompressor.data_descriptor.compressed_size.must_equal(compressed_size)
         decompressor
       end
-      closed_decompressor.data_descriptor.compressed_size.should ==
+      closed_decompressor.data_descriptor.compressed_size.must_equal(
         compressed_size
+      )
     end
   end
 
@@ -56,12 +61,14 @@ describe "Archive::Zip::Codec::Deflate::Decompress#data_descriptor" do
         cd
       ) do |decompressor|
         decompressor.read
-        decompressor.data_descriptor.uncompressed_size.should ==
+        decompressor.data_descriptor.uncompressed_size.must_equal(
           uncompressed_size
+        )
         decompressor
       end
-      closed_decompressor.data_descriptor.uncompressed_size.should ==
+      closed_decompressor.data_descriptor.uncompressed_size.must_equal(
         uncompressed_size
+      )
     end
   end
 end

data/spec/archive/zip/codec/deflate/decompress/new_spec.rb

@@ -1,14 +1,16 @@
 # encoding: UTF-8
 
-require File.dirname(__FILE__) + '/../../../../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require 'minitest/autorun'
+
+require File.expand_path('../../fixtures/classes', __FILE__)
+
 require 'archive/zip/codec/deflate'
 require 'archive/support/binary_stringio'
 
 describe "Archive::Zip::Codec::Deflate::Decompress.new" do
   it "returns a new instance" do
     d = Archive::Zip::Codec::Deflate::Decompress.new(BinaryStringIO.new)
-    d.class.should == Archive::Zip::Codec::Deflate::Decompress
+    d.must_be_instance_of(Archive::Zip::Codec::Deflate::Decompress)
     d.close
   end
 end

data/spec/archive/zip/codec/deflate/decompress/open_spec.rb

@@ -1,20 +1,22 @@
 # encoding: UTF-8
 
-require File.dirname(__FILE__) + '/../../../../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require 'minitest/autorun'
+
+require File.expand_path('../../fixtures/classes', __FILE__)
+
 require 'archive/zip/codec/deflate'
 require 'archive/support/binary_stringio'
 
 describe "Archive::Zip::Codec::Deflate::Decompress.open" do
   it "returns a new instance when run without a block" do
     d = Archive::Zip::Codec::Deflate::Decompress.open(BinaryStringIO.new)
-    d.class.should == Archive::Zip::Codec::Deflate::Decompress
+    d.must_be_instance_of(Archive::Zip::Codec::Deflate::Decompress)
     d.close
   end
 
   it "executes a block with a new instance as an argument" do
     Archive::Zip::Codec::Deflate::Decompress.open(BinaryStringIO.new) do |decompressor|
-      decompressor.class.should == Archive::Zip::Codec::Deflate::Decompress
+      decompressor.must_be_instance_of(Archive::Zip::Codec::Deflate::Decompress)
     end
   end
 
@@ -22,6 +24,6 @@ describe "Archive::Zip::Codec::Deflate::Decompress.open" do
     d = Archive::Zip::Codec::Deflate::Decompress.open(BinaryStringIO.new) do |decompressor|
       decompressor
     end
-    d.closed?.should.be_true
+    d.closed?.must_equal(true)
   end
 end