ruby_spriter 0.6.6 → 0.6.7.1

data/spec/ruby_spriter/compression_manager_spec.rb

@@ -0,0 +1,157 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe RubySpriter::CompressionManager do
+  let(:input_file) { 'E:/test/input.png' }
+  let(:output_file) { 'E:/test/output.png' }
+  let(:temp_file) { 'E:/test/temp.png' }
+
+  before do
+    allow(File).to receive(:exist?).and_return(true)
+    allow(File).to receive(:readable?).and_return(true)
+    allow(File).to receive(:size).with(input_file).and_return(100000)
+    allow(File).to receive(:size).with(output_file).and_return(80000)
+    allow(RubySpriter::Utils::FileHelper).to receive(:validate_readable!)
+    allow(RubySpriter::Utils::FileHelper).to receive(:validate_exists!)
+  end
+
+  describe '.compress' do
+    it 'compresses PNG file using ImageMagick' do
+      magick_cmd = RubySpriter::Platform.imagemagick_convert_cmd
+
+      expect(Open3).to receive(:capture3) do |cmd|
+        expect(cmd).to include(magick_cmd.split.first)  # Check for 'convert' or 'magick'
+        expect(cmd).to include(input_file)
+        expect(cmd).to include(output_file)
+        expect(cmd).to include('-strip')
+        expect(cmd).to include('-define png:compression-level=9')
+        expect(cmd).to include('-define png:compression-filter=5')
+        expect(cmd).to include('-define png:compression-strategy=1')
+        ['', '', double(success?: true)]
+      end
+
+      described_class.compress(input_file, output_file)
+    end
+
+    it 'raises error if compression fails' do
+      allow(Open3).to receive(:capture3).and_return(['', 'error', double(success?: false)])
+
+      expect {
+        described_class.compress(input_file, output_file)
+      }.to raise_error(RubySpriter::ProcessingError, /Failed to compress/)
+    end
+
+    it 'validates input file exists and is readable' do
+      expect(RubySpriter::Utils::FileHelper).to receive(:validate_readable!).with(input_file)
+
+      allow(Open3).to receive(:capture3).and_return(['', '', double(success?: true)])
+
+      described_class.compress(input_file, output_file)
+    end
+
+    it 'validates output file was created' do
+      allow(Open3).to receive(:capture3).and_return(['', '', double(success?: true)])
+      expect(RubySpriter::Utils::FileHelper).to receive(:validate_exists!).with(output_file)
+
+      described_class.compress(input_file, output_file)
+    end
+  end
+
+  describe '.compress_with_metadata' do
+    let(:metadata) { { columns: 4, rows: 4, frames: 16 } }
+
+    before do
+      allow(RubySpriter::MetadataManager).to receive(:read).and_return(metadata)
+      allow(RubySpriter::MetadataManager).to receive(:embed)
+      allow(FileUtils).to receive(:mv)
+      allow(File).to receive(:exist?).with(temp_file).and_return(true)
+      allow(FileUtils).to receive(:rm_f)
+    end
+
+    it 'reads metadata before compression' do
+      expect(RubySpriter::MetadataManager).to receive(:read).with(input_file)
+
+      allow(Open3).to receive(:capture3).and_return(['', '', double(success?: true)])
+
+      described_class.compress_with_metadata(input_file, output_file)
+    end
+
+    it 'compresses file with metadata preservation' do
+      allow(Open3).to receive(:capture3).and_return(['', '', double(success?: true)])
+
+      expect(described_class).to receive(:compress).with(input_file, anything, debug: false)
+      expect(RubySpriter::MetadataManager).to receive(:embed)
+
+      described_class.compress_with_metadata(input_file, output_file)
+    end
+
+    it 're-embeds metadata after compression' do
+      allow(Open3).to receive(:capture3).and_return(['', '', double(success?: true)])
+
+      expect(RubySpriter::MetadataManager).to receive(:embed) do |temp, output, **opts|
+        expect(opts[:columns]).to eq(4)
+        expect(opts[:rows]).to eq(4)
+        expect(opts[:frames]).to eq(16)
+      end
+
+      described_class.compress_with_metadata(input_file, output_file)
+    end
+
+    it 'handles files without metadata' do
+      allow(RubySpriter::MetadataManager).to receive(:read).and_return(nil)
+      allow(Open3).to receive(:capture3).and_return(['', '', double(success?: true)])
+
+      # Should just compress without re-embedding metadata
+      expect(RubySpriter::MetadataManager).not_to receive(:embed)
+
+      described_class.compress_with_metadata(input_file, output_file)
+    end
+
+    it 'cleans up temp file after successful compression' do
+      allow(Open3).to receive(:capture3).and_return(['', '', double(success?: true)])
+      allow(RubySpriter::MetadataManager).to receive(:read).and_return(metadata)
+      allow(RubySpriter::MetadataManager).to receive(:embed)
+
+      # Simulate temp file creation
+      temp_path = nil
+      allow(described_class).to receive(:compress) do |input, output|
+        temp_path = output
+      end
+
+      expect(FileUtils).to receive(:rm_f).with(anything)
+
+      described_class.compress_with_metadata(input_file, output_file)
+    end
+  end
+
+  describe '.compression_stats' do
+    it 'returns compression statistics' do
+      original_size = 100000
+      compressed_size = 80000
+
+      allow(File).to receive(:size).with(input_file).and_return(original_size)
+      allow(File).to receive(:size).with(output_file).and_return(compressed_size)
+
+      stats = described_class.compression_stats(input_file, output_file)
+
+      expect(stats[:original_size]).to eq(original_size)
+      expect(stats[:compressed_size]).to eq(compressed_size)
+      expect(stats[:saved_bytes]).to eq(20000)
+      expect(stats[:reduction_percent]).to be_within(0.1).of(20.0)
+    end
+
+    it 'handles case where compressed file is larger' do
+      original_size = 100000
+      compressed_size = 120000
+
+      allow(File).to receive(:size).with(input_file).and_return(original_size)
+      allow(File).to receive(:size).with(output_file).and_return(compressed_size)
+
+      stats = described_class.compression_stats(input_file, output_file)
+
+      expect(stats[:saved_bytes]).to eq(-20000)
+      expect(stats[:reduction_percent]).to be_within(0.1).of(-20.0)
+    end
+  end
+end

data/spec/ruby_spriter/consolidator_spec.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
+require 'securerandom'
 
 RSpec.describe RubySpriter::Consolidator do
   let(:spritesheet1) { File.join(__dir__, '..', 'fixtures', 'spritesheet_4x2.png') }
@@ -372,4 +373,166 @@ RSpec.describe RubySpriter::Consolidator do
       end
     end
   end
+
+  describe '#find_spritesheets_in_directory' do
+    let(:consolidator) { described_class.new }
+    let(:image_without_meta) { File.join(__dir__, '..', 'fixtures', 'image_without_metadata.png') }
+
+    # Helper to create a unique test directory for each test
+    def create_test_dir
+      dir = File.join($test_temp_dir, "consolidate_test_#{SecureRandom.hex(8)}")
+      FileUtils.mkdir_p(dir)
+      dir
+    end
+
+    it 'finds all PNG files with metadata in directory' do
+      test_dir = create_test_dir
+      # Copy spritesheets with metadata to test directory
+      sprite1_path = File.join(test_dir, 'sprite1.png')
+      sprite2_path = File.join(test_dir, 'sprite2.png')
+      FileUtils.cp(spritesheet1, sprite1_path)
+      FileUtils.cp(spritesheet2, sprite2_path)
+
+      # Mock metadata reading to return valid metadata for these files
+      allow(RubySpriter::MetadataManager).to receive(:read).and_call_original
+      allow(RubySpriter::MetadataManager).to receive(:read).with(sprite1_path).and_return(
+        { columns: 2, rows: 2, frames: 4, version: '0.6' }
+      )
+      allow(RubySpriter::MetadataManager).to receive(:read).with(sprite2_path).and_return(
+        { columns: 2, rows: 3, frames: 6, version: '0.6' }
+      )
+
+      found_files = consolidator.find_spritesheets_in_directory(test_dir)
+
+      expect(found_files.length).to eq(2)
+      expect(found_files).to include(sprite1_path)
+      expect(found_files).to include(sprite2_path)
+    end
+
+    it 'excludes PNG files without metadata' do
+      test_dir = create_test_dir
+      # Copy two spritesheets with metadata and one image without
+      sprite1_path = File.join(test_dir, 'sprite1.png')
+      sprite2_path = File.join(test_dir, 'sprite2.png')
+      no_meta_path = File.join(test_dir, 'no_meta.png')
+      FileUtils.cp(spritesheet1, sprite1_path)
+      FileUtils.cp(spritesheet2, sprite2_path)
+      FileUtils.cp(image_without_meta, no_meta_path)
+
+      # Mock metadata reading
+      allow(RubySpriter::MetadataManager).to receive(:read).and_call_original
+      allow(RubySpriter::MetadataManager).to receive(:read).with(sprite1_path).and_return(
+        { columns: 2, rows: 2, frames: 4, version: '0.6' }
+      )
+      allow(RubySpriter::MetadataManager).to receive(:read).with(sprite2_path).and_return(
+        { columns: 2, rows: 3, frames: 6, version: '0.6' }
+      )
+      allow(RubySpriter::MetadataManager).to receive(:read).with(no_meta_path).and_return(nil)
+
+      found_files = consolidator.find_spritesheets_in_directory(test_dir)
+
+      expect(found_files.length).to eq(2)
+      expect(found_files).to include(sprite1_path)
+      expect(found_files).to include(sprite2_path)
+      expect(found_files).not_to include(no_meta_path)
+    end
+
+    it 'returns files sorted alphabetically' do
+      test_dir = create_test_dir
+      # Copy spritesheets with names that test alphabetical sorting
+      c_sprite_path = File.join(test_dir, 'c_sprite.png')
+      a_sprite_path = File.join(test_dir, 'a_sprite.png')
+      b_sprite_path = File.join(test_dir, 'b_sprite.png')
+      FileUtils.cp(spritesheet1, c_sprite_path)
+      FileUtils.cp(spritesheet2, a_sprite_path)
+      FileUtils.cp(spritesheet3, b_sprite_path)
+
+      # Mock metadata reading
+      allow(RubySpriter::MetadataManager).to receive(:read).and_call_original
+      allow(RubySpriter::MetadataManager).to receive(:read).with(c_sprite_path).and_return(
+        { columns: 4, rows: 1, frames: 4, version: '0.6' }
+      )
+      allow(RubySpriter::MetadataManager).to receive(:read).with(a_sprite_path).and_return(
+        { columns: 2, rows: 3, frames: 6, version: '0.6' }
+      )
+      allow(RubySpriter::MetadataManager).to receive(:read).with(b_sprite_path).and_return(
+        { columns: 4, rows: 4, frames: 16, version: '0.6' }
+      )
+
+      found_files = consolidator.find_spritesheets_in_directory(test_dir)
+
+      expect(found_files.length).to eq(3)
+      expect(found_files[0]).to end_with('a_sprite.png')
+      expect(found_files[1]).to end_with('b_sprite.png')
+      expect(found_files[2]).to end_with('c_sprite.png')
+    end
+
+    it 'raises error when directory does not exist' do
+      expect {
+        consolidator.find_spritesheets_in_directory('nonexistent_directory')
+      }.to raise_error(RubySpriter::ValidationError, /Directory not found/)
+    end
+
+    it 'raises error when no PNG files with metadata found' do
+      # Create empty directory
+      empty_dir = File.join($test_temp_dir, 'empty_dir')
+      FileUtils.mkdir_p(empty_dir)
+
+      expect {
+        consolidator.find_spritesheets_in_directory(empty_dir)
+      }.to raise_error(RubySpriter::ValidationError, /No PNG files with spritesheet metadata found/)
+    end
+
+    it 'raises error when directory has PNGs but none with metadata' do
+      test_dir = create_test_dir
+      # Copy only image without metadata
+      FileUtils.cp(image_without_meta, File.join(test_dir, 'no_meta.png'))
+
+      expect {
+        consolidator.find_spritesheets_in_directory(test_dir)
+      }.to raise_error(RubySpriter::ValidationError, /No PNG files with spritesheet metadata found/)
+    end
+
+    it 'handles directory with mixed file types' do
+      test_dir = create_test_dir
+      # Copy spritesheets and create non-PNG files
+      sprite1_path = File.join(test_dir, 'sprite1.png')
+      sprite2_path = File.join(test_dir, 'sprite2.png')
+      FileUtils.cp(spritesheet1, sprite1_path)
+      FileUtils.cp(spritesheet2, sprite2_path)
+      File.write(File.join(test_dir, 'readme.txt'), 'test')
+      File.write(File.join(test_dir, 'data.json'), '{}')
+
+      # Mock metadata reading
+      allow(RubySpriter::MetadataManager).to receive(:read).and_call_original
+      allow(RubySpriter::MetadataManager).to receive(:read).with(sprite1_path).and_return(
+        { columns: 2, rows: 2, frames: 4, version: '0.6' }
+      )
+      allow(RubySpriter::MetadataManager).to receive(:read).with(sprite2_path).and_return(
+        { columns: 2, rows: 3, frames: 6, version: '0.6' }
+      )
+
+      found_files = consolidator.find_spritesheets_in_directory(test_dir)
+
+      expect(found_files.length).to eq(2)
+      expect(found_files).to all(end_with('.png'))
+    end
+
+    it 'requires at least 2 spritesheets' do
+      test_dir = create_test_dir
+      # Copy only one spritesheet
+      sprite1_path = File.join(test_dir, 'sprite1.png')
+      FileUtils.cp(spritesheet1, sprite1_path)
+
+      # Mock metadata reading
+      allow(RubySpriter::MetadataManager).to receive(:read).and_call_original
+      allow(RubySpriter::MetadataManager).to receive(:read).with(sprite1_path).and_return(
+        { columns: 2, rows: 2, frames: 4, version: '0.6' }
+      )
+
+      expect {
+        consolidator.find_spritesheets_in_directory(test_dir)
+      }.to raise_error(RubySpriter::ValidationError, /Found only 1 spritesheet, need at least 2/)
+    end
+  end
 end

data/spec/ruby_spriter/platform_spec.rb

@@ -71,7 +71,7 @@ RSpec.describe RubySpriter::Platform do
   describe '.imagemagick_identify_cmd' do
     it 'returns appropriate command for platform' do
       cmd = described_class.imagemagick_identify_cmd
-      
+
       if described_class.windows?
         expect(cmd).to eq('magick identify')
       else
@@ -79,4 +79,14 @@ RSpec.describe RubySpriter::Platform do
       end
     end
   end
+
+  describe '.detect_gimp_version' do
+    it 'detects GIMP 3.x version from command output' do
+      gimp3_output = "GNU Image Manipulation Program version 3.0.0"
+      version = described_class.detect_gimp_version(gimp3_output)
+      expect(version[:major]).to eq(3)
+      expect(version[:minor]).to eq(0)
+      expect(version[:full]).to eq('3.0.0')
+    end
+  end
 end