omnizip 0.3.8 → 0.3.10

data/lib/omnizip/parity/par2_verifier.rb

@@ -58,6 +58,12 @@ module Omnizip
       # @return [Hash] Parsed PAR2 metadata
       attr_reader :metadata
 
+      # @return [Array<Hash>] Parsed file list (one entry per managed file)
+      attr_reader :file_list
+
+      # @return [Array] Available recovery blocks
+      attr_reader :recovery_blocks
+
       # Initialize verifier
       #
       # @param par2_file [String] Path to .par2 index file
@@ -125,11 +131,11 @@ module Omnizip
         )
       end
 
-      private
-
-      # Parse PAR2 index file using packet models
+      # Parse the PAR2 index file and populate +metadata+, +file_list+,
+      # and +recovery_blocks+. Idempotent — safe to call multiple times.
+      #
+      # @return [void]
       def parse_par2_file
-        # Reset state to prevent accumulation if called multiple times
         @metadata = {}
         @file_list = []
         @recovery_blocks = []
@@ -159,24 +165,6 @@ module Omnizip
         load_recovery_volumes
       end
 
-      # Process packet using model-based approach
-      #
-      # @param packet [Models::Packet] Parsed packet model
-      def process_packet_model(packet)
-        case packet
-        when Models::MainPacket
-          process_main_packet_model(packet)
-        when Models::FileDescriptionPacket
-          process_file_description_packet_model(packet)
-        when Models::IfscPacket
-          process_ifsc_packet_model(packet)
-        when Models::RecoverySlicePacket
-          process_recovery_packet_model(packet)
-        when Models::CreatorPacket
-          # Creator packets are informational only
-        end
-      end
-
       # Process main packet model
       #
       # @param packet [Models::MainPacket] Main packet
@@ -358,6 +346,23 @@ module Omnizip
           (file_info[:size].to_f / @metadata[:block_size]).ceil
         end
       end
+
+      private
+
+      def process_packet_model(packet)
+        case packet
+        when Models::MainPacket
+          process_main_packet_model(packet)
+        when Models::FileDescriptionPacket
+          process_file_description_packet_model(packet)
+        when Models::IfscPacket
+          process_ifsc_packet_model(packet)
+        when Models::RecoverySlicePacket
+          process_recovery_packet_model(packet)
+        when Models::CreatorPacket
+          # Creator packets are informational only
+        end
+      end
     end
   end
 end

data/lib/omnizip/parity.rb

@@ -175,16 +175,16 @@ module Omnizip
         return nil unless File.exist?(par2_file)
 
         verifier = Par2Verifier.new(par2_file)
-        verifier.send(:parse_par2_file)
+        verifier.parse_par2_file
 
-        total_blocks = verifier.send(:calculate_total_blocks)
-        recovery_blocks = verifier.instance_variable_get(:@recovery_blocks).size
+        total_blocks = verifier.calculate_total_blocks
+        recovery_blocks = verifier.recovery_blocks.size
 
         {
           par2_file: par2_file,
           block_size: verifier.metadata[:block_size],
           total_blocks: total_blocks,
-          file_count: verifier.metadata[:file_count] || verifier.instance_variable_get(:@file_list).size,
+          file_count: verifier.metadata[:file_count] || verifier.file_list.size,
           recovery_blocks: recovery_blocks,
           redundancy: calculate_redundancy(total_blocks, recovery_blocks),
         }

data/lib/omnizip/password/encryption_registry.rb

@@ -2,64 +2,25 @@
 
 module Omnizip
   module Password
-    # Registry for encryption strategies
-    class EncryptionRegistry
-      @strategies = {}
-
+    class EncryptionRegistry < Omnizip::Registry
       class << self
-        # Register an encryption strategy
-        # @param name [Symbol] Strategy name
-        # @param strategy_class [Class] Strategy class
-        def register(name, strategy_class)
-          @strategies[name] = strategy_class
-        end
-
-        # Get a strategy by name
-        # @param name [Symbol] Strategy name
-        # @return [Class] Strategy class
-        # @raise [ArgumentError] If strategy not found
-        def get(name)
-          strategy = @strategies[name]
-          return strategy if strategy
-
-          raise ArgumentError, "Unknown encryption strategy: #{name}. " \
-                               "Available: #{@strategies.keys.join(', ')}"
-        end
-
-        # Check if strategy is registered
-        # @param name [Symbol] Strategy name
-        # @return [Boolean] True if registered
-        def registered?(name)
-          @strategies.key?(name)
+        def not_found_error_class
+          Omnizip::UnknownEncryptionStrategyError
         end
 
-        # Get all registered strategy names
-        # @return [Array<Symbol>] Strategy names
-        def strategies
-          @strategies.keys
+        def label
+          "Encryption strategy"
         end
 
-        # Create a strategy instance
-        # @param name [Symbol] Strategy name
-        # @param password [String] Password
-        # @param options [Hash] Strategy options
-        # @return [EncryptionStrategy] Strategy instance
         def create(name, password, **options)
-          strategy_class = get(name)
-          strategy_class.new(password, **options)
-        end
-
-        # Reset registry (for testing)
-        def reset
-          @strategies = {}
+          get(name).new(password, **options)
         end
       end
     end
-
-    # Register built-in strategies
-    EncryptionRegistry.register(:traditional, ZipCryptoStrategy)
-    EncryptionRegistry.register(:zip_crypto, ZipCryptoStrategy)
-    EncryptionRegistry.register(:winzip_aes, WinzipAesStrategy)
-    EncryptionRegistry.register(:aes256, WinzipAesStrategy)
   end
 end
+
+Omnizip::Password::EncryptionRegistry.register(:traditional, Omnizip::Password::ZipCryptoStrategy)
+Omnizip::Password::EncryptionRegistry.register(:zip_crypto, Omnizip::Password::ZipCryptoStrategy)
+Omnizip::Password::EncryptionRegistry.register(:winzip_aes, Omnizip::Password::WinzipAesStrategy)
+Omnizip::Password::EncryptionRegistry.register(:aes256, Omnizip::Password::WinzipAesStrategy)

data/lib/omnizip/password/zip_crypto_strategy.rb

@@ -114,10 +114,7 @@ module Omnizip
       # @param byte [Integer] Byte to add
       # @return [Integer] Updated CRC
       def crc32_update(crc, byte)
-        crc32 = Omnizip::Checksums::Crc32.new
-        crc32.instance_variable_set(:@crc, crc)
-        crc32.update(byte.chr)
-        crc32.value
+        Omnizip::Checksums::Crc32.new.process_byte(crc, byte)
       end
 
       # Generate encryption header

data/lib/omnizip/pipe/stream_decompressor.rb

@@ -163,9 +163,8 @@ module Omnizip
         end
 
         # Preserve timestamp if available
-        if entry.respond_to?(:mtime) && entry.mtime
-          File.utime(entry.mtime, entry.mtime, dest_path)
-        end
+        mtime = entry.mtime if entry.is_a?(Omnizip::Metadata::EntryMetadata)
+        File.utime(mtime, mtime, dest_path) if mtime
 
         bytes
       end

data/lib/omnizip/profile/archive_profile.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "omnizip/file_type/mime_classifier"
-
 module Omnizip
   module Profile
     # Archive compression profile

data/lib/omnizip/profile/binary_profile.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "omnizip/file_type/mime_classifier"
-
 module Omnizip
   module Profile
     # Binary compression profile

data/lib/omnizip/profile/compression_profile.rb

@@ -148,7 +148,6 @@ module Omnizip
 
         # Auto-select BCJ filter based on MIME type
         # For executables, default to x86 architecture
-        require "omnizip/file_type/mime_classifier"
         if FileType::MimeClassifier.executable?(mime_type)
           :bcj_x86
         end

data/lib/omnizip/profile/profile_detector.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "omnizip/file_type/mime_classifier"
-
 module Omnizip
   module Profile
     # Automatic profile detection based on file analysis

data/lib/omnizip/profile/text_profile.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "omnizip/file_type/mime_classifier"
-
 module Omnizip
   module Profile
     # Text compression profile

data/lib/omnizip/profile.rb

@@ -161,8 +161,6 @@ module Omnizip
       # @param mime_type [String] MIME type string
       # @return [CompressionProfile] Best profile
       def select_best_profile_for_mime(profiles, mime_type)
-        require "omnizip/file_type/mime_classifier"
-
         # Determine category from MIME type
         category = FileType::MimeClassifier.profile_category(mime_type)
 

data/lib/omnizip/registry.rb

@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+module Omnizip
+  # Generic, thread-safe registry base class.
+  #
+  # Subclasses override the hooks +#not_found_error_class+,
+  # +#normalize_key+, and +#label+ to specialize behavior. They may also
+  # override +#register+ / +#get+ to add domain-specific arguments
+  # (e.g., +#register_with_formats+ on FilterRegistry).
+  #
+  # The base class is intentionally minimal: it owns a Hash store and a
+  # Mutex, and exposes the canonical CRUD quintet (+register+, +get+,
+  # +registered?+, +available+, +reset!+). Backward-compat aliases are
+  # provided so existing call sites keep working.
+  class Registry
+    class << self
+      def not_found_error_class
+        Omnizip::Error
+      end
+
+      def normalize_key(key)
+        key.to_sym
+      end
+
+      def label
+        return "Item" unless name
+
+        name.gsub(/^Omnizip::/, "")
+      end
+
+      def register(key, value)
+        synchronize { storage[normalize_key(key)] = value }
+        value
+      end
+
+      # Register a lazy trigger for +key+. When +get(key)+ is called and
+      # the key isn't yet in storage, the block is invoked. The block is
+      # expected to trigger autoload of the implementation file (e.g., by
+      # referencing a constant), which then self-registers.
+      def register_lazy(key, &trigger)
+        lazy_triggers[normalize_key(key)] = trigger
+      end
+
+      def get(key)
+        normalized = normalize_key(key)
+        value = storage[normalized]
+        return value if value
+
+        trigger = lazy_triggers[normalized]
+        if trigger
+          synchronize { lazy_triggers.delete(normalized) }
+          trigger.call
+          value = storage[normalized]
+          return value if value
+        end
+
+        raise not_found_error_class,
+              "#{label} not registered: #{key.inspect}. " \
+              "Available: #{available.join(', ')}"
+      end
+
+      def registered?(key)
+        normalized = normalize_key(key)
+        storage.key?(normalized) || lazy_triggers.key?(normalized)
+      end
+
+      def available
+        storage.keys
+      end
+      alias all available
+      alias strategies available
+
+      def reset!
+        # Clear stored entries but keep lazy triggers — the builtin
+        # autoload list should survive a reset so subsequent +get+ calls
+        # for builtins still trigger the autoload (which re-registers).
+        synchronize { storage.clear }
+      end
+      alias clear reset!
+      alias clear! reset!
+      alias reset reset!
+
+      def entries
+        synchronize { storage.dup }
+      end
+
+      def each(&block)
+        return to_enum(:each) unless block
+
+        entries.each(&block)
+      end
+
+      private
+
+      def storage
+        @storage ||= {}
+      end
+
+      def lazy_triggers
+        @lazy_triggers ||= {}
+      end
+
+      def synchronize(&block)
+        mutex.synchronize(&block)
+      end
+
+      def mutex
+        @mutex ||= Mutex.new
+      end
+    end
+  end
+end

data/lib/omnizip/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Omnizip
-  VERSION = "0.3.8"
+  VERSION = "0.3.10"
 end

data/lib/omnizip/zip/file.rb

@@ -50,7 +50,6 @@ module Omnizip
         @modified = false
         @reader = nil
         @writer = nil
-
         # Load existing archive if it exists
         if ::File.exist?(file_path) && !create
           load_archive
@@ -189,6 +188,18 @@ module Omnizip
       end
       alias_method :length, :size
 
+      # Mark this archive as having unsaved changes. The next +#commit+
+      # or +#close+ will write the archive to disk.
+      def modified!
+        @modified = true
+        self
+      end
+
+      # True if there are unsaved changes.
+      def modified?
+        @modified
+      end
+
       # Check if archive contains an entry
       # @param entry_name [String] Entry name to check
       # @return [Boolean] True if entry exists
@@ -374,8 +385,7 @@ module Omnizip
           extra_field: "",
           comment: "",
         ).tap do |header|
-          # Store original data in header for writing
-          header.instance_variable_set(:@_original_data, data)
+          header.cached_original_data = data
         end
       end
 
@@ -384,7 +394,7 @@ module Omnizip
         return "" if entry.directory?
 
         # Check if we have cached data (for new entries not yet written)
-        cached_data = entry.header.instance_variable_get(:@_original_data)
+        cached_data = entry.header.cached_original_data
         return cached_data if cached_data
 
         # Otherwise read from file
@@ -416,10 +426,11 @@ module Omnizip
           return "" unless compressed_data
 
           # Decompress
-          @reader.send(:decompress_data,
-                       compressed_data,
-                       reader_entry.compression_method,
-                       reader_entry.uncompressed_size)
+          @reader.decompress(
+            compressed_data,
+            reader_entry.compression_method,
+            reader_entry.uncompressed_size,
+          )
         end
       end
 
@@ -447,7 +458,7 @@ module Omnizip
           next if entry.directory?
 
           header = entry.header
-          cached = header.instance_variable_get(:@_original_data)
+          cached = header.cached_original_data
           entry_data[entry.name] = cached || read_entry_data(entry)
         end
 

data/lib/omnizip.rb

@@ -17,27 +17,30 @@
 #
 
 module Omnizip
-  # Core version - autoloaded
   autoload :VERSION, "omnizip/version"
 
-  # Error classes - autoloaded
   autoload :Error, "omnizip/error"
   autoload :CompressionError, "omnizip/error"
   autoload :DecompressionError, "omnizip/error"
   autoload :AlgorithmNotFoundError, "omnizip/error"
   autoload :UnknownAlgorithmError, "omnizip/error"
+  autoload :UnknownChecksumError, "omnizip/error"
+  autoload :UnknownFilterError, "omnizip/error"
+  autoload :UnknownEncryptionStrategyError, "omnizip/error"
+  autoload :ConversionNotSupportedError, "omnizip/error"
   autoload :UnsupportedFormatError, "omnizip/error"
   autoload :FormatError, "omnizip/error"
   autoload :InvalidArchiveError, "omnizip/error"
+  autoload :IOOperationError, "omnizip/error"
   autoload :IOError, "omnizip/error"
   autoload :ChecksumError, "omnizip/error"
-  autoload :OptimizationNotFound, "omnizip/error"
+  autoload :OptimizationNotFoundError, "omnizip/error"
   autoload :ProgressError, "omnizip/error"
   autoload :ETAError, "omnizip/error"
   autoload :NotLicensedError, "omnizip/error"
   autoload :RarNotAvailableError, "omnizip/error"
 
-  # Core registries
+  autoload :Registry, "omnizip/registry"
   autoload :Algorithm, "omnizip/algorithm"
   autoload :AlgorithmRegistry, "omnizip/algorithm_registry"
   autoload :FormatRegistry, "omnizip/format_registry"
@@ -45,11 +48,9 @@ module Omnizip
   autoload :ChecksumRegistry, "omnizip/checksum_registry"
   autoload :FilterRegistry, "omnizip/filter_registry"
 
-  # Base classes
   autoload :Filter, "omnizip/filter"
   autoload :FilterPipeline, "omnizip/filter_pipeline"
 
-  # Feature modules
   autoload :Buffer, "omnizip/buffer"
   autoload :Pipe, "omnizip/pipe"
   autoload :Chunked, "omnizip/chunked"
@@ -66,15 +67,25 @@ module Omnizip
   autoload :Platform, "omnizip/platform"
   autoload :Profiler, "omnizip/profiler"
   autoload :Commands, "omnizip/commands"
-
-  # Sub-module files
+  autoload :CliOutputFormatter, "omnizip/cli/output_formatter"
+
+  # Implementation namespaces. Each namespace file declares autoloads
+  # for its concrete classes. The classes self-register with their
+  # registry on load (see lib/omnizip/algorithms/lzma.rb etc.).
+  autoload :Algorithms, "omnizip/algorithms"
+  autoload :Filters, "omnizip/filters"
+  autoload :Checksums, "omnizip/checksums"
   autoload :IO, "omnizip/io"
   autoload :Crypto, "omnizip/crypto"
   autoload :Formats, "omnizip/formats"
   autoload :Zip, "omnizip/zip"
+  autoload :Extraction, "omnizip/extraction"
+  autoload :Implementations, "omnizip/implementations"
+  autoload :ArchiveHandler, "omnizip/archive_handler"
+  autoload :ArchiveHandlers, "omnizip/archive_handlers"
+  autoload :Convenience, "omnizip/convenience"
 end
 
-# Models module with autoloaded classes
 module Omnizip
   module Models
     autoload :AlgorithmMetadata, "omnizip/models/algorithm_metadata"
@@ -95,56 +106,15 @@ module Omnizip
   end
 end
 
-# Algorithms (with registration - must be required explicitly)
-require_relative "omnizip/algorithms/ppmd_base"
-require_relative "omnizip/algorithms/lzma"
-require_relative "omnizip/algorithms/lzma2"
-require_relative "omnizip/algorithms/ppmd7"
-require_relative "omnizip/algorithms/ppmd8"
-require_relative "omnizip/algorithms/bzip2"
-require_relative "omnizip/algorithms/deflate"
-require_relative "omnizip/algorithms/deflate64"
-require_relative "omnizip/algorithms/zstandard"
-
-# Filters implementations (with registration)
-require_relative "omnizip/filters/bcj"
-require_relative "omnizip/filters/bcj_x86"
-require_relative "omnizip/filters/bcj2"
-require_relative "omnizip/filters/bcj_arm"
-require_relative "omnizip/filters/bcj_arm64"
-require_relative "omnizip/filters/bcj_ppc"
-require_relative "omnizip/filters/bcj_sparc"
-require_relative "omnizip/filters/bcj_ia64"
-require_relative "omnizip/filters/delta"
-require_relative "omnizip/filters/registry"
-
-# Checksum implementations (with registration)
-require_relative "omnizip/checksums/crc_base"
-require_relative "omnizip/checksums/crc32"
-require_relative "omnizip/checksums/crc64"
-
-# Archive formats registry (with autoload declarations for lazy loading)
-require_relative "omnizip/formats"
-
-# Archive formats (with registration - must be required explicitly)
-require_relative "omnizip/formats/seven_zip"
-require_relative "omnizip/formats/zip"
-require_relative "omnizip/formats/rar"
-require_relative "omnizip/formats/tar"
-require_relative "omnizip/formats/gzip"
-require_relative "omnizip/formats/bzip2_file"
-require_relative "omnizip/formats/xz"
-
-# Platform-specific features
 module Omnizip
   module Platform
     autoload :NtfsStreams, "omnizip/platform/ntfs_streams"
   end
 
-  # Implementations module with autoloaded classes
   module Implementations
     autoload :SevenZip, "omnizip/implementations/seven_zip"
     autoload :XZUtils, "omnizip/implementations/xz_utils"
+
     module SevenZip
       module LZMA
         autoload :StateMachine,
@@ -172,7 +142,8 @@ module Omnizip
   end
 end
 
-# Load convenience module to extend Omnizip with utility methods
-require "omnizip/convenience"
-
-# Formats auto-register when their files are loaded (see individual format files)
+# Trigger autoload of Convenience so its methods are available on the
+# Omnizip module (it calls `extend Convenience` at the bottom of the
+# file). Without this, Omnizip.compress_file and friends would not be
+# defined until the first manual reference.
+Omnizip::Convenience

data/lib/tasks/msi_test_files.rake

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require "fileutils"
+require "open-uri"
+require "digest/sha2"
+
+namespace :test_files do
+  desc "Download Adobe font pack MSI for testing (60MB)"
+  task :adobe_msi do
+    url = "https://web.archive.org/web/20200816153035/http://ardownload.adobe.com/pub/adobe/reader/win/AcrobatDC/misc/FontPack1902120058_XtdAlf_Lang_DC.msi"
+    output_dir = "spec/fixtures/adobe"
+    output_path = "#{output_dir}/FontPack1902120058_XtdAlf_Lang_DC.msi"
+    expected_sha256 = "b5b9e15791a177715fa5e93ea458f8627cada7ac3218531461cfd35cecef6c24"
+
+    FileUtils.mkdir_p(output_dir)
+
+    if File.exist?(output_path)
+      # Verify existing file
+      actual_sha256 = Digest::SHA256.file(output_path).hexdigest
+      if actual_sha256 == expected_sha256
+        puts "Adobe font pack MSI already exists and verified: #{output_path}"
+        return
+      else
+        puts "Existing file has wrong SHA256, re-downloading..."
+        File.delete(output_path)
+      end
+    end
+
+    puts "Downloading Adobe font pack MSI (60MB)..."
+    puts "URL: #{url}"
+
+    begin
+      URI.open(url, "rb") do |remote|
+        File.binwrite(output_path, remote.read)
+      end
+    rescue OpenURI::HTTPError, Net::OpenTimeout, Errno::ECONNREFUSED => e
+      puts "Failed to download: #{e.message}"
+      puts "You may need to download manually from:"
+      puts "  #{url}"
+      puts "And place it at: #{output_path}"
+      exit 1
+    end
+
+    # Verify SHA256
+    actual_sha256 = Digest::SHA256.file(output_path).hexdigest
+    if actual_sha256 == expected_sha256
+      puts "Downloaded and verified: #{output_path}"
+      puts "SHA256: #{actual_sha256}"
+    else
+      File.delete(output_path)
+      puts "SHA256 mismatch!"
+      puts "Expected: #{expected_sha256}"
+      puts "Got:      #{actual_sha256}"
+      exit 1
+    end
+  end
+
+  desc "Clean up downloaded test files"
+  task :clean do
+    adobe_dir = "spec/fixtures/adobe"
+    if File.directory?(adobe_dir)
+      FileUtils.rm_rf(adobe_dir)
+      puts "Removed: #{adobe_dir}"
+    end
+  end
+end