archive-zip 0.11.0 → 0.13.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b3ed9fe304aaaccf2112d79acd33be3594225385
-  data.tar.gz: c09cbfbc1500cc9788a1f495e5063dcfa3660ea1
+SHA256:
+  metadata.gz: 1392110deef4d2f5d326613b369c129ba6c59802c8951d0f93c71f98f70e7b8c
+  data.tar.gz: 7d3d4fee38aa65051e96ec62364ee0642d0219488bb272e04c062e227735da75
 SHA512:
-  metadata.gz: da51b451dacabbb6fbcdad58d9fc0851d474e70ba0047df1676f5ecb148e501d82341122ebe533ff67ab2341201ffc6225dc8c0da9350fc197379168605384b1
-  data.tar.gz: 764188649dca68e41c8fd651fd1aba216e257d7856dcb7aa86c5f71d8d5105d185168c4b29c11034f4a1e0ee92b2dab4f1a5c54dcb8c4815eb32f66da7267993
+  metadata.gz: c46f9a08a470b353fd154e2d958c7ccd4454494a02f89d105b1cc567f6c66ca3ee284b49082e0875bbcbadd2da70ca7def0a0161efa1dfa0a2fba24029034712
+  data.tar.gz: c783d1001480fe8ef5756103101989e421855fd6f7435199bd29d338ce30745dda7ee2838b68a76201a9ddba04ee99f1de4515415ff087ab58d67b91d1dbfab8

data/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2018 Jeremy Bopp
+Copyright (c) 2025 Jeremy Bopp
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/NEWS.md

@@ -6,6 +6,18 @@ detailed information is available in the rest of the documentation.
 **NOTE:** Date stamps in the following entries are in YYYY/MM/DD format.
 
 
+## v0.13.0.pre1 (2025/05/25)
+
+* Upgrade io-like dependency to 0.4.0.pre1
+* Add more test coverage
+
+## v0.12.0 (2019/02/28)
+
+### Fixes
+
+* Check for codec availability before attempting to initialize a codec instance
+  during extraction. (Kouhei Sutou)
+
 ## v0.11.0 (2018/01/28)
 
 ### Fixes

data/README.md

@@ -183,6 +183,7 @@ Thanks to all contributors.  Without your help this project would not exist.
 * Jeremy Bopp :: jeremy@bopp.net
 * Akira Matsuda :: ronnie@dio.jp
 * Tatsuya Sato :: tatsuya.b.sato@rakuten.com
+* Kouhei Sutou :: kou@clear-code.com
 
 ## CONTRIBUTING
 
@@ -229,7 +230,7 @@ be more easily accepted if they are consistent with the rest of the code.
 ```
 (The MIT License)
 
-Copyright (c) 2018 Jeremy Bopp
+Copyright (c) 2025 Jeremy Bopp
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/archive/support/ioextensions.rb

@@ -4,13 +4,11 @@
 module IOExtensions
   # Reads and returns exactly _length_ bytes from _io_ using the read method on
   # _io_.  If there is insufficient data available, an EOFError is raised.
-  def self.read_exactly(io, length, buffer = '')
-    buffer.slice!(0..-1) unless buffer.empty?
-    while buffer.size < length do
-      internal = io.read(length - buffer.size)
-      raise EOFError, 'unexpected end of file' if internal.nil?
-      buffer << internal
+  def self.read_exactly(io, length)
+    result = io.read(length)
+    if result.nil? || result.bytesize < length
+      raise EOFError, 'unexpected end of file'
     end
-    buffer
+    result
   end
 end

data/lib/archive/support/iowindow.rb

@@ -1,115 +1,62 @@
 # encoding: UTF-8
 
-require 'archive/support/io-like'
-
-# IOWindow represents an IO object which wraps another one allowing read and/or
-# write access to a subset of the data within the stream.
-#
-# <b>NOTE:</b> This object is NOT thread safe.
-class IOWindow
-  include IO::Like
-
-  # Creates a new instance of this class using _io_ as the data source
-  # and where _window_position_ and _window_size_ define the location and size
-  # of data window respectively.
+require 'io/like_helpers/delegated_io'
+
+# IOWindow represents an IO object which wraps another one allowing read access
+# to a subset of the data within the stream.
+class IOWindow < IO::LikeHelpers::DelegatedIO
+  # Creates a new instance of this class using _delegate_ as the data source and
+  # where _window_position_ and _window_size_ define the location and size of
+  # data window respectively.
   #
-  # _io_ must be opened for reading and must be seekable.  _window_position_
-  # must be an integer greater than or equal to 0.  _window_size_ must be an
-  # integer greater than or equal to 0.
-  def initialize(io, window_position, window_size)
-    @io = io
-    @unbuffered_pos = 0
-    self.window_position = window_position
-    self.window_size = window_size
-  end
-
-  # The file position at which this window begins.
-  attr_reader :window_position
-
-  # Set the file position at which this window begins.
+  # _delegate_ must be opened for reading and must be seekable.
   # _window_position_ must be an integer greater than or equal to 0.
-  def window_position=(window_position)
-    unless window_position.respond_to?(:to_int) then
-      raise TypeError, "can't convert #{window_position.class} into Integer"
-    end
-    window_position = window_position.to_int
-    if window_position < 0 then
-      raise ArgumentError, 'non-positive window position given'
-    end
-
-    @window_position = window_position
-  end
-
-  # The size of the window.
-  attr_reader :window_size
-
-  # Set the size of the window.
   # _window_size_ must be an integer greater than or equal to 0.
-  def window_size=(window_size)
-    unless window_size.respond_to?(:to_int) then
-      raise TypeError, "can't convert #{window_size.class} into Integer"
+  def initialize(delegate, window_position, window_size, autoclose: true)
+    super(delegate, autoclose: autoclose)
+
+    @window_position = Integer(window_position)
+    if @window_position < 0
+      raise ArgumentError, 'window_position must be at least 0'
     end
-    window_size = window_size.to_int
-    raise ArgumentError, 'non-positive window size given' if window_size < 0
+    @window_size = Integer(window_size)
+    raise ArgumentError, 'window_size must be at least 0' if @window_size < 0
 
-    @window_size = window_size
+    @pos = 0
   end
 
-  private
-
-  def unbuffered_read(length)
-    restore_self
-
+  def read(length, buffer: nil, buffer_offset: 0)
     # Error out if the end of the window is reached.
-    raise EOFError, 'end of file reached' if @unbuffered_pos >= @window_size
+    raise EOFError, 'end of file reached' if @pos >= @window_size
 
     # Limit the read operation to the window.
-    length = @window_size - @unbuffered_pos if @unbuffered_pos + length > @window_size
+    length = @window_size - @pos if @pos + length > @window_size
 
     # Fill a buffer with the data from the delegate.
-    buffer = @io.read(length)
-    # Error out if the end of the delegate is reached.
-    raise EOFError, 'end of file reached' if buffer.nil?
+    result = super(length, buffer: buffer, buffer_offset: buffer_offset)
+    return result if Symbol === result
 
-    # Update the position.
-    @unbuffered_pos += buffer.length
+    @pos += buffer.nil? ? result.bytesize : result
 
-    buffer
-  ensure
-    restore_delegate
+    result
   end
 
-  def unbuffered_seek(offset, whence = IO::SEEK_SET)
-    # Convert the offset and whence into an absolute position.
+  def seek(amount, whence = IO::SEEK_SET)
+    # Convert the amount into an absolute position.
     case whence
     when IO::SEEK_SET
-      new_pos = offset
+      new_pos = amount
     when IO::SEEK_CUR
-      new_pos = @unbuffered_pos + offset
+      new_pos = @pos + amount
     when IO::SEEK_END
-      new_pos = @window_size + offset
+      new_pos = @window_size + amount
     end
 
     # Error out if the position is outside the window.
-    raise Errno::EINVAL, 'Invalid argument' if new_pos < 0 or new_pos > @window_size
-
-    # Set the new position.
-    @unbuffered_pos = new_pos
-  end
-
-  # Restores the state of the delegate IO object to that saved by a prior call
-  # to #restore_self.
-  def restore_delegate
-    @io.pos = @delegate_pos
-    @io.lineno = @delegate_lineno
-  end
+    if new_pos < 0 || new_pos > @window_size
+      raise Errno::EINVAL, 'Invalid argument'
+    end
 
-  # Saves the state of the delegate IO object so that it can be restored later
-  # using #restore_delegate and then configures the delegate so as to restore
-  # the state of this object.
-  def restore_self
-    @delegate_pos = @io.pos
-    @delegate_lineno = @io.lineno
-    @io.pos = @window_position + @unbuffered_pos
+    @pos = super(new_pos + @window_position, IO::SEEK_SET) - @window_position
   end
 end

data/lib/archive/support/stringio.rb

@@ -0,0 +1,27 @@
+# encoding: UTF-8
+
+require 'stringio'
+
+##
+# This extends StringIO to include additional methods required by the io-like
+# library to wrap IO objects.
+class StringIO
+  unless public_method_defined?(:sysseek)
+    def sysseek(offset, whence = IO::SEEK_SET)
+      seek(offset, whence)
+      pos
+    end
+  end
+
+  unless public_method_defined?(:nonblock?)
+    def nonblock?
+      false
+    end
+  end
+
+  unless public_method_defined?(:wait)
+    def wait(*args)
+      return true
+    end
+  end
+end