image_optim 0.27.1 → 0.31.0

data/spec/image_optim/hash_helpers_spec.rb

@@ -10,10 +10,10 @@ describe ImageOptim::HashHelpers do
 
   context 'stringify/simbolyze' do
     symbol_keys = {
-      :a => 1,
-      :b => {
-        :c => [:a, 'a'],
-        :d => {},
+      a: 1,
+      b: {
+        c: [:a, 'a'],
+        d: {},
       },
     }
 
@@ -38,22 +38,22 @@ describe ImageOptim::HashHelpers do
 
   it 'deep merges hashes' do
     merge_a = {
-      :a => {
-        :b => 1,
-        :c => {
-          :d => 2,
-          :e => {:f => true},
+      a: {
+        b: 1,
+        c: {
+          d: 2,
+          e: {f: true},
         },
       },
-      :y => 10,
+      y: 10,
     }
 
     merge_b = {
       :a => {
-        :b => 2,
-        :c => {
-          :d => 3,
-          :e => false,
+        b: 2,
+        c: {
+          d: 3,
+          e: false,
         },
       },
       'z' => 20,
@@ -61,10 +61,10 @@ describe ImageOptim::HashHelpers do
 
     merge_result = {
       :a => {
-        :b => 2,
-        :c => {
-          :d => 3,
-          :e => false,
+        b: 2,
+        c: {
+          d: 3,
+          e: false,
         },
       },
       :y => 10,

data/spec/image_optim/option_definition_spec.rb

@@ -58,13 +58,13 @@ describe ImageOptim::OptionDefinition do
 
       context 'when option is nil' do
         it 'returns nil' do
-          expect(subject.value(nil, :abc => nil)).to eq(nil)
+          expect(subject.value(nil, abc: nil)).to eq(nil)
         end
       end
 
       context 'when option is set' do
         it 'returns value' do
-          expect(subject.value(nil, :abc => 123)).to eq(123)
+          expect(subject.value(nil, abc: 123)).to eq(123)
         end
       end
     end
@@ -84,13 +84,13 @@ describe ImageOptim::OptionDefinition do
 
       context 'when option is nil' do
         it 'returns nil passed through proc' do
-          expect(subject.value(nil, :abc => nil)).to eq('nil')
+          expect(subject.value(nil, abc: nil)).to eq('nil')
         end
       end
 
       context 'when option is set' do
         it 'returns value passed through proc' do
-          expect(subject.value(nil, :abc => 123)).to eq('123')
+          expect(subject.value(nil, abc: 123)).to eq('123')
         end
       end
     end
@@ -108,13 +108,13 @@ describe ImageOptim::OptionDefinition do
 
       context 'when option is nil' do
         it 'returns nil passed through proc' do
-          expect(subject.value(nil, :abc => nil)).to eq(['nil', subject])
+          expect(subject.value(nil, abc: nil)).to eq(['nil', subject])
         end
       end
 
       context 'when option is set' do
         it 'returns value passed through proc' do
-          expect(subject.value(nil, :abc => 123)).to eq(['123', subject])
+          expect(subject.value(nil, abc: 123)).to eq(['123', subject])
         end
       end
     end

data/spec/image_optim/path_spec.rb

@@ -5,8 +5,6 @@ require 'image_optim/path'
 require 'tempfile'
 
 describe ImageOptim::Path do
-  include CapabilityCheckHelpers
-
   before do
     stub_const('Path', ImageOptim::Path)
   end
@@ -76,8 +74,7 @@ describe ImageOptim::Path do
         expect(src).to_not exist
       end
 
-      it 'preserves attributes of destination file' do
-        skip 'full file modes are not support' unless any_file_modes_allowed?
+      it 'preserves attributes of destination file', skip: SkipConditions[:any_file_mode_allowed] do
         mode = 0o666
 
         dst.chmod(mode)
@@ -89,17 +86,17 @@ describe ImageOptim::Path do
       end
 
       it 'does not preserve mtime of destination file' do
-        time = src.mtime
+        time = src.mtime - 1000
+        dst.utime(time, time)
 
-        dst.utime(time - 1000, time - 1000)
+        time = dst.mtime
 
         src.replace(dst)
 
-        expect(dst.mtime).to be >= time
+        expect(dst.mtime).to_not eq(time)
       end
 
-      it 'changes inode of destination' do
-        skip 'inodes are not supported' unless inodes_supported?
+      it 'changes inode of destination', skip: SkipConditions[:inodes_support] do
         expect{ src.replace(dst) }.to change{ dst.stat.ino }
       end
     end
@@ -120,7 +117,7 @@ describe ImageOptim::Path do
       include_examples 'replaces file'
 
       it 'is using temporary file with .tmp extension' do
-        expect(src).to receive(:move).with(having_attributes(:extname => '.tmp'))
+        expect(src).to receive(:move).with(having_attributes(extname: '.tmp'))
 
         src.replace(dst)
       end
@@ -135,7 +132,7 @@ describe ImageOptim::Path do
       include_examples 'replaces file'
 
       it 'is using temporary file with .tmp extension' do
-        expect(src).to receive(:move).with(having_attributes(:extname => '.tmp'))
+        expect(src).to receive(:move).with(having_attributes(extname: '.tmp'))
 
         src.replace(dst)
       end

data/spec/image_optim/runner/option_parser_spec.rb

@@ -37,7 +37,7 @@ describe ImageOptim::Runner::OptionParser do
       %w[-r -R --recursive].each do |flag|
         it "is parsed from #{flag}" do
           args = %W[#{flag} foo bar]
-          expect(OptionParser.parse!(args)).to eq(:recursive => true)
+          expect(OptionParser.parse!(args)).to eq(recursive: true)
           expect(args).to eq(%w[foo bar])
         end
       end
@@ -46,19 +46,19 @@ describe ImageOptim::Runner::OptionParser do
     describe 'numeric option threads' do
       it 'is parsed with space separator' do
         args = %w[--threads 616 foo bar]
-        expect(OptionParser.parse!(args)).to eq(:threads => 616)
+        expect(OptionParser.parse!(args)).to eq(threads: 616)
         expect(args).to eq(%w[foo bar])
       end
 
       it 'is parsed with equal separator' do
         args = %w[--threads=616 foo bar]
-        expect(OptionParser.parse!(args)).to eq(:threads => 616)
+        expect(OptionParser.parse!(args)).to eq(threads: 616)
         expect(args).to eq(%w[foo bar])
       end
 
       it 'is parsed with no- prefix' do
         args = %w[--no-threads 616 foo bar]
-        expect(OptionParser.parse!(args)).to eq(:threads => false)
+        expect(OptionParser.parse!(args)).to eq(threads: false)
         expect(args).to eq(%w[616 foo bar])
       end
     end

data/spec/image_optim/timer_spec.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'image_optim/timer'
+
+describe ImageOptim::Timer do
+  let!(:timer){ described_class.new(1) }
+
+  describe '#elapsed' do
+    it 'returns elapsed time' do
+      sleep 0.01
+
+      expect(timer.elapsed).to be >= 0.01
+    end
+  end
+
+  describe '#left' do
+    it 'returns time left' do
+      sleep 0.01
+
+      expect(timer.left).to be <= 0.99
+    end
+  end
+
+  describe '#to_f' do
+    it 'returns time left' do
+      sleep 0.01
+
+      expect(timer.to_f).to be <= 0.99
+    end
+  end
+end

data/spec/image_optim/worker/jpegrecompress_spec.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'image_optim/worker/jpegrecompress'
+
+describe ImageOptim::Worker::Jpegrecompress do
+  describe 'method value' do
+    let(:subject){ described_class.new(ImageOptim.new, method).method }
+
+    context 'default' do
+      let(:method){ {} }
+
+      it{ is_expected.to eq('ssim') }
+    end
+
+    context 'uses default when invalid' do
+      let(:method){ {method: 'invalid'} }
+
+      it 'warns and keeps default' do
+        expect_any_instance_of(described_class).
+          to receive(:warn).with('Unknown method for jpegrecompress: invalid')
+        is_expected.to eq('ssim')
+      end
+    end
+
+    context 'can use a valid option' do
+      let(:method){ {method: 'smallfry'} }
+
+      it{ is_expected.to eq('smallfry') }
+    end
+  end
+end

data/spec/image_optim/worker/optipng_spec.rb

@@ -10,7 +10,7 @@ describe ImageOptim::Worker::Optipng do
 
     let(:options){ {} }
     let(:optipng_version){ '0.7' }
-    let(:src){ instance_double(ImageOptim::Path, :copy => nil) }
+    let(:src){ instance_double(ImageOptim::Path, copy: nil) }
     let(:dst){ instance_double(ImageOptim::Path) }
 
     before do
@@ -34,7 +34,7 @@ describe ImageOptim::Worker::Optipng do
     end
 
     context 'when strip is disabled' do
-      let(:options){ {:strip => false} }
+      let(:options){ {strip: false} }
 
       it 'should not add -strip all to arguments' do
         expect(subject).to receive(:execute) do |_bin, *args|
@@ -61,42 +61,42 @@ describe ImageOptim::Worker::Optipng do
   describe '#optimized?' do
     let(:src){ instance_double(ImageOptim::Path, src_options) }
     let(:dst){ instance_double(ImageOptim::Path, dst_options) }
-    let(:src_options){ {:size => 10} }
-    let(:dst_options){ {:size? => 9} }
+    let(:src_options){ {size: 10} }
+    let(:dst_options){ {size?: 9} }
     let(:instance){ described_class.new(ImageOptim.new, instance_options) }
     let(:instance_options){ {} }
 
     subject{ instance.optimized?(src, dst) }
 
     context 'when interlace option is enabled' do
-      let(:instance_options){ {:interlace => true} }
+      let(:instance_options){ {interlace: true} }
 
       context 'when dst is empty' do
-        let(:dst_options){ {:size? => nil} }
+        let(:dst_options){ {size?: nil} }
         it{ is_expected.to be_falsy }
       end
 
       context 'when dst is not empty' do
-        let(:dst_options){ {:size? => 20} }
+        let(:dst_options){ {size?: 20} }
         it{ is_expected.to be_truthy }
       end
     end
 
     context 'when interlace option is disabled' do
-      let(:instance_options){ {:interlace => false} }
+      let(:instance_options){ {interlace: false} }
 
       context 'when dst is empty' do
-        let(:dst_options){ {:size? => nil} }
+        let(:dst_options){ {size?: nil} }
         it{ is_expected.to be_falsy }
       end
 
       context 'when dst is greater than or equal to src' do
-        let(:dst_options){ {:size? => 10} }
+        let(:dst_options){ {size?: 10} }
         it{ is_expected.to be_falsy }
       end
 
       context 'when dst is less than src' do
-        let(:dst_options){ {:size? => 9} }
+        let(:dst_options){ {size?: 9} }
         it{ is_expected.to be_truthy }
       end
     end

data/spec/image_optim/worker/oxipng_spec.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'image_optim/worker/oxipng'
+require 'image_optim/path'
+
+describe ImageOptim::Worker::Oxipng do
+  describe 'strip option' do
+    subject{ described_class.new(ImageOptim.new, options) }
+
+    let(:options){ {} }
+    let(:src){ instance_double(ImageOptim::Path, copy: nil) }
+    let(:dst){ instance_double(ImageOptim::Path) }
+
+    before do
+      oxipng_bin = instance_double(ImageOptim::BinResolver::Bin)
+      allow(subject).to receive(:resolve_bin!).
+        with(:oxipng).and_return(oxipng_bin)
+
+      allow(subject).to receive(:optimized?)
+    end
+
+    context 'by default' do
+      it 'should add --strip all to arguments' do
+        expect(subject).to receive(:execute) do |_bin, *args|
+          expect(args.join(' ')).to match(/(^| )--strip all($| )/)
+        end
+
+        subject.optimize(src, dst)
+      end
+    end
+
+    context 'when strip is disabled' do
+      let(:options){ {strip: false} }
+
+      it 'should not add --strip all to arguments' do
+        expect(subject).to receive(:execute) do |_bin, *args|
+          expect(args.join(' ')).not_to match(/(^| )--strip all($| )/)
+        end
+
+        subject.optimize(src, dst)
+      end
+    end
+  end
+
+  describe '#optimized?' do
+    let(:src){ instance_double(ImageOptim::Path, src_options) }
+    let(:dst){ instance_double(ImageOptim::Path, dst_options) }
+    let(:src_options){ {size: 10} }
+    let(:dst_options){ {size?: 9} }
+    let(:instance){ described_class.new(ImageOptim.new, instance_options) }
+    let(:instance_options){ {} }
+
+    subject{ instance.optimized?(src, dst) }
+
+    context 'when interlace option is enabled' do
+      let(:instance_options){ {interlace: true} }
+
+      context 'when dst is empty' do
+        let(:dst_options){ {size?: nil} }
+        it{ is_expected.to be_falsy }
+      end
+
+      context 'when dst is not empty' do
+        let(:dst_options){ {size?: 20} }
+        it{ is_expected.to be_truthy }
+      end
+    end
+
+    context 'when interlace option is disabled' do
+      let(:instance_options){ {interlace: false} }
+
+      context 'when dst is empty' do
+        let(:dst_options){ {size?: nil} }
+        it{ is_expected.to be_falsy }
+      end
+
+      context 'when dst is greater than or equal to src' do
+        let(:dst_options){ {size?: 10} }
+        it{ is_expected.to be_falsy }
+      end
+
+      context 'when dst is less than src' do
+        let(:dst_options){ {size?: 9} }
+        it{ is_expected.to be_truthy }
+      end
+    end
+  end
+end

data/spec/image_optim/worker/pngquant_spec.rb

@@ -22,7 +22,7 @@ describe ImageOptim::Worker::Pngquant do
         end
 
         context 'when value is passed through options' do
-          let(:options){ {:quality => 10..90} }
+          let(:options){ {quality: 10..90} }
 
           it 'warns and keeps default' do
             expect_any_instance_of(described_class).
@@ -34,13 +34,13 @@ describe ImageOptim::Worker::Pngquant do
 
       context 'when lossy allowed' do
         context 'by default' do
-          let(:options){ {:allow_lossy => true} }
+          let(:options){ {allow_lossy: true} }
 
           it{ is_expected.to eq(0..100) }
         end
 
         context 'when value is passed through options' do
-          let(:options){ {:allow_lossy => true, :quality => 10..90} }
+          let(:options){ {allow_lossy: true, quality: 10..90} }
 
           it 'sets the value without warning' do
             expect_any_instance_of(described_class).not_to receive(:warn)
@@ -49,7 +49,7 @@ describe ImageOptim::Worker::Pngquant do
         end
 
         context 'when passed range begin is less than 0' do
-          let(:options){ {:allow_lossy => true, :quality => -50..50} }
+          let(:options){ {allow_lossy: true, quality: -50..50} }
 
           it 'sets begin to 0' do
             is_expected.to eq(0..50)
@@ -57,7 +57,7 @@ describe ImageOptim::Worker::Pngquant do
         end
 
         context 'when passed range end is more than 100' do
-          let(:options){ {:allow_lossy => true, :quality => 50..150} }
+          let(:options){ {allow_lossy: true, quality: 50..150} }
 
           it 'sets end to 100' do
             is_expected.to eq(50..100)

data/spec/image_optim/worker_spec.rb

@@ -29,9 +29,9 @@ describe ImageOptim::Worker do
         option(:three, 3, 'Three')
       end
 
-      worker = worker_class.new(ImageOptim.new, :three => '...')
+      worker = worker_class.new(ImageOptim.new, three: '...')
 
-      expect(worker.options).to eq(:one => 1, :two => 2, :three => '...')
+      expect(worker.options).to eq(one: 1, two: 2, three: '...')
     end
   end
 
@@ -72,7 +72,7 @@ describe ImageOptim::Worker do
         option(:three, 3, 'Three')
       end)
 
-      worker = DefOptim.new(ImageOptim.new, :three => '...')
+      worker = DefOptim.new(ImageOptim.new, three: '...')
 
       expect(worker.inspect).to eq('#<DefOptim @one=1, @two=2, @three="...">')
     end
@@ -104,17 +104,17 @@ describe ImageOptim::Worker do
 
     it 'create hash by format' do
       workers = [
-        double(:image_formats => [:a]),
-        double(:image_formats => [:a, :b]),
-        double(:image_formats => [:b, :c]),
+        double(image_formats: [:a]),
+        double(image_formats: [:a, :b]),
+        double(image_formats: [:b, :c]),
       ]
 
       expect(Worker).to receive(:create_all).and_return(workers)
 
       worker_by_format = {
-        :a => [workers[0], workers[1]],
-        :b => [workers[1], workers[2]],
-        :c => [workers[2]],
+        a: [workers[0], workers[1]],
+        b: [workers[1], workers[2]],
+        c: [workers[2]],
       }
 
       expect(Worker.create_all_by_format(double)).to eq(worker_by_format)
@@ -123,21 +123,21 @@ describe ImageOptim::Worker do
 
   describe '.create_all' do
     def worker_double(override = {})
-      stubs = {:resolve_used_bins! => nil, :run_order => 0}.merge(override)
+      stubs = {resolve_used_bins!: nil, run_order: 0}.merge(override)
       instance_double(Worker, stubs)
     end
 
     def worker_class_doubles(workers)
-      workers.map{ |worker| class_double(Worker, :init => worker) }
+      workers.map{ |worker| class_double(Worker, init: worker) }
     end
 
-    let(:image_optim){ double(:allow_lossy => false) }
+    let(:image_optim){ double(allow_lossy: false) }
 
     it 'creates all workers for which options_proc returns true' do
       workers = Array.new(3){ worker_double }
       klasses = worker_class_doubles(workers)
       options_proc = proc do |klass|
-        klass == klasses[1] ? {:disable => true} : {}
+        klass == klasses[1] ? {disable: true} : {}
       end
 
       allow(Worker).to receive(:klasses).and_return(klasses)
@@ -206,7 +206,7 @@ describe ImageOptim::Worker do
     it 'orders workers by run_order' do
       run_orders = [10, -10, 0, 0, 0, 10, -10]
       workers = run_orders.map do |run_order|
-        worker_double(:run_order => run_order)
+        worker_double(run_order: run_order)
       end
       klasses_list = worker_class_doubles(workers)
 
@@ -243,16 +243,16 @@ describe ImageOptim::Worker do
       it 'allows overriding per worker' do
         klasses = worker_class_doubles([worker_double, worker_double])
         options_proc = proc do |klass|
-          klass == klasses[1] ? {:allow_lossy => :b} : {}
+          klass == klasses[1] ? {allow_lossy: :b} : {}
         end
 
         allow(Worker).to receive(:klasses).and_return(klasses)
 
         klasses.each{ |klass| klass.send(:attr_reader, :allow_lossy) }
         expect(klasses[0]).to receive(:init).
-          with(image_optim, hash_including(:allow_lossy => false))
+          with(image_optim, hash_including(allow_lossy: false))
         expect(klasses[1]).to receive(:init).
-          with(image_optim, hash_including(:allow_lossy => :b))
+          with(image_optim, hash_including(allow_lossy: :b))
 
         Worker.create_all(image_optim, &options_proc)
       end