rubyzip 1.1.7 → 1.3.0

data/lib/zip/inflater.rb

@@ -3,9 +3,9 @@ module Zip
     def initialize(input_stream, decrypter = NullDecrypter.new)
       super(input_stream)
       @zlib_inflater           = ::Zlib::Inflate.new(-Zlib::MAX_WBITS)
-      @output_buffer           = ''
+      @output_buffer           = ''.dup
       @has_returned_empty_string = false
-      @decrypter               = decrypter
+      @decrypter = decrypter
     end
 
     def sysread(number_of_bytes = nil, buf = '')
@@ -20,7 +20,7 @@ module Zip
     end
 
     def produce_input
-      if (@output_buffer.empty?)
+      if @output_buffer.empty?
         internal_produce_input
       else
         @output_buffer.slice!(0...(@output_buffer.length))
@@ -33,8 +33,8 @@ module Zip
       @output_buffer.empty? && internal_input_finished?
     end
 
-    alias :eof :input_finished?
-    alias :eof? :input_finished?
+    alias :eof input_finished?
+    alias :eof? input_finished?
 
     private
 

data/lib/zip/input_stream.rb

@@ -86,14 +86,14 @@ module Zip
       @output_buffer.empty? && @decompressor.eof
     end
 
-    alias :eof? :eof
+    alias :eof? eof
 
     class << self
       # 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(filename_or_io, offset = 0, decrypter = nil)
-        zio = self.new(filename_or_io, offset, decrypter)
+        zio = new(filename_or_io, offset, decrypter)
         return zio unless block_given?
         begin
           yield zio
@@ -103,16 +103,15 @@ module Zip
       end
 
       def open_buffer(filename_or_io, offset = 0)
-        puts "open_buffer is deprecated!!! Use open instead!"
-        self.open(filename_or_io, offset)
+        puts 'open_buffer is deprecated!!! Use open instead!'
+        open(filename_or_io, offset)
       end
     end
 
     protected
 
     def get_io(io_or_file, offset = 0)
-      case io_or_file
-      when IO, StringIO
+      if io_or_file.respond_to?(:seek)
         io = io_or_file.dup
         io.seek(offset, ::IO::SEEK_SET)
         io
@@ -125,21 +124,31 @@ module Zip
 
     def open_entry
       @current_entry = ::Zip::Entry.read_local_entry(@archive_io)
-      if @current_entry and @current_entry.gp_flags & 1 == 1 and @decrypter.is_a? NullEncrypter
+      if @current_entry && @current_entry.gp_flags & 1 == 1 && @decrypter.is_a?(NullEncrypter)
         raise Error, 'password required to decode zip file'
       end
-      @decompressor  = get_decompressor
+      if @current_entry && @current_entry.gp_flags & 8 == 8 && @current_entry.crc == 0 \
+        && @current_entry.compressed_size == 0 \
+        && @current_entry.size == 0 && !@complete_entry
+        raise GPFBit3Error,
+              'General purpose flag Bit 3 is set so not possible to get proper info from local header.' \
+              'Please use ::Zip::File instead of ::Zip::InputStream'
+      end
+      @decompressor = get_decompressor
       flush
       @current_entry
     end
 
     def get_decompressor
-      case
-      when @current_entry.nil?
+      if @current_entry.nil?
         ::Zip::NullDecompressor
-      when @current_entry.compression_method == ::Zip::Entry::STORED
-        ::Zip::PassThruDecompressor.new(@archive_io, @current_entry.size)
-      when @current_entry.compression_method == ::Zip::Entry::DEFLATED
+      elsif @current_entry.compression_method == ::Zip::Entry::STORED
+        if @current_entry.gp_flags & 8 == 8 && @current_entry.crc == 0 && @current_entry.size == 0 && @complete_entry
+          ::Zip::PassThruDecompressor.new(@archive_io, @complete_entry.size)
+        else
+          ::Zip::PassThruDecompressor.new(@archive_io, @current_entry.size)
+        end
+      elsif @current_entry.compression_method == ::Zip::Entry::DEFLATED
         header = @archive_io.read(@decrypter.header_bytesize)
         @decrypter.reset!(header)
         ::Zip::Inflater.new(@archive_io, @decrypter)

data/lib/zip/ioextras/abstract_input_stream.rb

@@ -33,9 +33,9 @@ module Zip
                  sysread(number_of_bytes, buf)
                end
 
-        if tbuf.nil? || tbuf.length == 0
+        if tbuf.nil? || tbuf.empty?
           return nil if number_of_bytes
-          return ""
+          return ''
         end
 
         @pos += tbuf.length
@@ -75,15 +75,13 @@ module Zip
         over_limit   = (number_of_bytes && @output_buffer.bytesize >= number_of_bytes)
         while (match_index = @output_buffer.index(a_sep_string, buffer_index)).nil? && !over_limit
           buffer_index = [buffer_index, @output_buffer.bytesize - a_sep_string.bytesize].max
-          if input_finished?
-            return @output_buffer.empty? ? nil : flush
-          end
+          return @output_buffer.empty? ? nil : flush if input_finished?
           @output_buffer << produce_input
           over_limit = (number_of_bytes && @output_buffer.bytesize >= number_of_bytes)
         end
         sep_index = [match_index + a_sep_string.bytesize, number_of_bytes || @output_buffer.bytesize].min
-        @pos     += sep_index
-        return @output_buffer.slice!(0...sep_index)
+        @pos += sep_index
+        @output_buffer.slice!(0...sep_index)
       end
 
       def ungetc(byte)
@@ -103,9 +101,7 @@ module Zip
       end
 
       def each_line(a_sep_string = $/)
-        while true
-          yield readline(a_sep_string)
-        end
+        yield readline(a_sep_string) while true
       rescue EOFError
       end
 

data/lib/zip/ioextras/abstract_output_stream.rb

@@ -10,23 +10,22 @@ module Zip
         data.to_s.bytesize
       end
 
-
       def print(*params)
         self << params.join($,) << $\.to_s
       end
 
       def printf(a_format_string, *params)
-        self << sprintf(a_format_string, *params)
+        self << format(a_format_string, *params)
       end
 
       def putc(an_object)
         self << case an_object
-                when Fixnum
+                when Integer
                   an_object.chr
                 when String
                   an_object
                 else
-                  raise TypeError, 'putc: Only Fixnum and String supported'
+                  raise TypeError, 'putc: Only Integer and String supported'
                 end
         an_object
       end
@@ -39,7 +38,6 @@ module Zip
           self << "\n" unless val[-1, 1] == "\n"
         end
       end
-
     end
   end
 end

data/lib/zip/ioextras.rb

@@ -1,7 +1,6 @@
 module Zip
   module IOExtras #:nodoc:
-
-    CHUNK_SIZE = 131072
+    CHUNK_SIZE = 131_072
 
     RANGE_ALL = 0..-1
 
@@ -26,7 +25,6 @@ module Zip
         object == IO || super
       end
     end
-
   end # IOExtras namespace module
 end
 

data/lib/zip/null_compressor.rb

@@ -2,8 +2,8 @@ module Zip
   class NullCompressor < Compressor #:nodoc:all
     include Singleton
 
-    def <<(data)
-      raise IOError, "closed stream"
+    def <<(_data)
+      raise IOError, 'closed stream'
     end
 
     attr_reader :size, :compressed_size

data/lib/zip/null_decompressor.rb

@@ -1,8 +1,8 @@
 module Zip
   module NullDecompressor #:nodoc:all
-    extend self
+    module_function
 
-    def sysread(numberOfBytes = nil, buf = nil)
+    def sysread(_numberOfBytes = nil, _buf = nil)
       nil
     end
 
@@ -18,7 +18,7 @@ module Zip
       true
     end
 
-    alias :eof? :eof
+    alias eof? eof
   end
 end
 

data/lib/zip/output_stream.rb

@@ -24,7 +24,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)
       super()
       @file_name = file_name
       @output_stream = if stream
@@ -33,7 +33,7 @@ module Zip
                          iostream.rewind
                          iostream
                        else
-                         ::File.new(@file_name, "wb")
+                         ::File.new(@file_name, 'wb')
                        end
       @entry_set = ::Zip::EntrySet.new
       @compressor = ::Zip::NullCompressor.instance
@@ -86,15 +86,15 @@ module Zip
     # Closes the current entry and opens a new for writing.
     # +entry+ can be a ZipEntry object or a string.
     def put_next_entry(entry_name, comment = nil, extra = nil, compression_method = Entry::DEFLATED, level = Zip.default_compression)
-      raise Error, "zip stream is closed" if @closed
-      if entry_name.kind_of?(Entry)
-        new_entry = entry_name
-      else
-        new_entry = Entry.new(@file_name, entry_name.to_s)
-      end
+      raise Error, 'zip stream is closed' if @closed
+      new_entry = if entry_name.kind_of?(Entry)
+                    entry_name
+                  else
+                    Entry.new(@file_name, entry_name.to_s)
+                  end
       new_entry.comment = comment unless comment.nil?
       unless extra.nil?
-        new_entry.extra = ExtraField === extra ? extra : ExtraField.new(extra.to_s)
+        new_entry.extra = extra.is_a?(ExtraField) ? extra : ExtraField.new(extra.to_s)
       end
       new_entry.compression_method = compression_method unless compression_method.nil?
       init_next_entry(new_entry, level)
@@ -103,8 +103,8 @@ module Zip
 
     def copy_raw_entry(entry)
       entry = entry.dup
-      raise Error, "zip stream is closed" if @closed
-      raise Error, "entry is not a ZipEntry" unless entry.is_a?(Entry)
+      raise Error, 'zip stream is closed' if @closed
+      raise Error, 'entry is not a ZipEntry' unless entry.is_a?(Entry)
       finalize_current_entry
       @entry_set << entry
       src_pos = entry.local_header_offset
@@ -123,7 +123,6 @@ module Zip
 
     def finalize_current_entry
       return unless @current_entry
-      @output_stream << @encrypter.header(@current_entry.mtime)
       finish
       @current_entry.compressed_size = @output_stream.tell - @current_entry.local_header_offset - @current_entry.calculate_local_header_size
       @current_entry.size = @compressor.size
@@ -139,6 +138,7 @@ module Zip
       @entry_set << entry
       entry.write_local_entry(@output_stream)
       @encrypter.reset!
+      @output_stream << @encrypter.header(entry.mtime)
       @compressor = get_compressor(entry, level)
     end
 
@@ -177,11 +177,10 @@ module Zip
     public
 
     # Modeled after IO.<<
-    def << (data)
+    def <<(data)
       @compressor << data
       self
     end
-
   end
 end
 

data/lib/zip/pass_thru_compressor.rb

@@ -3,13 +3,13 @@ module Zip
     def initialize(outputStream)
       super()
       @output_stream = outputStream
-      @crc = Zlib::crc32
+      @crc = Zlib.crc32
       @size = 0
     end
-    
-    def << (data)
+
+    def <<(data)
       val = data.to_s
-      @crc = Zlib::crc32(val, @crc)
+      @crc = Zlib.crc32(val, @crc)
       @size += val.bytesize
       @output_stream << val
     end

data/lib/zip/pass_thru_decompressor.rb

@@ -1,6 +1,5 @@
 module Zip
-  class PassThruDecompressor < Decompressor  #:nodoc:all
-
+  class PassThruDecompressor < Decompressor #:nodoc:all
     def initialize(input_stream, chars_to_read)
       super(input_stream)
       @chars_to_read = chars_to_read
@@ -31,8 +30,8 @@ module Zip
       @read_so_far >= @chars_to_read
     end
 
-    alias :eof :input_finished?
-    alias :eof? :input_finished?
+    alias eof input_finished?
+    alias eof? input_finished?
   end
 end
 

data/lib/zip/streamable_directory.rb

@@ -4,8 +4,8 @@ module Zip
       super(zipfile, entry)
 
       @ftype = :directory
-      entry.get_extra_attributes_from_path(srcPath) if (srcPath)
-      @unix_perms = permissionInt if (permissionInt)
+      entry.get_extra_attributes_from_path(srcPath) if srcPath
+      @unix_perms = permissionInt if permissionInt
     end
   end
 end

data/lib/zip/streamable_stream.rb

@@ -1,11 +1,11 @@
 module Zip
-  class StreamableStream < DelegateClass(Entry) #nodoc:all
+  class StreamableStream < DelegateClass(Entry) # nodoc:all
     def initialize(entry)
       super(entry)
       dirname = if zipfile.is_a?(::String)
                   ::File.dirname(zipfile)
                 else
-                  '.'
+                  nil
                 end
       @temp_file = Tempfile.new(::File.basename(name), dirname)
       @temp_file.binmode
@@ -24,7 +24,7 @@ module Zip
     end
 
     def get_input_stream
-      if !@temp_file.closed?
+      unless @temp_file.closed?
         raise StandardError, "cannot open entry for reading while its open for writing - #{name}"
       end
       @temp_file.open # reopens tempfile from top

data/lib/zip/version.rb

@@ -1,3 +1,3 @@
 module Zip
-  VERSION = '1.1.7'
+  VERSION = '1.3.0'
 end

data/lib/zip.rb

@@ -1,6 +1,7 @@
 require 'delegate'
 require 'singleton'
 require 'tempfile'
+require 'tmpdir'
 require 'fileutils'
 require 'stringio'
 require 'zlib'
@@ -30,14 +31,19 @@ require 'zip/streamable_stream'
 require 'zip/streamable_directory'
 require 'zip/constants'
 require 'zip/errors'
-if defined? JRUBY_VERSION
-  require 'jruby'
-  JRuby.objectspace = true
-end
 
 module Zip
   extend self
-  attr_accessor :unicode_names, :on_exists_proc, :continue_on_exists_proc, :sort_entries, :default_compression, :write_zip64_support, :warn_invalid_date
+  attr_accessor :unicode_names,
+                :on_exists_proc,
+                :continue_on_exists_proc,
+                :sort_entries,
+                :default_compression,
+                :write_zip64_support,
+                :warn_invalid_date,
+                :case_insensitive_match,
+                :force_entry_names_encoding,
+                :validate_entry_sizes
 
   def reset!
     @_ran_once = false
@@ -48,6 +54,8 @@ module Zip
     @default_compression = ::Zlib::DEFAULT_COMPRESSION
     @write_zip64_support = false
     @warn_invalid_date = true
+    @case_insensitive_match = false
+    @validate_entry_sizes = false
   end
 
   def setup

data/samples/example.rb

@@ -1,89 +1,79 @@
 #!/usr/bin/env ruby
 
-$: << "../lib"
-system("zip example.zip example.rb gtkRubyzip.rb")
+$: << '../lib'
+system('zip example.zip example.rb gtk_ruby_zip.rb')
 
 require 'zip'
 
 ####### Using ZipInputStream alone: #######
 
-Zip::InputStream.open("example.zip") {
-  |zis|
+Zip::InputStream.open('example.zip') do |zis|
   entry = zis.get_next_entry
   print "First line of '#{entry.name} (#{entry.size} bytes):  "
   puts "'#{zis.gets.chomp}'"
   entry = zis.get_next_entry
   print "First line of '#{entry.name} (#{entry.size} bytes):  "
   puts "'#{zis.gets.chomp}'"
-}
-
+end
 
 ####### Using ZipFile to read the directory of a zip file: #######
 
-zf = Zip::File.new("example.zip")
-zf.each_with_index {
-  |entry, index|
-
+zf = Zip::File.new('example.zip')
+zf.each_with_index do |entry, index|
   puts "entry #{index} is #{entry.name}, size = #{entry.size}, compressed size = #{entry.compressed_size}"
   # use zf.get_input_stream(entry) to get a ZipInputStream for the entry
   # entry can be the ZipEntry object or any object which has a to_s method that
   # returns the name of the entry.
-}
-
+end
 
 ####### Using ZipOutputStream to write a zip file: #######
 
-Zip::OutputStream.open("exampleout.zip") {
-  |zos|
-  zos.put_next_entry("the first little entry")
-  zos.puts "Hello hello hello hello hello hello hello hello hello"
+Zip::OutputStream.open('exampleout.zip') do |zos|
+  zos.put_next_entry('the first little entry')
+  zos.puts 'Hello hello hello hello hello hello hello hello hello'
 
-  zos.put_next_entry("the second little entry")
-  zos.puts "Hello again"
+  zos.put_next_entry('the second little entry')
+  zos.puts 'Hello again'
 
   # Use rubyzip or your zip client of choice to verify
   # the contents of exampleout.zip
-}
+end
 
 ####### Using ZipFile to change a zip file: #######
 
-Zip::File.open("exampleout.zip") {
-  |zf|
-  zf.add("thisFile.rb", "example.rb")
-  zf.rename("thisFile.rb", "ILikeThisName.rb")
-  zf.add("Again", "example.rb")
-}
+Zip::File.open('exampleout.zip') do |zip_file|
+  zip_file.add('thisFile.rb', 'example.rb')
+  zip_file.rename('thisFile.rb', 'ILikeThisName.rb')
+  zip_file.add('Again', 'example.rb')
+end
 
 # Lets check
-Zip::File.open("exampleout.zip") {
-  |zf|
-  puts "Changed zip file contains: #{zf.entries.join(', ')}"
-  zf.remove("Again")
-  puts "Without 'Again': #{zf.entries.join(', ')}"
-}
+Zip::File.open('exampleout.zip') do |zip_file|
+  puts "Changed zip file contains: #{zip_file.entries.join(', ')}"
+  zip_file.remove('Again')
+  puts "Without 'Again': #{zip_file.entries.join(', ')}"
+end
 
 ####### Using ZipFile to split a zip file: #######
 
 # Creating large zip file for splitting
-Zip::OutputStream.open("large_zip_file.zip") do |zos|
-  puts "Creating zip file..."
+Zip::OutputStream.open('large_zip_file.zip') do |zos|
+  puts 'Creating zip file...'
   10.times do |i|
     zos.put_next_entry("large_entry_#{i}.txt")
-    zos.puts "Hello" * 104857600
+    zos.puts 'Hello' * 104_857_600
   end
 end
 
 # Splitting created large zip file
-part_zips_count = Zip::File.split("large_zip_file.zip", 2097152, false)
+part_zips_count = Zip::File.split('large_zip_file.zip', 2_097_152, false)
 puts "Zip file splitted in #{part_zips_count} parts"
 
 # Track splitting an archive
-Zip::File.split("large_zip_file.zip", 1048576, true, 'part_zip_file') do
-  |part_count, part_index, chunk_bytes, segment_bytes|
-  puts "#{part_index} of #{part_count} part splitting: #{(chunk_bytes.to_f/segment_bytes.to_f * 100).to_i}%"
+Zip::File.split('large_zip_file.zip', 1_048_576, true, 'part_zip_file') do |part_count, part_index, chunk_bytes, segment_bytes|
+  puts "#{part_index} of #{part_count} part splitting: #{(chunk_bytes.to_f / segment_bytes.to_f * 100).to_i}%"
 end
 
-
 # For other examples, look at zip.rb and ziptest.rb
 
 # Copyright (C) 2002 Thomas Sondergaard