rubyzip 0.5.9 → 0.5.11

data/ChangeLog

@@ -1,3 +1,37 @@
+2005-09-03 10:27  thomas
+
+	* NEWS: [no log message]
+
+2005-09-03 10:02  thomas
+
+	* TODO, lib/zip/zip.rb: [no log message]
+
+2005-09-03 09:57  thomas
+
+	* lib/zip/ioextras.rb, lib/zip/zip.rb, test/ziptest.rb: Merged
+	  patch from oss-ruby at technorama.net
+
+2005-09-03 09:54  thomas
+
+	* test/ziptest.rb: Added failing test that shows that read and gets
+	  don't mix currently
+
+2005-08-29 08:50  thomas
+
+	* lib/zip/: ioextras.rb, zip.rb: [no log message]
+
+2005-08-29 08:41  thomas
+
+	* NEWS, lib/zip/zip.rb: [no log message]
+
+2005-08-29 08:35  thomas
+
+	* lib/zip/zip.rb: [no log message]
+
+2005-08-29 08:26  thomas
+
+	* lib/zip/zip.rb: [no log message]
+
 2005-08-07 14:27  thomas
 
 	* lib/zip/zip.rb, NEWS: [no log message]

data/NEWS

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

data/TODO

@@ -1,5 +1,9 @@
 
-* Fix problem with mixing AbstractInputStream::gets and AbstractInputStream::read
+* rename write to syswrite
+* provide alias for write -> syswrite in ioextras.rb
+* (is buffering used anywhere with write?)
+* produce_input should take an optional buffer parameter.
+* Inflater.sysread should pass the buffer to produce_input.
 * Implement ZipFsDir.glob
 * ZipFile.checkIntegrity method
 * non-MSDOS permission attributes

data/lib/zip/ioextras.rb

@@ -2,7 +2,9 @@ module IOExtras  #:nodoc:
 
   CHUNK_SIZE = 32768
 
-  def copy_stream(ostream, istream)
+  RANGE_ALL = 0..-1
+
+  def self.copy_stream(ostream, istream)
     s = ''
     ostream.write(istream.read(CHUNK_SIZE, s)) until istream.eof? 
   end
@@ -30,6 +32,32 @@ module IOExtras  #:nodoc:
 
     attr_accessor :lineno
 
+    def read(numberOfBytes = nil, buf = nil)
+      buf = "" unless (buf)
+
+      if numberOfBytes
+        if numberOfBytes <= @outputBuffer.length
+          buf[RANGE_ALL] = @outputBuffer.slice!(0, numberOfBytes)
+        else
+          if @outputBuffer.length > 0
+            buf[RANGE_ALL] = @outputBuffer + sysread(numberOfBytes - @outputBuffer.length, buf)
+            @outputBuffer.slice!(RANGE_ALL)
+          else
+            buf[RANGE_ALL] = sysread(nil, buf)
+          end
+        end
+      else
+        if @outputBuffer.length > 0
+          buf[RANGE_ALL] = @outputBuffer + sysread(nil, buf)
+          @outputBuffer.slice!(RANGE_ALL)
+        else
+          buf[RANGE_ALL] = sysread(nil, buf)
+        end
+      end
+
+      buf
+    end
+
     def readlines(aSepString = $/)
       retVal = []
       each_line(aSepString) { |line| retVal << line }

data/lib/zip/zip.rb

@@ -19,12 +19,10 @@ end
 
 module Zip
 
-  VERSION = '0.5.9'
+  VERSION = '0.5.11'
 
   RUBY_MINOR_VERSION = RUBY_VERSION.split(".")[1].to_i
 
-  CHUNK_SIZE=32768
-
   # Ruby 1.7.x compatibility
   # In ruby 1.6.x and 1.8.0 reading from an empty stream returns 
   # an empty string the first time and then nil.
@@ -122,8 +120,8 @@ module Zip
     end
 
     # Modeled after IO.read
-    def read(numberOfBytes = nil)
-      @decompressor.read(numberOfBytes)
+    def sysread(numberOfBytes = nil, buf = nil)
+      @decompressor.sysread(numberOfBytes, buf)
     end
 
     protected
@@ -157,6 +155,7 @@ module Zip
   
   
   class Decompressor  #:nodoc:all
+    CHUNK_SIZE=32768
     def initialize(inputStream)
       super()
       @inputStream=inputStream
@@ -171,7 +170,8 @@ module Zip
       @hasReturnedEmptyString = ! EMPTY_FILE_RETURNS_EMPTY_STRING_FIRST
     end
     
-    def read(numberOfBytes = nil)
+    # BUG: do something with buf
+    def sysread(numberOfBytes = nil, buf = nil)
       readEverything = (numberOfBytes == nil)
       while (readEverything || @outputBuffer.length < numberOfBytes)
 	break if internal_input_finished?
@@ -222,7 +222,7 @@ module Zip
     end
     
     # TODO: Specialize to handle different behaviour in ruby > 1.7.0 ?
-    def read(numberOfBytes = nil)
+    def sysread(numberOfBytes = nil, buf = nil)
       if input_finished?
 	hasReturnedEmptyStringVal=@hasReturnedEmptyString
 	@hasReturnedEmptyString=true
@@ -234,11 +234,11 @@ module Zip
 	numberOfBytes = @charsToRead-@readSoFar
       end
       @readSoFar += numberOfBytes
-      @inputStream.read(numberOfBytes)
+      @inputStream.read(numberOfBytes, buf)
     end
     
     def produce_input
-      read(Decompressor::CHUNK_SIZE)
+      sysread(Decompressor::CHUNK_SIZE)
     end
     
     def input_finished?
@@ -248,7 +248,7 @@ module Zip
   
   class NullDecompressor  #:nodoc:all
     include Singleton
-    def read(numberOfBytes = nil)
+    def sysread(numberOfBytes = nil, buf = nil)
       nil
     end
     
@@ -1279,7 +1279,7 @@ module Zip
     
     def write_to_zip_output_stream(aZipOutputStream)
       aZipOutputStream.put_next_entry(self)
-      get_input_stream { |is| copy_stream(aZipOutputStream, is) } 
+      get_input_stream { |is| IOExtras.copy_stream(aZipOutputStream, is) } 
     end
 
     def == (other)
@@ -1343,7 +1343,7 @@ module Zip
     
     def write_to_zip_output_stream(aZipOutputStream)
       aZipOutputStream.put_next_entry(self)
-      get_input_stream { |is| copy_stream(aZipOutputStream, is) } 
+      get_input_stream { |is| IOExtras.copy_stream(aZipOutputStream, is) } 
     end
   end
 

data/test/ziptest.rb

@@ -276,12 +276,12 @@ module DecompressorTests
   end
 
   def test_readEverything
-    assert_equal(@refText, @decompressor.read)
+    assert_equal(@refText, @decompressor.sysread)
   end
     
   def test_readInChunks
     chunkSize = 5
-    while (decompressedChunk = @decompressor.read(chunkSize))
+    while (decompressedChunk = @decompressor.sysread(chunkSize))
       assert_equal(@refText.slice!(0, chunkSize), decompressedChunk)
     end
     assert_equal(0, @refText.size)
@@ -293,7 +293,7 @@ module DecompressorTests
     assert(@refLines.length > 40)
 
     
-    assert_equal(@refText[0...100], @decompressor.read(100))
+    assert_equal(@refText[0...100], @decompressor.sysread(100))
 
     assert(! @decompressor.input_finished?)
     buf = @decompressor.produce_input
@@ -463,6 +463,16 @@ class ZipInputStreamTest < Test::Unit::TestCase
       assert_entry(e.name, zis, e.name)
     }
   end
+
+  def test_mix_read_and_gets
+    ZipInputStream.open(TestZipFile::TEST_ZIP2.zip_name) {
+      |zis|
+      e = zis.get_next_entry
+      assert_equal("#!/usr/bin/env ruby\n", zis.gets)
+      assert_equal("\n", zis.gets)
+      assert_equal("$VERBOSE =", zis.read(10))
+    }
+  end
   
 end
 
@@ -558,7 +568,7 @@ class DeflaterTest < Test::Unit::TestCase
     File.open(fileName, "rb") {
       |file|
       inflater = Inflater.new(file)
-      txt = inflater.read
+      txt = inflater.sysread
     }
   end
 
@@ -1574,6 +1584,6 @@ class ZipExtraFieldTest < Test::Unit::TestCase
 
 end
 
-# Copyright (C) 2002, 2003 Thomas Sondergaard
+# Copyright (C) 2002-2005 Thomas Sondergaard
 # rubyzip is free software; you can redistribute it and/or
 # modify it under the terms of the ruby license.

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rubyzip
 version: !ruby/object:Gem::Version 
-  version: 0.5.9
-date: 2005-08-07 00:00:00 +02:00
+  version: 0.5.11
+date: 2005-09-03 00:00:00 +02:00
 summary: rubyzip is a ruby module for reading and writing zip files
 require_paths: 
   - lib
@@ -59,12 +59,12 @@ files:
   - test/data/testDirectory.bin
   - test/data/zipWithDirs.zip
   - test/data/file2.txt.other
-  - lib/zip/ioextras.rb
   - lib/zip/stdrubyext.rb
   - lib/zip/tempfile_bugfixed.rb
   - lib/zip/zip.rb
   - lib/zip/zipfilesystem.rb
   - lib/zip/ziprequire.rb
+  - lib/zip/ioextras.rb
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []