rubyzip 1.0.0.beta1 → 1.0.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 43c105816327e51ada812102f96fb5ee767f4111
-  data.tar.gz: 9885633481d4b7f0887a5d7861e99fb8a632e913
-SHA512:
-  metadata.gz: 5d5b39710bf4d51ffeff8d4de6a9b1583f5fc844c1a128014a591288d3e770d20fb89a600884cfac0795dedbea0caea37a3af1b407f477a504923f719a4be158
-  data.tar.gz: 6549a23e186d61d456c3214e627dd084b80a569142bc0994c8dc9e2e87dcdfe7059f027d7ff045287c6daa73e95391c7247bc36fb0da4562e95a3f0fcd615b8c
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NjQ3YjE3YmQ0MDUyYzViOThmNDBjNGVhYTRmNDdiNzAzZjYzNjZkOA==
+  data.tar.gz: !binary |-
+    OGI5ZjFlYTk3NmQwMGY2NmM2NmVkYWI3ZjczMTVjNDAxYzg0YzY3Zg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ODI3NzAwZDg5NzYyZDdjZTNlNDUyOWJjYmY0YTU0MGEzMjUwOTE5MjdkOTM3
+    ZjkzMTFjNzQzZmRlZDA4MTllZmU2N2NjMDQyMDM5NTRjMjg5ODVmMzUyODMw
+    ZGExYjk3MDkwNzRmYTJkYjhhYjNmMmY4YTIyYTQ2ODA4MDdiNzk=
+  data.tar.gz: !binary |-
+    MWM5ODRlNzdmNDNiOGE4ZjkzMWYzZTIxZTE4OTU1ZTVhZmQ4YzhhZGQ0ZWNi
+    N2Q4N2NhZmE1ZmJiZjFjMzcxMWI3YzgzNmRiNDVlZGYwZmYyZTJiNTljY2Yx
+    MTY4NGM1YjNhOGJiZmE2MGUyZTBjYTc2YzdjMzc0ZTE3NTIyZDc=

data/NEWS

@@ -1,3 +1,9 @@
+= 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

data/README.md

@@ -1,11 +1,13 @@
-# rubyzip [![Build Status](https://secure.travis-ci.org/rubyzip/rubyzip.png)](http://travis-ci.org/aussiegeek/rubyzip)[![Code Climate](https://codeclimate.com/github/aussiegeek/rubyzip.png)](https://codeclimate.com/github/aussiegeek/rubyzip)
+# rubyzip
+[![Build Status](https://secure.travis-ci.org/rubyzip/rubyzip.png)](http://travis-ci.org/rubyzip/rubyzip)
+[![Code Climate](https://codeclimate.com/github/rubyzip/rubyzip.png)](https://codeclimate.com/github/rubyzip/rubyzip)
+[![Coverage Status](https://coveralls.io/repos/rubyzip/rubyzip/badge.png?branch=master)](https://coveralls.io/r/rubyzip/rubyzip?branch=master)
 
 rubyzip is a ruby library for reading and writing zip files.
 
 ## Important note
 
-This branch for next version of rubyzip. Do not use it on production.
-Rubyzip interface will be changed!!!
+Rubyzip interface changed!!! No need to do `require "zip/zip"` and `Zip` prefix in class names removed.
 
 ## Installation
 rubyzip is available on RubyGems, so:

data/Rakefile

@@ -1,13 +1,13 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 
-task :default => [:test]
+task :default => :test
 
 Rake::TestTask.new(:test) do |test|
   test.libs << File.join(File.dirname(__FILE__), 'lib')
   test.libs << File.join(File.dirname(__FILE__), 'test')
   test.pattern = File.join(File.dirname(__FILE__), 'test/alltests.rb')
   test.verbose = true
-  Dir.chdir File.join(File.dirname(__FILE__), 'test')
+
 end
 

data/lib/zip/central_directory.rb

@@ -2,9 +2,11 @@ module Zip
   class CentralDirectory
     include Enumerable
 
-    END_OF_CENTRAL_DIRECTORY_SIGNATURE          = 0x06054b50
-    MAX_END_OF_CENTRAL_DIRECTORY_STRUCTURE_SIZE = 65536 + 18
-    STATIC_EOCD_SIZE                            = 22
+    END_OF_CDS             = 0x06054b50
+    ZIP64_END_OF_CDS       = 0x06064b50
+    ZIP64_EOCD_LOCATOR     = 0x07064b50
+    MAX_END_OF_CDS_SIZE    = 65536 + 18
+    STATIC_EOCD_SIZE       = 22
 
     attr_reader :comment
 
@@ -13,10 +15,10 @@ module Zip
       @entry_set.entries
     end
 
-    def initialize(entries = EntrySet.new, comment = "") #:nodoc:
+    def initialize(entries = EntrySet.new, comment = '') #:nodoc:
       super()
       @entry_set = entries.kind_of?(EntrySet) ? entries : EntrySet.new(entries)
-      @comment  = comment
+      @comment   = comment
     end
 
     def write_to_stream(io) #:nodoc:
@@ -27,7 +29,7 @@ module Zip
 
     def write_e_o_c_d(io, offset) #:nodoc:
       tmp = [
-        END_OF_CENTRAL_DIRECTORY_SIGNATURE,
+        END_OF_CDS,
         0, # @numberOfThisDisk
         0, # @numberOfDiskWithStartOfCDir
         @entry_set ? @entry_set.size : 0,
@@ -43,7 +45,7 @@ module Zip
     private :write_e_o_c_d
 
     def cdir_size #:nodoc:
-                  # does not include eocd
+      # does not include eocd
       @entry_set.inject(0) do |value, entry|
         entry.cdir_header_size + value
       end
@@ -51,51 +53,91 @@ module Zip
 
     private :cdir_size
 
-    def read_e_o_c_d(io) #:nodoc:
-      buf                                   = get_e_o_c_d(io)
-      @numberOfThisDisk                     = Entry.read_zip_short(buf)
-      @numberOfDiskWithStartOfCDir          = Entry.read_zip_short(buf)
-      @totalNumberOfEntriesInCDirOnThisDisk = Entry.read_zip_short(buf)
-      @size                                 = Entry.read_zip_short(buf)
-      @sizeInBytes                          = Entry.read_zip_long(buf)
-      @cdirOffset                           = Entry.read_zip_long(buf)
-      commentLength                         = Entry.read_zip_short(buf)
-      if commentLength <= 0
-        @comment = buf.slice!(0, buf.size)
-      else
-        @comment = buf.read(commentLength)
-      end
+    def read_64_e_o_c_d(buf) #:nodoc:
+      buf                                           = get_64_e_o_c_d(buf)
+      @size_of_zip64_e_o_c_d                        = Entry.read_zip_64_long(buf)
+      @version_made_by                              = Entry.read_zip_short(buf)
+      @version_needed_for_extract                   = Entry.read_zip_short(buf)
+      @number_of_this_disk                          = Entry.read_zip_long(buf)
+      @number_of_disk_with_start_of_cdir            = Entry.read_zip_long(buf)
+      @total_number_of_entries_in_cdir_on_this_disk = Entry.read_zip_64_long(buf)
+      @size                                         = Entry.read_zip_64_long(buf)
+      @size_in_bytes                                = Entry.read_zip_64_long(buf)
+      @cdir_offset                                  = Entry.read_zip_64_long(buf)
+      @zip_64_extensible                            = buf.slice!(0, buf.bytesize)
+      raise ZipError, "Zip consistency problem while reading eocd structure" unless buf.size == 0
+    end
+
+    def read_e_o_c_d(buf) #:nodoc:
+      buf                                           = get_e_o_c_d(buf)
+      @number_of_this_disk                          = Entry.read_zip_short(buf)
+      @number_of_disk_with_start_of_cdir            = Entry.read_zip_short(buf)
+      @total_number_of_entries_in_cdir_on_this_disk = Entry.read_zip_short(buf)
+      @size                                         = Entry.read_zip_short(buf)
+      @size_in_bytes                                = Entry.read_zip_long(buf)
+      @cdir_offset                                  = Entry.read_zip_long(buf)
+      comment_length                                = Entry.read_zip_short(buf)
+      @comment                                      = if comment_length <= 0
+                                                        buf.slice!(0, buf.size)
+                                                      else
+                                                        buf.read(comment_length)
+                                                      end
       raise ZipError, "Zip consistency problem while reading eocd structure" unless buf.size == 0
     end
 
     def read_central_directory_entries(io) #:nodoc:
       begin
-        io.seek(@cdirOffset, IO::SEEK_SET)
+        io.seek(@cdir_offset, IO::SEEK_SET)
       rescue Errno::EINVAL
         raise ZipError, "Zip consistency problem while reading central directory entry"
       end
       @entry_set = EntrySet.new
       @size.times do
-        tmp = Entry.read_c_dir_entry(io)
-        @entry_set << tmp
+        @entry_set << Entry.read_c_dir_entry(io)
       end
     end
 
     def read_from_stream(io) #:nodoc:
-      read_e_o_c_d(io)
+      buf = start_buf(io)
+      if self.zip64_file?(buf)
+        read_64_e_o_c_d(buf)
+      else
+        read_e_o_c_d(buf)
+      end
       read_central_directory_entries(io)
     end
 
-    def get_e_o_c_d(io) #:nodoc:
+    def get_e_o_c_d(buf) #:nodoc:
+      sig_index = buf.rindex([END_OF_CDS].pack('V'))
+      raise ZipError, "Zip end of central directory signature not found" unless sig_index
+      buf = buf.slice!((sig_index + 4)..(buf.bytesize))
+
+      def buf.read(count)
+        slice!(0, count)
+      end
+
+      buf
+    end
+
+    def zip64_file?(buf)
+      buf.rindex([ZIP64_END_OF_CDS].pack('V')) && buf.rindex([ZIP64_EOCD_LOCATOR].pack('V'))
+    end
+
+    def start_buf(io)
       begin
-        io.seek(-MAX_END_OF_CENTRAL_DIRECTORY_STRUCTURE_SIZE, IO::SEEK_END)
+        io.seek(-MAX_END_OF_CDS_SIZE, IO::SEEK_END)
       rescue Errno::EINVAL
         io.seek(0, IO::SEEK_SET)
       end
-      buf      = io.read
-      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.bytesize))
+      io.read
+    end
+
+    def get_64_e_o_c_d(buf) #:nodoc:
+      zip_64_start = buf.rindex([ZIP64_END_OF_CDS].pack('V'))
+      raise ZipError, "Zip64 end of central directory signature not found" unless zip_64_start
+      zip_64_locator = buf.rindex([ZIP64_EOCD_LOCATOR].pack('V'))
+      raise ZipError, "Zip64 end of central directory signature locator not found" unless zip_64_locator
+      buf = buf.slice!((zip_64_start + 4)..zip_64_locator)
 
       def buf.read(count)
         slice!(0, count)
@@ -115,7 +157,7 @@ module Zip
       @entry_set.size
     end
 
-    def CentralDirectory.read_from_stream(io) #:nodoc:
+    def self.read_from_stream(io) #:nodoc:
       cdir = new
       cdir.read_from_stream(io)
       return cdir

data/lib/zip/decompressor.rb

@@ -1,6 +1,6 @@
 module Zip
   class Decompressor  #:nodoc:all
-    CHUNK_SIZE=32768
+    CHUNK_SIZE = 32768
     def initialize(input_stream)
       super()
       @input_stream=input_stream

data/lib/zip/entry.rb

@@ -124,6 +124,7 @@ module Zip
     end
 
     def calculate_local_header_size #:nodoc:all
+      fix_zip64_sizes!
       LOCAL_ENTRY_STATIC_HEADER_LENGTH + name_size + extra_size
     end
 
@@ -164,6 +165,10 @@ module Zip
         io.read(4).unpack('V')[0]
       end
 
+      def read_zip_64_long(io) # :nodoc:
+        io.read(8).unpack('V')[0]
+      end
+
       def read_c_dir_entry(io) #:nodoc:all
         entry = new(io.path)
         entry.read_c_dir_entry(io)
@@ -243,7 +248,7 @@ module Zip
        @compressed_size,
        @size,
        name_size,
-       @extra ? @extra.local_length : 0].pack('VvvvvvVVVvv')
+       @extra ? @extra.local_size : 0].pack('VvvvvvVVVvv')
     end
 
     def write_local_entry(io) #:nodoc:all
@@ -398,7 +403,7 @@ module Zip
         @compressed_size,
         @size,
         name_size,
-        @extra ? @extra.c_dir_length : 0,
+        @extra ? @extra.c_dir_size : 0,
         comment_size,
         0, # disk number start
         @internal_file_attributes, # file type (binary=0, text=1)
@@ -601,6 +606,14 @@ module Zip
 
       ::File.symlink(linkto, dest_path)
     end
+
+    def fix_zip64_sizes! #:nodoc:all
+      if zip64 = @extra["Zip64"]
+        @size = zip64.original_size
+        @compressed_size = zip64.compressed_size
+      end
+    end
+
   end
 end
 

data/lib/zip/extra_field.rb

@@ -67,24 +67,23 @@ module Zip
       self.map { |_, v| v.to_c_dir_bin }.join
     end
 
-    def c_dir_length
+    def c_dir_size
       to_c_dir_bin.bytesize
     end
 
-    def local_length
+    def local_size
       to_local_bin.bytesize
     end
 
-    alias :c_dir_size :c_dir_length
-    alias :local_size :local_length
-    alias :length :local_length
-    alias :size :local_length
+    alias :length :local_size
+    alias :size :local_size
   end
 end
 
 require 'zip/extra_field/generic'
 require 'zip/extra_field/universal_time'
 require 'zip/extra_field/unix'
+
 # 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.

data/lib/zip/extra_field/unix.rb

@@ -23,8 +23,7 @@ module Zip
     end
 
     def ==(other)
-      @uid == other.uid &&
-        @gid == other.gid
+      @uid == other.uid && @gid == other.gid
     end
 
     def pack_for_local
@@ -32,7 +31,7 @@ module Zip
     end
 
     def pack_for_c_dir
-      ""
+      ''
     end
   end
 

data/lib/zip/extra_field/zip64.rb

@@ -0,0 +1,30 @@
+module Zip
+  # Info-ZIP Extra for Zip64 size
+  class ExtraField::Zip64 < ExtraField::Generic
+    attr_accessor :original_size, :compressed_size, :relative_header_offset, :disk_start_number
+    HEADER_ID = "\001\000"
+    register_map
+
+    def initialize(binstr = nil)
+      @original_size          = nil
+      @compressed_size        = nil
+      @relative_header_offset = nil
+      @disk_start_number      = nil
+      binstr and merge(binstr)
+    end
+
+    def merge(binstr)
+      return if binstr.empty?
+      id, size, @original_size, @compressed_size, @relative_header_offset, @disk_start_number = binstr.to_s.unpack("vvQQQV")
+    end
+
+    def pack_for_local
+      return '' unless @original_size && @compressed_sie && @relative_header_offset && @disk_start_number
+      [1, 16, @original_size, @compressed_size, @relative_header_offset, @disk_start_number].pack("vvQQQV")
+    end
+
+    def pack_for_c_dir
+      pack_for_local
+    end
+  end
+end

data/lib/zip/file.rb

@@ -19,9 +19,9 @@ module Zip
   # <code>first.txt</code> and a directory entry <code>a_dir</code>
   # to it.
   #
-  #   require 'zip/zip'
+  #   require 'zip'
   #
-  #   Zip::ZipFile.open("my.zip", Zip::ZipFile::CREATE) {
+  #   Zip::File.open("my.zip", Zip::File::CREATE) {
   #    |zipfile|
   #     zipfile.get_output_stream("first.txt") { |f| f.puts "Hello from ZipFile" }
   #     zipfile.mkdir("a_dir")
@@ -31,9 +31,9 @@ module Zip
   # <code>first.txt</code> to standard out and deletes the entry from
   # the archive.
   #
-  #   require 'zip/zip'
+  #   require 'zip'
   #
-  #   Zip::ZipFile.open("my.zip", Zip::ZipFile::CREATE) {
+  #   Zip::File.open("my.zip", Zip::File::CREATE) {
   #     |zipfile|
   #     puts zipfile.read("first.txt")
   #     zipfile.remove("first.txt")
@@ -46,6 +46,7 @@ module Zip
 
     CREATE           = 1
     SPLIT_SIGNATURE  = 0x08074b50
+    ZIP64_EOCD_SIGNATURE = 0x06064b50
     MAX_SEGMENT_SIZE = 3221225472
     MIN_SEGMENT_SIZE = 65536
     DATA_BUFFER_SIZE = 8192
@@ -58,18 +59,20 @@ module Zip
     attr_accessor :restore_permissions
     # default -> true
     attr_accessor :restore_times
+    # Returns the zip files comment, if it has one
+    attr_accessor :comment
 
     # Opens a zip archive. Pass true as the second parameter to create
     # a new archive if it doesn't exist already.
     def initialize(fileName, create = nil, buffer = false)
       super()
       @name    = fileName
-      @comment = ""
+      @comment = ''
       @create = create
       case
       when ::File.exists?(fileName) && !buffer
         @create = nil
-        ::File.open(name, "rb") do |f|
+        ::File.open(name, 'rb') do |f|
           read_from_stream(f)
         end
       when create
@@ -113,15 +116,15 @@ module Zip
       # (This can be used to extract data from a 
       # downloaded zip archive without first saving it to disk.)
       def open_buffer(io)
+        unless io.is_a?(IO) && io.is_a?(String)
+          raise "Zip::ZipFile.open_buffer expects an argument of class String or IO. Found: #{io.class}"
+        end
         zf = ::Zip::File.new('', true, true)
-        if io.is_a? IO
-          zf.read_from_stream(io)
-        elsif io.is_a? String
+        if io.is_a(::String)
           require 'stringio'
-          zf.read_from_stream(StringIO.new(io))
-        else
-          raise "Zip::ZipFile.open_buffer expects an argument of class String or IO. Found: #{io.class}"
+          io = ::StringIO.new(io)
         end
+        zf.read_from_stream(io)
         yield zf
         zf.write_buffer
       end
@@ -213,8 +216,6 @@ module Zip
       end
     end
 
-    # Returns the zip files comment, if it has one
-    attr_accessor :comment
 
     # 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

data/lib/zip/ioextras.rb

@@ -5,22 +5,21 @@ module Zip
 
     RANGE_ALL = 0..-1
 
-    def self.copy_stream(ostream, istream)
-      s = ''
-      ostream.write(istream.read(CHUNK_SIZE, s)) until istream.eof?
-    end
+    class << self
+      def copy_stream(ostream, istream)
+        ostream.write(istream.read(CHUNK_SIZE, '')) until istream.eof?
+      end
 
-    def self.copy_stream_n(ostream, istream, nbytes)
-      s      = ''
-      toread = nbytes
-      while (toread > 0 && !istream.eof?)
-        tr = toread > CHUNK_SIZE ? CHUNK_SIZE : toread
-        ostream.write(istream.read(tr, s))
-        toread -= tr
+      def copy_stream_n(ostream, istream, nbytes)
+        toread = nbytes
+        while toread > 0 && !istream.eof?
+          tr = toread > CHUNK_SIZE ? CHUNK_SIZE : toread
+          ostream.write(istream.read(tr, ''))
+          toread -= tr
+        end
       end
     end
 
-
     # Implements kind_of? in order to pretend to be an IO object
     module FakeIO
       def kind_of?(object)
@@ -28,159 +27,12 @@ module Zip
       end
     end
 
-    # Implements many of the convenience methods of IO
-    # such as gets, getc, readline and readlines
-    # depends on: input_finished?, produce_input and read
-    module AbstractInputStream
-      include Enumerable
-      include FakeIO
-
-      def initialize
-        super
-        @lineno        = 0
-        @pos           = 0
-        @output_buffer = ""
-      end
-
-      attr_accessor :lineno
-      attr_reader :pos
-
-      def read(numberOfBytes = nil, buf = nil)
-        tbuf = nil
-
-        if @output_buffer.bytesize > 0
-          if numberOfBytes <= @output_buffer.bytesize
-            tbuf = @output_buffer.slice!(0, numberOfBytes)
-          else
-            numberOfBytes -= @output_buffer.bytesize if (numberOfBytes)
-            rbuf = sysread(numberOfBytes, buf)
-            tbuf = @output_buffer
-            tbuf << rbuf if (rbuf)
-            @output_buffer = ""
-          end
-        else
-          tbuf = sysread(numberOfBytes, buf)
-        end
-
-        @pos += tbuf.length
-
-        return nil unless (tbuf)
-
-        if buf
-          buf.replace(tbuf)
-        else
-          buf = tbuf
-        end
-
-        buf
-      end
-
-      def readlines(aSepString = $/)
-        retVal = []
-        each_line(aSepString) { |line| retVal << line }
-        retVal
-      end
-
-      def gets(aSepString = $/, numberOfBytes = nil)
-        @lineno = @lineno.next
-
-        if numberOfBytes.respond_to?(:to_int)
-          numberOfBytes = numberOfBytes.to_int
-          aSepString = aSepString.to_str if aSepString
-        elsif aSepString.respond_to?(:to_int)
-          numberOfBytes = aSepString.to_int
-          aSepString    = $/
-        else
-          numberOfBytes = nil
-          aSepString = aSepString.to_str if aSepString
-        end
-
-        return read(numberOfBytes) if aSepString.nil?
-        aSepString = "#{$/}#{$/}" if aSepString.empty?
-
-        bufferIndex = 0
-        overLimit   = (numberOfBytes && @output_buffer.bytesize >= numberOfBytes)
-        while ((matchIndex = @output_buffer.index(aSepString, bufferIndex)) == nil && !overLimit)
-          bufferIndex = [bufferIndex, @output_buffer.bytesize - aSepString.bytesize].max
-          if input_finished?
-            return @output_buffer.empty? ? nil : flush
-          end
-          @output_buffer << produce_input
-          overLimit = (numberOfBytes && @output_buffer.bytesize >= numberOfBytes)
-        end
-        sepIndex = [matchIndex + aSepString.bytesize, numberOfBytes || @output_buffer.bytesize].min
-        @pos     += sepIndex
-        return @output_buffer.slice!(0...sepIndex)
-      end
-
-      def flush
-        retVal        = @output_buffer
-        @output_buffer=""
-        return retVal
-      end
-
-      def readline(aSepString = $/)
-        retVal = gets(aSepString)
-        raise EOFError if retVal == nil
-        retVal
-      end
-
-      def each_line(aSepString = $/)
-        while true
-          yield readline(aSepString)
-        end
-      rescue EOFError
-      end
-
-      alias_method :each, :each_line
-    end
-
-
-    # Implements many of the output convenience methods of IO.
-    # relies on <<
-    module AbstractOutputStream
-      include FakeIO
-
-      def write(data)
-        self << data
-        data.to_s.bytesize
-      end
-
-
-      def print(*params)
-        self << params.join($,) << $\.to_s
-      end
-
-      def printf(aFormatString, *params)
-        self << sprintf(aFormatString, *params)
-      end
-
-      def putc(anObject)
-        self << case anObject
-                when Fixnum then
-                  anObject.chr
-                when String then
-                  anObject
-                else
-                  raise TypeError, "putc: Only Fixnum and String supported"
-                end
-        anObject
-      end
-
-      def puts(*params)
-        params << "\n" if params.empty?
-        params.flatten.each do |element|
-          val = element.to_s
-          self << val
-          self << "\n" unless val[-1, 1] == "\n"
-        end
-      end
-
-    end
-
   end # IOExtras namespace module
 end
 
+require 'zip/ioextras/abstract_input_stream'
+require 'zip/ioextras/abstract_output_stream'
+
 # Copyright (C) 2002-2004 Thomas Sondergaard
 # rubyzip is free software; you can redistribute it and/or
 # modify it under the terms of the ruby license.

data/lib/zip/ioextras/abstract_input_stream.rb

@@ -0,0 +1,108 @@
+module Zip
+  module IOExtras
+    # Implements many of the convenience methods of IO
+    # such as gets, getc, readline and readlines
+    # depends on: input_finished?, produce_input and read
+    module AbstractInputStream
+      include Enumerable
+      include FakeIO
+
+      def initialize
+        super
+        @lineno        = 0
+        @pos           = 0
+        @output_buffer = ''
+      end
+
+      attr_accessor :lineno
+      attr_reader :pos
+
+      def read(number_of_bytes = nil, buf = nil)
+        tbuf = if @output_buffer.bytesize > 0
+                 if number_of_bytes <= @output_buffer.bytesize
+                   @output_buffer.slice!(0, number_of_bytes)
+                 else
+                   number_of_bytes -= @output_buffer.bytesize if number_of_bytes
+                   rbuf = sysread(number_of_bytes, buf)
+                   out  = @output_buffer
+                   out << rbuf if rbuf
+                   @output_buffer = ''
+                   out
+                 end
+               else
+                 sysread(number_of_bytes, buf)
+               end
+
+        @pos += tbuf.length
+
+        return nil unless tbuf
+
+        if buf
+          buf.replace(tbuf)
+        else
+          buf = tbuf
+        end
+        buf
+      end
+
+      def readlines(a_sep_string = $/)
+        ret_val = []
+        each_line(a_sep_string) { |line| ret_val << line }
+        ret_val
+      end
+
+      def gets(a_sep_string = $/, number_of_bytes = nil)
+        @lineno = @lineno.next
+
+        if number_of_bytes.respond_to?(:to_int)
+          number_of_bytes = number_of_bytes.to_int
+          a_sep_string = a_sep_string.to_str if a_sep_string
+        elsif a_sep_string.respond_to?(:to_int)
+          number_of_bytes = a_sep_string.to_int
+          a_sep_string    = $/
+        else
+          number_of_bytes = nil
+          a_sep_string = a_sep_string.to_str if a_sep_string
+        end
+
+        return read(number_of_bytes) if a_sep_string.nil?
+        a_sep_string = "#{$/}#{$/}" if a_sep_string.empty?
+
+        buffer_index = 0
+        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
+          @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)
+      end
+
+      def flush
+        ret_val        = @output_buffer
+        @output_buffer = ''
+        ret_val
+      end
+
+      def readline(a_sep_string = $/)
+        ret_val = gets(a_sep_string)
+        raise EOFError unless ret_val
+        ret_val
+      end
+
+      def each_line(a_sep_string = $/)
+        while true
+          yield readline(a_sep_string)
+        end
+      rescue EOFError
+      end
+
+      alias_method :each, :each_line
+    end
+  end
+end

data/lib/zip/ioextras/abstract_output_stream.rb

@@ -0,0 +1,45 @@
+module Zip
+  module IOExtras
+    # Implements many of the output convenience methods of IO.
+    # relies on <<
+    module AbstractOutputStream
+      include FakeIO
+
+      def write(data)
+        self << data
+        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)
+      end
+
+      def putc(an_object)
+        self << case an_object
+                when Fixnum
+                  an_object.chr
+                when String
+                  an_object
+                else
+                  raise TypeError, 'putc: Only Fixnum and String supported'
+                end
+        an_object
+      end
+
+      def puts(*params)
+        params << "\n" if params.empty?
+        params.flatten.each do |element|
+          val = element.to_s
+          self << val
+          self << "\n" unless val[-1, 1] == "\n"
+        end
+      end
+
+    end
+  end
+end

data/lib/zip/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyzip
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0
 platform: ruby
 authors:
 - Alexander Simonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -36,11 +36,14 @@ files:
 - lib/zip/extra_field/generic.rb
 - lib/zip/extra_field/universal_time.rb
 - lib/zip/extra_field/unix.rb
+- lib/zip/extra_field/zip64.rb
 - lib/zip/extra_field.rb
 - lib/zip/file.rb
 - lib/zip/filesystem.rb
 - lib/zip/inflater.rb
 - lib/zip/input_stream.rb
+- lib/zip/ioextras/abstract_input_stream.rb
+- lib/zip/ioextras/abstract_output_stream.rb
 - lib/zip/ioextras.rb
 - lib/zip/null_compressor.rb
 - lib/zip/null_decompressor.rb
@@ -65,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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: rubyzip is a ruby module for reading and writing zip files