omnizip 0.3.9 → 0.3.10

data/lib/omnizip/formats/lzip.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "stringio"
-require "omnizip/algorithms/lzma"
-require "omnizip/format_registry"
 
 module Omnizip
   module Formats
@@ -76,21 +74,7 @@ module Omnizip
         # @option options [Boolean] :concatenated If true, decode concatenated .lz members (default: false)
         # @return [String, nil] Decompressed data (if output is nil)
         def decompress(input, output = nil, options = {})
-          # Handle raw data string vs file path vs IO object
-          data = if input.respond_to?(:read)
-                   # Already an IO object
-                   input.read
-                 elsif input.is_a?(String)
-                   # Could be file path or raw data
-                   if !input.include?("\0") && File.exist?(input)
-                     File.binread(input)
-                   else
-                     input.b
-                   end
-                 else
-                   raise ArgumentError,
-                         "Input must be a String or IO object"
-                 end
+          data = Omnizip::IO::Source.for(input).read
 
           # Decode using LzipDecoder
           decoder = Omnizip::Algorithms::LZMA::LzipDecoder.new(
@@ -100,11 +84,7 @@ module Omnizip
           result = decoder.decode_stream
 
           if output
-            if output.respond_to?(:write)
-              output.write(result)
-            else
-              File.binwrite(output, result)
-            end
+            Omnizip::IO::Sink.for(output).write(result)
           else
             result
           end
@@ -146,9 +126,9 @@ module Omnizip
 
           # Return metadata
           {
-            version: decoder.instance_variable_get(:@version),
-            dict_size: decoder.instance_variable_get(:@dict_size),
-            member_size: decoder.instance_variable_get(:@member_size),
+            version: decoder.version,
+            dict_size: decoder.dict_size,
+            member_size: decoder.member_size,
           }
         end
 

data/lib/omnizip/formats/lzma_alone.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "stringio"
-require "omnizip/algorithms/lzma"
-require "omnizip/format_registry"
 
 module Omnizip
   module Formats
@@ -66,19 +64,7 @@ module Omnizip
         # @option options [Boolean] :picky If true, reject files unlikely to be .lzma (default: false)
         # @return [String, nil] Decompressed data (if output is nil)
         def decompress(input, output = nil, options = {})
-          # Handle raw data string vs file path
-          data = if input.respond_to?(:read)
-                   input.read
-                 elsif input.is_a?(String)
-                   if !input.include?("\0") && File.exist?(input)
-                     File.binread(input)
-                   else
-                     input.b
-                   end
-                 else
-                   raise ArgumentError,
-                         "Input must be a String or IO object"
-                 end
+          data = Omnizip::IO::Source.for(input).read
 
           # Decode using LzmaAloneDecoder
           decoder = Omnizip::Algorithms::LZMA::LzmaAloneDecoder.new(
@@ -88,11 +74,7 @@ module Omnizip
           result = decoder.decode_stream
 
           if output
-            if output.respond_to?(:write)
-              output.write(result)
-            else
-              File.binwrite(output, result)
-            end
+            Omnizip::IO::Sink.for(output).write(result)
           else
             result
           end
@@ -149,11 +131,11 @@ module Omnizip
 
           # Return metadata
           {
-            lc: decoder.instance_variable_get(:@lc),
-            lp: decoder.instance_variable_get(:@lp),
-            pb: decoder.instance_variable_get(:@pb),
-            dict_size: decoder.instance_variable_get(:@dict_size),
-            uncompressed_size: decoder.instance_variable_get(:@uncompressed_size),
+            lc: decoder.lc,
+            lp: decoder.lp,
+            pb: decoder.pb,
+            dict_size: decoder.dict_size,
+            uncompressed_size: decoder.uncompressed_size,
           }
         end
 

data/lib/omnizip/formats/msi/reader.rb

@@ -2,6 +2,7 @@
 
 require "fileutils"
 require "tempfile"
+require "tmpdir"
 
 module Omnizip
   module Formats

data/lib/omnizip/formats/msi/string_pool.rb

@@ -86,9 +86,8 @@ module Omnizip
           candidates = []
 
           # Try encoded name from the map first (set by Reader)
-          stream_name_map = instance_variable_get(:@stream_name_map)
-          if stream_name_map&.key?(base_name)
-            candidates << stream_name_map[base_name]
+          if @stream_name_map&.key?(base_name)
+            candidates << @stream_name_map[base_name]
           end
 
           # Try with standard prefix bytes

data/lib/omnizip/formats/msi.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "omnizip/formats/ole"
-require "omnizip/formats/msi/constants"
-
 module Omnizip
   module Formats
     # MSI (Microsoft Installer) format support
@@ -15,6 +12,7 @@ module Omnizip
     # - String pool for interned strings
     # - Embedded cabinets (in _Streams or direct OLE streams)
     module Msi
+      autoload :Constants, "omnizip/formats/msi/constants"
       autoload :Entry, "omnizip/formats/msi/entry"
       autoload :StringPool, "omnizip/formats/msi/string_pool"
       autoload :TableParser, "omnizip/formats/msi/table_parser"
@@ -74,7 +72,6 @@ module Omnizip
         #
         # This overrides OLE's .msi registration.
         def register!
-          require "omnizip/format_registry"
           FormatRegistry.register(".msi", self)
           FormatRegistry.register(".msp", self)
         end

data/lib/omnizip/formats/ole/allocation_table.rb

@@ -2,7 +2,6 @@
 
 require "set"
 
-require "omnizip/formats/ole"
 module Omnizip
   module Formats
     module Ole

data/lib/omnizip/formats/ole/dirent.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "omnizip/formats/ole"
 module Omnizip
   module Formats
     module Ole
@@ -74,6 +73,12 @@ module Omnizip
         # @return [Array<Dirent>] Child entries (for directories)
         attr_reader :parent
 
+        # Public read access to the per-dirent name lookup hash. Used by
+        # children to update the parent's index when their name changes.
+        def name_lookup
+          @name_lookup ||= {}
+        end
+
         # @return [Integer, nil] Index in dirent array (used during loading)
         attr_accessor :idx
 
@@ -154,7 +159,7 @@ module Omnizip
         # @param value [String] Entry name
         def name=(value)
           if @parent
-            map = @parent.instance_variable_get(:@name_lookup)
+            map = @parent.name_lookup
             map&.delete(@name)
             map&.store(value, self)
           end
@@ -314,7 +319,7 @@ module Omnizip
           raise Errno::EISDIR unless file?
 
           io = RangesIOMigrateable.new(self, mode)
-          @modify_time = Time.now if io.respond_to?(:writeable?) && io.writeable?
+          @modify_time = Time.now if io.is_a?(RangesIOMigrateable) && io.writeable?
 
           if block_given?
             begin
@@ -371,7 +376,7 @@ module Omnizip
         # Call this when done with the dirent to release memory.
         # @return [void]
         def free
-          @children&.each { |child| child.free if child.respond_to?(:free) }
+          @children&.each { |child| child.free if child.is_a?(Dirent) }
           @children = nil
           @parent = nil
           @ole = nil

data/lib/omnizip/formats/ole/header.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "omnizip/formats/ole"
 module Omnizip
   module Formats
     module Ole

data/lib/omnizip/formats/ole/ranges_io.rb

@@ -179,7 +179,7 @@ module Omnizip
         # @param data [String] Data to write
         # @return [Integer] Bytes written
         def write(data)
-          data = data.dup.force_encoding(Encoding::ASCII_8BIT) if data.respond_to?(:encoding)
+          data = data.dup.force_encoding(Encoding::ASCII_8BIT) if data.is_a?(String)
           return 0 if data.empty?
 
           # Grow if needed

data/lib/omnizip/formats/ole/storage.rb

@@ -2,7 +2,6 @@
 
 require "set"
 
-require "omnizip/formats/ole"
 module Omnizip
   module Formats
     module Ole
@@ -80,7 +79,7 @@ module Omnizip
                                end
 
           # Force binary encoding
-          @io.set_encoding(Encoding::ASCII_8BIT) if @io.respond_to?(:set_encoding)
+          @io.set_encoding(Encoding::ASCII_8BIT) if @io.is_a?(::IO)
 
           # Determine if writable
           @writeable = determine_writeable(mode)
@@ -185,11 +184,11 @@ module Omnizip
         # Call this to release memory while keeping the IO open.
         # @return [void]
         def free
-          @sb_file&.free if @sb_file.respond_to?(:free)
+          @sb_file&.free
           @sb_file = nil
-          @sbat&.free if @sbat.respond_to?(:free)
+          @sbat&.free
           @sbat = nil
-          @bbat&.free if @bbat.respond_to?(:free)
+          @bbat&.free
           @bbat = nil
           @dirents = nil
           @root = nil
@@ -458,7 +457,7 @@ module Omnizip
           else
             begin
               @io.flush
-              @io.write_nonblock("") if @io.respond_to?(:write_nonblock)
+              @io.write_nonblock("") if @io.is_a?(::IO)
               true
             rescue IOError, Errno::EBADF
               false

data/lib/omnizip/formats/ole.rb

@@ -119,7 +119,6 @@ module Omnizip
 
         # Register OLE format in registry
         def register!
-          require "omnizip/format_registry"
           FormatRegistry.register(".ole", Storage)
           FormatRegistry.register(".doc", Storage)
           FormatRegistry.register(".xls", Storage)

data/lib/omnizip/formats/rar/block_parser.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "omnizip/formats/rar"
 module Omnizip
   module Formats
     module Rar

data/lib/omnizip/formats/rar/compression/ppmd/encoder.rb

@@ -52,7 +52,7 @@ module Omnizip
 
             # Accessor for memory size (for testing)
             def memory_size
-              @model.instance_variable_get(:@mem_size)
+              @model.mem_size
             end
 
             # Initialize the RAR PPMd encoder

data/lib/omnizip/formats/rar/decompressor.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "English"
+require "tmpdir"
 module Omnizip
   module Formats
     module Rar

data/lib/omnizip/formats/rar/header.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "omnizip/formats/rar"
 module Omnizip
   module Formats
     module Rar

data/lib/omnizip/formats/rar/rar5/writer.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "omnizip/parity/par2_creator"
-require "omnizip/formats/rar/rar5/header"
-
 module Omnizip
   module Formats
     module Rar

data/lib/omnizip/formats/rar/reader.rb

@@ -2,7 +2,6 @@
 
 require "fileutils"
 
-require "omnizip/formats/rar"
 module Omnizip
   module Formats
     module Rar
@@ -243,7 +242,7 @@ module Omnizip
           return false unless @header.version == 4
 
           # Check if we have the compression method
-          return false unless entry.respond_to?(:method) && entry.method
+          return false if entry.nil? || entry.method.nil?
 
           # All RAR4 methods are supported by our Dispatcher
           true
@@ -261,7 +260,7 @@ module Omnizip
           File.open(output_path, "wb") do |output|
             # For now, assume METHOD_STORE (0x30)
             # Real implementation would get method from entry
-            method = entry.respond_to?(:method) ? entry.method : 0x30
+            method = entry.method || 0x30
 
             Compression::Dispatcher.decompress(method, compressed_data, output)
           end

data/lib/omnizip/formats/rar/writer.rb

@@ -4,7 +4,6 @@ require "fileutils"
 require "zlib"
 require "stringio"
 
-require "omnizip/formats/rar"
 module Omnizip
   module Formats
     module Rar

data/lib/omnizip/formats/rar.rb

@@ -164,7 +164,6 @@ module Omnizip
 
         # Auto-register .rar format
         def register!
-          require "omnizip/format_registry"
           FormatRegistry.register(".rar", "Omnizip::Formats::Rar::Reader")
         end
       end

data/lib/omnizip/formats/rpm/entry.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "omnizip/formats/rpm"
 module Omnizip
   module Formats
     module Rpm

data/lib/omnizip/formats/rpm/header.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "omnizip/formats/rpm"
 module Omnizip
   module Formats
     module Rpm
@@ -32,9 +31,7 @@ module Omnizip
         # @return [Header] Parsed header object
         # @raise [ArgumentError] If magic is invalid
         def self.parse(io)
-          new.tap do |header|
-            header.send(:parse!, io)
-          end
+          new.tap { |header| header.parse!(io) }
         end
 
         # Get tag value by name
@@ -73,8 +70,6 @@ module Omnizip
           end
         end
 
-        private
-
         def parse!(io)
           # Read header header (16 bytes)
           header_data = io.read(HEADER_HEADER_SIZE)

data/lib/omnizip/formats/rpm/lead.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "omnizip/formats/rpm"
 module Omnizip
   module Formats
     module Rpm
@@ -39,6 +38,22 @@ module Omnizip
         # @return [Integer] Total length (always 96)
         attr_reader :length
 
+        # Initialize a parsed lead. All attributes are required; use
+        # +Lead.parse(io)+ for the typical read path.
+        def initialize(magic:, major_version:, minor_version:, type:,
+                       architecture:, name:, os:, signature_type:,
+                       length: LEAD_SIZE)
+          @magic = magic
+          @major_version = major_version
+          @minor_version = minor_version
+          @type = type
+          @architecture = architecture
+          @name = name
+          @os = os
+          @signature_type = signature_type
+          @length = length
+        end
+
         # Parse lead from IO
         #
         # @param io [IO] Input stream positioned at lead
@@ -49,31 +64,27 @@ module Omnizip
           raise ArgumentError, "Failed to read RPM lead" unless data
           raise ArgumentError, "Truncated RPM lead" if data.bytesize < LEAD_SIZE
 
-          new.tap do |lead|
-            lead.instance_variable_set(:@length, LEAD_SIZE)
-
-            # Unpack lead structure
-            # A4 = 4-byte string (magic)
-            # CC = 2 unsigned chars (major, minor)
-            # n = big-endian short (type)
-            # n = big-endian short (architecture)
-            # A66 = 66-byte string (name)
-            # n = big-endian short (os)
-            # n = big-endian short (signature_type)
-            # A16 = 16-byte reserved
-            fields = data.unpack("A4 CC n n A66 n n A16")
-
-            lead.instance_variable_set(:@magic, fields[0])
-            lead.instance_variable_set(:@major_version, fields[1])
-            lead.instance_variable_set(:@minor_version, fields[2])
-            lead.instance_variable_set(:@type, fields[3])
-            lead.instance_variable_set(:@architecture, fields[4])
-            lead.instance_variable_set(:@name, fields[5].strip)
-            lead.instance_variable_set(:@os, fields[6])
-            lead.instance_variable_set(:@signature_type, fields[7])
-
-            lead.validate!
-          end
+          # Unpack lead structure
+          # A4 = 4-byte string (magic)
+          # CC = 2 unsigned chars (major, minor)
+          # n = big-endian short (type)
+          # n = big-endian short (architecture)
+          # A66 = 66-byte string (name)
+          # n = big-endian short (os)
+          # n = big-endian short (signature_type)
+          # A16 = 16-byte reserved
+          magic, major, minor, type, arch, name, os, sig_type = data.unpack("A4 CC n n A66 n n A16")
+
+          new(
+            magic: magic,
+            major_version: major,
+            minor_version: minor,
+            type: type,
+            architecture: arch,
+            name: name.strip,
+            os: os,
+            signature_type: sig_type,
+          ).tap(&:validate!)
         end
 
         # Validate lead structure

data/lib/omnizip/formats/rpm/tag.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "omnizip/formats/rpm"
 module Omnizip
   module Formats
     module Rpm

data/lib/omnizip/formats/rpm/writer.rb

@@ -5,7 +5,6 @@ require "zlib"
 require "stringio"
 require "digest"
 
-require "omnizip/formats/rpm"
 module Omnizip
   module Formats
     module Rpm

data/lib/omnizip/formats/seven_zip/bcj2_stream_decompressor.rb

@@ -2,7 +2,6 @@
 
 require "stringio"
 
-require "omnizip/formats/seven_zip"
 module Omnizip
   module Formats
     module SevenZip

data/lib/omnizip/formats/seven_zip/coder_chain.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "omnizip/formats/seven_zip"
 module Omnizip
   module Formats
     module SevenZip
@@ -134,7 +133,7 @@ module Omnizip
           decompressor = algo_class.new
           # Pass properties if algorithm supports them
           # Some algorithms (LZMA2) need properties
-          if chain_config[:properties] && !chain_config[:properties].empty? && decompressor.respond_to?(:properties=)
+          if chain_config[:properties] && !chain_config[:properties].empty? && decompressor.is_a?(Omnizip::Algorithms::LZMA2)
             decompressor.properties = chain_config[:properties]
           end
 

data/lib/omnizip/formats/seven_zip/encoded_header.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "omnizip/formats/seven_zip"
 module Omnizip
   module Formats
     module SevenZip

data/lib/omnizip/formats/seven_zip/encrypted_header.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "omnizip/formats/seven_zip"
 module Omnizip
   module Formats
     module SevenZip

data/lib/omnizip/formats/seven_zip/header.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "omnizip/formats/seven_zip"
 module Omnizip
   module Formats
     module SevenZip

data/lib/omnizip/formats/seven_zip/header_encryptor.rb

@@ -2,7 +2,6 @@
 
 require "openssl"
 
-require "omnizip/formats/seven_zip"
 module Omnizip
   module Formats
     module SevenZip

data/lib/omnizip/formats/seven_zip/header_writer.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "omnizip/formats/seven_zip"
 module Omnizip
   module Formats
     module SevenZip

data/lib/omnizip/formats/seven_zip/models/file_entry.rb

@@ -10,7 +10,7 @@ module Omnizip
           attr_accessor :name, :size, :compressed_size, :crc, :is_dir,
                         :is_empty, :is_anti, :has_stream, :mtime, :atime,
                         :ctime, :attributes, :folder_index, :file_index,
-                        :source_path
+                        :source_path, :inline_data, :compression_options
 
           # Initialize file entry
           def initialize

data/lib/omnizip/formats/seven_zip/parser.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "omnizip/formats/seven_zip"
 module Omnizip
   module Formats
     module SevenZip
@@ -570,7 +569,7 @@ module Omnizip
             time_val = read_uint64
             # Convert Windows FILETIME to Ruby Time
             # (100-nanosecond intervals since 1601-01-01)
-            entry.send(:"#{attr}=", windows_time_to_unix(time_val))
+            entry.public_send(:"#{attr}=", windows_time_to_unix(time_val))
           end
         end
 

data/lib/omnizip/formats/seven_zip/reader.rb

@@ -174,6 +174,17 @@ module Omnizip
           encrypted? && !@password.nil?
         end
 
+        # Extract raw entry payload from the archive. Public so converters
+        # and parallel extractors can reuse the stream-positioning +
+        # decompression logic.
+        #
+        # @param io [IO] Archive file handle
+        # @param entry [Models::FileEntry] Entry to extract
+        # @return [String] Extracted bytes
+        def extract_entry_data(io, entry)
+          extract_entry_data_private(io, entry)
+        end
+
         private
 
         # Parse .7z archive structure
@@ -386,12 +397,12 @@ module Omnizip
           end
         end
 
-        # Extract entry data
+        # Extract entry data (private implementation)
         #
         # @param io [IO] Archive file handle
         # @param entry [Models::FileEntry] Entry to extract
         # @return [String] Extracted data
-        def extract_entry_data(io, entry)
+        def extract_entry_data_private(io, entry)
           return "" unless entry.has_stream?
           return "" unless @stream_info
 

data/lib/omnizip/formats/seven_zip/split_archive_reader.rb

@@ -2,7 +2,6 @@
 
 require "fileutils"
 
-require "omnizip/formats/seven_zip"
 module Omnizip
   module Formats
     module SevenZip

data/lib/omnizip/formats/seven_zip/split_archive_writer.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "omnizip/formats/seven_zip"
 module Omnizip
   module Formats
     module SevenZip