rubyzip 1.0.0 → 1.1.0

data/lib/zip/ioextras/abstract_input_stream.rb

@@ -17,7 +17,7 @@ module Zip
       attr_accessor :lineno
       attr_reader :pos
 
-      def read(number_of_bytes = nil, buf = nil)
+      def read(number_of_bytes = nil, buf = '')
         tbuf = if @output_buffer.bytesize > 0
                  if number_of_bytes <= @output_buffer.bytesize
                    @output_buffer.slice!(0, number_of_bytes)
@@ -33,9 +33,12 @@ module Zip
                  sysread(number_of_bytes, buf)
                end
 
-        @pos += tbuf.length
+        if tbuf.nil? || tbuf.length == 0
+          return nil if number_of_bytes
+          return ""
+        end
 
-        return nil unless tbuf
+        @pos += tbuf.length
 
         if buf
           buf.replace(tbuf)

data/lib/zip/null_decompressor.rb

@@ -1,6 +1,6 @@
 module Zip
-  class NullDecompressor #:nodoc:all
-    include Singleton
+  module NullDecompressor #:nodoc:all
+    extend self
 
     def sysread(numberOfBytes = nil, buf = nil)
       nil

data/lib/zip/null_input_stream.rb

@@ -1,5 +1,6 @@
 module Zip
-  class NullInputStream < NullDecompressor #:nodoc:all
+  module NullInputStream #:nodoc:all
+    include ::Zip::NullDecompressor
     include ::Zip::IOExtras::AbstractInputStream
   end
 end

data/lib/zip/output_stream.rb

@@ -35,7 +35,7 @@ module Zip
       @entry_set = ::Zip::EntrySet.new
       @compressor = ::Zip::NullCompressor.instance
       @closed = false
-      @currentEntry = nil
+      @current_entry = nil
       @comment = nil
     end
 
@@ -94,7 +94,7 @@ module Zip
       end
       new_entry.compression_method = compression_method if !compression_method.nil?
       init_next_entry(new_entry, level)
-      @currentEntry = new_entry
+      @current_entry = new_entry
     end
 
     def copy_raw_entry(entry)
@@ -111,18 +111,18 @@ module Zip
         IOExtras.copy_stream_n(@output_stream, is, entry.compressed_size)
       end
       @compressor = NullCompressor.instance
-      @currentEntry = nil
+      @current_entry = nil
     end
 
     private
 
     def finalize_current_entry
-      return unless @currentEntry
+      return unless @current_entry
       finish
-      @currentEntry.compressed_size = @output_stream.tell - @currentEntry.local_header_offset - @currentEntry.calculate_local_header_size
-      @currentEntry.size = @compressor.size
-      @currentEntry.crc = @compressor.crc
-      @currentEntry = nil
+      @current_entry.compressed_size = @output_stream.tell - @current_entry.local_header_offset - @current_entry.calculate_local_header_size
+      @current_entry.size = @compressor.size
+      @current_entry.crc = @compressor.crc
+      @current_entry = nil
       @compressor = NullCompressor.instance
     end
 
@@ -146,7 +146,7 @@ module Zip
       pos = @output_stream.pos
       @entry_set.each do |entry|
         @output_stream.pos = entry.local_header_offset
-        entry.write_local_entry(@output_stream)
+        entry.write_local_entry(@output_stream, true)
       end
       @output_stream.pos = pos
     end

data/lib/zip/pass_thru_decompressor.rb

@@ -8,7 +8,7 @@ module Zip
       @has_returned_empty_string = false
     end
 
-    def sysread(number_of_bytes = nil, buf = nil)
+    def sysread(number_of_bytes = nil, buf = '')
       if input_finished?
         has_returned_empty_string_val = @has_returned_empty_string
         @has_returned_empty_string = true
@@ -16,7 +16,7 @@ module Zip
         return
       end
 
-      if (number_of_bytes == nil || @read_so_far + number_of_bytes > @chars_to_read)
+      if number_of_bytes.nil? || @read_so_far + number_of_bytes > @chars_to_read
         number_of_bytes = @chars_to_read - @read_so_far
       end
       @read_so_far += number_of_bytes

data/lib/zip/version.rb

@@ -1,3 +1,3 @@
 module Zip
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyzip
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Alexander Simonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -37,6 +37,7 @@ files:
 - lib/zip/extra_field/universal_time.rb
 - lib/zip/extra_field/unix.rb
 - lib/zip/extra_field/zip64.rb
+- lib/zip/extra_field/zip64_placeholder.rb
 - lib/zip/extra_field.rb
 - lib/zip/file.rb
 - lib/zip/filesystem.rb
@@ -56,7 +57,6 @@ files:
 - lib/zip/version.rb
 - lib/zip.rb
 - README.md
-- NEWS
 - TODO
 - Rakefile
 homepage: http://github.com/rubyzip/rubyzip
@@ -68,17 +68,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: rubyzip is a ruby module for reading and writing zip files

data/NEWS

@@ -1,182 +0,0 @@
-= Version 1.0.0
-
-Changed the API for gem. Now it can be used without require param in Gemfile.
-Added read-only support for Zip64 files.
-Added support for setting Unicode file names.
-
-= Version 0.9.9
-
-Added support for backslashes in zip files (generated by the default Windows
-zip packer for example) and comment sections with the comment length set to zero
-even though there is actually a comment.
-
-= Version 0.9.8
-
-Fixed: "Unitialized constant NullInputStream" error
-
-= Version 0.9.5
-
-Removed support for loading ruby in zip files (ziprequire.rb).
-
-= Version 0.9.4
-
-Changed ZipOutputStream.put_next_entry signature (API CHANGE!). Now
-allows comment, extra field and compression method to be specified.
-
-= Version 0.9.3
-
-Fixed: Added ZipEntry::name_encoding which retrieves the character
-encoding of the name and comment of the entry. Also added convenience
-methods ZipEntry::name_in(enc) and ZipEntry::comment_in(enc) for
-getting zip entry names and comments in a specified character
-encoding.
-
-= Version 0.9.2
-
-Fixed: Renaming an entry failed if the entry's new name was a
-different length than its old name. (Diego Barros)
-
-= Version 0.9.1
-
-Added symlink support and support for unix file permissions. Reduced
-memory usage during decompression.
-
-New methods ZipFile::[follow_symlinks, restore_times, restore_permissions, restore_ownership].
-New methods ZipEntry::unix_perms, ZipInputStream::eof?.
-Added documentation and test for new ZipFile::extract.
-Added some of the API suggestions from sf.net #1281314.
-Applied patch for sf.net bug #1446926.
-Applied patch for sf.net bug #1459902.
-Rework ZipEntry and delegate classes.
-
-= Version 0.5.12
-
-Fixed problem with writing binary content to a ZipFile in MS Windows.
-
-= Version 0.5.11
-
-Fixed name clash file method copy_stream from fileutils.rb. Fixed
-problem with references to constant CHUNK_SIZE.
-ZipInputStream/AbstractInputStream read is now buffered like ruby IO's
-read method, which means that read and gets etc can be mixed. The
-unbuffered read method has been renamed to sysread.
-
-= Version 0.5.10
-
-Fixed method name resolution problem with FileUtils::copy_stream and
-IOExtras::copy_stream.
-
-= Version 0.5.9
-
-Fixed serious memory consumption issue
-
-= Version 0.5.8
-
-Fixed install script.
-
-= Version 0.5.7
-
-install.rb no longer assumes it is being run from the toplevel source
-dir. Directory structure changed to reflect common ruby library
-project structure. Migrated from RubyUnit to Test::Unit format.  Now
-uses Rake to build source packages and gems and run unit tests.
-
-= Version 0.5.6
-
-Fix for FreeBSD 4.9 which returns Errno::EFBIG instead of
-Errno::EINVAL for some invalid seeks. Fixed 'version needed to
-extract'-field incorrect in local headers.
-
-= Version 0.5.5
-
-Fix for a problem with writing zip files that concerns only ruby 1.8.1.
-
-= Version 0.5.4
-
-Significantly reduced memory footprint when modifying zip files.
-
-= Version 0.5.3
-
-Added optimization to avoid decompressing and recompressing individual
-entries when modifying a zip archive.
-
-= Version 0.5.2
-
-Fixed ZipFile corruption bug in ZipFile class. Added basic unix
-extra-field support.
-
-= Version 0.5.1
-
-Fixed ZipFile.get_output_stream bug.
-
-= Version 0.5.0
-
-List of changes:
-* Ruby 1.8.0 and ruby-zlib 0.6.0 compatibility
-* Changed method names from camelCase to rubys underscore style.
-* Installs to zip/ subdir instead of directly to site_ruby
-* Added ZipFile.directory and ZipFile.file - each method return an
-object that can be used like Dir and File only for the contents of the
-zip file.
-* Added sample application zipfind which works like Find.find, only
-Zip::ZipFind.find traverses into zip archives too.
-
-Bug fixes:
-* AbstractInputStream.each_line with non-default separator
-
-
-= Version 0.5.0a
-
-Source reorganized. Added ziprequire, which can be used to load ruby
-modules from a zip file, in a fashion similar to jar files in
-Java. Added gtkRubyzip, another sample application. Implemented
-ZipInputStream.lineno and ZipInputStream.rewind
-
-Bug fixes:
-
-* Read and write date and time information correctly for zip entries.
-* Fixed read() using separate buffer, causing mix of gets/readline/read to
-cause problems.
-
-= Version 0.4.2
-
-Performance optimizations. Test suite runs in half the time.
-
-= Version 0.4.1
-
-Windows compatibility fixes.
-
-= Version 0.4.0
-
-Zip::ZipFile is now mutable and provides a more convenient way of
-modifying zip archives than Zip::ZipOutputStream. Operations for
-adding, extracting, renaming, replacing and removing entries to zip
-archives are now available.
-
-Runs without warnings with -w switch.
-
-Install script install.rb added.
-
-
-= Version 0.3.1
-
-Rudimentary support for writing zip archives.
-
-
-= Version 0.2.2
-
-Fixed and extended unit test suite. Updated to work with ruby/zlib
-0.5. It doesn't work with earlier versions of ruby/zlib.
-
-
-= Version 0.2.0
-
-Class ZipFile added. Where ZipInputStream is used to read the
-individual entries in a zip file, ZipFile reads the central directory
-in the zip archive, so you can get to any entry in the zip archive
-without having to skipping through all the preceeding entries.
-
-
-= Version 0.1.0
-
-First working version of ZipInputStream.