zip_tricks 4.4.1 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4fb7180cf39e2f4acbae7edc62614e0d391f5ab
-  data.tar.gz: 88bcc21c47233036a05f5a8cd1d4a99f8eecc1fc
+  metadata.gz: c690345707197b65846cdbda6096a94321edd088
+  data.tar.gz: 23fb11b83016deacb2d94f6fb7ac8a5a2f8a6821
 SHA512:
-  metadata.gz: d6fd5a5d297bc276c3f0853561490611bd42dc014d764eb6f9d9e297592703aaf9b5116409589d380f35d25d8f83cfee7217098f808fd07f3b134123c53b9b70
-  data.tar.gz: 29e47a62795eaffd99c2c8e8b17bbedb51cc7f3f470802b6f73412ecbe1751585387c5bdd82e7115600ad06821e5d75bead2d96f9870526a481f228f87c572ad
+  metadata.gz: 854c3bd1a6d7d52f83187f925736f610fcc564a3fa892007b27ca4dc8ace5548d56fc872cf6acec2e6395dc70638b97beda07f29877bbe4562d736839ddea0b6
+  data.tar.gz: 475035d3ec2229b154b264bf1b0e7dc8ada36b008cbfea64323bf8e251d54c553957dadac5fa16b0f322ba8c35bc88ca933243325b72a34d2c9533d9d853dffa

data/.travis.yml

@@ -2,6 +2,7 @@ rvm:
 - 2.1
 - 2.2
 - 2.3.0
+- 2.4.1
 - jruby-9.0
 sudo: false
 cache: bundler

data/CHANGELOG.md

@@ -0,0 +1,119 @@
+## 4.4.2
+
+* Add 2.4 to Travis rubies
+* Fix a severe performance degradation in Streamer with large file counts (https://github.com/WeTransfer/zip_tricks/pull/14)
+
+## 4.4.1
+
+* Tweak documentation a little
+
+## 4.4.0
+
+* Add `Streamer#add_empty_directory_entry` for writing empty directories/folders into the ZIP
+
+## 4.3.0
+
+* Add a native Rails streaming module for easier integration of ZipTricks into Rails controllers
+
+## 4.2.4
+
+* Get rid of Jeweler in favor of the standard Bundler/rubygems gem tasks
+
+## 4.2.3
+
+* Instead of BlockWrite, use intrim flushes of the same zlib Deflater
+
+## 4.2.2
+
+* Rewrite small data writes to perform less calls to `pack`
+
+## 4.2.1
+
+* Uniquify filenames during writes, so that the caller doesn't have to.
+
+## 4.2.0
+
+* Make it possible to swap the destination for Streamer writes, to improve `Range` support in the
+  download server. Sometimes it might be useful to actually "redirect" the output to a different IO
+  or buffer, without having to provide our own implementation of this switching.
+
+## 4.1.0
+
+* Implement brute-force straight-ahead reading of local file headers, for damaged or
+  incomplete ZIP files
+
+## 4.0.0
+
+* Make reading local headers optional, since we need it but we don't have to use it for all archives. Ideally
+  we should only do it when a reasonable central directory cannot be found. This can also happen under normal
+  usage, when we are dealing with a ZIP-within-a-ZIP or when the end of the ZIP file has been truncated on
+  write.
+* Make sure `Writable#write` returns the number of bytes written (fix `IO.copy_stream` compatibility)
+
+## 3.1.1
+
+* Fix reading Zip64 extra fields. Only read fields that have corresponding "normal" fields set to overflow value.
+
+## 3.1.0
+
+* Fix `FileReader` failing where the EOCD marker would be detected multiple times at the end of a ZIP, which
+  is something that _can_ happen during normal usage - a byte pattern has to appear twice to trigger the bug.
+* Add support for archive comment customization
+
+## 2.8.1
+
+* Fix the bug with older versions of The Unarchiver refusing to open our Zip64 files
+
+## 2.8.0
+
+* Replace RubyZip with a clean-room ZIP writer, due to the overly elaborate Java-esque structure of RubyZip being hostile
+  to modifications. The straw that broke the camel's back in this case is the insistence of RubyZip on writing out padding
+  for the Zip64 extra fields in the local entries that it would never replace with useful data, which was breaking unarchiving
+  when using Windows Explorer.
+  
+## 2.7.0
+
+* Add `Streamer#write` so that the Streamer can be used as argument to `IO.copy_stream`
+
+## 2.6.1
+
+* Fi 0-byte reads in RemoteIO of RemoteUncap
+
+## 2.6.0
+
+* Set up open-source facilities (Github, Travis CI...)
+* Add RemoteUncap for listing ZIP archives located on HTTP servers without having to download them.
+  RemoteUncap downloads the central directory only using HTTP `Range` headers.
+
+## 2.5.0
+
+* Add Manifest for building a map of the ZIP file (for later Range support)
+
+## 2.4.3  (Internal rel)
+
+* Extract [very_tiny_state_machine](https://rubygems.org/gems/very_tiny_state_machine) gem from ZipTricks
+
+## 2.4.1  (Internal rel)
+
+* Include StreamCRC32 in the README
+
+## 2.3.1  (Internal rel)
+
+* Restore a streaming CRC facility
+
+## 2.2.1  (Internal rel)
+
+* Ensure WriteAndTell plays nice with strings in other encodings than BINARY
+
+## 2.2.0  (Internal rel)
+
+* Fix bytes_written return from deflate_in_blocks
+* Raise on invalid Streamer IO arguments
+* Set the EFS flag for UTF-8 filenames
+* Add a RackBody object for plugging ZipTricks into Rack
+* Add an offset wrapper for IOs given to Streamer, to support size estimation
+* Ensure the given compression level is supported
+
+## 2.0.0 (Internal rel)
+
+* Implements streaming zip based on RubyZip

data/lib/zip_tricks/streamer.rb

@@ -94,6 +94,7 @@ class ZipTricks::Streamer
     @out = stream
     @files = []
     @local_header_offsets = []
+    @filenames_set = Set.new
     @writer = writer
   end
 
@@ -183,7 +184,7 @@ class ZipTricks::Streamer
     crc, comp, uncomp = w.finish
 
     # Save the information into the entry for when the time comes to write out the central directory
-    last_entry = @files[-1]
+    last_entry = @files.last
     last_entry.crc32 = crc
     last_entry.compressed_size = comp
     last_entry.uncompressed_size = uncomp
@@ -257,13 +258,14 @@ class ZipTricks::Streamer
 
     # Clean backslashes and uniqify filenames if there are duplicates
     filename = remove_backslash(filename)
-    filename = uniquify_name(filename) if @files.any? { |e| e.filename == filename }
+    filename = uniquify_name(filename) if @filenames_set.include?(filename)
 
     raise UnknownMode, "Unknown compression mode #{storage_mode}" unless [STORED, DEFLATED].include?(storage_mode)
     raise Overflow, "Filename is too long" if filename.bytesize > 0xFFFF
 
     e = Entry.new(filename, crc32, compressed_size, uncompressed_size, storage_mode, mtime=Time.now.utc, use_data_descriptor)
     @files << e
+    @filenames_set << e.filename
     @local_header_offsets << @out.tell
     @writer.write_local_file_header(io: @out, gp_flags: e.gp_flags, crc32: e.crc32, compressed_size: e.compressed_size,
       uncompressed_size: e.uncompressed_size, mtime: e.mtime, filename: e.filename, storage_mode: e.storage_mode)
@@ -279,7 +281,6 @@ class ZipTricks::Streamer
   end
 
   def uniquify_name(filename)
-    files = Set.new(@files.map(&:filename))
     copy_pattern = /\((\d+)\)$/ # we add (1), (2), (n) at the end of a filename if there is a duplicate
     parts = filename.split(".")
     ext = if parts.last =~ /gz|zip/ && parts.size > 2
@@ -297,7 +298,7 @@ class ZipTricks::Streamer
         fn_last_part = "#{fn_last_part} (#{duplicate_counter})"
       end
       new_filename = (parts + [fn_last_part, ext]).compact.join(".")
-      return new_filename unless files.include?(new_filename)
+      return new_filename unless @filenames_set.include?(new_filename)
       duplicate_counter += 1
     end
   end

data/lib/zip_tricks/version.rb

@@ -1,3 +1,3 @@
 module ZipTricks
-  VERSION = '4.4.1'
+  VERSION = '4.4.2'
 end

data/zip_tricks.gemspec

@@ -33,9 +33,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubyzip', '~> 1.1'
   spec.add_development_dependency 'terminal-table'
   spec.add_development_dependency 'range_utils'
+  
   spec.add_development_dependency 'rack', '~> 1.6' # For Jeweler
   spec.add_development_dependency 'rake', '~> 10.4'
-  spec.add_development_dependency "rspec", "~> 3.2.0", '< 3.3'
+  spec.add_development_dependency "rspec", "~> 3"
+  spec.add_development_dependency 'complexity_assert'
   spec.add_development_dependency 'coderay'
   spec.add_development_dependency "yard", "~> 0.9"
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zip_tricks
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.4.2
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,20 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
-    - - "<"
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: complexity_assert
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +162,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - ".yardopts"
+- CHANGELOG.md
 - Gemfile
 - IMPLEMENTATION_DETAILS.md
 - LICENSE.txt
@@ -213,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Stream out ZIP files from Ruby