image_optim 0.12.0 → 0.12.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDA2NmMyODM2ZTg1ZDUzMTA3NjBjYjIzYWIyZTEwODQyZmRmOGNmMQ==
+    MzhlYjg1NzA0MjUxYmM3MDhjNWVkZDcyYTAyZTM4MTAyMzUyZWU1ZQ==
   data.tar.gz: !binary |-
-    MWZlMWVhNGE5MzNiOGE0YWZhODMxNWJiNzRkOGU4YTVmN2NlNWU5Yw==
+    MjE2MjNkNzk1NDIyY2NjM2VjZjc4OTkwNmQ5MGY4NWU5YmI4NmViZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDcyMjNlNDFmNmE3ODQ5ZGEwMmE5MTk0OTc1NDkzY2FmNzY3ZjczMzA2NTEy
-    ZDE2Y2NhODlkMjRiYzVjYTA2OTE2NTUzYzhmODU3YWE0ZWQxMmZjNzk5YTlj
-    Y2JkM2ViYTMzMzVmNjNhMzFhZDQzYjU1ZjNlMWIyODdhYzFhMDE=
+    Yzg2ZDUyY2E3MTNhMTQzODgxOWU5M2ZkMWYxZDE1ZThkN2Q3ZTQyYTM3MThj
+    OTE0OWQwMDUyYjJlZTFlZjU3YWI1ZmI4NTJlZGU4OTdkZTYyM2YzOTY2NTU0
+    MjM1ZDQyMmQ1NGZhYTJiNGFlY2MyNThhNTdkYTAxMzExODkxYTM=
   data.tar.gz: !binary |-
-    MTBhMzNjMTgzZGU2NTA5NTc3ZTA1OThlODU4Yzk3OGQ3ZDE1ZDM0OTM0MDg5
-    ZGU4ODQwNGMyNjRhZDIwMjU5YzRlMjQ2NzZjM2I1MzhlZTNiYThmMTE5YWVk
-    YzFkYjllN2I1MWEzNTJjOTNjMGMwZDUxZmNkNzBiYTQ3MzQ2YmE=
+    ZmM1ZDRjNzBkNjNjYmI3MmEwZDRjYWVhYThjMjQ1NjIxMTJjZTgzZDJiMmNl
+    OTQ4NjM2MjU3YTA4M2NlMGZjNDk3YTIyODYzM2RhZWM5YmVjOThjMGM2NjU3
+    YzFhMjJkMWEyNDFhOTllYjNjOWZhNTViMzQ1YWJhNmQ3M2NjYzg=

data/README.markdown

@@ -188,6 +188,9 @@ image_optim.optimize_images_data(datas)
 
 `ImageOptim::Railtie` will automatically register sprockets preprocessor unless you set `config.assets.image_optim = false` or `config.assets.compress = false` (later for partial rails 3 compatibility).
 
+You can provide options for image_optim used for preprocessor through config `config.assets.image_optim = {nice: 20, svgo: false}` (ruby1.8 style: `{:nice => 20, :svgo => false}`).
+Check available options in [options section](#options).
+
 Image optimization can be time consuming, so depending on your deployment process you may prefer to optimize original asset files.
 
 ## Configuration
@@ -208,41 +211,47 @@ optipng:
 
 ## Options
 
-* `:nice` — Nice level *(defaults to 10)*
+* `:nice` — Nice level *(defaults to `10`)*
 * `:threads` — Number of threads or disable *(defaults to number of processors)*
-* `:verbose` — Verbose output *(defaults to false)*
+* `:verbose` — Verbose output *(defaults to `false`)*
 
-Worker can be disabled by passing false instead of options hash.
+Worker can be disabled by passing `false` instead of options hash.
 
 <!---<worker-options>-->
 
-### 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)*
+### :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`)*
 
-### 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)*
+### :advpng =>
+* `:level` — Compression level: `0` - don't compress, `1` - fast, `2` - normal, `3` - extra, `4` - extreme *(defaults to `4`)*
 
-### 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)*
+### :jhead =>
+Worker has no options
 
-### advpng
-* `:level` — Compression level: 0 - don't compress, 1 - fast, 2 - normal, 3 - extra, 4 - extreme *(defaults to 4)*
+### :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` *(defaults to `100`)*
 
-### 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 *(defaults to 100)*
+### :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`)*
 
-### 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)*
+### :gifsicle =>
+* `:interlace` — Turn interlacing on *(defaults to `false`)*
 
-### gifsicle
-* `:interlace` — Turn interlacing on *(defaults to false)*
+### :svgo =>
+Worker has no options
 
 <!---</worker-options>-->
 

data/image_optim.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.12.0'
+  s.version     = '0.12.1'
   s.summary     = %q{Optimize (lossless compress) images (jpeg, png, gif, svg) using external utilities (advpng, gifsicle, jpegoptim, jpegtran, optipng, pngcrush, pngout, svgo)}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']

data/lib/image_optim.rb

@@ -36,13 +36,19 @@ class ImageOptim
   #
   #     ImageOptim.new(:nice => 20)
   def initialize(options = {})
-    @bin_resolver = BinResolver.new
-
     config = Config.new(options)
     @nice = config.nice
     @threads = config.threads
     @verbose = config.verbose
 
+    if verbose?
+      $stderr << config
+      $stderr << "Nice level: #{nice}\n"
+      $stderr << "Using threads: #{threads}\n"
+    end
+
+    @bin_resolver = BinResolver.new(self)
+
     @workers_by_format = {}
     Worker.klasses.each do |klass|
       if worker_options = config.for_worker(klass)
@@ -56,8 +62,6 @@ class ImageOptim
     @workers_by_format.values.each(&:sort!)
 
     config.assert_no_unused_options!
-
-    puts config if verbose?
   end
 
   # Get workers for image

data/lib/image_optim/bin_resolver.rb

@@ -18,7 +18,8 @@ class ImageOptim
     end
 
     attr_reader :dir
-    def initialize
+    def initialize(image_optim)
+      @image_optim = image_optim
       @bins = {}
       @lock = Mutex.new
     end
@@ -27,7 +28,10 @@ class ImageOptim
       name = name.to_sym
 
       resolving(name) do
-        @bins[name] = resolve?(name) && Bin.new(name, version(name))
+        if bin = resolve?(name) && Bin.new(name, version(name))
+          $stderr << "Resolved #{bin}\n" if @image_optim.verbose?
+        end
+        @bins[name] = bin
       end
 
       if @bins[name]

data/lib/image_optim/config.rb

@@ -75,7 +75,7 @@ class ImageOptim
     def threads
       threads = get!(:threads)
 
-      threads = case threads
+      case threads
       when true, nil
         processor_count
       when false
@@ -83,8 +83,6 @@ class ImageOptim
       else
         threads.to_i
       end
-
-      OptionHelpers.limit_with_range(threads, 1..16)
     end
 
     def verbose

data/lib/image_optim/railtie.rb

@@ -3,12 +3,15 @@ require 'image_optim'
 class ImageOptim
   class Railtie < Rails::Railtie
     initializer 'image_optim.initializer' do |app|
-      if app.config.assets.compress != false && app.config.assets.image_optim != false
-        image_optim = if app.config.assets.image_optim == true
-                        ImageOptim.new
-                      else
-                        ImageOptim.new(app.config.assets.image_optim || {})
-                      end
+      if app.config.assets.compress != false && app.config.assets.image_optim != false && app.assets
+
+        options = if app.config.assets.image_optim == true
+          {}
+        else
+          app.config.assets.image_optim || {}
+        end
+
+        image_optim = ImageOptim.new(options)
 
         processor = proc do |context, data|
           image_optim.optimize_image_data(data) || data
@@ -18,6 +21,7 @@ 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/worker/advpng.rb

@@ -4,7 +4,7 @@ require 'image_optim/option_helpers'
 class ImageOptim
   class Worker
     class Advpng < Worker
-      option(:level, 4, 'Compression level: 0 - don\'t compress, 1 - fast, 2 - normal, 3 - extra, 4 - extreme') do |v|
+      option(:level, 4, 'Compression level: `0` - don\'t compress, `1` - fast, `2` - normal, `3` - extra, `4` - extreme') do |v|
         OptionHelpers.limit_with_range(v.to_i, 0..4)
       end
 

data/lib/image_optim/worker/jpegoptim.rb

@@ -4,7 +4,7 @@ require 'image_optim/option_helpers'
 class ImageOptim
   class Worker
     class Jpegoptim < Worker
-      option(:strip, :all, Array, 'List of extra markers to strip: comments, exif, iptc, icc or all') do |v|
+      option(:strip, :all, Array, 'List of extra markers to strip: `:comments`, `:exif`, `:iptc`, `:icc` or `:all`') do |v|
         values = Array(v).map(&:to_s)
         known_values = %w[all comments exif iptc icc]
         unknown_values = values - known_values
@@ -12,7 +12,7 @@ class ImageOptim
         values & known_values
       end
 
-      option(:max_quality, 100, 'Maximum image quality factor 0..100'){ |v| OptionHelpers.limit_with_range(v.to_i, 0..100) }
+      option(:max_quality, 100, 'Maximum image quality factor `0`..`100`'){ |v| OptionHelpers.limit_with_range(v.to_i, 0..100) }
 
       # Run first if max_quality < 100
       def run_order

data/lib/image_optim/worker/optipng.rb

@@ -5,9 +5,9 @@ require 'image_optim/true_false_nil'
 class ImageOptim
   class Worker
     class Optipng < Worker
-      option(:level, 6, 'Optimization level preset 0 is least, 7 is best'){ |v| OptionHelpers.limit_with_range(v.to_i, 0..7) }
+      option(:level, 6, 'Optimization level preset: `0` is least, `7` is best'){ |v| OptionHelpers.limit_with_range(v.to_i, 0..7) }
 
-      option(:interlace, false, TrueFalseNil, 'Interlace, true - interlace on, false - interlace off, nil - as is in original image') do |v|
+      option(:interlace, false, TrueFalseNil, 'Interlace, `true` - interlace on, `false` - interlace off, `nil` - as is in original image') do |v|
         v && true
       end
 

data/lib/image_optim/worker/pngcrush.rb

@@ -3,8 +3,8 @@ require 'image_optim/worker'
 class ImageOptim
   class Worker
     class Pngcrush < Worker
-      option(:chunks, :alla, Array, 'List of chunks to remove or \'alla\' - all except tRNS/transparency or '\
-                                '\'allb\' - all except tRNS and gAMA/gamma'){ |v| Array(v).map(&:to_s) }
+      option(:chunks, :alla, Array, 'List of chunks to remove or `:alla` - all except tRNS/transparency or '\
+                                '`:allb` - all except tRNS and gAMA/gamma'){ |v| Array(v).map(&:to_s) }
 
       option(:fix, false, 'Fix otherwise fatal conditions such as bad CRCs'){ |v| !!v }
 

data/lib/image_optim/worker/pngout.rb

@@ -6,7 +6,7 @@ class ImageOptim
     class Pngout < Worker
       option(:copy_chunks, false, 'Copy optional chunks'){ |v| !!v }
 
-      option(:strategy, 0, 'Strategy: 0 - xtreme, 1 - intense, 2 - longest Match, 3 - huffman Only, 4 - uncompressed') do |v|
+      option(:strategy, 0, 'Strategy: `0` - xtreme, `1` - intense, `2` - longest Match, `3` - huffman Only, `4` - uncompressed') do |v|
         OptionHelpers.limit_with_range(v.to_i, 0..4)
       end
 

data/script/update_worker_options_in_readme

@@ -13,13 +13,15 @@ def worker_options
   io = StringIO.new
 
   ImageOptim::Worker.klasses.each_with_index do |klass, i|
-    unless klass.option_definitions.empty?
-      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|
-        io.puts "* `:#{option_definition.name}` — #{option_definition.description} *(defaults to #{option_definition.default})*"
+        io.puts "* `:#{option_definition.name}` — #{option_definition.description} *(defaults to `#{option_definition.default.inspect}`)*"
       end
-      io.puts
     end
+    io.puts
   end
 
   io.string

data/spec/image_optim/bin_resolver_spec.rb

@@ -10,9 +10,11 @@ ensure
 end
 
 describe ImageOptim::BinResolver do
+  let(:image_optim){ double(:image_optim, :verbose? => false) }
+  let(:resolver){ ImageOptim::BinResolver.new(image_optim) }
+
   it "should resolve bin in path" do
     with_env 'LS_BIN', nil do
-      resolver = ImageOptim::BinResolver.new
       resolver.should_receive(:accessible?).with(:ls).once.and_return(true)
       FSPath.should_not_receive(:temp_dir)
 
@@ -29,7 +31,6 @@ describe ImageOptim::BinResolver do
       tmpdir = double(:tmpdir)
       symlink = double(:symlink)
 
-      resolver = ImageOptim::BinResolver.new
       resolver.should_receive(:accessible?).with(:image_optim).once.and_return(true)
       FSPath.should_receive(:temp_dir).once.and_return(tmpdir)
       tmpdir.should_receive(:/).with(:image_optim).once.and_return(symlink)
@@ -52,7 +53,6 @@ describe ImageOptim::BinResolver do
 
   it "should raise on failure to resolve bin" do
     with_env 'SHOULD_NOT_EXIST_BIN', nil do
-      resolver = ImageOptim::BinResolver.new
       resolver.should_receive(:accessible?).with(:should_not_exist).once.and_return(false)
       FSPath.should_not_receive(:temp_dir)
 
@@ -71,7 +71,6 @@ describe ImageOptim::BinResolver do
       tmpdir = double(:tmpdir)
       symlink = double(:symlink)
 
-      resolver = ImageOptim::BinResolver.new
       resolver.should_receive(:accessible?).with(:should_not_exist).once.and_return(false)
       FSPath.should_receive(:temp_dir).once.and_return(tmpdir)
       tmpdir.should_receive(:/).with(:should_not_exist).once.and_return(symlink)
@@ -96,7 +95,6 @@ describe ImageOptim::BinResolver do
 
   it "should resolve bin only once" do
     with_env 'LS_BIN', nil do
-      resolver = ImageOptim::BinResolver.new
       resolver.should_receive(:resolve?).once.with(:ls){ sleep 0.1; true }
 
       10.times.map do
@@ -109,7 +107,6 @@ describe ImageOptim::BinResolver do
 
   it "should raise on detection of problematic version" do
     with_env 'PNGCRUSH_BIN', nil do
-      resolver = ImageOptim::BinResolver.new
       resolver.should_receive(:accessible?).with(:pngcrush).once.and_return(true)
       resolver.should_receive(:version).with(:pngcrush).once.and_return('1.7.60')
       FSPath.should_not_receive(:temp_dir)

data/spec/image_optim/config_spec.rb

@@ -51,9 +51,9 @@ class ImageOptim
         config.threads.should == 1
       end
 
-      it "should convert value to number and limit to 1..16" do
+      it "should convert value to number" do
         config = Config.new({:threads => '616'})
-        config.threads.should == 16
+        config.threads.should == 616
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-02 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath