image_optim 0.29.0 → 0.30.0

data/spec/image_optim_spec.rb

@@ -27,7 +27,7 @@ describe ImageOptim do
     ImageOptim::Worker.klasses.map do |klass|
       [klass.bin_sym, false]
     end
-  ].merge(:skip_missing_workers => false)
+  ].merge(skip_missing_workers: false)
 
   ImageOptim::Worker.klasses.each do |worker_klass|
     describe "#{worker_klass.bin_sym} worker" do
@@ -36,7 +36,7 @@ describe ImageOptim do
 
         image_optim = ImageOptim.new(options)
         if Array(worker_klass.init(image_optim)).empty?
-          image_optim = ImageOptim.new(options.merge(:allow_lossy => true))
+          image_optim = ImageOptim.new(options.merge(allow_lossy: true))
         end
 
         expect(test_images.any? do |original|
@@ -59,10 +59,10 @@ describe ImageOptim do
       rotated = images_dir / 'orient/original.jpg'
       rotate_images = images_dir.glob('orient/?.jpg')
 
-      base_options = {:skip_missing_workers => false}
+      base_options = {skip_missing_workers: false}
       [
         ['lossless', base_options, 0],
-        ['lossy', base_options.merge(:allow_lossy => true), 0.001],
+        ['lossy', base_options.merge(allow_lossy: true), 0.001],
       ].each do |type, options, max_difference|
         it "does it #{type}" do
           image_optim = ImageOptim.new(options)
@@ -95,8 +95,8 @@ describe ImageOptim do
     end
 
     {
-      :png => "\211PNG\r\n\032\n",
-      :jpeg => "\377\330",
+      png: "\211PNG\r\n\032\n",
+      jpeg: "\377\330",
     }.each do |type, data|
       it "ingores broken #{type}" do
         path = FSPath.temp_file_path
@@ -105,12 +105,49 @@ describe ImageOptim do
         expect(ImageOptim.optimize_image(path)).to be_nil
       end
     end
+
+    context 'using timeout' do
+      let(:timeout){ 123 }
+      let(:image_optim){ ImageOptim.new(isolated_options_base.merge(timeout: timeout)) }
+      let(:timer){ instance_double(ImageOptim::Timer) }
+      let(:workers){ Array.new(3){ instance_double(ImageOptim::Worker) } }
+      let(:path){ test_images.first }
+
+      before do
+        allow(ImageOptim::Timer).to receive(:new).with(timeout).and_return(timer)
+        allow(image_optim).to receive(:workers_for_image).and_return(workers)
+      end
+
+      it 'sends timeout to every worker' do
+        some_path = instance_of(ImageOptim::Path)
+
+        expect(workers[0]).to receive(:optimize).with(some_path, some_path, timeout: timer)
+        expect(workers[1]).to receive(:optimize).with(some_path, some_path, timeout: timer)
+        expect(workers[2]).to receive(:optimize).with(some_path, some_path, timeout: timer)
+
+        image_optim.optimize_image(path)
+      end
+
+      it 'returns nil if there was no success before worker times out' do
+        allow(workers[0]).to receive(:optimize).and_return(false)
+        allow(workers[1]).to receive(:optimize).and_raise(ImageOptim::Errors::TimeoutExceeded)
+
+        expect(image_optim.optimize_image(path)).to be_nil
+      end
+
+      it 'returns result if there was success before worker times out' do
+        allow(workers[0]).to receive(:optimize).and_return(true)
+        allow(workers[1]).to receive(:optimize).and_raise(ImageOptim::Errors::TimeoutExceeded)
+
+        expect(image_optim.optimize_image(path)).to be_an(ImageOptim::OptimizedPath)
+      end
+    end
   end
 
   describe '#optimize_image!' do
     it 'optimizes image and replaces original' do
       original = double
-      optimized = double(:original_size => 12_345)
+      optimized = double(original_size: 12_345)
       optimized_wrap = double
       image_optim = ImageOptim.new
 
@@ -144,7 +181,7 @@ describe ImageOptim do
   describe '#optimize_image_data' do
     it 'create temp file, optimizes image and returns data' do
       data = double
-      temp = double(:path => double)
+      temp = double(path: double)
       optimized = double
       optimized_data = double
       image_optim = ImageOptim.new
@@ -165,7 +202,7 @@ describe ImageOptim do
 
     it 'returns nil if optimization fails' do
       data = double
-      temp = double(:path => double)
+      temp = double(path: double)
       image_optim = ImageOptim.new
 
       allow(ImageOptim::ImageMeta).to receive(:format_for_data).

data/spec/spec_helper.rb

@@ -75,22 +75,23 @@ RSpec::Matchers.define :be_similar_to do |expected, max_difference|
   end
 end
 
-module CapabilityCheckHelpers
-  def any_file_modes_allowed?
-    Tempfile.open 'posix' do |f|
+SkipConditions = Hash.new do |cache, name|
+  cache[name] = case name
+  when :any_file_mode_allowed
+    Tempfile.open('posix') do |f|
       File.chmod(0, f.path)
-      return (File.stat(f.path).mode & 0o777).zero?
+      'full file modes are not support' unless (File.stat(f.path).mode & 0o777).zero?
     end
-  end
-
-  def inodes_supported?
-    !File.stat(__FILE__).ino.zero?
-  end
-
-  def signals_supported?
-    Process.kill(0, 0)
-    true
-  rescue
-    false
+  when :inodes_support
+    'inodes are not supported' if File.stat(__FILE__).ino.zero?
+  when :signals_support
+    begin
+      Process.kill(0, 0)
+      nil
+    rescue
+      'signals are not supported'
+    end
+  else
+    fail "Unknown check #{name}"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -191,6 +191,8 @@ files:
 - lib/image_optim/cmd.rb
 - lib/image_optim/config.rb
 - lib/image_optim/configuration_error.rb
+- lib/image_optim/elapsed_time.rb
+- lib/image_optim/errors.rb
 - lib/image_optim/handler.rb
 - lib/image_optim/hash_helpers.rb
 - lib/image_optim/image_meta.rb
@@ -203,6 +205,7 @@ files:
 - lib/image_optim/runner/glob_helpers.rb
 - lib/image_optim/runner/option_parser.rb
 - lib/image_optim/space.rb
+- lib/image_optim/timer.rb
 - lib/image_optim/true_false_nil.rb
 - lib/image_optim/worker.rb
 - lib/image_optim/worker/advpng.rb
@@ -229,6 +232,7 @@ files:
 - spec/image_optim/cache_spec.rb
 - spec/image_optim/cmd_spec.rb
 - spec/image_optim/config_spec.rb
+- spec/image_optim/elapsed_time_spec.rb
 - spec/image_optim/handler_spec.rb
 - spec/image_optim/hash_helpers_spec.rb
 - spec/image_optim/image_meta_spec.rb
@@ -239,6 +243,7 @@ files:
 - spec/image_optim/runner/glob_helpers_spec.rb
 - spec/image_optim/runner/option_parser_spec.rb
 - spec/image_optim/space_spec.rb
+- spec/image_optim/timer_spec.rb
 - spec/image_optim/worker/jpegrecompress_spec.rb
 - spec/image_optim/worker/optipng_spec.rb
 - spec/image_optim/worker/pngquant_spec.rb
@@ -279,7 +284,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/toy/image_optim/issues
   changelog_uri: https://github.com/toy/image_optim/blob/master/CHANGELOG.markdown
-  documentation_uri: https://www.rubydoc.info/gems/image_optim/0.29.0
+  documentation_uri: https://www.rubydoc.info/gems/image_optim/0.30.0
   source_code_uri: https://github.com/toy/image_optim
 post_install_message: |
   Rails image assets optimization is extracted into image_optim_rails gem
@@ -298,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.5
+rubygems_version: 3.2.16
 signing_key:
 specification_version: 4
 summary: Command line tool and ruby interface to optimize (lossless compress, optionally
@@ -313,6 +318,7 @@ test_files:
 - spec/image_optim/cache_spec.rb
 - spec/image_optim/cmd_spec.rb
 - spec/image_optim/config_spec.rb
+- spec/image_optim/elapsed_time_spec.rb
 - spec/image_optim/handler_spec.rb
 - spec/image_optim/hash_helpers_spec.rb
 - spec/image_optim/image_meta_spec.rb
@@ -323,6 +329,7 @@ test_files:
 - spec/image_optim/runner/glob_helpers_spec.rb
 - spec/image_optim/runner/option_parser_spec.rb
 - spec/image_optim/space_spec.rb
+- spec/image_optim/timer_spec.rb
 - spec/image_optim/worker/jpegrecompress_spec.rb
 - spec/image_optim/worker/optipng_spec.rb
 - spec/image_optim/worker/pngquant_spec.rb