rubyzip 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 869a32fef1374d44c2d01fcf90d92d10760ceb619cbc2ccb545f7753503efee4
-  data.tar.gz: 9eb0b0601572717187029c44fbcfdd7fa3a47005d869d8aea2b36ab465b18de5
+  metadata.gz: 169fa7d5832e775e15c2f8a409a35e9da32c0177117039f089f9fa1646aa281e
+  data.tar.gz: 9b4fb8929262cb097e3631ad8d8a9efa98d691488ce79e37092df4de27204aea
 SHA512:
-  metadata.gz: 8cc3d0b1cb58eabdafb91db1cc8e7a2ef3932bcaf993df9a8c21ae261d480ffa43d431111faa11f5e19e52aa59a70e14a4724bbd174a8628a7ffacb48119ccdb
-  data.tar.gz: 1171566d3c91b07b01e3f5fe77e9d098f6c5fa6f94891cf289c1edbaa35bbe2a3a96165bebfcb7b35f2d41eedb268b13e90aab27683cd05175ea0ffbc9a485c6
+  metadata.gz: 4bc8630670298d013486cf4632084554a10ed2ba327c2b54f65c105602f31ca84b87a42976fa1a606226d7cc5b88ecbc356f8a0932a9a53880e0b68c4b7f6275
+  data.tar.gz: 4cc717180899d18767c73913fa16abaafeb3624167fc2c4e14a43dde406eef815d9791e84a7bb9f018a255e32d08109dc01efdd8844cc1503a85ac8d931d4b22

data/Changelog.md

@@ -1,3 +1,14 @@
+# 3.2.0 (2025-10-14)
+
+- Add option to suppress extra fields. [#653](https://github.com/rubyzip/rubyzip/pull/653) (fixes [#34](https://github.com/rubyzip/rubyzip/issues/34), [#398](https://github.com/rubyzip/rubyzip/issues/398) and [#648](https://github.com/rubyzip/rubyzip/issues/648))
+
+Tooling/internal:
+
+- Entry: clean up reading and writing the Central Directory headers.
+- Improve Zip64 tests for `OutputStream`.
+- Extra fields: use symbols as indices as opposed to strings.
+- Ensure that `Unknown` extra field has a superclass.
+
 # 3.1.1 (2025-09-26)
 
 - Improve the IO pipeline when decompressing. [#649](https://github.com/rubyzip/rubyzip/pull/649) (which also fixes [#647](https://github.com/rubyzip/rubyzip/issues/647))

data/README.md

@@ -67,6 +67,48 @@ Zip::File.open(zipfile_name, create: true) do |zipfile|
 end
 ```
 
+### Creating a Zip file with `Zip::OutputStream`
+
+```ruby
+require 'rubygems'
+require 'zip'
+
+Zip::OutputStream.open('archive.zip') do |zos|
+  # Quick.
+  zos.put_next_entry('greeting.txt')
+  zos << 'Hello, World!'
+
+  # More control.
+  # You MUST NOT make any calls on your `Entry` after calling `put_next_entry`.
+  entry = Zip::Entry.new(nil, 'parting.txt')
+  entry.atime = Time.now
+  zos.put_next_entry(entry)
+  zos.write('TTFN')
+end
+```
+
+You can generate a Zip archive in memory using `Zip::OutputStream.write_buffer`.
+
+### Suppressing extra fields
+
+If you wish to suppress extra fields from being added to your entries, you can do so by passing the `suppress_extra_fields` parameter to any of the archive opening calls within `Zip::File` or `Zip::OutputStream`, e.g.:
+
+```ruby
+# Suppress all extra fields.
+Zip::File.open('archive.zip', create: true, suppress_extra_fields: true)
+Zip::OutputStream.open('archive.zip', suppress_extra_fields: true)
+
+# Suppress an individual extra field.
+Zip::File.open('archive.zip', create: true, suppress_extra_fields: :zip64)
+Zip::OutputStream.open('archive.zip', suppress_extra_fields: :zip64)
+
+# Suppress multiple extra fields.
+Zip::File.open('archive.zip', create: true, suppress_extra_fields: [:ntfs, :zip64])
+Zip::OutputStream.open('archive.zip', suppress_extra_fields: [:ntfs, :zip64])
+```
+
+Note that there are some extra fields that cannot be suppressed at all (e.g. `:aes`), and some which will only be suppressed if it is safe to do so (e.g. `:zip64`).
+
 ### Zipping a directory recursively
 
 Copy from [here](https://github.com/rubyzip/rubyzip/blob/9d891f7353e66052283562d3e252fe380bb4b199/samples/example_recursive.rb)
@@ -180,7 +222,7 @@ Zip::File.open('foo.zip') do |zip_file|
 end
 ```
 
-### Notes on `Zip::InputStream`
+### Reading a Zip file with `Zip::InputStream`
 
 `Zip::InputStream` can be used for faster reading of zip file content because it does not read the Central directory up front.
 
@@ -190,14 +232,14 @@ There is one exception where it can not work however, and this is if the file do
 
 If `Zip::InputStream` finds such an entry in the zip archive it will raise an exception (`Zip::StreamingError`).
 
-`Zip::InputStream` is not designed to be used for random access in a zip file. When performing any operations on an entry that you are accessing via `Zip::InputStream.get_next_entry` then you should complete any such operations before the next call to `get_next_entry`.
+`Zip::InputStream` is not designed to be used for random access in a zip file. When performing any operations on an entry that you are accessing via `Zip::InputStream#get_next_entry` then you should complete any such operations before the next call to `get_next_entry`.
 
 ```ruby
-zip_stream = Zip::InputStream.new(File.open('file.zip'))
-
-while entry = zip_stream.get_next_entry
-  # All required operations on `entry` go here.
-end
+Zip::InputStream.open('file.zip') do |zip_stream|
+  while entry = zip_stream.get_next_entry
+    # All required operations on `entry` go here.
+  end
+end # The `InputStream` is closed at the end of the block.
 ```
 
 Any attempt to move about in a zip file opened with `Zip::InputStream` could result in the incorrect entry being accessed and/or Zlib buffer errors. If you need random access in a zip file, use `Zip::File`.

data/lib/zip/central_directory.rb

@@ -39,9 +39,11 @@ module Zip
       read_central_directory_entries(io)
     end
 
-    def write_to_stream(io) # :nodoc:
+    def write_to_stream(io, suppress_extra_fields: false) # :nodoc:
       cdir_offset = io.tell
-      @entry_set.each { |entry| entry.write_c_dir_entry(io) }
+      @entry_set.each do |entry|
+        entry.write_c_dir_entry(io, suppress_extra_fields: suppress_extra_fields)
+      end
       eocd_offset = io.tell
       cdir_size = eocd_offset - cdir_offset
       if Zip.write_zip64_support &&
@@ -182,7 +184,7 @@ module Zip
         next unless entry
 
         offset = if entry.zip64?
-                   entry.extra['Zip64'].relative_header_offset
+                   entry.extra[:zip64].relative_header_offset
                  else
                    entry.local_header_offset
                  end

data/lib/zip/entry.rb

@@ -127,10 +127,10 @@ module Zip
     # Returns modification time by default.
     def time(component: :mtime)
       time =
-        if @extra['UniversalTime']
-          @extra['UniversalTime'].send(component)
-        elsif @extra['NTFS']
-          @extra['NTFS'].send(component)
+        if @extra[:universaltime]
+          @extra[:universaltime].send(component)
+        elsif @extra[:ntfs]
+          @extra[:ntfs].send(component)
         end
 
       # Standard time field in central directory has local time
@@ -155,13 +155,13 @@ module Zip
     # Sets modification time by default.
     def time=(value, component: :mtime)
       @dirty = true
-      unless @extra.member?('UniversalTime') || @extra.member?('NTFS')
-        @extra.create('UniversalTime')
+      unless @extra.member?(:universaltime) || @extra.member?(:ntfs)
+        @extra.create(:universaltime)
       end
 
       value = DOSTime.from_time(value)
       comp = "#{component}=" unless component.to_s.end_with?('=')
-      (@extra['UniversalTime'] || @extra['NTFS']).send(comp, value)
+      (@extra[:universaltime] || @extra[:ntfs]).send(comp, value)
       @time = value if component == :mtime
     end
 
@@ -179,7 +179,7 @@ module Zip
 
     # Does this entry return time fields with accurate timezone information?
     def absolute_time?
-      @extra.member?('UniversalTime') || @extra.member?('NTFS')
+      @extra.member?(:universaltime) || @extra.member?(:ntfs)
     end
 
     # Return the compression method for this entry.
@@ -200,12 +200,12 @@ module Zip
 
     # Does this entry use the ZIP64 extensions?
     def zip64?
-      !@extra['Zip64'].nil?
+      !@extra[:zip64].nil?
     end
 
     # Is this entry encrypted with AES encryption?
     def aes?
-      !@extra['AES'].nil?
+      !@extra[:aes].nil?
     end
 
     def file_type_is?(type) # :nodoc:
@@ -392,7 +392,7 @@ module Zip
     end
 
     def pack_local_entry # :nodoc:
-      zip64 = @extra['Zip64']
+      zip64 = @extra[:zip64]
       [::Zip::LOCAL_ENTRY_SIGNATURE,
        @version_needed_to_extract, # version needed to extract
        @gp_flags, # @gp_flags
@@ -406,9 +406,17 @@ module Zip
        @extra ? @extra.local_size : 0].pack('VvvvvvVVVvv')
     end
 
-    def write_local_entry(io, rewrite: false) # :nodoc:
+    def write_local_entry(io, suppress_extra_fields: false, rewrite: false) # :nodoc:
       prep_local_zip64_extra
-      verify_local_header_size! if rewrite
+
+      # If we are rewriting the local header, then we verify that we haven't changed
+      # its size. At this point we have to keep extra fields if they are present.
+      if rewrite
+        verify_local_header_size!
+      elsif suppress_extra_fields
+        @extra.suppress_fields!(suppress_extra_fields)
+      end
+
       @local_header_offset = io.tell
 
       io << pack_local_entry
@@ -436,10 +444,7 @@ module Zip
         _, # diskNumberStart
         @internal_file_attributes,
         @external_file_attributes,
-        @local_header_offset,
-        @name,
-        @extra,
-        @comment = buf.unpack('VCCvvvvvVVVvvvvvVV')
+        @local_header_offset = buf.unpack('VCCvvvvvVVVvvvvvVV')
     end
 
     def set_ftype_from_c_dir_entry # :nodoc:
@@ -566,7 +571,7 @@ module Zip
     end
 
     def pack_c_dir_entry # :nodoc:
-      zip64 = @extra['Zip64']
+      zip64 = @extra[:zip64]
       [
         @header_signature,
         @version, # version of encoding software
@@ -585,14 +590,11 @@ module Zip
         zip64 && zip64.disk_start_number ? 0xFFFF : 0, # disk number start
         @internal_file_attributes, # file type (binary=0, text=1)
         @external_file_attributes, # native filesystem attributes
-        zip64 && zip64.relative_header_offset ? 0xFFFFFFFF : @local_header_offset,
-        @name,
-        @extra,
-        @comment
+        zip64 && zip64.relative_header_offset ? 0xFFFFFFFF : @local_header_offset
       ].pack('VCCvvvvvVVVvvvvvVV')
     end
 
-    def write_c_dir_entry(io) # :nodoc:
+    def write_c_dir_entry(io, suppress_extra_fields: false) # :nodoc:
       prep_cdir_zip64_extra
 
       case @fstype
@@ -614,6 +616,7 @@ module Zip
         end
       end
 
+      @extra.suppress_fields!(suppress_extra_fields) if suppress_extra_fields
       io << pack_c_dir_entry
 
       io << @name
@@ -799,9 +802,9 @@ module Zip
       return unless zip64?
 
       if for_local_header
-        @size, @compressed_size = @extra['Zip64'].parse(@size, @compressed_size)
+        @size, @compressed_size = @extra[:zip64].parse(@size, @compressed_size)
       else
-        @size, @compressed_size, @local_header_offset = @extra['Zip64'].parse(
+        @size, @compressed_size, @local_header_offset = @extra[:zip64].parse(
           @size, @compressed_size, @local_header_offset
         )
       end
@@ -810,15 +813,15 @@ module Zip
     def parse_aes_extra # :nodoc:
       return unless aes?
 
-      if @extra['AES'].vendor_id != 'AE'
-        raise Error, "Unsupported encryption method #{@extra['AES'].vendor_id}"
+      if @extra[:aes].vendor_id != 'AE'
+        raise Error, "Unsupported encryption method #{@extra[:aes].vendor_id}"
       end
 
-      unless ::Zip::AESEncryption::VERSIONS.include? @extra['AES'].vendor_version
-        raise Error, "Unsupported encryption style #{@extra['AES'].vendor_version}"
+      unless ::Zip::AESEncryption::VERSIONS.include? @extra[:aes].vendor_version
+        raise Error, "Unsupported encryption style #{@extra[:aes].vendor_version}"
       end
 
-      @compression_method = @extra['AES'].compression_method if ftype != :directory
+      @compression_method = @extra[:aes].compression_method if ftype != :directory
     end
 
     # For DEFLATED compression *only*: set the general purpose flags 1 and 2 to
@@ -851,7 +854,7 @@ module Zip
       # If we already have a ZIP64 extra (placeholder) then we must fill it in.
       if zip64? || @size.nil? || @size >= 0xFFFFFFFF || @compressed_size >= 0xFFFFFFFF
         @version_needed_to_extract = VERSION_NEEDED_TO_EXTRACT_ZIP64
-        zip64 = @extra['Zip64'] || @extra.create('Zip64')
+        zip64 = @extra[:zip64] || @extra.create(:zip64)
 
         # Local header always includes size and compressed size.
         zip64.original_size = @size || 0
@@ -865,7 +868,7 @@ module Zip
       if (@size && @size >= 0xFFFFFFFF) || @compressed_size >= 0xFFFFFFFF ||
          @local_header_offset >= 0xFFFFFFFF
         @version_needed_to_extract = VERSION_NEEDED_TO_EXTRACT_ZIP64
-        zip64 = @extra['Zip64'] || @extra.create('Zip64')
+        zip64 = @extra[:zip64] || @extra.create(:zip64)
 
         # Central directory entry entries include whichever fields are necessary.
         zip64.original_size = @size if @size && @size >= 0xFFFFFFFF

data/lib/zip/extra_field/aes.rb

@@ -33,6 +33,11 @@ module Zip
         @encryption_strength, @compression_method = content.unpack('va2Cv')
     end
 
+    # We can never suppress the AES extra field as it is needed to read the file.
+    def suppress?
+      false
+    end
+
     def pack_for_local
       [@vendor_version, @vendor_id,
        @encryption_strength, @compression_method].pack('va2Cv')

data/lib/zip/extra_field/generic.rb

@@ -9,7 +9,7 @@ module Zip
     end
 
     def self.name
-      @name ||= to_s.split('::')[-1]
+      @name ||= to_s.split('::').last.downcase.to_sym
     end
 
     # return field [size, content] or false
@@ -24,6 +24,12 @@ module Zip
       [binstr[2, 2].unpack1('v'), binstr[4..]]
     end
 
+    # Default strategy is to suppress all extra fields if we're asked to.
+    # Specific extra field types can override this if they need to be kept.
+    def suppress?
+      true
+    end
+
     def to_local_bin
       s = pack_for_local
       (self.class.const_get(:HEADER_ID) + [s.bytesize].pack('v')) << s

data/lib/zip/extra_field/unknown.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
+require_relative 'generic'
+
 module Zip
   # A class to hold unknown extra fields so that they are preserved.
-  class ExtraField::Unknown # :nodoc:
+  class ExtraField::Unknown < ExtraField::Generic # :nodoc:
     def initialize
       @local_bin = +''
       @cdir_bin = +''

data/lib/zip/extra_field/zip64.rb

@@ -56,6 +56,13 @@ module Zip
     end
     private :extract
 
+    # We can suppress the zip64 extra field unless we know the size is large or
+    # the relative header offset is large (for central directory entries).
+    def suppress?
+      !(@original_size && @original_size >= 0xFFFFFFFF) ||
+        (@relative_header_offset && @relative_header_offset >= 0xFFFFFFFF)
+    end
+
     def pack_for_local
       # Local header entries must contain original size and compressed size;
       # other fields do not apply.

data/lib/zip/extra_field.rb

@@ -19,14 +19,14 @@ module Zip
     end
 
     def extra_field_type_unknown(binstr, len, index, local)
-      self['Unknown'] ||= Unknown.new
+      self[:unknown] ||= Unknown.new
 
       if !len || len + 4 > binstr[index..].bytesize
-        self['Unknown'].merge(binstr[index..], local: local)
+        self[:unknown].merge(binstr[index..], local: local)
         return
       end
 
-      self['Unknown'].merge(binstr[index, len + 4], local: local)
+      self[:unknown].merge(binstr[index, len + 4], local: local)
     end
 
     def merge(binstr, local: false)
@@ -57,10 +57,17 @@ module Zip
     # signature/size does not prevent known fields from being read back in.
     def ordered_values
       result = []
-      each { |k, v| k == 'Unknown' ? result.push(v) : result.unshift(v) }
+      each { |k, v| k == :unknown ? result.push(v) : result.unshift(v) }
       result
     end
 
+    # Remove any extra fields that indicate they can be safely suppressed.
+    def suppress_fields!(fields)
+      reject! do |k, v|
+        v.suppress? if fields == true || [*fields].include?(k)
+      end
+    end
+
     def to_local_bin
       ordered_values.map! { |v| v.to_local_bin.force_encoding('BINARY') }.join
     end

data/lib/zip/file.rb

@@ -76,7 +76,8 @@ module Zip
                    restore_ownership: DEFAULT_RESTORE_OPTIONS[:restore_ownership],
                    restore_permissions: DEFAULT_RESTORE_OPTIONS[:restore_permissions],
                    restore_times: DEFAULT_RESTORE_OPTIONS[:restore_times],
-                   compression_level: ::Zip.default_compression)
+                   compression_level: ::Zip.default_compression,
+                   suppress_extra_fields: false)
       super()
 
       @name    = path_or_io.respond_to?(:path) ? path_or_io.path : path_or_io
@@ -84,10 +85,11 @@ module Zip
 
       initialize_cdir(path_or_io, buffer: buffer)
 
-      @restore_ownership   = restore_ownership
-      @restore_permissions = restore_permissions
-      @restore_times       = restore_times
-      @compression_level   = compression_level
+      @restore_ownership     = restore_ownership
+      @restore_permissions   = restore_permissions
+      @restore_times         = restore_times
+      @compression_level     = compression_level
+      @suppress_extra_fields = suppress_extra_fields
     end
 
     class << self
@@ -98,12 +100,14 @@ module Zip
                restore_ownership: DEFAULT_RESTORE_OPTIONS[:restore_ownership],
                restore_permissions: DEFAULT_RESTORE_OPTIONS[:restore_permissions],
                restore_times: DEFAULT_RESTORE_OPTIONS[:restore_times],
-               compression_level: ::Zip.default_compression)
-        zf = ::Zip::File.new(file_name, create:              create,
-                                        restore_ownership:   restore_ownership,
-                                        restore_permissions: restore_permissions,
-                                        restore_times:       restore_times,
-                                        compression_level:   compression_level)
+               compression_level: ::Zip.default_compression,
+               suppress_extra_fields: false)
+        zf = ::Zip::File.new(file_name, create:                create,
+                                        restore_ownership:     restore_ownership,
+                                        restore_permissions:   restore_permissions,
+                                        restore_times:         restore_times,
+                                        compression_level:     compression_level,
+                                        suppress_extra_fields: suppress_extra_fields)
 
         return zf unless block_given?
 
@@ -122,7 +126,8 @@ module Zip
                       restore_ownership: DEFAULT_RESTORE_OPTIONS[:restore_ownership],
                       restore_permissions: DEFAULT_RESTORE_OPTIONS[:restore_permissions],
                       restore_times: DEFAULT_RESTORE_OPTIONS[:restore_times],
-                      compression_level: ::Zip.default_compression)
+                      compression_level: ::Zip.default_compression,
+                      suppress_extra_fields: false)
         unless IO_METHODS.map { |method| io.respond_to?(method) }.all? || io.kind_of?(String)
           raise 'Zip::File.open_buffer expects a String or IO-like argument' \
                 "(responds to #{IO_METHODS.join(', ')}). Found: #{io.class}"
@@ -131,10 +136,11 @@ module Zip
         io = ::StringIO.new(io) if io.kind_of?(::String)
 
         zf = ::Zip::File.new(io, create: create, buffer: true,
-                                 restore_ownership:   restore_ownership,
-                                 restore_permissions: restore_permissions,
-                                 restore_times:       restore_times,
-                                 compression_level:   compression_level)
+                                 restore_ownership:     restore_ownership,
+                                 restore_permissions:   restore_permissions,
+                                 restore_times:         restore_times,
+                                 compression_level:     compression_level,
+                                 suppress_extra_fields: suppress_extra_fields)
 
         return zf unless block_given?
 
@@ -286,7 +292,7 @@ module Zip
       return if name.kind_of?(StringIO) || !commit_required?
 
       on_success_replace do |tmp_file|
-        ::Zip::OutputStream.open(tmp_file) do |zos|
+        ::Zip::OutputStream.open(tmp_file, suppress_extra_fields: @suppress_extra_fields) do |zos|
           @cdir.each do |e|
             e.write_to_zip_output_stream(zos)
             e.clean_up
@@ -302,7 +308,7 @@ module Zip
     def write_buffer(io = ::StringIO.new)
       return io unless commit_required?
 
-      ::Zip::OutputStream.write_buffer(io) do |zos|
+      ::Zip::OutputStream.write_buffer(io, suppress_extra_fields: @suppress_extra_fields) do |zos|
         @cdir.each { |e| e.write_to_zip_output_stream(zos) }
         zos.comment = comment
       end

data/lib/zip/filesystem/file.rb

@@ -112,9 +112,9 @@ module Zip
       def chown(owner, group, *filenames)
         filenames.each do |filename|
           e = find_entry(filename)
-          e.extra.create('IUnix') unless e.extra.member?('IUnix')
-          e.extra['IUnix'].uid = owner
-          e.extra['IUnix'].gid = group
+          e.extra.create(:iunix) unless e.extra.member?(:iunix)
+          e.extra[:iunix].uid = owner
+          e.extra[:iunix].gid = group
         end
         filenames.size
       end

data/lib/zip/filesystem/file_stat.rb

@@ -36,8 +36,8 @@ module Zip
 
         def gid
           e = find_entry
-          if e.extra.member? 'IUnix'
-            e.extra['IUnix'].gid || 0
+          if e.extra.member? :iunix
+            e.extra[:iunix].gid || 0
           else
             0
           end
@@ -45,8 +45,8 @@ module Zip
 
         def uid
           e = find_entry
-          if e.extra.member? 'IUnix'
-            e.extra['IUnix'].uid || 0
+          if e.extra.member? :iunix
+            e.extra[:iunix].uid || 0
           else
             0
           end

data/lib/zip/output_stream.rb

@@ -29,7 +29,7 @@ module Zip
 
     # Opens the indicated zip file. If a file with that name already
     # exists it will be overwritten.
-    def initialize(file_name, stream: false, encrypter: nil)
+    def initialize(file_name, stream: false, encrypter: nil, suppress_extra_fields: false)
       super()
       @file_name = file_name
       @output_stream = if stream
@@ -43,6 +43,7 @@ module Zip
       @cdir = ::Zip::CentralDirectory.new
       @compressor = ::Zip::NullCompressor.instance
       @encrypter = encrypter || ::Zip::NullEncrypter.new
+      @suppress_extra_fields = suppress_extra_fields
       @closed = false
       @current_entry = nil
     end
@@ -51,19 +52,21 @@ module Zip
       # Same as #initialize but if a block is passed the opened
       # stream is passed to the block and closed when the block
       # returns.
-      def open(file_name, encrypter: nil)
+      def open(file_name, encrypter: nil, suppress_extra_fields: false)
         return new(file_name) unless block_given?
 
-        zos = new(file_name, stream: false, encrypter: encrypter)
+        zos = new(file_name, stream: false, encrypter: encrypter,
+                  suppress_extra_fields: suppress_extra_fields)
         yield zos
       ensure
         zos.close if zos
       end
 
       # Same as #open but writes to a filestream instead
-      def write_buffer(io = ::StringIO.new, encrypter: nil)
+      def write_buffer(io = ::StringIO.new, encrypter: nil, suppress_extra_fields: false)
         io.binmode if io.respond_to?(:binmode)
-        zos = new(io, stream: true, encrypter: encrypter)
+        zos = new(io, stream: true, encrypter: encrypter,
+                  suppress_extra_fields: suppress_extra_fields)
         yield zos
         zos.close_buffer
       end
@@ -75,7 +78,7 @@ module Zip
 
       finalize_current_entry
       update_local_headers
-      @cdir.write_to_stream(@output_stream)
+      @cdir.write_to_stream(@output_stream, suppress_extra_fields: @suppress_extra_fields)
       @output_stream.close
       @closed = true
     end
@@ -86,7 +89,7 @@ module Zip
 
       finalize_current_entry
       update_local_headers
-      @cdir.write_to_stream(@output_stream)
+      @cdir.write_to_stream(@output_stream, suppress_extra_fields: @suppress_extra_fields)
       @closed = true
       @output_stream.flush
       @output_stream
@@ -157,7 +160,7 @@ module Zip
     def init_next_entry(entry)
       finalize_current_entry
       @cdir << entry
-      entry.write_local_entry(@output_stream)
+      entry.write_local_entry(@output_stream, suppress_extra_fields: @suppress_extra_fields)
       @encrypter.reset!
       @output_stream << @encrypter.header(entry.mtime)
       @compressor = get_compressor(entry)
@@ -178,7 +181,8 @@ module Zip
       pos = @output_stream.pos
       @cdir.each do |entry|
         @output_stream.pos = entry.local_header_offset
-        entry.write_local_entry(@output_stream, rewrite: true)
+        entry.write_local_entry(@output_stream, suppress_extra_fields: @suppress_extra_fields,
+                                                rewrite:               true)
       end
       @output_stream.pos = pos
     end

data/lib/zip/version.rb

@@ -2,5 +2,5 @@
 
 module Zip
   # The version of the Rubyzip library.
-  VERSION = '3.1.1'
+  VERSION = '3.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyzip
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Robert Haines
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-26 00:00:00.000000000 Z
+date: 2025-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -197,9 +197,9 @@ licenses:
 - BSD-2-Clause
 metadata:
   bug_tracker_uri: https://github.com/rubyzip/rubyzip/issues
-  changelog_uri: https://github.com/rubyzip/rubyzip/blob/v3.1.1/Changelog.md
-  documentation_uri: https://www.rubydoc.info/gems/rubyzip/3.1.1
-  source_code_uri: https://github.com/rubyzip/rubyzip/tree/v3.1.1
+  changelog_uri: https://github.com/rubyzip/rubyzip/blob/v3.2.0/Changelog.md
+  documentation_uri: https://www.rubydoc.info/gems/rubyzip/3.2.0
+  source_code_uri: https://github.com/rubyzip/rubyzip/tree/v3.2.0
   wiki_uri: https://github.com/rubyzip/rubyzip/wiki
   rubygems_mfa_required: 'true'
 post_install_message: