rubyzip 0.9.6.1 → 0.9.7

data/README.md

@@ -1,18 +1,49 @@
-rubyzip
+rubyzip [![Build Status](https://secure.travis-ci.org/aussiegeek/rubyzip.png)](http://travis-ci.org/aussiegeek/rubyzip)
 =======
 
 rubyzip is a ruby library for reading and writing zip files.
 
-Install
--------
+Installation
+------------
+rubyzip is available on RubyGems, so:
+
+```
+gem install rubyzip
+```
+
+Or in your Gemfile:
+
+```ruby
+gem 'rubyzip'
+```
+
+Developing
+----------
+
+To run tests you need run next commands:
 
-  gem install rubyzip
+```
+bundle install
+rake
+```
 
+Configuration
+-------------
+
+By default, rubyzip will not overwrite files if they already exist inside of the extracted path.  To change this behavior, you may specify a configuration option like so:
+
+```
+Zip.options[:on_exists_proc] = true
+```
 
-To run the unit tests you need to have test::unit installed
+If you're using rubyzip with rails, consider placing this snippet of code in an initializer file such as `config/initializers/rubyzip.rb`
+
+Additionally, if you want to configure rubyzip to overwrite existing files while creating a .zip file, you can do so with the following:
+
+```
+Zip.options[:continue_on_exists_proc] = true
+```
 
-  rake test
-[![Build Status](https://secure.travis-ci.org/aussiegeek/rubyzip.png)](http://travis-ci.org/aussiegeek/rubyzip)
 
 Documentation
 -------------
@@ -62,10 +93,12 @@ http://rdoc.info/github/aussiegeek/rubyzip/master/frames
 Authors
 -------
 
+Alexander Simonov ( alex at simonov.me)
+
 Alan Harper ( alan at aussiegeek.net)
 
 Thomas Sondergaard (thomas at sondergaard.cc)
 
 Technorama Ltd. (oss-ruby-zip at technorama.net)
 
-extra-field support contributed by Tatsuki Sugiura (sugi at nemui.org)
+extra-field support contributed by Tatsuki Sugiura (sugi at nemui.org)

data/lib/zip/constants.rb

@@ -1,5 +1,5 @@
 module Zip
-  VERSION = '0.9.5'
+  VERSION = '0.9.7'
   RUBY_MINOR_VERSION = RUBY_VERSION.split(".")[1].to_i
   RUNNING_ON_WINDOWS = RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/i
 

data/lib/zip/dos_time.rb

@@ -1,43 +1,45 @@
-class DOSTime < Time #:nodoc:all
+module Zip
+  class DOSTime < Time #:nodoc:all
 
-  #MS-DOS File Date and Time format as used in Interrupt 21H Function 57H:
+    #MS-DOS File Date and Time format as used in Interrupt 21H Function 57H:
 
-  # Register CX, the Time:
-  # Bits 0-4  2 second increments (0-29)
-  # Bits 5-10 minutes (0-59)
-  # bits 11-15 hours (0-24)
+    # Register CX, the Time:
+    # Bits 0-4  2 second increments (0-29)
+    # Bits 5-10 minutes (0-59)
+    # bits 11-15 hours (0-24)
 
-  # Register DX, the Date:
-  # Bits 0-4 day (1-31)
-  # bits 5-8 month (1-12)
-  # bits 9-15 year (four digit year minus 1980)
+    # Register DX, the Date:
+    # Bits 0-4 day (1-31)
+    # bits 5-8 month (1-12)
+    # bits 9-15 year (four digit year minus 1980)
 
-  def to_binary_dos_time
-    (sec/2) +
-    (min  << 5) +
-    (hour << 11)
-  end
+    def to_binary_dos_time
+      (sec/2) +
+      (min  << 5) +
+      (hour << 11)
+    end
 
-  def to_binary_dos_date
-    (day) +
-    (month << 5) +
-    ((year - 1980) << 9)
-  end
+    def to_binary_dos_date
+      (day) +
+      (month << 5) +
+      ((year - 1980) << 9)
+    end
 
-  # Dos time is only stored with two seconds accuracy
-  def dos_equals(other)
-    to_i/2 == other.to_i/2
-  end
+    # Dos time is only stored with two seconds accuracy
+    def dos_equals(other)
+      to_i/2 == other.to_i/2
+    end
 
-  def self.parse_binary_dos_format(binaryDosDate, binaryDosTime)
-    second = 2 * (       0b11111 & binaryDosTime)
-    minute = (     0b11111100000 & binaryDosTime) >> 5 
-    hour   = (0b1111100000000000 & binaryDosTime) >> 11
-    day    = (           0b11111 & binaryDosDate) 
-    month  = (       0b111100000 & binaryDosDate) >> 5
-    year   = ((0b1111111000000000 & binaryDosDate) >> 9) + 1980
-    begin
-      return self.local(year, month, day, hour, minute, second)
+    def self.parse_binary_dos_format(binaryDosDate, binaryDosTime)
+      second = 2 * (       0b11111 & binaryDosTime)
+      minute = (     0b11111100000 & binaryDosTime) >> 5 
+      hour   = (0b1111100000000000 & binaryDosTime) >> 11
+      day    = (           0b11111 & binaryDosDate) 
+      month  = (       0b111100000 & binaryDosDate) >> 5
+      year   = ((0b1111111000000000 & binaryDosDate) >> 9) + 1980
+      begin
+        return self.local(year, month, day, hour, minute, second)
+      end
     end
   end
 end

data/lib/zip/settings.rb

@@ -0,0 +1,10 @@
+module Zip
+  class << self
+    def options
+      @options ||= {
+        :on_exists_proc => false,
+        :continue_on_exists_proc => false
+      }
+    end
+  end
+end

data/lib/zip/zip.rb

@@ -28,6 +28,8 @@ require 'zip/zip_streamable_stream'
 require 'zip/zip_streamable_directory'
 require 'zip/constants'
 
+require 'zip/settings'
+
 if Tempfile.superclass == SimpleDelegator
   require 'zip/tempfile_bugfixed'
   Tempfile = BugFix::Tempfile

data/lib/zip/zip_central_directory.rb

@@ -21,41 +21,45 @@ module Zip
 
     def write_to_stream(io)  #:nodoc:
       offset = io.tell
-      @entrySet.sort.each { |entry| entry.write_c_dir_entry(io) }
+      @entrySet.each { |entry| entry.write_c_dir_entry(io) }
       write_e_o_c_d(io, offset)
     end
 
     def write_e_o_c_d(io, offset)  #:nodoc:
-      io <<
-      [END_OF_CENTRAL_DIRECTORY_SIGNATURE,
+      tmp = [
+        END_OF_CENTRAL_DIRECTORY_SIGNATURE,
         0                                  , # @numberOfThisDisk
         0                                  , # @numberOfDiskWithStartOfCDir
-        @entrySet? @entrySet.size : 0        ,
-        @entrySet? @entrySet.size : 0        ,
-        cdir_size                           ,
+        @entrySet? @entrySet.size : 0      ,
+        @entrySet? @entrySet.size : 0      ,
+        cdir_size                          ,
         offset                             ,
-        @comment ? @comment.length : 0     ].pack('VvvvvVVv')
-        io << @comment
+        @comment ? @comment.length : 0
+      ]
+      io << tmp.pack('VvvvvVVv')
+      io << @comment
     end
     
     private :write_e_o_c_d
 
     def cdir_size  #:nodoc:
       # does not include eocd
-      @entrySet.inject(0) { |value, entry| entry.cdir_header_size + value }
+      @entrySet.inject(0) do |value, entry|
+        entry.cdir_header_size + value
+      end
     end
     
     private :cdir_size
 
     def read_e_o_c_d(io) #:nodoc:
       buf = get_e_o_c_d(io)
-      @numberOfThisDisk                     = ZipEntry::read_zip_short(buf)
-      @numberOfDiskWithStartOfCDir          = ZipEntry::read_zip_short(buf)
-      @totalNumberOfEntriesInCDirOnThisDisk = ZipEntry::read_zip_short(buf)
-      @size                                 = ZipEntry::read_zip_short(buf)
-      @sizeInBytes                          = ZipEntry::read_zip_long(buf)
-      @cdirOffset                           = ZipEntry::read_zip_long(buf)
-      commentLength                         = ZipEntry::read_zip_short(buf)
+      @numberOfThisDisk                     = ZipEntry.read_zip_short(buf)
+      @numberOfDiskWithStartOfCDir          = ZipEntry.read_zip_short(buf)
+      @totalNumberOfEntriesInCDirOnThisDisk = ZipEntry.read_zip_short(buf)
+      @size                                 = ZipEntry.read_zip_short(buf)
+      @sizeInBytes                          = ZipEntry.read_zip_long(buf)
+      @cdirOffset                           = ZipEntry.read_zip_long(buf)
+      commentLength                         = ZipEntry.read_zip_short(buf)
       @comment                              = buf.read(commentLength)
       raise ZipError, "Zip consistency problem while reading eocd structure" unless buf.size == 0
     end
@@ -67,9 +71,10 @@ module Zip
         raise ZipError, "Zip consistency problem while reading central directory entry"
       end
       @entrySet = ZipEntrySet.new
-      @size.times {
-        @entrySet << ZipEntry.read_c_dir_entry(io)
-      }
+      @size.times do
+        tmp = ZipEntry.read_c_dir_entry(io)
+        @entrySet << tmp
+      end
     end
 
     def read_from_stream(io)  #:nodoc:
@@ -94,18 +99,19 @@ module Zip
       rescue Errno::EFBIG # FreeBSD 4.5 may raise Errno::EFBIG
         raise if (retried)
         retried = true
-
         io.seek(0, IO::SEEK_SET)
         retry
       end
 
       sigIndex = buf.rindex([END_OF_CENTRAL_DIRECTORY_SIGNATURE].pack('V'))
       raise ZipError, "Zip end of central directory signature not found" unless sigIndex
-      buf=buf.slice!((sigIndex+4)...(buf.size))
+      buf = buf.slice!((sigIndex + 4)...(buf.bytesize))
+
       def buf.read(count)
         slice!(0, count)
       end
-      return buf
+
+      buf
     end
 
     # For iterating over the entries.
@@ -127,7 +133,7 @@ module Zip
       return nil
     end
 
-    def == (other) #:nodoc:
+    def ==(other) #:nodoc:
       return false unless other.kind_of?(ZipCentralDirectory)
       @entrySet.entries.sort == other.entries.sort && comment == other.comment
     end

data/lib/zip/zip_entry.rb

@@ -11,7 +11,7 @@ module Zip
     FSTYPE_ATARI = 5
     FSTYPE_HPFS = 6
     FSTYPE_MAC = 7
-    FSTYPE_Z_SYSTEM = 8 
+    FSTYPE_Z_SYSTEM = 8
     FSTYPE_CPM = 9
     FSTYPE_TOPS20 = 10
     FSTYPE_NTFS = 11
@@ -49,40 +49,19 @@ module Zip
       FSTYPE_ATHEOS => 'AtheOS'.freeze,
     }.freeze
 
-    attr_accessor  :comment, :compressed_size, :crc, :extra, :compression_method, 
+    attr_accessor  :comment, :compressed_size, :crc, :extra, :compression_method,
       :name, :size, :localHeaderOffset, :zipfile, :fstype, :externalFileAttributes, :gp_flags, :header_signature
 
     attr_accessor :follow_symlinks
     attr_accessor :restore_times, :restore_permissions, :restore_ownership
     attr_accessor :unix_uid, :unix_gid, :unix_perms
-
     attr_accessor :dirty
-
     attr_reader :ftype, :filepath # :nodoc:
 
-    # Returns the character encoding used for name and comment
-    def name_encoding
-      (@gp_flags & 0b100000000000) != 0 ? "UTF-8" : "CP437//"
-    end
-
-    # Returns the name in the encoding specified by enc
-    def name_in(enc)
-      if RUBY_VERSION >= '1.9'
-        @name.encode(enc)
-      else
-        Iconv.conv(enc, name_encoding, @name)
-      end
-    end
-
-    # Returns the name in the encoding specified by enc
-    def comment_in(enc)
-      name_in(enc)
-    end
-
-    def initialize(zipfile = "", name = "", comment = "", extra = "", 
+    def initialize(zipfile = "", name = "", comment = "", extra = "",
                    compressed_size = 0, crc = 0, 
-       compression_method = ZipEntry::DEFLATED, size = 0,
-       time  = DOSTime.now)
+                   compression_method = ZipEntry::DEFLATED, size = 0,
+                   time  = DOSTime.now)
       super()
       if name.start_with?("/")
         raise ZipEntryNameError, "Illegal ZipEntry name '#{name}', name must not start with /"
@@ -91,6 +70,8 @@ module Zip
       @local_header_size = 0
       @internalFileAttributes = 1
       @externalFileAttributes = 0
+      @header_signature = CENTRAL_DIRECTORY_ENTRY_SIGNATURE
+      @versionNeededToExtract = VERSION_NEEDED_TO_EXTRACT
       @version = 52 # this library's version
       @ftype = nil # unspecified or unknown
       @filepath = nil
@@ -108,7 +89,7 @@ module Zip
       @name = name
       @size = size
       @time = time
-      @gp_flags = nil
+      @gp_flags = 0
 
       @follow_symlinks = false
 
@@ -187,7 +168,7 @@ module Zip
     end
 
     def cdir_header_size  #:nodoc:all
-      CDIR_ENTRY_STATIC_HEADER_LENGTH  + (@name ?  @name.bytesize : 0) + 
+      CDIR_ENTRY_STATIC_HEADER_LENGTH  + (@name ?  @name.bytesize : 0) +
       (@extra ? @extra.c_dir_size : 0) + (@comment ? @comment.bytesize : 0)
     end
 
@@ -197,7 +178,7 @@ module Zip
 
     # Extracts entry to file destPath (defaults to @name).
     def extract(destPath = @name, &onExistsProc)
-      onExistsProc ||= proc { false }
+      onExistsProc ||= proc { Zip.options[:on_exists_proc] }
 
       if directory?
         create_directory(destPath, &onExistsProc)
@@ -218,24 +199,44 @@ module Zip
 
     protected
 
-    def ZipEntry.read_zip_short(io) # :nodoc:
-      io.read(2).unpack('v')[0]
-    end
+    class << self
+      def read_zip_short(io) # :nodoc:
+        io.read(2).unpack('v')[0]
+      end
+
+      def read_zip_long(io) # :nodoc:
+        io.read(4).unpack('V')[0]
+      end
+
+      def read_c_dir_entry(io)  #:nodoc:all
+        entry = new(io.path)
+        entry.read_c_dir_entry(io)
+        entry
+      rescue ZipError
+        nil
+      end
+
+      def read_local_entry(io)
+        entry = new(io.path)
+        entry.read_local_entry(io)
+        entry
+      rescue ZipError
+        nil
+      end
 
-    def ZipEntry.read_zip_long(io) # :nodoc:
-      io.read(4).unpack('V')[0]
     end
+
     public
 
     LOCAL_ENTRY_SIGNATURE = 0x04034b50
     LOCAL_ENTRY_STATIC_HEADER_LENGTH = 30
     LOCAL_ENTRY_TRAILING_DESCRIPTOR_LENGTH = 4+4+4
-    VERSION_NEEDED_TO_EXTRACT = 10
+    VERSION_NEEDED_TO_EXTRACT = 20
 
     def read_local_entry(io)  #:nodoc:all
       @localHeaderOffset = io.tell
       staticSizedFieldsBuf = io.read(LOCAL_ENTRY_STATIC_HEADER_LENGTH)
-      unless (staticSizedFieldsBuf.size==LOCAL_ENTRY_STATIC_HEADER_LENGTH)
+      unless (staticSizedFieldsBuf.size == LOCAL_ENTRY_STATIC_HEADER_LENGTH)
         raise ZipError, "Premature end of file. Not enough data for zip entry local header"
       end
 
@@ -272,21 +273,15 @@ module Zip
       @local_header_size = calculate_local_header_size
     end
 
-    def ZipEntry.read_local_entry(io)
-      entry = new(io.path)
-      entry.read_local_entry(io)
-      return entry
-    rescue ZipError
-      return nil
-    end
+
 
     def write_local_entry(io)   #:nodoc:all
       @localHeaderOffset = io.tell
 
-      io << 
+      io <<
       [LOCAL_ENTRY_SIGNATURE    ,
-      VERSION_NEEDED_TO_EXTRACT , # version needed to extract
-      0                         , # @gp_flags                  ,
+      @versionNeededToExtract , # version needed to extract
+      @gp_flags                         , # @gp_flags                  ,
       @compression_method        ,
       @time.to_binary_dos_time     , # @lastModTime              ,
       @time.to_binary_dos_date     , # @lastModDate              ,
@@ -304,30 +299,31 @@ module Zip
 
     def read_c_dir_entry(io)  #:nodoc:all
       staticSizedFieldsBuf = io.read(CDIR_ENTRY_STATIC_HEADER_LENGTH)
-      unless (staticSizedFieldsBuf.size == CDIR_ENTRY_STATIC_HEADER_LENGTH)
+      unless (staticSizedFieldsBuf.bytesize == CDIR_ENTRY_STATIC_HEADER_LENGTH)
         raise ZipError, "Premature end of file. Not enough data for zip cdir entry header"
       end
 
-      @header_signature          ,
-      @version               , # version of encoding software
-      @fstype                , # filesystem type
-      @versionNeededToExtract,
-      @gp_flags               ,
-      @compression_method     ,
-      lastModTime            ,
-      lastModDate            ,
-      @crc                   ,
-      @compressed_size        ,
-      @size                  ,
-      nameLength             ,
-      extraLength            ,
-      commentLength          ,
-      diskNumberStart        ,
-      @internalFileAttributes,
-      @externalFileAttributes,
-      @localHeaderOffset     ,
-      @name                  ,
-      @extra                 ,
+
+      @header_signature         ,
+      @version                  , # version of encoding software
+      @fstype                   , # filesystem type
+      @versionNeededToExtract   ,
+      @gp_flags                 ,
+      @compression_method       ,
+      lastModTime               ,
+      lastModDate               ,
+      @crc                      ,
+      @compressed_size          ,
+      @size                     ,
+      nameLength                ,
+      extraLength               ,
+      commentLength             ,
+      diskNumberStart           ,
+      @internalFileAttributes   ,
+      @externalFileAttributes   ,
+      @localHeaderOffset        ,
+      @name                     ,
+      @extra                    ,
       @comment               = staticSizedFieldsBuf.unpack('VCCvvvvvVVVvvvvvVV')
 
       unless (@header_signature == CENTRAL_DIRECTORY_ENTRY_SIGNATURE)
@@ -335,13 +331,13 @@ module Zip
       end
       set_time(lastModDate, lastModTime)
 
-      @name                  = io.read(nameLength)
+      @name = io.read(nameLength)
       if ZipExtraField === @extra
         @extra.merge(io.read(extraLength))
       else
         @extra = ZipExtraField.new(io.read(extraLength))
       end
-      @comment               = io.read(commentLength)
+      @comment = io.read(commentLength)
       unless (@comment && @comment.bytesize == commentLength)
         raise ZipError, "Truncated cdir zip entry header"
       end
@@ -358,7 +354,13 @@ module Zip
         when 012
           @ftype = :symlink
         else
-          @ftype = :unknown
+          #best case guess for whether it is a file or not
+          #Otherwise this would be set to unknown and that entry would never be able to extracted
+          if name_is_directory?
+            @ftype = :directory
+          else
+            @ftype = :file
+          end
         end
       else
         if name_is_directory?
@@ -370,13 +372,7 @@ module Zip
       @local_header_size = calculate_local_header_size
     end
 
-    def ZipEntry.read_c_dir_entry(io)  #:nodoc:all
-      entry = new(io.path)
-      entry.read_c_dir_entry(io)
-      return entry
-    rescue ZipError
-      return nil
-    end
+
 
     def file_stat(path)	# :nodoc:
       if @follow_symlinks
@@ -431,28 +427,31 @@ module Zip
         end
       end
 
-      io << 
-      [CENTRAL_DIRECTORY_ENTRY_SIGNATURE,
-      @version                          , # version of encoding software
-      @fstype                           , # filesystem type
-      VERSION_NEEDED_TO_EXTRACT         , # @versionNeededToExtract           ,
-      0                                 , # @gp_flags                          ,
-      @compression_method               ,
-      @time.to_binary_dos_time          , # @lastModTime                      ,
-      @time.to_binary_dos_date          , # @lastModDate                      ,
-      @crc                              ,
-      @compressed_size                  ,
-      @size                             ,
-      @name  ?  @name.bytesize  : 0       ,
-      @extra ? @extra.c_dir_length : 0  ,
-      @comment ? @comment.bytesize : 0    ,
-      0                                 , # disk number start
-      @internalFileAttributes           , # file type (binary=0, text=1)
-      @externalFileAttributes           , # native filesystem attributes
-      @localHeaderOffset                ,
-      @name                             ,
-      @extra                            ,
-      @comment                          ].pack('VCCvvvvvVVVvvvvvVV')
+      tmp = [
+        @header_signature,
+        @version                          , # version of encoding software
+        @fstype                           , # filesystem type
+        @versionNeededToExtract         , # @versionNeededToExtract           ,
+        @gp_flags                                 , # @gp_flags                          ,
+        @compression_method               ,
+        @time.to_binary_dos_time          , # @lastModTime                      ,
+        @time.to_binary_dos_date          , # @lastModDate                      ,
+        @crc                              ,
+        @compressed_size                  ,
+        @size                             ,
+        @name  ?  @name.bytesize  : 0       ,
+        @extra ? @extra.c_dir_length : 0  ,
+        @comment ? @comment.bytesize : 0    ,
+        0                                 , # disk number start
+        @internalFileAttributes           , # file type (binary=0, text=1)
+        @externalFileAttributes           , # native filesystem attributes
+        @localHeaderOffset                ,
+        @name                             ,
+        @extra                            ,
+        @comment                          
+      ]
+
+      io << tmp.pack('VCCvvvvvVVVvvvvvVV')
 
       io << @name
       io << (@extra ? @extra.to_c_dir_bin : "")
@@ -544,7 +543,7 @@ module Zip
         aZipOutputStream.put_next_entry(self)
       elsif @filepath
         aZipOutputStream.put_next_entry(self)
-        get_input_stream { |is| IOExtras.copy_stream(aZipOutputStream, is) } 
+        get_input_stream { |is| IOExtras.copy_stream(aZipOutputStream, is) }
       else
         aZipOutputStream.copy_raw_entry(self)
       end
@@ -568,7 +567,7 @@ module Zip
       puts "Invalid date/time in zip entry"
     end
 
-    def write_file(destPath, continueOnExistsProc = proc { false })
+    def write_file(destPath, continueOnExistsProc = proc { Zip.options[:continue_on_exists_proc] })
       if ::File.exists?(destPath) && ! yield(self, destPath)
         raise ZipDestinationFileExistsError,
           "Destination '#{destPath}' already exists"
@@ -635,4 +634,4 @@ end
 
 # Copyright (C) 2002, 2003 Thomas Sondergaard
 # rubyzip is free software; you can redistribute it and/or
-# modify it under the terms of the ruby license.
+# modify it under the terms of the ruby license.

data/lib/zip/zip_entry_set.rb

@@ -9,11 +9,15 @@ module Zip
     end
 
     def include?(entry)
-      @entrySet.include?(entry.to_s)
+      @entrySet.include?(to_key(entry))
+    end
+
+    def find_entry(entry)
+      @entrySet[to_key(entry)]
     end
 
     def <<(entry)
-      @entrySet[entry.to_s] = entry
+      @entrySet[to_key(entry)] = entry
     end
     alias :push :<<
 
@@ -24,7 +28,7 @@ module Zip
     alias :length :size
 
     def delete(entry)
-      @entrySet.delete(entry.to_s) ? entry : nil
+      @entrySet.delete(to_key(entry)) ? entry : nil
     end
 
     def each(&aProc)
@@ -46,7 +50,7 @@ module Zip
     end
 
     def parent(entry)
-      @entrySet[entry.parent_as_string]
+      @entrySet[to_key(entry.parent_as_string)]
     end
 
     def glob(pattern, flags = ::File::FNM_PATHNAME|::File::FNM_DOTMATCH)
@@ -58,6 +62,11 @@ module Zip
 #TODO    attr_accessor :auto_create_directories
     protected
     attr_accessor :entrySet
+
+    private
+    def to_key(entry)
+      entry.to_s.sub(/\/$/, "")
+    end
   end
 end
 

data/lib/zip/zip_extra_field.rb

@@ -27,21 +27,21 @@ module Zip
       end
 
       def ==(other)
-        self.class != other.class and return false
-        each { |k, v|
+        return false if self.class != other.class
+        each do |k, v|
           v != other[k] and return false
-        }
+        end
         true
       end
 
       def to_local_bin
         s = pack_for_local
-        self.class.const_get(:HEADER_ID) + [s.length].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.length].pack("v") + s
+        self.class.const_get(:HEADER_ID) + [s.bytesize].pack("v") + s
       end
     end
 
@@ -60,7 +60,7 @@ module Zip
       attr_accessor :atime, :ctime, :mtime, :flag
 
       def merge(binstr)
-        binstr == "" and return
+        return if binstr.empty?
         size, content = initial_parse(binstr)
         size or return
         @flag, mtime, atime, ctime = content.unpack("CVVV")
@@ -103,10 +103,10 @@ module Zip
       attr_accessor :uid, :gid
 
       def merge(binstr)
-        binstr == "" and return
+        return if binstr.empty?
         size, content = initial_parse(binstr)
-        # size: 0 for central direcotry. 4 for local header
-        return if(! size || size == 0)
+        # size: 0 for central directory. 4 for local header
+        return if(!size || size == 0)
         uid, gid = content.unpack("vv")
         @uid ||= uid
         @gid ||= gid
@@ -132,17 +132,17 @@ module Zip
     end
 
     def merge(binstr)
-      binstr == "" and return
+      return if binstr.empty?
       i = 0 
-      while i < binstr.length
+      while i < binstr.bytesize
         id = binstr[i,2]
-        len = binstr[i+2,2].to_s.unpack("v")[0] 
+        len = binstr[i + 2,2].to_s.unpack("v")[0]
         if id && ID_MAP.member?(id)
           field_name = ID_MAP[id].name
           if self.member?(field_name)
-            self[field_name].mergea(binstr[i, len+4])
+            self[field_name].mergea(binstr[i, len + 4])
           else
-            field_obj = ID_MAP[id].new(binstr[i, len+4])
+            field_obj = ID_MAP[id].new(binstr[i, len + 4])
             self[field_name] = field_obj
           end
         elsif id
@@ -154,13 +154,13 @@ module Zip
             end
             self["Unknown"] = s
           end
-          if ! len || len+4 > binstr[i..-1].length
+          if !len || len + 4 > binstr[i..-1].bytesize
             self["Unknown"] << binstr[i..-1]
-            break;
+            break
           end
-          self["Unknown"] << binstr[i, len+4]
+          self["Unknown"] << binstr[i, len + 4]
         end
-        i += len+4
+        i += len + 4
       end
     end
 
@@ -180,26 +180,26 @@ module Zip
 
     def to_local_bin
       s = ""
-      each { |k, v|
+      each do |k, v|
         s << v.to_local_bin
-      }
+      end
       s
     end
     alias :to_s :to_local_bin
 
     def to_c_dir_bin
       s = ""
-      each { |k, v|
+      each do |k, v|
         s << v.to_c_dir_bin
-      }
+      end
       s
     end
 
     def c_dir_length
-      to_c_dir_bin.length
+      to_c_dir_bin.bytesize
     end
     def local_length
-      to_local_bin.length
+      to_local_bin.bytesize
     end
     alias :c_dir_size :c_dir_length
     alias :local_size :local_length

data/lib/zip/zip_file.rb

@@ -61,63 +61,64 @@ module Zip
       super()
       @name = fileName
       @comment = ""
-      if (::File.exists?(fileName)) and !buffer
-        ::File.open(name, "rb") { |f| read_from_stream(f) }
-      elsif (create)
-        @entrySet = ZipEntrySet.new
-      else
-        raise ZipError, "File #{fileName} not found"
+      case
+        when ::File.exists?(fileName) && !buffer
+          ::File.open(name, "rb") do |f|
+            read_from_stream(f)
+          end
+        when create
+          @entrySet = ZipEntrySet.new
+        else
+          raise ZipError, "File #{fileName} not found"
       end
       @create = create
       @storedEntries = @entrySet.dup
-
+      @storedComment = @comment
       @restore_ownership = false
       @restore_permissions = false
       @restore_times = true
     end
 
-    # Same as #new. If a block is passed the ZipFile object is passed
-    # to the block and is automatically closed afterwards just as with
-    # ruby's builtin File.open method.
-    def ZipFile.open(fileName, create = nil)
-      zf = ZipFile.new(fileName, create)
-      if block_given?
-        begin
-          yield zf
-        ensure
-          zf.close
+    class << self
+      # Same as #new. If a block is passed the ZipFile object is passed
+      # to the block and is automatically closed afterwards just as with
+      # ruby's builtin File.open method.
+      def open(fileName, create = nil)
+        zf = ZipFile.new(fileName, create)
+        if block_given?
+          begin
+            yield zf
+          ensure
+            zf.close
+          end
+        else
+          zf
         end
-      else
-        zf
       end
-    end
 
-    # Same as #open. But outputs data to a buffer instead of a file
-    def ZipFile.add_buffer
-      zf = ZipFile.new('', true, true)
-      begin
+      # Same as #open. But outputs data to a buffer instead of a file
+      def add_buffer
+        zf = ZipFile.new('', true, true)
         yield zf
-      ensure
-        buffer = zf.write_buffer
-        return buffer
+        zf.write_buffer
+      end
+
+      # Iterates over the contents of the ZipFile. This is more efficient
+      # than using a ZipInputStream since this methods simply iterates
+      # through the entries in the central directory structure in the archive
+      # whereas ZipInputStream jumps through the entire archive accessing the
+      # local entry headers (which contain the same information as the
+      # central directory).
+      def foreach(aZipFileName, &block)
+        open(aZipFileName) do |zipFile|
+          zipFile.each(&block)
+        end
       end
     end
 
   # Returns the zip files comment, if it has one
     attr_accessor :comment
 
-    # Iterates over the contents of the ZipFile. This is more efficient
-    # than using a ZipInputStream since this methods simply iterates
-    # through the entries in the central directory structure in the archive
-    # whereas ZipInputStream jumps through the entire archive accessing the
-    # local entry headers (which contain the same information as the
-    # central directory).
-    def ZipFile.foreach(aZipFileName, &block)
-      ZipFile.open(aZipFileName) do |zipFile|
-        zipFile.each(&block)
-      end
-    end
-
     # Returns an input stream to the specified entry. If a block is passed
     # the stream object is passed to the block and the stream is automatically
     # closed afterwards just as with ruby's builtin File.open method.
@@ -152,7 +153,7 @@ module Zip
 
     # Convenience method for adding the contents of a file to the archive
     def add(entry, srcPath, &continueOnExistsProc)
-      continueOnExistsProc ||= proc { false }
+      continueOnExistsProc ||= proc { Zip.options[:continue_on_exists_proc] }
       check_entry_exists(entry, continueOnExistsProc, "add")
       newEntry = entry.kind_of?(ZipEntry) ? entry : ZipEntry.new(@name, entry.to_s)
       newEntry.gather_fileinfo_from_srcpath(srcPath)
@@ -183,7 +184,7 @@ module Zip
 
     # Extracts entry to file destPath.
     def extract(entry, destPath, &onExistsProc)
-      onExistsProc ||= proc { false }
+      onExistsProc ||= proc { Zip.options[:on_exists_proc] }
       foundEntry = get_entry(entry)
       foundEntry.extract(destPath, &onExistsProc)
     end
@@ -191,7 +192,7 @@ module Zip
     # Commits changes that has been made since the previous commit to
     # the zip archive.
     def commit
-      return if ! commit_required?
+      return if !commit_required?
       on_success_replace(name) {
         |tmpFile|
         ZipOutputStream.open(tmpFile) {
@@ -229,16 +230,13 @@ module Zip
       @entrySet.each do |e|
         return true if e.dirty
       end
-      return @entrySet != @storedEntries || @create == ZipFile::CREATE
+      @comment != @storedComment || @entrySet != @storedEntries || @create == ZipFile::CREATE
     end
 
     # Searches for entry with the specified name. Returns nil if
     # no entry is found. See also get_entry
-    def find_entry(entry)
-      @entrySet.detect {
-        |e|
-        e.name.sub(/\/$/, "") == entry.to_s.sub(/\/$/, "")
-      }
+    def find_entry(entry_name)
+      @entrySet.find_entry(entry_name)
     end
 
     # Searches for an entry just as find_entry, but throws Errno::ENOENT
@@ -259,7 +257,7 @@ module Zip
       if find_entry(entryName)
         raise Errno::EEXIST, "File exists - #{entryName}"
       end
-      entryName = entryName.to_s
+      entryName = entryName.dup.to_s
       entryName << '/' unless entryName.end_with?('/')
       @entrySet << ZipStreamableDirectory.new(@name, entryName, nil, permissionInt)
     end
@@ -279,8 +277,8 @@ module Zip
     end
 
     def check_entry_exists(entryName, continueOnExistsProc, procedureName)
-      continueOnExistsProc ||= proc { false }
-      if @entrySet.detect { |e| e.name == entryName }
+      continueOnExistsProc ||= proc { Zip.options[:continue_on_exists_proc] }
+      if @entrySet.include?(entryName)
         if continueOnExistsProc.call
           remove get_entry(entryName)
         else

data/lib/zip/zip_output_stream.rb

@@ -74,20 +74,23 @@ module Zip
       update_local_headers
       write_central_directory
       @closed = true
-      return @outputStream
+      @outputStream
     end
 
 	  # Closes the current entry and opens a new for writing.
     # +entry+ can be a ZipEntry object or a string.
     def put_next_entry(entryname, comment = nil, extra = nil, compression_method = ZipEntry::DEFLATED,  level = Zlib::DEFAULT_COMPRESSION)
       raise ZipError, "zip stream is closed" if @closed
-      new_entry = ZipEntry.new(@fileName, entryname.to_s)
-      new_entry.unix_perms = entryname.unix_perms if entryname.respond_to? :unix_perms
+      if entryname.kind_of?(ZipEntry)
+        new_entry = entryname
+      else
+        new_entry = ZipEntry.new(@fileName, entryname.to_s)
+      end
       new_entry.comment = comment if !comment.nil?
       if (!extra.nil?)
         new_entry.extra = ZipExtraField === extra ? extra : ZipExtraField.new(extra.to_s)
       end
-      new_entry.compression_method = compression_method
+      new_entry.compression_method = compression_method if !compression_method.nil?
       init_next_entry(new_entry, level)
       @currentEntry = new_entry
     end
@@ -110,11 +113,11 @@ module Zip
     end
 
     private
+
     def finalize_current_entry
       return unless @currentEntry
       finish
-      @currentEntry.compressed_size = @outputStream.tell - @currentEntry.localHeaderOffset -
-	    @currentEntry.calculate_local_header_size
+      @currentEntry.compressed_size = @outputStream.tell - @currentEntry.localHeaderOffset - @currentEntry.calculate_local_header_size
       @currentEntry.size = @compressor.size
       @currentEntry.crc = @compressor.crc
       @currentEntry = nil
@@ -138,12 +141,11 @@ module Zip
     end
 
     def update_local_headers
-      pos = @outputStream.tell
-      @entrySet.each {
-        |entry|
+      pos = @outputStream.pos
+      @entrySet.each do |entry|
         @outputStream.pos = entry.localHeaderOffset
         entry.write_local_entry(@outputStream)
-      }
+      end
       @outputStream.pos = pos
     end
 

metadata

@@ -1,22 +1,27 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rubyzip
-version: !ruby/object:Gem::Version
-  version: 0.9.6.1
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.9.7
 platform: ruby
-authors:
+authors: 
 - Alan Harper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000Z
+
+date: 2012-04-07 00:00:00 Z
 dependencies: []
+
 description: 
 email: alan@aussiegeek.net
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - samples/example.rb
 - samples/example_filesystem.rb
 - samples/example_recursive.rb
@@ -36,6 +41,7 @@ files:
 - lib/zip/null_input_stream.rb
 - lib/zip/pass_thru_compressor.rb
 - lib/zip/pass_thru_decompressor.rb
+- lib/zip/settings.rb
 - lib/zip/tempfile_bugfixed.rb
 - lib/zip/zip.rb
 - lib/zip/zip_central_directory.rb
@@ -54,27 +60,31 @@ files:
 - Rakefile
 homepage: http://github.com/aussiegeek/rubyzip
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: rubyzip is a ruby module for reading and writing zip files
 test_files: []
+
 has_rdoc: