image_optim 0.14.0 → 0.15.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDYzNDg2MTY5NjdlNGIyY2U3NzY0Mzc5MTc1YzA3N2I3MGRmNDQ0Yw==
+    ODA5N2IyMjgwM2FjYTU3OGM4NjE2OTU0NzM5NGRhOTRiNGExNDM5Mw==
   data.tar.gz: !binary |-
-    OTcyM2IxMWJjOTA4NDYyYTVkMjcwNTI4MDI5NzE0OTVmYjI5MzE0NQ==
+    YTNiZmYwOTk0OWY5NmE0OGM3OTliNzRmNTE5NDIwMGQ4OWM4NmMyMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    N2ViYzljYTU3OGVkMzQ5OTNmNmYyM2RmZjdmZDZmN2E4MDA0MmJmNGI5MjFk
-    Yzc1NDFjYWM0NjgxZTU0ZWQwMjc0MmVjNGM1MjEyYmQ3MzhmNTlmYWNkZjU3
-    Mzc1Mjc2Y2M0NWNkZGM3OTFlN2ZjZDNiM2EwOGRmNjY0MmIxM2M=
+    YzI4NWY2MmU5Y2Y3YjJjMmExNzQ1NDk4NmE5NjhmOWFjMjVlZmY1NmQyMmM3
+    M2RmZTAzZWI1Mzg2MTQ3ZDQ4YzkyZjM5MGYxYjcwM2NiMTE3Mzg1ZmMwY2Vl
+    MmQwODgxMDkwYmVlOTE2ZjY1MTA2YzY4ODgxMzJmODFiN2FmMmU=
   data.tar.gz: !binary |-
-    Y2M4Y2I4ZTNiYjZhYThmYThhNTQxYjQ4N2UxZDhhNmU4NjQ1MmI2NmY1YTdh
-    MGI3YTI1YjRiZmIyYmQ5NGE4MDI2NmVjNGY1YWNmNmRkMDM3MzZhMGY3ZjQ5
-    MjYwZmJhOWNkYTM3YWU3NTc4OTQwMThiZjhmY2RkY2Y5ZTc3ZmY=
+    NzViMzQ4Yjc0Y2MyYjdlNDBiNjM1N2U5ZmIzYTkzYzZlZjNkNjZlMzMxMDVk
+    NWEwYjk0MzEzMTU3NDdlNmZiZjlmMjMzYWM2ZjRjNGNlNjRmY2I2MTY2MjRm
+    YmFjNmE0ZTc2M2I1MGVlM2RiOTg1OTJmOGFhZjEwYzkxMjNiNTY=

data/.gitignore

@@ -11,3 +11,5 @@ Makefile
 *.o
 *.bundle
 /tmp/
+
+/analysis/

data/.travis.yml

@@ -17,12 +17,18 @@ script:
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq advancecomp gifsicle jhead jpegoptim libjpeg-progs optipng pngcrush
+  - npm install -g svgo
+  - mkdir ~/bin
+  # pngquant:
+  - git clone git://github.com/pornel/pngquant.git
+  - pushd pngquant && git checkout $(git describe --tags --abbrev=0) && make && popd
+  - mv pngquant/pngquant ~/bin
+  # pngout:
   - wget http://static.jonof.id.au/dl/kenutils/pngout-20130221-linux.tar.gz
   - tar -xzf pngout-*-linux.tar.gz
-  - mv pngout-*-linux pngout-linux
-  - npm install -g svgo
+  - mv pngout-*-linux/x86_64/pngout ~/bin
 env:
-  - PATH=pngout-linux/x86_64:$PATH
+  - PATH=~/bin:$PATH
 matrix:
   allow_failures:
     - rvm: ruby-head

data/CONTRIBUTING.markdown

@@ -0,0 +1,9 @@
+# Contributing
+
+* Create topic/feature branch: `git checkout -b awesome-changes`
+* Commit…
+* Run tests: `bundle exec rspec`
+* Check code style: `bundle exec rubocop`
+* Push your branch: `git push origin awesome-changes`
+* Create pull request
+* Check if [travis is happy](https://travis-ci.org/toy/image_optim/pull_requests)

data/README.markdown

@@ -1,9 +1,9 @@
-[![Gem Version](https://img.shields.io/gem/v/image_optim.svg)](https://rubygems.org/gems/image_optim)
-[![Build Status](https://img.shields.io/travis/toy/image_optim/master.svg)](https://travis-ci.org/toy/image_optim)
-[![Code Climate](https://img.shields.io/codeclimate/github/toy/image_optim.svg)](https://codeclimate.com/github/toy/image_optim)
-[![Dependency Status](https://img.shields.io/gemnasium/toy/image_optim.svg)](https://gemnasium.com/toy/image_optim)
-[![Inch CI](http://inch-ci.org/github/toy/image_optim.svg?branch=master)](http://inch-ci.org/github/toy/image_optim)
-[![Gittip](https://img.shields.io/gittip/toy.svg)](https://www.gittip.com/toy/)
+[![Gem Version](https://img.shields.io/gem/v/image_optim.svg?style=flat)](https://rubygems.org/gems/image_optim)
+[![Build Status](https://img.shields.io/travis/toy/image_optim/master.svg?style=flat)](https://travis-ci.org/toy/image_optim)
+[![Code Climate](https://img.shields.io/codeclimate/github/toy/image_optim.svg?style=flat)](https://codeclimate.com/github/toy/image_optim)
+[![Dependency Status](https://img.shields.io/gemnasium/toy/image_optim.svg?style=flat)](https://gemnasium.com/toy/image_optim)
+[![Inch CI](http://inch-ci.org/github/toy/image_optim.svg?branch=master&style=flat)](http://inch-ci.org/github/toy/image_optim)
+[![Gittip](https://img.shields.io/gittip/toy.svg?style=flat)](https://www.gittip.com/toy/)
 
 # image_optim
 
@@ -18,6 +18,7 @@ Optimize (lossless compress) images (jpeg, png, gif, svg) using external utiliti
 * [optipng](http://optipng.sourceforge.net/)
 * [pngcrush](http://pmt.sourceforge.net/pngcrush/)
 * [pngout](http://www.advsys.net/ken/util/pngout.htm)
+* [pngquant](http://pngquant.org/)
 * [svgo](https://github.com/svg/svgo)
 
 Based on [ImageOptim.app](http://imageoptim.com/).
@@ -81,13 +82,15 @@ Besides permanently setting environment variables in `~/.profile`, `~/.bash_prof
 ### Linux - Debian/Ubuntu
 
 ```bash
-sudo apt-get install -y advancecomp gifsicle jhead jpegoptim libjpeg-progs optipng pngcrush
+sudo apt-get install -y advancecomp gifsicle jhead jpegoptim libjpeg-progs optipng pngcrush pngquant
 ```
 
+If you get an old version of `pngquant`, please check how to install up-to-date version or compile from source at [http://pngquant.org/](http://pngquant.org/).
+
 ### Linux - RHEL/Fedora/Centos
 
 ```bash
-sudo yum install -y advancecomp gifsicle jhead libjpeg optipng
+sudo yum install -y advancecomp gifsicle jhead libjpeg optipng pngquant
 ```
 
 You may also need to install `libjpeg-turbo-utils` instead of `libjpeg`:
@@ -127,13 +130,13 @@ make && cp -f pngcrush /usr/local/bin
 ### OS X: Macports
 
 ```bash
-sudo port install advancecomp gifsicle jhead jpegoptim jpeg optipng pngcrush
+sudo port install advancecomp gifsicle jhead jpegoptim jpeg optipng pngcrush pngquant
 ```
 
 ### OS X: Brew
 
 ```bash
-brew install advancecomp gifsicle jhead jpegoptim jpeg optipng pngcrush
+brew install advancecomp gifsicle jhead jpegoptim jpeg optipng pngcrush pngquant
 ```
 
 ### pngout installation (optional)
@@ -238,24 +241,14 @@ optipng:
 Worker can be disabled by passing `false` instead of options hash.
 
 <!---<worker-options>-->
-<!-- worker options markdown is generated by `script/update_worker_options_in_readme` -->
-
-### :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`)*
-
-### :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`)*
-
-### :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`)*
+<!-- markdown for worker options is generated by `script/update_worker_options_in_readme` -->
 
 ### :advpng =>
 * `:level` — Compression level: `0` - don't compress, `1` - fast, `2` - normal, `3` - extra, `4` - extreme *(defaults to `4`)*
 
+### :gifsicle =>
+* `:interlace` — Turn interlacing on *(defaults to `false`)*
+
 ### :jhead =>
 Worker has no options
 
@@ -268,14 +261,32 @@ Worker has no options
 * `:progressive` — Create progressive JPEG file *(defaults to `true`)*
 * `:jpegrescan` — Use jpegtran through jpegrescan, ignore progressive option *(defaults to `false`)*
 
-### :gifsicle =>
-* `:interlace` — Turn interlacing on *(defaults to `false`)*
+### :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`)*
+
+### :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`)*
+
+### :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`) *(defaults to `100..100`)*
+* `:speed` — speed/quality trade-off: `1` - slow, `3` - default, `11` - fast & rough *(defaults to `3`)*
 
 ### :svgo =>
 Worker has no options
 
 <!---</worker-options>-->
 
+## Contributing
+
+If you would like to contribute - that is great and you are very welcome. Please check few notes about [CONTRIBUTING](CONTRIBUTING.markdown).
+
 ## Copyright
 
-Copyright (c) 2012-2014 Ivan Kuchin. See LICENSE.txt for details.
+Copyright (c) 2012-2014 Ivan Kuchin. See [LICENSE.txt](LICENSE.txt) for details.

data/bin/image_optim

@@ -2,11 +2,14 @@
 # encoding: UTF-8
 
 require 'image_optim/runner'
+require 'image_optim/true_false_nil'
+require 'image_optim/non_negative_integer_range'
 
 options = {}
 
 option_parser = OptionParser.new do |op|
   ImageOptim::TrueFalseNil.add_to_option_parser(op)
+  ImageOptim::NonNegativeIntegerRange.add_to_option_parser(op)
 
   op.banner = <<-TEXT.gsub(/^\s*\|/, '')
     |#{ImageOptim.full_version}
@@ -65,6 +68,8 @@ option_parser = OptionParser.new do |op|
         [Integer, 'N']
       when Array >= type
         [Array, 'a,b,c']
+      when ImageOptim::NonNegativeIntegerRange == type
+        [type, 'M-N']
       else
         fail "Unknown type #{type}"
       end

data/image_optim.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.14.0'
-  s.summary     = %q{Optimize (lossless compress) images (jpeg, png, gif, svg) using external utilities (advpng, gifsicle, jpegoptim, jpegtran, optipng, pngcrush, pngout, svgo)}
+  s.version     = '0.15.0'
+  s.summary     = %q{Optimize (lossless compress) images (jpeg, png, gif, svg) using external utilities (advpng, gifsicle, jpegoptim, jpegtran, optipng, pngcrush, pngout, pngquant, svgo)}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']
   s.license     = 'MIT'
@@ -18,8 +18,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'fspath', '~> 2.1.0'
   s.add_dependency 'image_size', '~> 1.3.0'
   s.add_dependency 'exifr', '~> 1.1.3'
-  s.add_dependency 'progress', '~> 3.0.0'
-  s.add_dependency 'in_threads', '~> 1.2.0'
+  s.add_dependency 'progress', '~> 3.0.1'
+  s.add_dependency 'in_threads', '~> 1.2.2'
   s.add_development_dependency 'rspec', '~> 3.0'
   if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('1.9.2')
     s.add_development_dependency 'rubocop', '~> 0.24.1'

data/lib/image_optim.rb

@@ -68,15 +68,15 @@ class ImageOptim
   def optimize_image(original)
     original = ImagePath.convert(original)
     return unless (workers = workers_for_image(original))
-    handler = Handler.new(original)
-    workers.each do |worker|
-      handler.process do |src, dst|
-        worker.optimize(src, dst)
+    result = Handler.for(original) do |handler|
+      workers.each do |worker|
+        handler.process do |src, dst|
+          worker.optimize(src, dst)
+        end
       end
     end
-    handler.cleanup
-    return unless handler.result
-    ImagePath::Optimized.new(handler.result, original)
+    return unless result
+    ImagePath::Optimized.new(result, original)
   end
 
   # Optimize one file in place, return original as OptimizedImagePath or nil if
@@ -106,7 +106,7 @@ class ImageOptim
   # Optimize multiple images
   # if block given yields path and result for each image and returns array of
   # yield results
-  # else return array of results
+  # else return array of path and result pairs
   def optimize_images(paths, &block)
     run_method_for(paths, :optimize_image, &block)
   end
@@ -114,7 +114,7 @@ class ImageOptim
   # Optimize multiple images in place
   # if block given yields path and result for each image and returns array of
   # yield results
-  # else return array of results
+  # else return array of path and result pairs
   def optimize_images!(paths, &block)
     run_method_for(paths, :optimize_image!, &block)
   end
@@ -122,7 +122,7 @@ class ImageOptim
   # Optimize multiple image datas
   # if block given yields original and result for each image data and returns
   # array of yield results
-  # else return array of results
+  # else return array of path and result pairs
   def optimize_images_data(datas, &block)
     run_method_for(datas, :optimize_image_data, &block)
   end
@@ -178,14 +178,17 @@ private
     by_format.each{ |_format, workers| workers.sort! }
   end
 
-  # Run method for each path and yield each path and result if block given
-  def run_method_for(paths, method_name, &block)
-    apply_threading(paths).map do |path|
-      result = send(method_name, path)
+  # Run method for each item in list
+  # if block given yields item and result for item and returns array of yield
+  # results
+  # else return array of item and result pairs
+  def run_method_for(list, method_name, &block)
+    apply_threading(list).map do |item|
+      result = send(method_name, item)
       if block
-        block.call(path, result)
+        block.call(item, result)
       else
-        result
+        [item, result]
       end
     end
   end
@@ -201,7 +204,7 @@ private
 end
 
 %w[
-  pngcrush pngout optipng advpng
+  pngcrush pngout advpng optipng pngquant
   jhead jpegoptim jpegtran
   gifsicle
   svgo

data/lib/image_optim/bin_resolver.rb

@@ -4,15 +4,16 @@ require 'image_optim/bin_resolver/simple_version'
 require 'image_optim/bin_resolver/comparable_condition'
 
 class ImageOptim
-  class BinNotFoundError < StandardError; end
-  class BadBinVersion < StandardError; end
-
   # Handles resolving binaries and checking versions
   #
   # If there is an environment variable XXX_BIN when resolbing xxx, then a
   # symlink to binary will be created in a temporary directory which will be
   # added to PATH
   class BinResolver
+    class Error < StandardError; end
+    class BinNotFound < Error; end
+    class BadBinVersion < Error; end
+
     # Holds name and version of an executable
     class Bin
       attr_reader :name, :version
@@ -47,7 +48,7 @@ class ImageOptim
       if @bins[name]
         check!(@bins[name])
       else
-        fail BinNotFoundError, "`#{name}` not found"
+        fail BinNotFound, "`#{name}` not found"
       end
     end
 
@@ -84,7 +85,7 @@ class ImageOptim
 
     def version(name)
       case name.to_sym
-      when :advpng, :gifsicle, :jpegoptim, :optipng
+      when :advpng, :gifsicle, :jpegoptim, :optipng, :pngquant
         capture_output("#{name} --version")[/\d+(\.\d+){1,}/]
       when :svgo
         capture_output("#{name} --version 2>&1")[/\d+(\.\d+){1,}/]
@@ -114,6 +115,13 @@ class ImageOptim
         when c = is < '1.17'
           warn "Note that `#{bin}` (#{c}) does not use zopfli"
         end
+      when :pngquant
+        case bin.version
+        when c = is < '2.0'
+          fail BadBinVersion, "`#{bin}` (#{c}) is not supported"
+        when c = is < '2.1'
+          warn "Note that `#{bin}` (#{c}) may be lossy even with quality `100-`"
+        end
       end
     end
 

data/lib/image_optim/bin_resolver/simple_version.rb

@@ -5,16 +5,23 @@ class ImageOptim
     class SimpleVersion
       include Comparable
 
+      # Numbers extracted from version string
       attr_reader :parts
+
+      # Initialize with a string or an object convertible to string
+      #
+      #    SimpleVersion.new('2.0.1') <=> SimpleVersion.new(2)
       def initialize(str)
         @str = String(str)
         @parts = @str.split('.').map(&:to_i).reverse.drop_while(&:zero?).reverse
       end
 
+      # Returns original version string
       def to_s
         @str
       end
 
+      # Compare version parts of self with other
       def <=>(other)
         other = self.class.new(other) unless other.is_a?(self.class)
         parts <=> other.parts

data/lib/image_optim/handler.rb

@@ -16,6 +16,22 @@ class ImageOptim
       @result = nil
     end
 
+    # with no associated block, works as new. Otherwise creates instance and
+    # passes it to block, runs cleanup and returns result of handler
+    def self.for(original)
+      handler = new(original)
+      if block_given?
+        begin
+          yield handler
+          handler.result
+        ensure
+          handler.cleanup
+        end
+      else
+        handler
+      end
+    end
+
     # Yields two paths, one to latest successful result or original, second to
     # temp path
     def process

data/lib/image_optim/non_negative_integer_range.rb

@@ -0,0 +1,11 @@
+class ImageOptim
+  # Denote range of non negative integers for worker option
+  class NonNegativeIntegerRange
+    # Add handling of range of non negative integers in OptionParser instance
+    def self.add_to_option_parser(option_parser)
+      option_parser.accept(self, /(\d+)(?:-|\.\.)(\d+)/) do |_, m, n|
+        m.to_i..n.to_i
+      end
+    end
+  end
+end

data/lib/image_optim/railtie.rb

@@ -4,11 +4,17 @@ class ImageOptim
   # Adds image_optim as preprocessor for gif, jpeg, png and svg images
   class Railtie < Rails::Railtie
     initializer 'image_optim.initializer' do |app|
+      register_preprocessor(app) if register_preprocessor?(app)
+    end
+
+    def register_preprocessor?(app)
+      return if app.config.assets.compress == false
+      return if app.config.assets.image_optim == false
 
-      break if app.config.assets.compress == false
-      break if app.config.assets.image_optim == false
-      break unless app.assets
+      app.assets
+    end
 
+    def register_preprocessor(app)
       options = if app.config.assets.image_optim == true
         {}
       else
@@ -25,7 +31,6 @@ class ImageOptim
       app.assets.register_preprocessor 'image/jpeg', :image_optim, &processor
       app.assets.register_preprocessor 'image/png', :image_optim, &processor
       app.assets.register_preprocessor 'image/svg+xml', :image_optim, &processor
-
     end
   end
 end

data/lib/image_optim/runner.rb

@@ -1,6 +1,5 @@
 require 'image_optim'
 require 'image_optim/hash_helpers'
-require 'image_optim/true_false_nil'
 require 'image_optim/space'
 require 'progress'
 require 'optparse'
@@ -56,7 +55,7 @@ class ImageOptim
       unless @to_optimize.empty?
         results = Results.new
 
-        optimize_images! do |original, optimized|
+        optimize_images!.each do |original, optimized|
           results.add(original, optimized)
         end
 

data/lib/image_optim/space.rb

@@ -13,7 +13,7 @@ class ImageOptim
       when 0, nil
         EMPTY_SPACE
       else
-        log_denominator = Math.log(size) / Math.log(BASE)
+        log_denominator = Math.log(size.abs) / Math.log(BASE)
         degree = [log_denominator.floor, SIZE_SYMBOLS.length - 1].min
         number_string = if degree == 0
           size.to_s

data/lib/image_optim/true_false_nil.rb

@@ -7,5 +7,10 @@ class ImageOptim
       completing = OptionParser.top.atype[TrueClass][0].merge('nil' => nil)
       option_parser.accept(self, completing){ |_arg, val| val }
     end
+
+    # Convert everything truthy to `true`, leave `false` and `nil` as is
+    def self.convert(v)
+      v && true
+    end
   end
 end

data/lib/image_optim/worker.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
 
+require 'image_optim/configuration_error'
 require 'image_optim/option_definition'
 require 'image_optim/option_helpers'
 require 'shellwords'
@@ -40,6 +41,9 @@ class ImageOptim
 
     # Configure (raises on extra options)
     def initialize(image_optim, options = {})
+      unless image_optim.is_a?(ImageOptim)
+        fail ArgumentError, 'first parameter should be an ImageOptim instance'
+      end
       @image_optim = image_optim
       self.class.option_definitions.each do |option_definition|
         value = if options.key?(option_definition.name)
@@ -98,6 +102,10 @@ class ImageOptim
     # Forward bin resolving to image_optim
     def resolve_bin!(bin)
       @image_optim.resolve_bin!(bin)
+    rescue BinResolver::Error => e
+      name = self.class.bin_sym
+      raise e, "#{name} worker: #{e.message}; please provide proper binary or "\
+          "disable this worker (`:#{name} => false`)", e.backtrace
     end
 
     # Run command setting priority and hiding output

data/lib/image_optim/worker/optipng.rb

@@ -18,8 +18,7 @@ class ImageOptim
           '`true` - interlace on, '\
           '`false` - interlace off, '\
           '`nil` - as is in original image') do |v|
-        # convert everything truthy to `true`, leave `false` and `nil` as is
-        v && true
+        TrueFalseNil.convert(v)
       end
 
       def optimize(src, dst)

data/lib/image_optim/worker/pngquant.rb

@@ -0,0 +1,43 @@
+require 'image_optim/worker'
+require 'image_optim/option_helpers'
+require 'image_optim/non_negative_integer_range'
+
+class ImageOptim
+  class Worker
+    # 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`)') do |v|
+        min = OptionHelpers.limit_with_range(v.begin, 0..100)
+        min..OptionHelpers.limit_with_range(v.end, min..100)
+      end
+
+      SPEED_OPTION =
+      option(:speed, 3, 'speed/quality trade-off: '\
+          '`1` - slow, '\
+          '`3` - default, '\
+          '`11` - fast & rough') do |v|
+        OptionHelpers.limit_with_range(v.to_i, 1..11)
+      end
+
+      # Always run first
+      def run_order
+        -5
+      end
+
+      def optimize(src, dst)
+        args = %W[
+          --quality=#{quality.begin}-#{quality.end}
+          --speed=#{speed}
+          --output=#{dst}
+          --force
+          --
+          #{src}
+        ]
+        execute(:pngquant, *args) && optimized?(src, dst)
+      end
+    end
+  end
+end

data/script/update_worker_options_in_readme

@@ -33,7 +33,7 @@ def write_marked(io)
   io.puts GENERATED_NOTE
   io.puts
 
-  ImageOptim::Worker.klasses.each do |klass|
+  ImageOptim::Worker.klasses.sort_by(&:name).each do |klass|
     write_worker_options(io, klass)
   end
 

data/spec/image_optim/bin_resolver_spec.rb

@@ -71,7 +71,7 @@ describe ImageOptim::BinResolver do
       5.times do
         expect do
           resolver.resolve!(:should_not_exist)
-        end.to raise_error ImageOptim::BinNotFoundError
+        end.to raise_error ImageOptim::BinResolver::BinNotFound
       end
       expect(resolver.env_path).to eq([
         ENV['PATH'],
@@ -103,7 +103,7 @@ describe ImageOptim::BinResolver do
       5.times do
         expect do
           resolver.resolve!(:should_not_exist)
-        end.to raise_error ImageOptim::BinNotFoundError
+        end.to raise_error ImageOptim::BinResolver::BinNotFound
       end
       expect(resolver.env_path).to eq([
         tmpdir,
@@ -139,7 +139,7 @@ describe ImageOptim::BinResolver do
       5.times do
         expect do
           resolver.resolve!(:pngcrush)
-        end.to raise_error ImageOptim::BadBinVersion
+        end.to raise_error ImageOptim::BinResolver::BadBinVersion
       end
       expect(resolver.env_path).to eq([
         ENV['PATH'],

data/spec/image_optim/handler_spec.rb

@@ -56,4 +56,37 @@ describe ImageOptim::Handler do
     handler.cleanup
     handler.cleanup
   end
+
+  describe :open do
+    it 'should yield instance, run cleanup and return result' do
+      original = double
+      handler = double
+      result = double
+
+      expect(ImageOptim::Handler).to receive(:new).
+          with(original).and_return(handler)
+      expect(handler).to receive(:process)
+      expect(handler).to receive(:cleanup)
+      expect(handler).to receive(:result).and_return(result)
+
+      expect(ImageOptim::Handler.for(original) do |h|
+        h.process
+      end).to eq(result)
+    end
+
+    it 'should cleanup if exception is raised' do
+      original = double
+      handler = double
+
+      expect(ImageOptim::Handler).to receive(:new).
+          with(original).and_return(handler)
+      expect(handler).to receive(:cleanup)
+
+      expect do
+        ImageOptim::Handler.for(original) do
+          fail 'hello'
+        end
+      end.to raise_error 'hello'
+    end
+  end
 end

data/spec/image_optim/worker_spec.rb

@@ -9,8 +9,10 @@ describe ImageOptim::Worker do
     it 'should raise NotImplementedError unless overriden' do
       class Abc < ImageOptim::Worker; end
 
+      image_optim = ImageOptim.new
+
       expect do
-        Abc.new({}).optimize(double, double)
+        Abc.new(image_optim, {}).optimize(double, double)
       end.to raise_error NotImplementedError
     end
   end

data/spec/image_optim_spec.rb

@@ -47,9 +47,10 @@ describe ImageOptim do
 
   describe 'workers' do
     it 'should be ordered by run_order' do
+      image_optim = ImageOptim.new
       original_klasses = ImageOptim::Worker.klasses
       formats = original_klasses.map do |klass|
-        klass.new({}).image_formats
+        klass.new(image_optim, {}).image_formats
       end.flatten.uniq
 
       [
@@ -62,7 +63,7 @@ describe ImageOptim do
         image_optim = ImageOptim.new
 
         formats.each do |format|
-          path = ImagePath.new("test.#{format}")
+          path = ImageOptim::ImagePath.new("test.#{format}")
           expect(path).to receive(:format).and_return(format)
 
           workers = image_optim.workers_for_image(path)
@@ -73,12 +74,14 @@ describe ImageOptim do
   end
 
   describe 'worker' do
+    image_optim = ImageOptim.new
+
     base_options = Hash[ImageOptim::Worker.klasses.map do |klass|
       [klass.bin_sym, false]
     end]
 
     real_workers = ImageOptim::Worker.klasses.reject do |klass|
-      klass.new({}).image_formats.empty?
+      klass.new(image_optim, {}).image_formats.empty?
     end
 
     real_workers.each do |worker_klass|
@@ -171,32 +174,37 @@ describe ImageOptim do
   describe 'bunch' do
     it 'should optimize' do
       copies = TEST_IMAGES.map(&:temp_copy)
-      optimized_images = ImageOptim.optimize_images(copies)
-      zipped = TEST_IMAGES.zip(copies, optimized_images)
-      zipped.each do |original, copy, optimized_image|
-        expect(optimized_image).to be_a(ImageOptim::ImagePath::Optimized)
-        expect(optimized_image.size).to be_in_range(1...original.size)
-        expect(optimized_image.read).not_to eq(original.read)
+      results = ImageOptim.optimize_images(copies)
+      zipped = TEST_IMAGES.zip(copies, results)
+      zipped.each do |original, copy, result|
+        expect(result[0]).to eq(copy)
+        expect(result[1]).to be_a(ImageOptim::ImagePath::Optimized)
+        expect(result[1].size).to be_in_range(1...original.size)
         expect(copy.read).to eq(original.read)
       end
     end
 
     it 'should optimize in place' do
       copies = TEST_IMAGES.map(&:temp_copy)
-      ImageOptim.optimize_images!(copies)
-      TEST_IMAGES.zip(copies).each do |original, copy|
+      results = ImageOptim.optimize_images!(copies)
+      zipped = TEST_IMAGES.zip(copies, results)
+      zipped.each do |original, copy, result|
+        expect(result[0]).to eq(copy)
+        expect(result[1]).to be_a(ImageOptim::ImagePath::Optimized)
         expect(copy.size).to be_in_range(1...original.size)
-        expect(copy.read).not_to eq(original.read)
       end
     end
 
     it 'should optimize datas' do
-      optimized_datas = ImageOptim.optimize_images_data(TEST_IMAGES.map(&:read))
-      TEST_IMAGES.zip(optimized_datas).each do |original, optimized_data|
-        expect(optimized_data).not_to be_nil
+      results = ImageOptim.optimize_images_data(TEST_IMAGES.map(&:read))
+      zipped = TEST_IMAGES.zip(results)
+      zipped.each do |original, result|
+        expect(result[0]).to eq(original.read)
+        expect(result[1]).to be_a(String)
+        expect(result[1].size).to be_in_range(1...original.size)
 
         expected_path = ImageOptim.optimize_image(original.temp_copy)
-        expect(optimized_data).to eq(expected_path.open('rb', &:read))
+        expect(result[1]).to eq(expected_path.open('rb', &:read))
       end
     end
   end
@@ -259,7 +267,7 @@ describe ImageOptim do
               expect(image_optim).to receive(method).with(src).and_return(dst)
               dst
             end
-            expect(image_optim.send(list_method, srcs)).to eq(dsts)
+            expect(image_optim.send(list_method, srcs)).to eq(srcs.zip(dsts))
           end
         end
 

data/spec/images/orient/generate

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+cd "$(dirname "$0")"
+
 convert -size 2x2 xc:black -fill '#f00' -draw 'point 0,1' -fill '#0f0' -draw 'point 1,0' -fill '#00f' -draw 'point 1,1' -scale 64x64 original.png
 
 convert original.png             0.jpg

data/spec/images/quant/generate

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+
+Dir.chdir(File.dirname(__FILE__))
+
+require 'shellwords'
+
+palettes = [64]
+side = 256
+
+palettes.each do |palette|
+  IO.popen(%W[
+    convert
+    -depth 8
+    -size #{side}x#{side}
+    -strip
+    rgb:-
+    PNG24:#{palette}.png
+  ].shelljoin, 'w') do |f|
+    (side * side).times do |i|
+      color = i * palette / (side * side) * 0x10000 / palette
+      f << [color / 0x100, color % 0x100, 0].pack('C*')
+    end
+  end
+  system "identify -format 'Wrote %f with %k unique colors\n' #{palette}.png"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: in_threads
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -118,6 +118,7 @@ files:
 - .gitignore
 - .rubocop.yml
 - .travis.yml
+- CONTRIBUTING.markdown
 - Gemfile
 - LICENSE.txt
 - README.markdown
@@ -133,6 +134,7 @@ files:
 - lib/image_optim/hash_helpers.rb
 - lib/image_optim/image_meta.rb
 - lib/image_optim/image_path.rb
+- lib/image_optim/non_negative_integer_range.rb
 - lib/image_optim/option_definition.rb
 - lib/image_optim/option_helpers.rb
 - lib/image_optim/railtie.rb
@@ -148,6 +150,7 @@ files:
 - lib/image_optim/worker/optipng.rb
 - lib/image_optim/worker/pngcrush.rb
 - lib/image_optim/worker/pngout.rb
+- lib/image_optim/worker/pngquant.rb
 - lib/image_optim/worker/svgo.rb
 - script/update_worker_options_in_readme
 - spec/image_optim/bin_resolver/comparable_condition_spec.rb
@@ -176,6 +179,8 @@ files:
 - spec/images/orient/8.jpg
 - spec/images/orient/generate
 - spec/images/orient/original.jpg
+- spec/images/quant/64.png
+- spec/images/quant/generate
 - spec/images/test.svg
 - spec/images/transparency1.png
 - spec/images/transparency2.png
@@ -205,7 +210,8 @@ rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Optimize (lossless compress) images (jpeg, png, gif, svg) using external
-  utilities (advpng, gifsicle, jpegoptim, jpegtran, optipng, pngcrush, pngout, svgo)
+  utilities (advpng, gifsicle, jpegoptim, jpegtran, optipng, pngcrush, pngout, pngquant,
+  svgo)
 test_files:
 - spec/image_optim/bin_resolver/comparable_condition_spec.rb
 - spec/image_optim/bin_resolver/simple_version_spec.rb
@@ -233,6 +239,8 @@ test_files:
 - spec/images/orient/8.jpg
 - spec/images/orient/generate
 - spec/images/orient/original.jpg
+- spec/images/quant/64.png
+- spec/images/quant/generate
 - spec/images/test.svg
 - spec/images/transparency1.png
 - spec/images/transparency2.png