zip_tricks 4.5.0 → 4.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd1865613940a7038642206baf6cd58457b87ff5
-  data.tar.gz: 3ebda3c665c9671d9f033d6f768ccdc800d7f2f9
+  metadata.gz: e248ba8b5366308587a9a56968b14d3f9625b905
+  data.tar.gz: 7038b66a1cf64ee3dc745be2c9d558825aa8673b
 SHA512:
-  metadata.gz: c16f15ab10788d90fe96e61e8ecf20a20eee6a7e94d2d22538c34964d51eb9ee4cc64459dd46997f2b994212944e34e8162d7880ff4d79343c86a5d1ed09fd77
-  data.tar.gz: da1d6e24031365ea67fc2fa0fbf3096f57b007c6ac35449b57b1783eecfa703d530c1c695429335bee252a841da6722f3bca341bd6fc8c5e9e24bf6379edee76
+  metadata.gz: 5c849e7ba92b7f7d7b6af57447c703f970b71a00ba25bcd0fc7ff632ef93d61169cbbafc505e82b0d0a3e96631db0b2e400b23dc31e1dda161456db1eda8d9d6
+  data.tar.gz: 22f7c757eb8117ae48292158a657f8b288efd9b56b7c85a94323590fd3f607d033a2a3e7d61849b786435ccd8f34ee7971ee66f2c9d951f44128343de773b5e1

data/.rubocop.yml

@@ -77,3 +77,6 @@ Layout/SpaceInsideHashLiteralBraces:
 
 Style/Alias:
   EnforcedStyle: prefer_alias_method
+
+Style/ZeroLengthPredicate:
+  Enabled: false # Does not work for StringIOs

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.5.1
+
+* Speed up CRC32 calculation using a buffer of 5MB (have to combine CRCs less often)
+
 ## 4.5.0
 
 * Rename `Streamer#add_compressed_entry` and `SizeEstimator#add_compressed_entry` to `add_deflated_entry`

data/lib/zip_tricks/stream_crc32.rb

@@ -2,18 +2,21 @@
 
 # A simple stateful class for keeping track of a CRC32 value through multiple writes
 class ZipTricks::StreamCRC32
+  BUFFER_SIZE = 1024 * 1024 * 5
+
   # Compute a CRC32 value from an IO object. The object should respond to `read` and `eof?`
   #
   # @param io[IO] the IO to read the data from
   # @return [Fixnum] the computed CRC32 value
   def self.from_io(io)
     crc = new
-    crc << io.read(1024 * 512) until io.eof?
+    crc << io.read(BUFFER_SIZE) until io.eof?
     crc.to_i
   end
 
   # Creates a new streaming CRC32 calculator
   def initialize
+    @buf = StringIO.new
     @crc = Zlib.crc32('')
   end
 
@@ -22,7 +25,8 @@ class ZipTricks::StreamCRC32
   # @param blob[String] the string to compute the CRC32 from
   # @return [self]
   def <<(blob)
-    @crc = Zlib.crc32_combine(@crc, Zlib.crc32(blob), blob.bytesize)
+    @buf << blob
+    buf_flush if @buf.size > BUFFER_SIZE
     self
   end
 
@@ -30,6 +34,7 @@ class ZipTricks::StreamCRC32
   #
   # @return [Fixnum] the updated CRC32 value for all the blobs so far
   def to_i
+    buf_flush if @buf.size > 0
     @crc
   end
 
@@ -40,6 +45,15 @@ class ZipTricks::StreamCRC32
   # @param blob_size[Fixnum] the size of the daata the `crc32` is computed from
   # @return [Fixnum] the updated CRC32 value for all the blobs so far
   def append(crc32, blob_size)
+    buf_flush if @buf.size > 0
     @crc = Zlib.crc32_combine(@crc, crc32, blob_size)
   end
+
+  private
+
+  def buf_flush
+    @crc = Zlib.crc32_combine(@crc, Zlib.crc32(@buf.string), @buf.size)
+    @buf.truncate(0)
+    @buf.rewind
+  end
 end

data/lib/zip_tricks/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZipTricks
-  VERSION = '4.5.0'
+  VERSION = '4.5.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zip_tricks
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.5.1
 platform: ruby
 authors:
 - Julik Tarkhanov