image_optim 0.21.0 → 0.22.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzU4OTIxMDYxM2E3MjAyOTk3NGEzOTg1MjY0NzY0OGE2YTVkZGNiMA==
+    NGEwM2UzY2VlZmU0OWJmNzg2YTAyMDZlNWM1MzM5ZWVhNDAyOTg3Mw==
   data.tar.gz: !binary |-
-    M2E0MzhmYWQ2MGJjMDIzOWJkMDg3ODNhZDg5NmVjMTNhODRiMDMxMg==
+    YTE0YzA1YjQ2NzU3NDIxZjFjNzA4ZGVjOGFmNGY4YTgxMjhiODlhZA==
 SHA512:
   metadata.gz: !binary |-
-    NWI2M2EyYzdjOTVmYjVlNmY3YjQ5ZTc4ZTg1NGFmNTBmODQ2NzI5MDBjZjEy
-    MDlkMDI4NTNmNWYyMDAyOTcyN2ZhMWY4ZDA3ZjZlNGQwMmQ5MGY2ODdjMWRh
-    ODM1MWVlMTkyM2EyMWQ2NjEzMGMwOWZhNWIwNDZjNDg1MjZjMmM=
+    YjI3M2JhYmExNTg2OTg2OGI1NWU5YWEwM2Y4MjNmOWRhNjcwM2EwZmFjOTQz
+    ZjI2MzBiZjcwZWIwMjQ0ZWUwOTFlODNjZjU0NThmMDhjYWUzMTE2ZTVmOGFm
+    NGM1ZWMzMjYyODZmZTUzZjk2NzljMTY1MDg1M2Y4NmZmNTMwZTY=
   data.tar.gz: !binary |-
-    MmExY2E0YzJlODkwM2EwOTdiODI3ZTU4ZjU4ODNmNmQ4ZDQ1ZWQwZDczMDc3
-    YThiMTdlNGI5ODc3M2NiODkzMDRkMDU0MGUyOWUzZWRiZDcwMDYyM2U5NTQ3
-    NzZmNzc0NzhiOGE0ZTFhMmFlMGU1ODA4YjUzYzQxYzc0YTViYTg=
+    NTQxYjc1MWI2OTgzNzNhOTliMGRjMjgwMTBlMDBjZDdjYmRlN2RjOTVhNTk0
+    YjE0NzczOWE0NzZjMWMzOGM4NWFlZTg0ZjAzZWQ3NTNjZGRhYTVkNjc2ZjUx
+    OWQ3ODZmZGE2MmMxMWM1YmU1NjI0NzljNDE4MjE4MDdjYzliOTU=

data/.rubocop.yml

@@ -20,9 +20,6 @@ Metrics/MethodLength:
 Metrics/PerceivedComplexity:
   Max: 8
 
-Performance/ParallelAssignment:
-  Enabled: false
-
 Style/AccessModifierIndentation:
   EnforcedStyle: outdent
 
@@ -47,6 +44,9 @@ Style/IfUnlessModifier:
 Style/IndentHash:
   EnforcedStyle: consistent
 
+Style/ParallelAssignment:
+  Enabled: false
+
 Style/PercentLiteralDelimiters:
   PreferredDelimiters:
     '%w': '[]'

data/.travis.yml

@@ -1,3 +1,4 @@
+sudo: false
 language: ruby
 rvm:
   - 1.8.7
@@ -6,7 +7,6 @@ rvm:
   - '2.0'
   - '2.1'
   - '2.2'
-  - jruby-18mode
   - jruby-19mode
   - ree
 script:
@@ -36,6 +36,8 @@ matrix:
       rvm: default
     - env: RUBOCOP=true
       rvm: default
+  allow_failures:
+    - rvm: jruby-19mode
 addons:
   code_climate:
     repo_token:

data/CHANGELOG.markdown

@@ -2,6 +2,14 @@
 
 ## unreleased
 
+## v0.22.0 (2015-11-21)
+
+* Unify getting description of option default value using `default_description` [@toy](https://github.com/toy)
+* Don't use `-strip` option for optipng when the bin version is less than 0.7 [#106](https://github.com/toy/image_optim/issues/106) [@toy](https://github.com/toy)
+* Use quality `0..100` by default in lossy mode of pngquant worker [#77](https://github.com/toy/image_optim/issues/77) [@toy](https://github.com/toy)
+* Add `:disable_plugins` and `:enable_plugins` options to `svgo` worker [#110](https://github.com/toy/image_optim/pull/110) [@tomhughes](https://github.com/tomhughes)
+* Allow setting config in rails like `config.assets.image_optim.name = value` [#111](https://github.com/toy/image_optim/pull/111) [@toy](https://github.com/toy)
+
 ## v0.21.0 (2015-05-30)
 
 * Use exifr 1.2.2 with fix for a bug [#85](https://github.com/toy/image_optim/issues/85) [@toy](https://github.com/toy)

data/README.markdown

@@ -277,50 +277,51 @@ Worker can be disabled by passing `false` instead of options hash or by setting
 <!---<worker-options>-->
 <!-- markdown for worker options is generated by `script/update_worker_options_in_readme` -->
 
-### :advpng =>
+### advpng:
 * `:level` — Compression level: `0` - don't compress, `1` - fast, `2` - normal, `3` - extra, `4` - extreme *(defaults to `4`)*
 
-### :gifsicle =>
+### gifsicle:
 * `:interlace` — Interlace: `true` - interlace on, `false` - interlace off, `nil` - as is in original image (defaults to running two instances, one with interlace off and one with on)
 * `:level` — Compression level: `1` - light and fast, `2` - normal, `3` - heavy (slower) *(defaults to `3`)*
 * `:careful` — Avoid bugs with some software *(defaults to `false`)*
 
-### :jhead =>
+### jhead:
 Worker has no options
 
-### :jpegoptim =>
+### jpegoptim:
 * `:strip` — List of extra markers to strip: `:comments`, `:exif`, `:iptc`, `:icc` or `:all` *(defaults to `:all`)*
 * `:max_quality` — Maximum image quality factor `0`..`100`, ignored in default/lossless mode *(defaults to `100`)*
 
-### :jpegrecompress =>
+### jpegrecompress:
 * `:quality` — JPEG quality preset: `0` - low, `1` - medium, `2` - high, `3` - veryhigh *(defaults to `3`)*
 
-### :jpegtran =>
+### jpegtran:
 * `:copy_chunks` — Copy all chunks *(defaults to `false`)*
 * `:progressive` — Create progressive JPEG file *(defaults to `true`)*
 * `:jpegrescan` — Use jpegtran through jpegrescan, ignore progressive option *(defaults to `false`)*
 
-### :optipng =>
+### optipng:
 * `:level` — Optimization level preset: `0` is least, `7` is best *(defaults to `6`)*
 * `:interlace` — Interlace: `true` - interlace on, `false` - interlace off, `nil` - as is in original image *(defaults to `false`)*
 * `:strip` — Remove all auxiliary chunks *(defaults to `true`)*
 
-### :pngcrush =>
+### pngcrush:
 * `:chunks` — List of chunks to remove or `:alla` - all except tRNS/transparency or `:allb` - all except tRNS and gAMA/gamma *(defaults to `:alla`)*
 * `:fix` — Fix otherwise fatal conditions such as bad CRCs *(defaults to `false`)*
 * `:brute` — Brute force try all methods, very time-consuming and generally not worthwhile *(defaults to `false`)*
 * `:blacken` — Blacken fully transparent pixels *(defaults to `true`)*
 
-### :pngout =>
+### pngout:
 * `:copy_chunks` — Copy optional chunks *(defaults to `false`)*
 * `:strategy` — Strategy: `0` - xtreme, `1` - intense, `2` - longest Match, `3` - huffman Only, `4` - uncompressed *(defaults to `0`)*
 
-### :pngquant =>
-* `:quality` — min..max - don't save below min, use less colors below max (both in range `0..100`; in yaml - `!ruby/range 0..100`), ignored in default/lossless mode *(defaults to `100..100`)*
+### pngquant:
+* `:quality` — min..max - don't save below min, use less colors below max (both in range `0..100`; in yaml - `!ruby/range 0..100`), ignored in default/lossless mode *(defaults to `100..100`, `0..100` in lossy mode)*
 * `:speed` — speed/quality trade-off: `1` - slow, `3` - default, `11` - fast & rough *(defaults to `3`)*
 
-### :svgo =>
-Worker has no options
+### svgo:
+* `:disable_plugins` — List of plugins to disable *(defaults to `[]`)*
+* `:enable_plugins` — List of plugins to enable *(defaults to `[]`)*
 
 <!---</worker-options>-->
 

data/Vagrantfile

@@ -1,15 +1,22 @@
 VAGRANTFILE_API_VERSION = '2'
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = 'ubuntu/trusty64'
+  config.vm.box = 'ubuntu/precise64'
 
   config.vm.provision 'shell', :inline => <<-SH
     set -e
 
     cd /vagrant
 
-    echo 'Install git, node, npm, imagemagick...'
-    apt-get install -y git npm nodejs-legacy imagemagick > /dev/null
+    echo 'apt-get update...'
+    apt-get update > /dev/null
+
+    echo 'Install git, imagemagick, ruby1.9.1-dev...'
+    apt-get install -y git npm imagemagick ruby1.9.1-dev > /dev/null
+
+    echo 'Install node, npm...'
+    curl -sL https://deb.nodesource.com/setup | sudo bash - > /dev/null
+    sudo apt-get install -y nodejs > /dev/null
 
     echo 'Update rubygems...'
     REALLY_GEM_UPDATE_SYSTEM=x gem update --system > /dev/null

data/image_optim.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.21.0'
+  s.version     = '0.22.0'
   s.summary     = %q{Optimize (lossless compress, optionally lossy) images (jpeg, png, gif, svg) using external utilities (advpng, gifsicle, jhead, jpeg-recompress, jpegoptim, jpegrescan, jpegtran, optipng, pngcrush, pngout, pngquant, svgo)}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']
@@ -24,6 +24,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'image_optim_pack', '~> 0.2'
   s.add_development_dependency 'rspec', '~> 3.0'
   if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('1.9.3')
-    s.add_development_dependency 'rubocop', '~> 0.27', '!= 0.30.1'
+    s.add_development_dependency 'rubocop', '~> 0.35'
   end
 end

data/lib/image_optim.rb

@@ -163,7 +163,9 @@ class ImageOptim
 
   # Version of image_optim gem spec loaded
   def self.version
-    Gem.loaded_specs['image_optim'].version.to_s rescue 'DEV'
+    Gem.loaded_specs['image_optim'].version.to_s
+  rescue
+    'DEV'
   end
 
   # Full version of image_optim

data/lib/image_optim/bin_resolver/bin.rb

@@ -36,6 +36,7 @@ class ImageOptim
         [:gifsicle, is < '1.85', 'does not support removing extension blocks'],
         [:pngcrush, is < '1.7.38', 'does not have blacken flag'],
         [:pngquant, is < '2.1', 'may be lossy even with quality `100-`'],
+        [:optipng, is < '0.7', 'does not support -strip option'],
       ]
 
       # Fail if version will not work properly

data/lib/image_optim/option_definition.rb

@@ -28,5 +28,11 @@ class ImageOptim
         value
       end
     end
+
+    # Describe default value, returns string as is otherwise surrounds
+    # inspected value with backticks
+    def default_description
+      default.is_a?(String) ? default : "`#{default.inspect}`"
+    end
   end
 end

data/lib/image_optim/railtie.rb

@@ -3,6 +3,16 @@ require 'image_optim'
 class ImageOptim
   # Adds image_optim as preprocessor for gif, jpeg, png and svg images
   class Railtie < Rails::Railtie
+    config.before_configuration do |app|
+      worker_names = ImageOptim::Worker.klasses.map(&:bin_sym)
+      app.config.assets.image_optim =
+        ActiveSupport::OrderedOptions.new do |hash, key|
+          if worker_names.include?(key.to_sym)
+            hash[key] = ActiveSupport::OrderedOptions.new
+          end
+        end
+    end
+
     initializer 'image_optim.initializer' do |app|
       register_preprocessor(app) if register_preprocessor?(app)
     end

data/lib/image_optim/runner/option_parser.rb

@@ -174,8 +174,8 @@ ImageOptim::Runner::OptionParser::DEFINE = proc do |op, options|
 
     bin = klass.bin_sym
     klass.option_definitions.each do |option_definition|
-      name = option_definition.name.to_s.gsub('_', '-')
-      default = option_definition.default
+      name = option_definition.name.to_s.tr('_', '-')
+      default = option_definition.default_description
       type = option_definition.type
 
       type, marking = case

data/lib/image_optim/worker/optipng.rb

@@ -37,7 +37,9 @@ class ImageOptim
           #{dst}
         ]
         args.unshift "-i#{interlace ? 1 : 0}" unless interlace.nil?
-        args.unshift '-strip', 'all' if strip
+        if resolve_bin!(:optipng).version >= '0.7'
+          args.unshift '-strip', 'all' if strip
+        end
         execute(:optipng, *args) && optimized?(src, dst)
       end
     end

data/lib/image_optim/worker/pngquant.rb

@@ -7,19 +7,24 @@ class ImageOptim
     # http://pngquant.org/
     class Pngquant < Worker
       QUALITY_OPTION =
-      option(:quality, 100..100, NonNegativeIntegerRange, 'min..max - don\'t '\
-          'save below min, use less colors below max (both in range `0..100`; '\
-          'in yaml - `!ruby/range 0..100`), ignored in default/lossless '\
-          'mode') do |v, opt_def|
+      option(:quality, '`100..100`, `0..100` in lossy mode',
+             NonNegativeIntegerRange, 'min..max - don\'t '\
+         'save below min, use less colors below max (both in range `0..100`; '\
+         'in yaml - `!ruby/range 0..100`), ignored in default/lossless '\
+         'mode') do |v, opt_def|
         if allow_lossy
-          min = OptionHelpers.limit_with_range(v.begin, 0..100)
-          min..OptionHelpers.limit_with_range(v.end, min..100)
+          if v == opt_def.default
+            0..100
+          else
+            min = OptionHelpers.limit_with_range(v.begin, 0..100)
+            min..OptionHelpers.limit_with_range(v.end, min..100)
+          end
         else
           if v != opt_def.default
             warn "#{self.class.bin_sym} #{opt_def.name} #{v} ignored " \
                 'in lossless mode'
           end
-          opt_def.default
+          100..100
         end
       end
 

data/lib/image_optim/worker/svgo.rb

@@ -4,11 +4,27 @@ class ImageOptim
   class Worker
     # https://github.com/svg/svgo
     class Svgo < Worker
+      DISABLE_PLUGINS_OPTION =
+      option(:disable_plugins, [], 'List of plugins to disable') do |v|
+        Array(v).map(&:to_s)
+      end
+
+      ENABLE_PLUGINS_OPTION =
+      option(:enable_plugins, [], 'List of plugins to enable') do |v|
+        Array(v).map(&:to_s)
+      end
+
       def optimize(src, dst)
         args = %W[
           --input #{src}
           --output #{dst}
         ]
+        disable_plugins.each do |plugin_name|
+          args.unshift "--disable=#{plugin_name}"
+        end
+        enable_plugins.each do |plugin_name|
+          args.unshift "--enable=#{plugin_name}"
+        end
         execute(:svgo, *args) && optimized?(src, dst)
       end
     end

data/script/update_worker_options_in_readme

@@ -12,14 +12,14 @@ GENERATED_NOTE = '<!-- markdown for worker options is generated by '\
     "`#{Pathname($PROGRAM_NAME).cleanpath}` -->"
 
 def write_worker_options(io, klass)
-  io.puts "### :#{klass.bin_sym} =>"
+  io.puts "### #{klass.bin_sym}:"
   if klass.option_definitions.empty?
     io.puts 'Worker has no options'
   else
     klass.option_definitions.each do |option_definition|
       line = "* `:#{option_definition.name}` — #{option_definition.description}"
       unless line['(defaults']
-        line << " *(defaults to `#{option_definition.default.inspect}`)*"
+        line << " *(defaults to #{option_definition.default_description})*"
       end
       io.puts line
     end

data/spec/image_optim/handler_spec.rb

@@ -72,9 +72,7 @@ describe ImageOptim::Handler do
       expect(handler).to receive(:cleanup)
       expect(handler).to receive(:result).and_return(result)
 
-      expect(Handler.for(original) do |h|
-        h.process
-      end).to eq(result)
+      expect(Handler.for(original, &:process)).to eq(result)
     end
 
     it 'cleans up if exception is raised' do

data/spec/image_optim/hash_helpers_spec.rb

@@ -40,9 +40,7 @@ describe ImageOptim::HashHelpers do
         :b => 1,
         :c => {
           :d => 2,
-          :e => {
-            :f => true,
-          },
+          :e => {:f => true},
         },
       },
       :y => 10,

data/spec/image_optim/option_definition_spec.rb

@@ -0,0 +1,110 @@
+require 'spec_helper'
+require 'image_optim/option_definition'
+
+describe ImageOptim::OptionDefinition do
+  describe 'initialization' do
+    context 'when type is not specified explicitly' do
+      subject{ described_class.new('abc', :def, 'desc') }
+
+      describe '#name' do
+        it{ expect(subject.name).to eq(:abc) }
+      end
+
+      describe '#default' do
+        it{ expect(subject.default).to eq(:def) }
+      end
+
+      describe '#type' do
+        it{ expect(subject.type).to eq(Symbol) }
+      end
+
+      describe '#description' do
+        it{ expect(subject.description).to eq('desc') }
+      end
+    end
+
+    context 'when type is specified explicitly' do
+      subject{ described_class.new('abc', :def, Hash, 'desc') }
+
+      describe '#name' do
+        it{ expect(subject.name).to eq(:abc) }
+      end
+
+      describe '#default' do
+        it{ expect(subject.default).to eq(:def) }
+      end
+
+      describe '#type' do
+        it{ expect(subject.type).to eq(Hash) }
+      end
+
+      describe '#description' do
+        it{ expect(subject.description).to eq('desc') }
+      end
+    end
+  end
+
+  describe '#value' do
+    context 'when proc not given' do
+      subject{ described_class.new('abc', :def, 'desc') }
+
+      context 'when option not provided' do
+        it 'returns default' do
+          expect(subject.value(nil, {})).to eq(:def)
+        end
+      end
+
+      context 'when option is nil' do
+        it 'returns nil' do
+          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)
+        end
+      end
+    end
+
+    context 'when proc given' do
+      subject{ described_class.new('abc', :def, 'desc', &:inspect) }
+
+      context 'when option not provided' do
+        it 'returns default passed through proc' do
+          expect(subject.value(nil, {})).to eq(':def')
+        end
+      end
+
+      context 'when option is nil' do
+        it 'returns nil passed through proc' do
+          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')
+        end
+      end
+    end
+  end
+
+  describe '#default_description' do
+    context 'when default is not a string' do
+      subject{ described_class.new('abc', :def, 'desc') }
+
+      it 'returns inspected value in backticks' do
+        expect(subject.default_description).to eq('`:def`')
+      end
+    end
+
+    context 'when default is a string' do
+      subject{ described_class.new('abc', '`1`', 'desc') }
+
+      it 'returns it as is' do
+        expect(subject.default_description).to eq('`1`')
+      end
+    end
+  end
+end

data/spec/image_optim/railtie_spec.rb

@@ -23,7 +23,6 @@ describe 'ImageOptim::Railtie' do
         assets.paths = %w[spec/images]
 
         assets.delete(:compress)
-        assets.delete(:image_optim)
       end
 
       yield config if block_given?
@@ -68,14 +67,14 @@ describe 'ImageOptim::Railtie' do
       end
 
       it 'initializes with empty hash if config.assets.image_optim is true' do
-        expect(ImageOptim).to receive(:new).with({}).and_call_original
+        expect(ImageOptim).to receive(:new).with({})
         init_rails_app do |config|
           config.assets.image_optim = true
         end
       end
 
       it 'initializes with empty hash if config.assets.image_optim is nil' do
-        expect(ImageOptim).to receive(:new).with({}).and_call_original
+        expect(ImageOptim).to receive(:new).with({})
         init_rails_app do |config|
           config.assets.image_optim = nil
         end
@@ -88,6 +87,33 @@ describe 'ImageOptim::Railtie' do
           config.assets.image_optim = hash
         end
       end
+
+      it 'is possible to set individual options' do
+        hash = {:config_paths => 'config/image_optim.yml'}
+        expect(ImageOptim).to receive(:new).with(hash)
+        init_rails_app do |config|
+          config.assets.image_optim.config_paths = 'config/image_optim.yml'
+        end
+      end
+
+      it 'is possible to set individual worker options' do
+        hash = {:advpng => {:level => 3}}
+        expect(ImageOptim).to receive(:new).with(hash)
+        init_rails_app do |config|
+          expect(config.assets.image_optim.advpng).to eq({})
+          config.assets.image_optim.advpng.level = 3
+        end
+      end
+
+      it 'is not possible to set unknown worker options' do
+        expect(ImageOptim).to receive(:new).with({})
+        init_rails_app do |config|
+          expect(config.assets.image_optim.unknown).to eq(nil)
+          expect do
+            config.assets.image_optim.unknown.level = 3
+          end.to raise_error(NoMethodError)
+        end
+      end
     end
   end
 

data/spec/image_optim/worker/optipng_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+require 'image_optim/worker/optipng'
+require 'image_optim/image_path'
+
+describe ImageOptim::Worker::Optipng do
+  describe 'strip option' do
+    subject{ described_class.new(ImageOptim.new, options) }
+
+    let(:options){ {} }
+    let(:optipng_version){ '0.7' }
+    let(:src){ instance_double(ImageOptim::ImagePath, :copy => nil) }
+    let(:dst){ instance_double(ImageOptim::ImagePath) }
+
+    before do
+      optipng_bin = instance_double(ImageOptim::BinResolver::Bin)
+      allow(subject).to receive(:resolve_bin!).
+        with(:optipng).and_return(optipng_bin)
+      allow(optipng_bin).to receive(:version).
+        and_return(ImageOptim::BinResolver::SimpleVersion.new(optipng_version))
+
+      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
+
+    context 'when optipng version is < 0.7' do
+      let(:optipng_version){ '0.6.999' }
+
+      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
+end

data/spec/image_optim/worker/pngquant_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+require 'image_optim/worker/pngquant'
+
+describe ImageOptim::Worker::Pngquant do
+  describe 'quality option' do
+    describe 'default' do
+      subject{ described_class::QUALITY_OPTION.default }
+
+      it{ is_expected.to match(/100\.\.100.*0\.\.100/) }
+    end
+
+    describe 'value' do
+      let(:options){ {} }
+      subject{ described_class.new(ImageOptim.new, options).quality }
+
+      context 'by default' do
+        it{ is_expected.to eq(100..100) }
+      end
+
+      context 'when lossy allowed by default' do
+        let(:options){ {:allow_lossy => true} }
+
+        it{ is_expected.to eq(0..100) }
+      end
+    end
+  end
+end

data/spec/image_optim_spec.rb

@@ -67,7 +67,7 @@ describe ImageOptim do
       base_options = {:skip_missing_workers => false}
       [
         ['lossless', base_options, 0],
-        ['lossy', base_options.merge(:allow_lossy => true), 0.01],
+        ['lossy', base_options.merge(:allow_lossy => true), 0.001],
       ].each do |type, options, max_difference|
         image_optim = ImageOptim.new(options)
         describe type do

data/spec/images/test.svg

@@ -1,3 +1,3 @@
-<svg width="1in" height="100" xmlns="http://www.w3.org/2000/svg">
+<svg width="90.000" height="100.000" xmlns="http://www.w3.org/2000/svg">
 	<circle cx="36" cy="50" r="30" stroke="black" stroke-width="10" fill="red" />
 </svg>

data/spec/spec_helper.rb

@@ -14,35 +14,36 @@ end
 def flatten_animation(image)
   if image.format == :gif
     flattened = image.temp_path
-    flatten_command = %W[
+    command = %W[
       convert
       #{image.to_s.shellescape}
       -coalesce
       -append
       #{flattened.to_s.shellescape}
     ].join(' ')
-    expect(ImageOptim::Cmd.run(flatten_command)).to be_truthy
+    expect(ImageOptim::Cmd.run(command)).to be_truthy
     flattened
   else
     image
   end
 end
 
-def nrmse(image_a, image_b)
+def mepp(image_a, image_b)
   coalesce_a = flatten_animation(image_a)
   coalesce_b = flatten_animation(image_b)
-  nrmse_command = %W[
+  command = %W[
     compare
-    -metric RMSE
+    -metric MEPP
     -alpha Background
     #{coalesce_a.to_s.shellescape}
     #{coalesce_b.to_s.shellescape}
     /dev/null
     2>&1
   ].join(' ')
-  output = ImageOptim::Cmd.capture(nrmse_command)
+  output = ImageOptim::Cmd.capture(command)
   if [0, 1].include?($CHILD_STATUS.exitstatus)
-    output[/\((\d+(\.\d+)?)\)/, 1].to_f
+    num_r = '\d+(?:\.\d+(?:[eE][-+]?\d+)?)?'
+    output[/\((#{num_r}), #{num_r}\)/, 1].to_f
   else
     fail "compare #{image_a} with #{image_b} failed with `#{output}`"
   end
@@ -54,7 +55,7 @@ end
 
 RSpec::Matchers.define :be_similar_to do |expected, max_difference|
   match do |actual|
-    @diff = nrmse(actual, expected)
+    @diff = mepp(actual, expected)
     @diff <= max_difference
   end
   failure_message do |actual|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-30 00:00:00.000000000 Z
+date: 2015-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -126,20 +126,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.27'
-    - - ! '!='
-      - !ruby/object:Gem::Version
-        version: 0.30.1
+        version: '0.35'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.27'
-    - - ! '!='
-      - !ruby/object:Gem::Version
-        version: 0.30.1
+        version: '0.35'
 description: 
 email: 
 executables:
@@ -206,10 +200,13 @@ files:
 - spec/image_optim/handler_spec.rb
 - spec/image_optim/hash_helpers_spec.rb
 - spec/image_optim/image_path_spec.rb
+- spec/image_optim/option_definition_spec.rb
 - spec/image_optim/railtie_spec.rb
 - 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/optipng_spec.rb
+- spec/image_optim/worker/pngquant_spec.rb
 - spec/image_optim/worker_spec.rb
 - spec/image_optim_spec.rb
 - spec/images/comparison.png
@@ -274,10 +271,13 @@ test_files:
 - spec/image_optim/handler_spec.rb
 - spec/image_optim/hash_helpers_spec.rb
 - spec/image_optim/image_path_spec.rb
+- spec/image_optim/option_definition_spec.rb
 - spec/image_optim/railtie_spec.rb
 - 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/optipng_spec.rb
+- spec/image_optim/worker/pngquant_spec.rb
 - spec/image_optim/worker_spec.rb
 - spec/image_optim_spec.rb
 - spec/images/comparison.png