Move the restore options to the top level.

This will ensure consistency between `File` and `Entry`.
hainesr · May 31, 2021 · 83df65c · 83df65c
1 parent ca51c7c
commit 83df65c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/lib/zip.rb b/lib/zip.rb
@@ -48,6 +48,12 @@ module Zip
                 :force_entry_names_encoding,
                 :validate_entry_sizes
 
+  DEFAULT_RESTORE_OPTIONS = {
+    restore_ownership:   false,
+    restore_permissions: false,
+    restore_times:       false
+  }.freeze
+
   def reset!
     @_ran_once = false
     @unicode_names = false

diff --git a/lib/zip/entry.rb b/lib/zip/entry.rb
@@ -42,9 +42,9 @@ def set_default_vars_values
       end
       @follow_symlinks = false
 
-      @restore_times       = false
-      @restore_permissions = false
-      @restore_ownership   = false
+      @restore_times       = DEFAULT_RESTORE_OPTIONS[:restore_times]
+      @restore_permissions = DEFAULT_RESTORE_OPTIONS[:restore_permissions]
+      @restore_ownership   = DEFAULT_RESTORE_OPTIONS[:restore_ownership]
       # BUG: need an extra field to support uid/gid's
       @unix_uid            = nil
       @unix_gid            = nil

diff --git a/lib/zip/file.rb b/lib/zip/file.rb
@@ -53,12 +53,6 @@ class File < CentralDirectory
     DATA_BUFFER_SIZE     = 8192
     IO_METHODS           = [:tell, :seek, :read, :eof, :close].freeze
 
-    DEFAULT_OPTIONS = {
-      restore_ownership:   false,
-      restore_permissions: false,
-      restore_times:       false
-    }.freeze
-
     attr_reader :name
 
     # default -> false.
@@ -77,7 +71,7 @@ class File < CentralDirectory
     # a new archive if it doesn't exist already.
     def initialize(path_or_io, create = false, buffer = false, options = {})
       super()
-      options  = DEFAULT_OPTIONS
+      options  = DEFAULT_RESTORE_OPTIONS
                  .merge(compression_level: ::Zip.default_compression)
                  .merge(options)
       @name    = path_or_io.respond_to?(:path) ? path_or_io.path : path_or_io