zip_tricks 2.6.0 → 2.6.1

data/spec/zip_tricks/block_write_spec.rb

@@ -6,44 +6,44 @@ describe ZipTricks::BlockWrite do
     adapter = described_class.new{|s|
       blobs << s
     }
-    
+
     adapter << 'hello'
     adapter << 'world'
     adapter << '!'
-    
+
     expect(blobs).to eq(['hello', 'world', '!'])
   end
-  
+
   it 'supports chained shovel' do
     blobs = []
     adapter = described_class.new{|s|
       blobs << s
     }
-    
+
     adapter << 'hello' << 'world' << '!'
-    
+
     expect(blobs).to eq(['hello', 'world', '!'])
   end
-  
+
   it 'can write in all possible encodings, even if the strings are frozen' do
     destination = ''.encode(Encoding::BINARY)
-    
+
     accum_string = ''
     adapter = described_class.new{|s| accum_string << s }
-    
+
     adapter << 'hello'
     adapter << 'привет'
     adapter << 'привет'.freeze
     adapter << '!'
     adapter << SecureRandom.random_bytes(1024)
-    
+
     expect(accum_string.bytesize).to eq(1054)
   end
-  
+
   it 'can be closed' do
     expect(described_class.new{}.close).to be_nil
   end
-  
+
   it 'forces the written strings to binary encoding' do
     blobs = []
     adapter = described_class.new{|s|
@@ -55,7 +55,7 @@ describe ZipTricks::BlockWrite do
     expect(blobs).not_to be_empty
     blobs.each {|s| expect(s.encoding).to eq(Encoding::BINARY) }
   end
-  
+
   it 'omits strings of zero length' do
     blobs = []
     adapter = described_class.new{|s|
@@ -66,7 +66,7 @@ describe ZipTricks::BlockWrite do
     adapter << '!'
     expect(blobs).to eq(['hello', '!'])
   end
-  
+
   it 'omits nils' do
     blobs = []
     adapter = described_class.new{|s|
@@ -77,17 +77,17 @@ describe ZipTricks::BlockWrite do
     adapter << '!'
     expect(blobs).to eq(['hello', '!'])
   end
-  
+
   it 'raises a TypeError on specific unsupported methods' do
     adapter = described_class.new {|s| }
     expect {
       adapter.seek(123)
     }.to raise_error(/non\-rewindable/)
-    
+
     expect {
       adapter.to_s
     }.to raise_error(/non\-rewindable/)
-    
+
     expect {
       adapter.pos = 123
     }.to raise_error(/non\-rewindable/)

data/spec/zip_tricks/manifest_spec.rb

@@ -6,53 +6,53 @@ describe ZipTricks::Manifest do
     raw_file_1 = SecureRandom.random_bytes(1024 * 20)
     raw_file_2 = SecureRandom.random_bytes(1024 * 128)
     raw_file_3 = SecureRandom.random_bytes(1258695)
-    
+
     manifest, bytesize = described_class.build do | builder |
       r = builder.add_stored_entry(name: "first-file.bin", size_uncompressed: raw_file_1.size)
       expect(r).to eq(builder), "add_stored_entry should return self"
-      
+
       builder.add_stored_entry(name: "second-file.bin", size_uncompressed: raw_file_2.size)
-      
+
       r = builder.add_compressed_entry(name: "second-file-comp.bin", size_uncompressed: raw_file_2.size, 
         size_compressed: raw_file_3.size, segment_info: 'http://example.com/second-file-deflated-segment.bin')
       expect(r).to eq(builder), "add_compressed_entry should return self"
     end
-    
+
     require 'range_utils'
-    
+
     expect(manifest).to be_kind_of(Array)
     total_size_of_all_parts = manifest.inject(0) do | total_bytes, span |
       total_bytes + RangeUtils.size_from_range(span.byte_range_in_zip)
     end
     expect(total_size_of_all_parts).to eq(1410595)
     expect(bytesize).to eq(1410595)
-    
+
     expect(manifest.length).to eq(7)
-    
+
     first_header = manifest[0]
     expect(first_header.part_type).to eq(:entry_header)
     expect(first_header.byte_range_in_zip).to eq(0..43)
     expect(first_header.filename).to eq("first-file.bin")
     expect(first_header.additional_metadata).to be_nil
-    
+
     first_body = manifest[1]
     expect(first_body.part_type).to eq(:entry_body)
     expect(first_body.byte_range_in_zip).to eq(44..20523)
     expect(first_body.filename).to eq("first-file.bin")
     expect(first_body.additional_metadata).to be_nil
-    
+
     third_header = manifest[4]
     expect(third_header.part_type).to eq(:entry_header)
     expect(third_header.byte_range_in_zip).to eq(151641..151690)
     expect(third_header.filename).to eq("second-file-comp.bin")
     expect(third_header.additional_metadata).to eq("http://example.com/second-file-deflated-segment.bin")
-    
+
     third_body = manifest[5]
     expect(third_body.part_type).to eq(:entry_body)
     expect(third_body.byte_range_in_zip).to eq(151691..1410385)
     expect(third_body.filename).to eq("second-file-comp.bin")
     expect(third_body.additional_metadata).to eq("http://example.com/second-file-deflated-segment.bin")
-    
+
     cd = manifest[-1]
     expect(cd.part_type).to eq(:central_directory)
     expect(cd.byte_range_in_zip).to eq(1410386..1410594)

data/spec/zip_tricks/rack_body_spec.rb

@@ -3,22 +3,22 @@ require_relative '../spec_helper'
 describe ZipTricks::RackBody do
   it 'is usable as a Rack response body, supports each() and close()' do
     output_buf = Tempfile.new('output')
-    
+
     file_body = SecureRandom.random_bytes(1024 * 1024 + 8981)
-    
+
     body = described_class.new do | zip |
       zip.add_stored_entry("A file", file_body.bytesize, Zlib.crc32(file_body))
       zip << file_body
     end
-    
+
     body.each do | some_data |
       output_buf << some_data
     end
     body.close
-    
+
     output_buf.rewind
     expect(output_buf.size).to eq(1057667)
-    
+
     per_filename = {}
     Zip::File.open(output_buf.path) do |zip_file|
       # Handle entries one by one
@@ -27,7 +27,7 @@ describe ZipTricks::RackBody do
         per_filename[entry.name] = entry.get_input_stream.read
       end
     end
-    
+
     expect(per_filename).to have_key('A file')
     expect(per_filename['A file'].bytesize).to eq(file_body.bytesize)
   end

data/spec/zip_tricks/remote_io_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe ZipTricks::RemoteIO do
-  
+
   context 'working with the fetcher object' do
     it 'asks the fetcher object to obtain the object size and the actual data when reading' do
       mock_fetcher = double(request_object_size: 120, request_range: 'abc')
@@ -9,17 +9,17 @@ describe ZipTricks::RemoteIO do
       expect(subject.read(3)).to eq('abc')
     end
   end
-  
+
   context 'when it internally addresses a remote resource' do
     it 'requests the size of the resource once via #request_object_size and does neet to read if resource is empty' do
       subject = described_class.new
       expect(subject).to receive(:request_object_size).and_return(0)
       expect(subject.read).to be_nil
     end
-    
+
     it 'performs remote reads when repeatedly requesting the same chunk, via #request_range' do
       subject = described_class.new
-      
+
       expect(subject).to receive(:request_object_size).and_return(120)
       allow(subject).to receive(:request_range) {|range|
         expect(range).to eq(5..14)
@@ -31,7 +31,7 @@ describe ZipTricks::RemoteIO do
       end
     end
   end
-  
+
   describe '#seek' do
     context 'with an unsupported mode' do
       it 'raises an error' do
@@ -55,7 +55,7 @@ describe ZipTricks::RemoteIO do
       it 'seens to 10 bytes to the end of the IO' do
         uncap = described_class.new
         expect(uncap).to receive(:request_object_size).and_return(100)
-        
+
         mode = IO::SEEK_END
         offset = -10
         expect(uncap.seek(-10, IO::SEEK_END)).to eq(0)
@@ -70,19 +70,19 @@ describe ZipTricks::RemoteIO do
       @buf.binmode
       5.times { @buf << Random.new.bytes(1024 * 1024 * 3) }
       @buf.rewind
-      
+
       @subject = described_class.new
-      
+
       allow(@subject).to receive(:request_object_size).and_return(@buf.size)
       allow(@subject).to receive(:request_range) {|range|
         @buf.read[range].tap { @buf.rewind }
       }
     end
-    
+
     after :each do
       @buf.close; @buf.unlink
     end
-    
+
     context 'without arguments' do
       it 'reads the entire buffer and alters the position pointer' do
         expect(@subject.pos).to eq(0)
@@ -93,6 +93,14 @@ describe ZipTricks::RemoteIO do
     end
 
     context 'with length' do
+      it 'supports an unlimited number of reads of size 0 and does not perform remote fetches for them' do
+        expect(@subject).not_to receive(:request_range)
+        20.times do
+          data = @subject.read(0)
+          expect(data).to eq('')
+        end
+      end
+      
       it 'returns exact amount of bytes at the start of the buffer' do
         bytes_read = @subject.read(10)
         expect(@subject.pos).to eq(10)
@@ -102,10 +110,10 @@ describe ZipTricks::RemoteIO do
 
       it 'returns exact amount of bytes from the middle of the buffer' do
         @subject.seek(456, IO::SEEK_SET)
-        
+
         bytes_read = @subject.read(10)
         expect(@subject.pos).to eq(456+10)
-        
+
         @buf.seek(456)
         expect(bytes_read).to eq(@buf.read(10))
       end
@@ -113,11 +121,11 @@ describe ZipTricks::RemoteIO do
       it 'returns the last N bytes it can read' do
         at_end = @buf.size - 4
         @subject.seek(at_end, IO::SEEK_SET)
-        
+
         expect(@subject.pos).to eq(15728636)
         bytes_read = @subject.read(10)
         expect(@subject.pos).to eq(@buf.size) # Should have moved the pos pointer to the end
-        
+
         expect(bytes_read.bytesize).to eq(4)
 
         expect(@subject.pos).to eq(@buf.size)

data/spec/zip_tricks/remote_uncap_spec.rb

@@ -6,16 +6,16 @@ describe ZipTricks::RemoteUncap, webmock: true do
   after :each do
     File.unlink('temp.zip') rescue Errno::ENOENT
   end
-  
+
   it 'returns an array of remote entries that can be used to fetch the segments from within the ZIP' do
     payload1 = Tempfile.new 'payload1'
     payload1 << Random.new.bytes((1024 * 1024 * 5) + 10)
     payload1.flush; payload1.rewind;
-    
+
     payload2 = Tempfile.new 'payload2'
     payload2 << Random.new.bytes(1024 * 1024 * 3)
     payload2.flush; payload2.rewind
-    
+
     payload1_crc = Zlib.crc32(payload1.read).tap { payload1.rewind }
     payload2_crc = Zlib.crc32(payload2.read).tap { payload2.rewind }
 
@@ -32,9 +32,9 @@ describe ZipTricks::RemoteUncap, webmock: true do
       end
     end
     payload1.rewind; payload2.rewind
-    
+
     expect(File).to be_exist('temp.zip')
-    
+
     allow_any_instance_of(described_class).to receive(:request_object_size) {
       File.size('temp.zip')
     }
@@ -44,22 +44,22 @@ describe ZipTricks::RemoteUncap, webmock: true do
         f.read(range.end - range.begin + 1)
       end
     }
-    
+
     payload1.rewind; payload2.rewind
-    
+
     files = described_class.files_within_zip_at('http://fake.example.com')
     expect(files).to be_kind_of(Array)
     expect(files.length).to eq(2)
-    
+
     first, second = *files
-    
+
     expect(first.name).to eq('first-file.bin')
     expect(first.size_uncompressed).to eq(payload1.size)
     File.open('temp.zip', 'rb') do |readback|
       readback.seek(first.starts_at_offset, IO::SEEK_SET)
       expect(readback.read(12)).to eq(payload1.read(12))
     end
-    
+
     expect(second.name).to eq('second-file.bin')
     expect(second.size_uncompressed).to eq(payload2.size)
     File.open('temp.zip', 'rb') do |readback|
@@ -67,15 +67,15 @@ describe ZipTricks::RemoteUncap, webmock: true do
       expect(readback.read(12)).to eq(payload2.read(12))
     end
   end
-  
+
   it 'can cope with an empty file within the zip' do
     payload1 = Tempfile.new 'payload1'
     payload1.flush; payload1.rewind;
-    
+
     payload2 = Tempfile.new 'payload2'
     payload2 << Random.new.bytes(1024)
     payload2.flush; payload2.rewind
-    
+
     payload1_crc = Zlib.crc32(payload1.read).tap { payload1.rewind }
     payload2_crc = Zlib.crc32(payload2.read).tap { payload2.rewind }
 
@@ -90,9 +90,9 @@ describe ZipTricks::RemoteUncap, webmock: true do
       end
     end
     payload1.rewind; payload2.rewind
-    
+
     expect(File).to be_exist('temp.zip')
-    
+
     allow_any_instance_of(described_class).to receive(:request_object_size) {
       File.size('temp.zip')
     }
@@ -102,22 +102,22 @@ describe ZipTricks::RemoteUncap, webmock: true do
         f.read(range.end - range.begin + 1)
       end
     }
-    
+
     payload1.rewind; payload2.rewind
-    
+
     files = described_class.files_within_zip_at('http://fake.example.com')
     expect(files).to be_kind_of(Array)
     expect(files.length).to eq(2)
-    
+
     first, second = *files
-    
+
     expect(first.name).to eq('first-file.bin')
     expect(first.size_uncompressed).to eq(payload1.size)
     File.open('temp.zip', 'rb') do |readback|
       readback.seek(first.starts_at_offset, IO::SEEK_SET)
       expect(readback.read(0)).to eq(payload1.read(0))
     end
-    
+
     expect(second.name).to eq('second-file.bin')
     expect(second.size_uncompressed).to eq(payload2.size)
     File.open('temp.zip', 'rb') do |readback|

data/spec/zip_tricks/stored_size_estimator_spec.rb

@@ -6,17 +6,17 @@ describe ZipTricks::StoredSizeEstimator do
     raw_file_1 = SecureRandom.random_bytes(1024 * 20)
     raw_file_2 = SecureRandom.random_bytes(1024 * 128)
     raw_file_3 = SecureRandom.random_bytes(1258695)
-    
+
     predicted_size = described_class.perform_fake_archiving do | estimator |
       r = estimator.add_stored_entry("first-file.bin", raw_file_1.size)
       expect(r).to eq(estimator), "add_stored_entry should return self"
-      
+
       estimator.add_stored_entry("second-file.bin", raw_file_2.size)
-      
+
       r = estimator.add_compressed_entry("second-file.bin", raw_file_2.size, raw_file_3.size)
       expect(r).to eq(estimator), "add_compressed_entry should return self"
     end
-    
+
     expect(predicted_size).to eq(1410524)
   end
 end

data/spec/zip_tricks/stream_crc32_spec.rb

@@ -7,29 +7,29 @@ describe ZipTricks::StreamCRC32 do
     via_from_io = described_class.from_io(raw)
     expect(via_from_io).to eq(crc)
   end
-  
+
   it 'allows in-place updates' do
     raw = StringIO.new(SecureRandom.random_bytes(45 * 1024 * 1024))
     crc = Zlib.crc32(raw.string)
-    
+
     stream_crc = described_class.new
     stream_crc << raw.read(1024 * 64) until raw.eof?
     expect(stream_crc.to_i).to eq(crc)
   end
-  
+
   it 'supports chained shovel' do
     str = 'abcdef'
     crc = Zlib.crc32(str)
-    
+
     stream_crc = described_class.new
     stream_crc << 'a' << 'b' << 'c' << 'd' << 'e' << 'f'
-    
+
     expect(stream_crc.to_i).to eq(crc)
   end
-  
+
   it 'allows in-place update with a known value' do
     crc = Zlib.crc32
-    
+
     stream_crc = described_class.new
     stream_crc << "This is some data"
     stream_crc.append(45678, 12910)