rubyzip 1.1.7 → 1.2.4

data/lib/zip/entry_set.rb

@@ -5,7 +5,7 @@ module Zip
 
     def initialize(an_enumerable = [])
       super()
-      @entry_set   = {}
+      @entry_set = {}
       an_enumerable.each { |o| push(o) }
     end
 
@@ -18,28 +18,24 @@ module Zip
     end
 
     def <<(entry)
-      @entry_set[to_key(entry)] = entry
+      @entry_set[to_key(entry)] = entry if entry
     end
 
-    alias :push :<<
+    alias push <<
 
     def size
       @entry_set.size
     end
 
-    alias :length :size
+    alias length size
 
     def delete(entry)
-      if @entry_set.delete(to_key(entry))
-        entry
-      else
-        nil
-      end
+      entry if @entry_set.delete(to_key(entry))
     end
 
-    def each(&block)
+    def each
       @entry_set = sorted_entries.dup.each do |_, value|
-        block.call(value)
+        yield(value)
       end
     end
 
@@ -49,7 +45,7 @@ module Zip
 
     # deep clone
     def dup
-      EntrySet.new(@entry_set.map { |key, value| value.dup })
+      EntrySet.new(@entry_set.values.map(&:dup))
     end
 
     def ==(other)
@@ -61,7 +57,7 @@ module Zip
       @entry_set[to_key(entry.parent_as_string)]
     end
 
-    def glob(pattern, flags = ::File::FNM_PATHNAME|::File::FNM_DOTMATCH)
+    def glob(pattern, flags = ::File::FNM_PATHNAME | ::File::FNM_DOTMATCH | ::File::FNM_EXTGLOB)
       entries.map do |entry|
         next nil unless ::File.fnmatch(pattern, entry.name.chomp('/'), flags)
         yield(entry) if block_given?
@@ -70,13 +66,17 @@ module Zip
     end
 
     protected
+
     def sorted_entries
       ::Zip.sort_entries ? Hash[@entry_set.sort] : @entry_set
     end
 
     private
+
     def to_key(entry)
-      entry.to_s.chomp('/')
+      k = entry.to_s.chomp('/')
+      k.downcase! if ::Zip.case_insensitive_match
+      k
     end
   end
 end

data/lib/zip/errors.rb

@@ -5,6 +5,7 @@ module Zip
   class CompressionMethodError < Error; end
   class EntryNameError < Error; end
   class InternalError < Error; end
+  class GPFBit3Error < Error; end
 
   # Backwards compatibility with v1 (delete in v2)
   ZipError = Error

data/lib/zip/extra_field.rb

@@ -3,12 +3,12 @@ module Zip
     ID_MAP = {}
 
     def initialize(binstr = nil)
-      binstr and merge(binstr)
+      merge(binstr) if binstr
     end
 
     def extra_field_type_exist(binstr, id, len, i)
       field_name = ID_MAP[id].name
-      if self.member?(field_name)
+      if member?(field_name)
         self[field_name].merge(binstr[i, len + 4])
       else
         field_obj        = ID_MAP[id].new(binstr[i, len + 4])
@@ -26,7 +26,7 @@ module Zip
     end
 
     def create_unknown_item
-      s = ''
+      s = ''.dup
       class << s
         alias_method :to_c_dir_bin, :to_s
         alias_method :to_local_bin, :to_s
@@ -51,7 +51,7 @@ module Zip
     end
 
     def create(name)
-      unless field_class = ID_MAP.values.find { |k| k.name == name }
+      unless (field_class = ID_MAP.values.find { |k| k.name == name })
         raise Error, "Unknown extra field '#{name}'"
       end
       self[name] = field_class.new
@@ -61,7 +61,7 @@ module Zip
     # does not prevent known fields from being read back in
     def ordered_values
       result = []
-      self.each { |k,v| k == 'Unknown' ? result.push(v) : result.unshift(v) }
+      each { |k, v| k == 'Unknown' ? result.push(v) : result.unshift(v) }
       result
     end
 
@@ -69,7 +69,7 @@ module Zip
       ordered_values.map! { |v| v.to_local_bin.force_encoding('BINARY') }.join
     end
 
-    alias :to_s :to_local_bin
+    alias to_s to_local_bin
 
     def to_c_dir_bin
       ordered_values.map! { |v| v.to_c_dir_bin.force_encoding('BINARY') }.join
@@ -83,8 +83,8 @@ module Zip
       to_local_bin.bytesize
     end
 
-    alias :length :local_size
-    alias :size :local_size
+    alias length local_size
+    alias size local_size
   end
 end
 

data/lib/zip/extra_field/generic.rb

@@ -1,13 +1,13 @@
 module Zip
   class ExtraField::Generic
     def self.register_map
-      if self.const_defined?(:HEADER_ID)
-        ::Zip::ExtraField::ID_MAP[self.const_get(:HEADER_ID)] = self
+      if const_defined?(:HEADER_ID)
+        ::Zip::ExtraField::ID_MAP[const_get(:HEADER_ID)] = self
       end
     end
 
     def self.name
-      @name ||= self.to_s.split("::")[-1]
+      @name ||= to_s.split('::')[-1]
     end
 
     # return field [size, content] or false
@@ -16,28 +16,28 @@ module Zip
         # If nil, start with empty.
         return false
       elsif binstr[0, 2] != self.class.const_get(:HEADER_ID)
-        $stderr.puts "Warning: weired extra feild header ID. skip parsing"
+        $stderr.puts 'Warning: weired extra feild header ID. skip parsing'
         return false
       end
-      [binstr[2, 2].unpack("v")[0], binstr[4..-1]]
+      [binstr[2, 2].unpack('v')[0], binstr[4..-1]]
     end
 
     def ==(other)
       return false if self.class != other.class
       each do |k, v|
-        v != other[k] and return false
+        return false if v != other[k]
       end
       true
     end
 
     def to_local_bin
       s = pack_for_local
-      self.class.const_get(:HEADER_ID) + [s.bytesize].pack("v") << s
+      self.class.const_get(:HEADER_ID) + [s.bytesize].pack('v') << s
     end
 
     def to_c_dir_bin
       s = pack_for_c_dir
-      self.class.const_get(:HEADER_ID) + [s.bytesize].pack("v") << s
+      self.class.const_get(:HEADER_ID) + [s.bytesize].pack('v') << s
     end
   end
 end

data/lib/zip/extra_field/ntfs.rb

@@ -5,14 +5,14 @@ module Zip
     HEADER_ID = [0x000A].pack('v')
     register_map
 
-    WINDOWS_TICK = 10000000.0
-    SEC_TO_UNIX_EPOCH = 11644473600
+    WINDOWS_TICK = 10_000_000.0
+    SEC_TO_UNIX_EPOCH = 11_644_473_600
 
     def initialize(binstr = nil)
       @ctime = nil
       @mtime = nil
       @atime = nil
-      binstr and merge(binstr)
+      binstr && merge(binstr)
     end
 
     attr_accessor :atime, :ctime, :mtime
@@ -20,18 +20,17 @@ module Zip
     def merge(binstr)
       return if binstr.empty?
       size, content = initial_parse(binstr)
-      (size && content) or return
+      (size && content) || return
 
       content = content[4..-1]
       tags = parse_tags(content)
 
       tag1 = tags[1]
-      if tag1
-        ntfs_mtime, ntfs_atime, ntfs_ctime = tag1.unpack("Q<Q<Q<")
-        ntfs_mtime and @mtime ||= from_ntfs_time(ntfs_mtime)
-        ntfs_atime and @atime ||= from_ntfs_time(ntfs_atime)
-        ntfs_ctime and @ctime ||= from_ntfs_time(ntfs_ctime)
-      end
+      return unless tag1
+      ntfs_mtime, ntfs_atime, ntfs_ctime = tag1.unpack('Q<Q<Q<')
+      ntfs_mtime && @mtime ||= from_ntfs_time(ntfs_mtime)
+      ntfs_atime && @atime ||= from_ntfs_time(ntfs_atime)
+      ntfs_ctime && @ctime ||= from_ntfs_time(ntfs_ctime)
     end
 
     def ==(other)
@@ -48,16 +47,14 @@ module Zip
     # But 7-zip for Windows only stores at central dir
     def pack_for_c_dir
       # reserved 0 and tag 1
-      s = [0, 1].pack("Vv")
+      s = [0, 1].pack('Vv')
 
       tag1 = ''.force_encoding(Encoding::BINARY)
       if @mtime
         tag1 << [to_ntfs_time(@mtime)].pack('Q<')
         if @atime
           tag1 << [to_ntfs_time(@atime)].pack('Q<')
-          if @ctime
-            tag1 << [to_ntfs_time(@ctime)].pack('Q<')
-          end
+          tag1 << [to_ntfs_time(@ctime)].pack('Q<') if @ctime
         end
       end
       s << [tag1.bytesize].pack('v') << tag1
@@ -65,11 +62,12 @@ module Zip
     end
 
     private
+
     def parse_tags(content)
       return {} if content.nil?
       tags = {}
       i = 0
-      while i < content.bytesize do
+      while i < content.bytesize
         tag, size = content[i, 4].unpack('vv')
         i += 4
         break unless tag && size
@@ -89,4 +87,4 @@ module Zip
       ((time.to_f + SEC_TO_UNIX_EPOCH) * WINDOWS_TICK).to_i
     end
   end
-end
+end

data/lib/zip/extra_field/old_unix.rb

@@ -1,7 +1,7 @@
 module Zip
   # Olf Info-ZIP Extra for UNIX uid/gid and file timestampes
   class ExtraField::OldUnix < ExtraField::Generic
-    HEADER_ID = "UX"
+    HEADER_ID = 'UX'
     register_map
 
     def initialize(binstr = nil)
@@ -9,7 +9,7 @@ module Zip
       @gid = 0
       @atime = nil
       @mtime = nil
-      binstr and merge(binstr)
+      binstr && merge(binstr)
     end
 
     attr_accessor :uid, :gid, :atime, :mtime
@@ -18,8 +18,8 @@ module Zip
       return if binstr.empty?
       size, content = initial_parse(binstr)
       # size: 0 for central directory. 4 for local header
-      return if (!size || size == 0)
-      atime, mtime, uid, gid = content.unpack("VVvv")
+      return if !size || size == 0
+      atime, mtime, uid, gid = content.unpack('VVvv')
       @uid ||= uid
       @gid ||= gid
       @atime ||= atime
@@ -29,17 +29,16 @@ module Zip
     def ==(other)
       @uid == other.uid &&
         @gid == other.gid &&
-          @atime == other.atime &&
-            @mtime == other.mtime
+        @atime == other.atime &&
+        @mtime == other.mtime
     end
 
     def pack_for_local
-      [@atime, @mtime, @uid, @gid].pack("VVvv")
+      [@atime, @mtime, @uid, @gid].pack('VVvv')
     end
 
     def pack_for_c_dir
-      [@atime, @mtime].pack("VV")
+      [@atime, @mtime].pack('VV')
     end
   end
-
-end
+end

data/lib/zip/extra_field/universal_time.rb

@@ -1,7 +1,7 @@
 module Zip
   # Info-ZIP Additional timestamp field
   class ExtraField::UniversalTime < ExtraField::Generic
-    HEADER_ID = "UT"
+    HEADER_ID = 'UT'
     register_map
 
     def initialize(binstr = nil)
@@ -9,7 +9,7 @@ module Zip
       @mtime = nil
       @atime = nil
       @flag  = nil
-      binstr and merge(binstr)
+      binstr && merge(binstr)
     end
 
     attr_accessor :atime, :ctime, :mtime, :flag
@@ -17,11 +17,11 @@ module Zip
     def merge(binstr)
       return if binstr.empty?
       size, content = initial_parse(binstr)
-      size or return
-      @flag, mtime, atime, ctime = content.unpack("CVVV")
-      mtime and @mtime ||= ::Zip::DOSTime.at(mtime)
-      atime and @atime ||= ::Zip::DOSTime.at(atime)
-      ctime and @ctime ||= ::Zip::DOSTime.at(ctime)
+      size || return
+      @flag, mtime, atime, ctime = content.unpack('CVVV')
+      mtime && @mtime ||= ::Zip::DOSTime.at(mtime)
+      atime && @atime ||= ::Zip::DOSTime.at(atime)
+      ctime && @ctime ||= ::Zip::DOSTime.at(ctime)
     end
 
     def ==(other)
@@ -31,17 +31,17 @@ module Zip
     end
 
     def pack_for_local
-      s = [@flag].pack("C")
-      @flag & 1 != 0 and s << [@mtime.to_i].pack("V")
-      @flag & 2 != 0 and s << [@atime.to_i].pack("V")
-      @flag & 4 != 0 and s << [@ctime.to_i].pack("V")
+      s = [@flag].pack('C')
+      @flag & 1 != 0 && s << [@mtime.to_i].pack('V')
+      @flag & 2 != 0 && s << [@atime.to_i].pack('V')
+      @flag & 4 != 0 && s << [@ctime.to_i].pack('V')
       s
     end
 
     def pack_for_c_dir
-      s = [@flag].pack("C")
-      @flag & 1 == 1 and s << [@mtime.to_i].pack("V")
+      s = [@flag].pack('C')
+      @flag & 1 == 1 && s << [@mtime.to_i].pack('V')
       s
     end
   end
-end
+end

data/lib/zip/extra_field/unix.rb

@@ -1,13 +1,13 @@
 module Zip
   # Info-ZIP Extra for UNIX uid/gid
   class ExtraField::IUnix < ExtraField::Generic
-    HEADER_ID = "Ux"
+    HEADER_ID = 'Ux'
     register_map
 
     def initialize(binstr = nil)
       @uid = 0
       @gid = 0
-      binstr and merge(binstr)
+      binstr && merge(binstr)
     end
 
     attr_accessor :uid, :gid
@@ -16,10 +16,10 @@ module Zip
       return if binstr.empty?
       size, content = initial_parse(binstr)
       # size: 0 for central directory. 4 for local header
-      return if (!size || size == 0)
-      uid, gid = content.unpack("vv")
-      @uid     ||= uid
-      @gid     ||= gid
+      return if !size || size == 0
+      uid, gid = content.unpack('vv')
+      @uid ||= uid
+      @gid ||= gid
     end
 
     def ==(other)
@@ -27,12 +27,11 @@ module Zip
     end
 
     def pack_for_local
-      [@uid, @gid].pack("vv")
+      [@uid, @gid].pack('vv')
     end
 
     def pack_for_c_dir
       ''
     end
   end
-
-end
+end

data/lib/zip/extra_field/zip64.rb

@@ -6,21 +6,22 @@ module Zip
     register_map
 
     def initialize(binstr = nil)
-      @content = nil # unparsed binary; we don't actually know what this contains
-                     # without looking for FFs in the associated file header
-                     # call parse after initializing with a binary string
+      # unparsed binary; we don't actually know what this contains
+      # without looking for FFs in the associated file header
+      # call parse after initializing with a binary string
+      @content = nil
       @original_size          = nil
       @compressed_size        = nil
       @relative_header_offset = nil
       @disk_start_number      = nil
-      binstr and merge(binstr)
+      binstr && merge(binstr)
     end
 
     def ==(other)
       other.original_size == @original_size &&
         other.compressed_size == @compressed_size &&
-          other.relative_header_offset == @relative_header_offset &&
-            other.disk_start_number == @disk_start_number
+        other.relative_header_offset == @relative_header_offset &&
+        other.disk_start_number == @disk_start_number
     end
 
     def merge(binstr)
@@ -51,16 +52,16 @@ module Zip
     def pack_for_local
       # local header entries must contain original size and compressed size; other fields do not apply
       return '' unless @original_size && @compressed_size
-      [@original_size, @compressed_size].pack("Q<Q<")
+      [@original_size, @compressed_size].pack('Q<Q<')
     end
 
     def pack_for_c_dir
       # central directory entries contain only fields that didn't fit in the main entry part
       packed = ''.force_encoding('BINARY')
-      packed << [@original_size].pack("Q<") if @original_size
-      packed << [@compressed_size].pack("Q<") if @compressed_size
-      packed << [@relative_header_offset].pack("Q<") if @relative_header_offset
-      packed << [@disk_start_number].pack("V") if @disk_start_number
+      packed << [@original_size].pack('Q<') if @original_size
+      packed << [@compressed_size].pack('Q<') if @compressed_size
+      packed << [@relative_header_offset].pack('Q<') if @relative_header_offset
+      packed << [@disk_start_number].pack('V') if @disk_start_number
       packed
     end
   end