Clean up `OutputStream` internals.

There was some fairly odd stuff going on in `put_next_entry` that
allowed for data within an `Entry` to be overridden and prevented an
`Entry` from being a single point of truth. Fixing this also simplifies
the code within `File` and still passes all tests.

Also, fixing the above means we can stop passing the compression level
around as a parameter and use the value stored in each `Entry` directly.

Let's keep `compression_level` out of the `Entry` public API though as
it only makes sense when writing an `Entry`: there doesn't seem to be an
obvious way to read what level of compression was used when reading an
`Entry` from a zip file.

lib/zip/entry.rb

@@ -13,8 +13,7 @@ module Zip
                   :restore_times, :restore_permissions, :restore_ownership,
                   :unix_uid, :unix_gid, :unix_perms,
                   :dirty
-    attr_reader :ftype, :filepath # :nodoc:
+    attr_reader :compression_level, :ftype, :filepath # :nodoc:
-    attr_writer :compression_level # :nodoc:
 
     def set_default_vars_values
       @local_header_offset      = 0
@@ -579,14 +578,13 @@ module Zip
 
     def write_to_zip_output_stream(zip_output_stream) #:nodoc:all
       if @ftype == :directory
-        zip_output_stream.put_next_entry(self, nil, nil, ::Zip::Entry::STORED)
+        @compression_method = ::Zip::Entry::STORED
+        zip_output_stream.put_next_entry(self)
       elsif @filepath
-        zip_output_stream.put_next_entry(
+        zip_output_stream.put_next_entry(self)
-          self, nil, nil,
+        get_input_stream do |is|
-          compression_method || ::Zip::Entry::DEFLATED,
+          ::Zip::IOExtras.copy_stream(zip_output_stream, is)
-          @compression_level || ::Zip.default_compression
+        end
-        )
-        get_input_stream { |is| ::Zip::IOExtras.copy_stream(zip_output_stream, is) }
       else
         zip_output_stream.copy_raw_entry(self)
       end

lib/zip/output_stream.rb

@@ -95,15 +95,10 @@ module Zip
       new_entry = if entry_name.kind_of?(Entry)
                     entry_name
                   else
-                    Entry.new(@file_name, entry_name.to_s)
+                    Entry.new(@file_name, entry_name.to_s, comment, extra, 0, 0, compression_method, level)
                   end
-      new_entry.comment = comment unless comment.nil?
+
-      unless extra.nil?
+      init_next_entry(new_entry)
-        new_entry.extra = extra.kind_of?(ExtraField) ? extra : ExtraField.new(extra.to_s)
-      end
-      new_entry.compression_method = compression_method unless compression_method.nil?
-      new_entry.compression_level = level unless level.nil?
-      init_next_entry(new_entry, level)
       @current_entry = new_entry
     end
 
@@ -143,19 +138,19 @@ module Zip
       @compressor = ::Zip::NullCompressor.instance
     end
 
-    def init_next_entry(entry, level)
+    def init_next_entry(entry)
       finalize_current_entry
       @entry_set << entry
       entry.write_local_entry(@output_stream)
       @encrypter.reset!
       @output_stream << @encrypter.header(entry.mtime)
-      @compressor = get_compressor(entry, level)
+      @compressor = get_compressor(entry)
     end
 
-    def get_compressor(entry, level)
+    def get_compressor(entry)
       case entry.compression_method
       when Entry::DEFLATED
-        ::Zip::Deflater.new(@output_stream, level, @encrypter)
+        ::Zip::Deflater.new(@output_stream, entry.compression_level, @encrypter)
       when Entry::STORED
         ::Zip::PassThruCompressor.new(@output_stream)
       else

test/file_test.rb

@@ -87,6 +87,7 @@ class ZipFileTest < MiniTest::Test
       assert_equal(custom_entry_args[2], entry.compressed_size)
       assert_equal(custom_entry_args[3], entry.crc)
       assert_equal(custom_entry_args[4], entry.compression_method)
+      assert_equal(custom_entry_args[5], entry.compression_level)
       assert_equal(custom_entry_args[6], entry.size)
       assert_equal(custom_entry_args[7], entry.time)