image_optim 0.27.1 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8d7c83b1d36f1cb0c41866cf421a8477632c43137749f2011b2520854de859d
-  data.tar.gz: 3030f2377d510cc964025e3497dfb2bc860bd560fa88e33acc97e3caaa56614c
+  metadata.gz: 818160db3036f1fd4305077d943e59991aebe5fb1023b3c7e46db02e63c5fb37
+  data.tar.gz: 76c76ec43a5c05b9e35de21757928ec8793709a3db27e8a982cc46612f8d491e
 SHA512:
-  metadata.gz: 3df3a7cd3606e03dc16fd7aed023e40f61e5c4b688707a39240cc67b5432b9705fbb2c33df9ec8a1da96e4408d7a5270b6a181415647e53c686565f45b5c2bd4
-  data.tar.gz: b19684e4d13d29e6ac52e3ba5cddb38a6716f9acfae9946962ab45582a38e49c6c42018387d66e75a5f52d7153e12cf4a9e9dc10388f6d36bd4834d5a5e78ee0
+  metadata.gz: f30e6f493be6ff4e98407bb611d8fd868733af14da078b225b6708c7f6aabaa41d00b08e82c3801c788bd70c4d7278ee91a186a3dc54bc7bdcc16e685d27c7a8
+  data.tar.gz: b3402efe19eeb298518cfeb117f38c7aca1e0bbabe68313663107269d3ab87f8900f238db182042377adb5ebc12f69dd133ee5c922fcbde54c4b647bc9efa836

data/.travis.yml

@@ -7,7 +7,6 @@ cache:
     - $(npm root)
     - ~/bin
 rvm:
-  - '1.8.7-p374'
   - '1.9.3-p551'
   - '2.0.0-p648'
   - '2.1.10'
@@ -16,7 +15,7 @@ rvm:
   - '2.4.10'
   - '2.5.8'
   - '2.6.6'
-  - '2.7.1'
+  - '2.7.2'
   - 'jruby-9.2.11.1'
 script:
   - bundle exec image_optim --info

data/CHANGELOG.markdown

@@ -2,6 +2,12 @@
 
 ## unreleased
 
+## v0.28.0 (2020-12-18)
+
+* Fix and update list of markers in jpegoptim worker: allow to pass `com` instead of incorrect `comments` and add missing `xmp` and `none` [#188](https://github.com/toy/image_optim/issues/188) [@toy](https://github.com/toy)
+* Add `--skip-if-larger` flag to pngquant worker. The pngquant worker already does this, but this will make it fail faster. [#125](https://github.com/toy/image_optim/pull/125) [#181](https://github.com/toy/image_optim/pull/181) [@iggant](https://github.com/iggant) [@oblakeerickson](https://github.com/oblakeerickson)
+* Add `method` option for jpegrecompress, default to `ssim` [#102](https://github.com/toy/image_optim/issues/102) [#103](https://github.com/toy/image_optim/pull/103) [#182](https://github.com/toy/image_optim/pull/182) [@ramiroaraujo](https://github.com/ramiroaraujo) [@oblakeerickson](https://github.com/oblakeerickson)
+
 ## v0.27.1 (2020-09-30)
 
 * Fixed atomic replacement for case when equal `File::Stat#dev` doesn't mean that file can be linked [#180](https://github.com/toy/image_optim/issues/180) [@toy](https://github.com/toy)

data/CONTRIBUTING.markdown

@@ -2,7 +2,10 @@
 
 * Create topic/feature branch: `git checkout -b awesome-changes`
 * Commit…
-* Add entry at the top of [ChangeLog](CHANGELOG.markdown)
+* Add an entry at the top (after ## unreleased) of [ChangeLog](CHANGELOG.markdown), include:
+  * Issues (`[#123](https://github.com/toy/image_optim/issues/123)`)
+  * Pull requests (`[#123](https://github.com/toy/image_optim/pull/123)`)
+  * Authors (`[@octocat](https://github.com/octocat)`)
 * Run tests: `bundle exec rspec`
 * Check code style: `bundle exec rubocop`
 * Rebase on master and squash commits to logical units

data/README.markdown

@@ -60,7 +60,7 @@ With version:
 
 <!---<update-version>-->
 ```ruby
-gem 'image_optim', '~> 0.27'
+gem 'image_optim', '~> 0.28'
 ```
 <!---</update-version>-->
 
@@ -310,12 +310,13 @@ Worker has no options
 
 ### jpegoptim:
 * `:allow_lossy` — Allow limiting maximum quality *(defaults to `false`)*
-* `:strip` — List of extra markers to strip: `:comments`, `:exif`, `:iptc`, `:icc` or `:all` *(defaults to `:all`)*
+* `:strip` — List of markers to strip: `:com`, `:exif`, `:iptc`, `:icc`, `:xmp`, `:none` or `:all` *(defaults to `:all`)*
 * `:max_quality` — Maximum image quality factor `0`..`100`, ignored in default/lossless mode *(defaults to `100`)*
 
 ### jpegrecompress:
 * `:allow_lossy` — Allow worker, it is always lossy *(defaults to `false`)*
 * `:quality` — JPEG quality preset: `0` - low, `1` - medium, `2` - high, `3` - veryhigh *(defaults to `3`)*
+* `:method` — Comparison Metric: `mpe` - Mean pixel error, `ssim` - Structural similarity, `ms-ssim` - Multi-scale structural similarity (slow!), `smallfry` - Linear-weighted BBCQ-like (may be patented) *(defaults to ssim)*
 
 ### jpegtran:
 * `:copy_chunks` — Copy all chunks *(defaults to `false`)*

data/image_optim.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.27.1'
+  s.version     = '0.28.0'
   s.summary     = %q{Command line tool and ruby interface to optimize (lossless compress, optionally lossy) jpeg, png, gif and svg images using external utilities (advpng, gifsicle, jhead, jpeg-recompress, jpegoptim, jpegrescan, jpegtran, optipng, pngcrush, pngout, pngquant, svgo)}
   s.homepage    = "https://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']
@@ -33,7 +33,7 @@ EOF
 
   s.add_development_dependency 'image_optim_pack', '~> 0.2', '>= 0.2.2'
   s.add_development_dependency 'rspec', '~> 3.0'
-  if RUBY_VERSION >= '2.2' && !Gem.win_platform? && !defined?(JRUBY_VERSION)
-    s.add_development_dependency 'rubocop', '~> 0.59', '!= 0.78.0'
+  if RUBY_VERSION >= '2.4' && !Gem.win_platform? && !defined?(JRUBY_VERSION)
+    s.add_development_dependency 'rubocop', '~> 1.0'
   end
 end

data/lib/image_optim/bin_resolver/bin.rb

@@ -14,6 +14,7 @@ class ImageOptim
     # Holds bin name and path, gets version
     class Bin
       class UnknownVersion < Error; end
+
       class BadVersion < Error; end
 
       attr_reader :name, :path, :version

data/lib/image_optim/config.rb

@@ -197,10 +197,10 @@ class ImageOptim
       when /darwin9/
         Cmd.capture 'hwprefs cpu_count'
       when /darwin/
-        if (Cmd.capture 'which hwprefs') != ''
-          Cmd.capture 'hwprefs thread_count'
-        else
+        if (Cmd.capture 'which hwprefs') == ''
           Cmd.capture 'sysctl -n hw.ncpu'
+        else
+          Cmd.capture 'hwprefs thread_count'
         end
       when /linux/
         Cmd.capture 'grep -c processor /proc/cpuinfo'

data/lib/image_optim/runner/option_parser.rb

@@ -202,6 +202,8 @@ ImageOptim::Runner::OptionParser::DEFINE = proc do |op, options|
         [Integer, 'N']
       when Array >= type
         [Array, 'a,b,c']
+      when String >= type
+        [String, 'S']
       when ImageOptim::NonNegativeIntegerRange == type
         [type, 'M-N']
       else

data/lib/image_optim/worker/jpegoptim.rb

@@ -11,14 +11,16 @@ class ImageOptim
       option(:allow_lossy, false, 'Allow limiting maximum quality'){ |v| !!v }
 
       STRIP_OPTION =
-      option(:strip, :all, Array, 'List of extra markers to strip: '\
-          '`:comments`, '\
+      option(:strip, :all, Array, 'List of markers to strip: '\
+          '`:com`, '\
           '`:exif`, '\
           '`:iptc`, '\
-          '`:icc` or '\
+          '`:icc`, '\
+          '`:xmp`, '\
+          '`:none` or '\
           '`:all`') do |v|
         values = Array(v).map(&:to_s)
-        known_values = %w[all comments exif iptc icc]
+        known_values = %w[com exif iptc icc xmp none all]
         unknown_values = values - known_values
         unless unknown_values.empty?
           warn "Unknown markers for jpegoptim: #{unknown_values.join(', ')}"

data/lib/image_optim/worker/jpegrecompress.rb

@@ -26,6 +26,20 @@ class ImageOptim
         OptionHelpers.limit_with_range(v.to_i, 0...QUALITY_NAMES.length)
       end
 
+      METHOD_OPTION =
+      option(:method, 'ssim', 'Comparison Metric: '\
+          '`mpe` - Mean pixel error, '\
+          '`ssim` - Structural similarity, '\
+          '`ms-ssim` - Multi-scale structural similarity (slow!), '\
+          '`smallfry` - Linear-weighted BBCQ-like (may be patented)') do |v, opt_def|
+        if %w[mpe ssim ms-ssim smallfry].include? v
+          v
+        else
+          warn "Unknown method for jpegrecompress: #{v}"
+          opt_def.default
+        end
+      end
+
       def used_bins
         [:'jpeg-recompress']
       end
@@ -38,6 +52,7 @@ class ImageOptim
       def optimize(src, dst)
         args = %W[
           --quality #{QUALITY_NAMES[quality]}
+          --method #{method}
           --no-copy
           #{src}
           #{dst}

data/lib/image_optim/worker/pngquant.rb

@@ -55,6 +55,7 @@ class ImageOptim
           --quality=#{quality.begin}-#{quality.end}
           --speed=#{speed}
           --output=#{dst}
+          --skip-if-larger
           --force
           #{max_colors}
           --

data/script/update_worker_options_in_readme

@@ -18,7 +18,7 @@ def write_worker_options(io, klass)
     klass.option_definitions.each do |option_definition|
       line = "* `:#{option_definition.name}` — #{option_definition.description}"
       unless line['(defaults']
-        line << " *(defaults to #{option_definition.default_description})*"
+        line += " *(defaults to #{option_definition.default_description})*"
       end
       io.puts line
     end

data/spec/image_optim/cache_spec.rb

@@ -102,7 +102,7 @@ describe ImageOptim::Cache do
           expect(FileUtils).not_to receive(:mv)
           expect(File).not_to receive(:rename)
 
-          expect(cache.fetch(original){}).to eq(cached)
+          expect(cache.fetch(original){ nil }).to eq(cached)
         end
 
         it 'returns nil when file is already optimized' do

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim
 version: !ruby/object:Gem::Version
-  version: 0.27.1
+  version: 0.28.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-29 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -138,20 +138,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.59'
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 0.78.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.59'
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 0.78.0
+        version: '1.0'
 description:
 email:
 executables:
@@ -230,6 +224,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/worker/jpegrecompress_spec.rb
 - spec/image_optim/worker/optipng_spec.rb
 - spec/image_optim/worker/pngquant_spec.rb
 - spec/image_optim/worker_spec.rb
@@ -269,7 +264,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.27.1
+  documentation_uri: https://www.rubydoc.info/gems/image_optim/0.28.0
   source_code_uri: https://github.com/toy/image_optim
 post_install_message: |
   Rails image assets optimization is extracted into image_optim_rails gem
@@ -288,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.5
 signing_key:
 specification_version: 4
 summary: Command line tool and ruby interface to optimize (lossless compress, optionally
@@ -313,6 +308,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/worker/jpegrecompress_spec.rb
 - spec/image_optim/worker/optipng_spec.rb
 - spec/image_optim/worker/pngquant_spec.rb
 - spec/image_optim/worker_spec.rb