image_optim 0.22.0 → 0.22.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGEwM2UzY2VlZmU0OWJmNzg2YTAyMDZlNWM1MzM5ZWVhNDAyOTg3Mw==
+    MDRiNGJkYTQ0MDcxZGIyODc5YWJkMGZkNGVkYmQzNzRmYTk4N2Y4OQ==
   data.tar.gz: !binary |-
-    YTE0YzA1YjQ2NzU3NDIxZjFjNzA4ZGVjOGFmNGY4YTgxMjhiODlhZA==
+    NDMyODhiNzkyZGIxZmVmNDdmODY3MWFkOTE0NWFkMTM5ZWY0YWY5OQ==
 SHA512:
   metadata.gz: !binary |-
-    YjI3M2JhYmExNTg2OTg2OGI1NWU5YWEwM2Y4MjNmOWRhNjcwM2EwZmFjOTQz
-    ZjI2MzBiZjcwZWIwMjQ0ZWUwOTFlODNjZjU0NThmMDhjYWUzMTE2ZTVmOGFm
-    NGM1ZWMzMjYyODZmZTUzZjk2NzljMTY1MDg1M2Y4NmZmNTMwZTY=
+    NzdkYmVmNDRmYmYwODFmZjAyOWJhODBlZGE3NWEwZmJhNjllNjE5ZmJjM2Y2
+    ZTk1NDZiOWViNTZjMTI2MDE3YjgwNWQ3N2Y0Y2ZjNWQ0ODJjMGU1MjQ3NDkx
+    NTZjZjA4NjQ4MGM4YzNhMDkyYTQ3OTI3ZGYwZGMzMGRjNWU5ODQ=
   data.tar.gz: !binary |-
-    NTQxYjc1MWI2OTgzNzNhOTliMGRjMjgwMTBlMDBjZDdjYmRlN2RjOTVhNTk0
-    YjE0NzczOWE0NzZjMWMzOGM4NWFlZTg0ZjAzZWQ3NTNjZGRhYTVkNjc2ZjUx
-    OWQ3ODZmZGE2MmMxMWM1YmU1NjI0NzljNDE4MjE4MDdjYzliOTU=
+    MDMwNzg5MDM4NWRmNzM5ZjI0MDJmZTgwNzRiMjBlZDI1ZTNmOTMzZWUwNGE0
+    ZTc0ZGIyNWVkMjExNTIyZGFkNTk1YWQ2MjU1NzU1ZjY3ZmZkNGUyNGVmZTk2
+    ZGMyMDZjNGVlY2M1NmRmY2EyNWRjNTY5ZTBjNGRiMmI5YWYxOTE=

data/.gitignore

@@ -5,6 +5,7 @@
 /rdoc/
 /.yardoc/
 /coverage/
+/vendor/
 
 Gemfile.lock
 Makefile

data/.rubocop.yml

@@ -1,6 +1,7 @@
 AllCops:
   Exclude:
     - '*.gemspec'
+    - 'vendor/**/*'
 
 Lint/EndAlignment:
   AlignWith: variable
@@ -23,6 +24,9 @@ Metrics/PerceivedComplexity:
 Style/AccessModifierIndentation:
   EnforcedStyle: outdent
 
+Style/Alias:
+  EnforcedStyle: prefer_alias_method
+
 Style/CaseIndentation:
   IndentWhenRelativeTo: end
 
@@ -41,6 +45,12 @@ Style/HashSyntax:
 Style/IfUnlessModifier:
   MaxLineLength: 40
 
+Style/IndentArray:
+  EnforcedStyle: consistent
+
+Style/IndentAssignment:
+  Enabled: false
+
 Style/IndentHash:
   EnforcedStyle: consistent
 
@@ -55,11 +65,17 @@ Style/PercentLiteralDelimiters:
 Style/Semicolon:
   AllowAsExpressionSeparator: true
 
+Style/SignalException:
+  EnforcedStyle: semantic
+
 Style/SpaceBeforeBlockBraces:
   EnforcedStyle: no_space
 
 Style/SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
 
-Style/TrailingComma:
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: no_comma
+
+Style/TrailingCommaInLiteral:
   EnforcedStyleForMultiline: comma

data/.travis.yml

@@ -1,9 +1,13 @@
 sudo: false
 language: ruby
+cache:
+  bundler: true
+  directories:
+  - $(npm root)
+  - ~/bin
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
+  - '1.8'
+  - '1.9'
   - '2.0'
   - '2.1'
   - '2.2'
@@ -21,17 +25,22 @@ script:
   ; fi
 before_install:
   if [ -z "$RUBOCOP" ]; then
-    mkdir ~/bin
-    && npm install -g svgo
-    && curl -L "http://static.jonof.id.au/dl/kenutils/pngout-20130221-linux.tar.gz" | tar -xz -C ~/bin --strip-components 2 --wildcards '*/x86_64/pngout'
+    command -v svgo || npm install svgo
+    ;
+    command -v pngout || (
+      mkdir -p ~/bin
+      && curl -L "http://static.jonof.id.au/dl/kenutils/pngout-20130221-linux.tar.gz" | tar -xz -C ~/bin --strip-components 2 --wildcards '*/x86_64/pngout'
+    )
   ; fi
-env:
-  - PATH=~/bin:$PATH
 matrix:
   fast_finish: true
   include:
+    - env: RAILS_VERSION='~> 3.2' SPROCKETS_VERSION='~> 2.0'
+      rvm: default
     - env: RAILS_VERSION='~> 3.2'
       rvm: default
+    - env: RAILS_VERSION='~> 4.0' SPROCKETS_RAILS_VERSION='~> 2.0'
+      rvm: default
     - env: RAILS_VERSION='~> 4.0'
       rvm: default
     - env: RUBOCOP=true

data/CHANGELOG.markdown

@@ -2,6 +2,13 @@
 
 ## unreleased
 
+## v0.22.1 (2016-02-21)
+
+* Fix missing old (1.x) `pngquant` version as it was output to stderr [#123](https://github.com/toy/image_optim/issues/123) [@toy](https://github.com/toy)
+* Fix capturing wrong version of `pngcrush` when it complains about different png.h and png.c [#122](https://github.com/toy/image_optim/issues/122) [@toy](https://github.com/toy)
+* Add support for `sprockets-rails` 3.x, kudos to [@iggant](https://github.com/iggant) and [@valff](https://github.com/valff) for initial PRs [#120](https://github.com/toy/image_optim/pull/120) [#121](https://github.com/toy/image_optim/pull/121) [#126](https://github.com/toy/image_optim/pull/126) [@toy](https://github.com/toy)
+* Use rubocop ~> 0.37 [@toy](https://github.com/toy)
+
 ## v0.22.0 (2015-11-21)
 
 * Unify getting description of option default value using `default_description` [@toy](https://github.com/toy)

data/Gemfile

@@ -6,4 +6,11 @@ if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('1.9')
   gem 'codeclimate-test-reporter', :group => :test, :require => nil
 end
 
-gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
+%w[
+  rails
+  sprockets
+  sprockets-rails
+].each do |gem_name|
+  version = ENV[gem_name.tr('-', '_').upcase + '_VERSION']
+  gem gem_name, version if version
+end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2015 Ivan Kuchin
+Copyright (c) 2012-2016 Ivan Kuchin
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -341,4 +341,4 @@ In separate file [CHANGELOG.markdown](CHANGELOG.markdown).
 
 ## Copyright
 
-Copyright (c) 2012-2015 Ivan Kuchin. See [LICENSE.txt](LICENSE.txt) for details.
+Copyright (c) 2012-2016 Ivan Kuchin. See [LICENSE.txt](LICENSE.txt) for details.

data/Vagrantfile

@@ -1,6 +1,4 @@
-VAGRANTFILE_API_VERSION = '2'
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+Vagrant.configure('2') do |config|
   config.vm.box = 'ubuntu/precise64'
 
   config.vm.provision 'shell', :inline => <<-SH

data/image_optim.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.22.0'
+  s.version     = '0.22.1'
   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.35'
+    s.add_development_dependency 'rubocop', '~> 0.37'
   end
 end

data/lib/image_optim.rb

@@ -212,7 +212,7 @@ private
     apply_threading(list).map do |item|
       result = send(method_name, item)
       if block
-        block.call(item, result)
+        yield item, result
       else
         [item, result]
       end

data/lib/image_optim/bin_resolver.rb

@@ -44,11 +44,9 @@ class ImageOptim
         bin.check! if bin
       end
 
-      if @bins[name]
-        @bins[name].check_fail!
-      else
-        fail BinNotFound, "`#{name}` not found"
-      end
+      fail BinNotFound, "`#{name}` not found" unless @bins[name]
+
+      @bins[name].check_fail!
 
       @bins[name]
     end

data/lib/image_optim/bin_resolver/bin.rb

@@ -29,7 +29,7 @@ class ImageOptim
               'broken pngs'],
         [:pngcrush, is == '1.7.80', 'loses one color in indexed images'],
         [:pngquant, is < '2.0', 'is not supported'],
-      ]
+      ].freeze
 
       WARN_CHECKS = [
         [:advpng, is < '1.17', 'does not use zopfli'],
@@ -37,7 +37,7 @@ class ImageOptim
         [: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'],
-      ]
+      ].freeze
 
       # Fail if version will not work properly
       def check_fail!
@@ -72,16 +72,16 @@ class ImageOptim
       # Getting version of bin, will fail for an unknown name
       def version_string
         case name
-        when :advpng, :gifsicle, :jpegoptim, :optipng, :pngquant
-          capture("#{escaped_path} --version 2> /dev/null")[/\d+(\.\d+){1,}/]
-        when :svgo
-          capture("#{escaped_path} --version 2>&1")[/\d+(\.\d+){1,}/]
+        when :advpng, :gifsicle, :jpegoptim, :optipng
+          capture("#{escaped_path} --version 2> /dev/null")[/\d+(\.\d+)+/]
+        when :svgo, :pngquant
+          capture("#{escaped_path} --version 2>&1")[/\d+(\.\d+)+/]
         when :jhead, :'jpeg-recompress'
-          capture("#{escaped_path} -V 2> /dev/null")[/\d+(\.\d+){1,}/]
+          capture("#{escaped_path} -V 2> /dev/null")[/\d+(\.\d+)+/]
         when :jpegtran
           capture("#{escaped_path} -v - 2>&1")[/version (\d+\S*)/, 1]
         when :pngcrush
-          capture("#{escaped_path} -version 2>&1")[/\d+(\.\d+){1,}/]
+          capture("#{escaped_path} -version 2>&1")[/pngcrush (\d+(\.\d+)+)/, 1]
         when :pngout
           date_regexp = /[A-Z][a-z]{2} (?: |\d)\d \d{4}/
           date_str = capture("#{escaped_path} 2>&1")[date_regexp]

data/lib/image_optim/config.rb

@@ -18,7 +18,7 @@ class ImageOptim
     end
 
     # Local config path at `./.image_optim.yml`
-    LOCAL_PATH = './.image_optim.yml'
+    LOCAL_PATH = './.image_optim.yml'.freeze
 
     class << self
       # Read options at path: expand path (warn on failure), return {} if file
@@ -192,10 +192,9 @@ class ImageOptim
         Cmd.capture 'sysctl -n hw.ncpu'
       when /mswin|mingw/
         require 'win32ole'
-        WIN32OLE.
-        connect('winmgmts://').
-        ExecQuery('select NumberOfLogicalProcessors from Win32_Processor').
-        to_enum.first.NumberOfLogicalProcessors
+        query = 'select NumberOfLogicalProcessors from Win32_Processor'
+        result = WIN32OLE.connect('winmgmts://').ExecQuery(query)
+        result.to_enum.first.NumberOfLogicalProcessors
       else
         warn "Unknown architecture (#{host_os}) assuming one processor."
         1

data/lib/image_optim/hash_helpers.rb

@@ -16,11 +16,11 @@ class ImageOptim
 
       # Returns a new hash with recursive merge of all keys
       def deep_merge(a, b)
-        a.merge(b) do |_k, v_a, v_b|
-          if v_a.is_a?(Hash) && v_b.is_a?(Hash)
-            deep_merge(v_a, v_b)
+        a.merge(b) do |_key, value_a, value_b|
+          if value_a.is_a?(Hash) && value_b.is_a?(Hash)
+            deep_merge(value_a, value_b)
           else
-            v_b
+            value_b
           end
         end
       end
@@ -31,11 +31,11 @@ class ImageOptim
       # provided block
       def deep_transform_keys(hash, &block)
         new_hash = {}
-        hash.each do |k, v|
-          new_hash[block.call(k)] = if v.is_a?(Hash)
-            deep_transform_keys(v, &block)
+        hash.each do |key, value|
+          new_hash[yield key] = if value.is_a?(Hash)
+            deep_transform_keys(value, &block)
           else
-            v
+            value
           end
         end
         new_hash

data/lib/image_optim/railtie.rb

@@ -3,6 +3,13 @@ require 'image_optim'
 class ImageOptim
   # Adds image_optim as preprocessor for gif, jpeg, png and svg images
   class Railtie < Rails::Railtie
+    MIME_TYPES = %w[
+      image/gif
+      image/jpeg
+      image/png
+      image/svg+xml
+    ].freeze
+
     config.before_configuration do |app|
       worker_names = ImageOptim::Worker.klasses.map(&:bin_sym)
       app.config.assets.image_optim =
@@ -14,14 +21,22 @@ class ImageOptim
     end
 
     initializer 'image_optim.initializer' do |app|
-      register_preprocessor(app) if register_preprocessor?(app)
-    end
+      next if app.config.assets.compress == false
+      next if app.config.assets.image_optim == false
 
-    def register_preprocessor?(app)
-      return if app.config.assets.compress == false
-      return if app.config.assets.image_optim == false
+      @image_optim = ImageOptim.new(options(app))
 
-      app.assets
+      register_preprocessor(app) do |*args|
+        if args[1] # context and data arguments in sprockets 2
+          optimize_image_data(args[1])
+        else
+          input = args[0]
+          {
+            :data => optimize_image_data(input[:data]),
+            :charset => nil, # no gzipped version with rails/sprockets#228
+          }
+        end
+      end
     end
 
     def options(app)
@@ -32,17 +47,20 @@ class ImageOptim
       end
     end
 
-    def register_preprocessor(app)
-      image_optim = ImageOptim.new(options(app))
+    def optimize_image_data(data)
+      @image_optim.optimize_image_data(data) || data
+    end
 
-      processor = proc do |_context, data|
-        image_optim.optimize_image_data(data) || data
+    def register_preprocessor(app, &processor)
+      MIME_TYPES.each do |mime_type|
+        if app.assets
+          app.assets.register_preprocessor mime_type, :image_optim, &processor
+        else
+          app.config.assets.configure do |env|
+            env.register_preprocessor mime_type, :image_optim, &processor
+          end
+        end
       end
-
-      app.assets.register_preprocessor 'image/gif', :image_optim, &processor
-      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/jhead.rb

@@ -7,6 +7,8 @@ class ImageOptim
     #
     # Jhead internally uses jpegtran which should be on path
     class Jhead < Worker
+      ORIENTED = 2..8 # not top-left
+
       # Works on jpegs
       def image_formats
         [:jpeg]
@@ -36,7 +38,7 @@ class ImageOptim
 
       def oriented?(image)
         exif = EXIFR::JPEG.new(image.to_s)
-        (2..8).include?(exif.orientation.to_i)
+        ORIENTED.include?(exif.orientation.to_i)
       end
     end
   end

data/lib/image_optim/worker/jpegrecompress.rb

@@ -10,7 +10,7 @@ class ImageOptim
         super if options[:allow_lossy]
       end
 
-      QUALITY_NAMES = [:low, :medium, :high, :veryhigh]
+      QUALITY_NAMES = [:low, :medium, :high, :veryhigh].freeze
 
       quality_names_desc = QUALITY_NAMES.each_with_index.map do |name, i|
         "`#{i}` - #{name}"

data/script/update_worker_options_in_readme

@@ -6,10 +6,8 @@ require 'bundler/setup'
 require 'image_optim'
 
 README_FILE = File.expand_path('../../README.markdown', __FILE__)
-BEGIN_MARKER = '<!---<worker-options>-->'
-END_MARKER = '<!---</worker-options>-->'
-GENERATED_NOTE = '<!-- markdown for worker options is generated by '\
-    "`#{Pathname($PROGRAM_NAME).cleanpath}` -->"
+BEGIN_MARKER = '<!---<worker-options>-->'.freeze
+END_MARKER = '<!---</worker-options>-->'.freeze
 
 def write_worker_options(io, klass)
   io.puts "### #{klass.bin_sym}:"
@@ -29,7 +27,8 @@ end
 
 def write_marked(io)
   io.puts BEGIN_MARKER
-  io.puts GENERATED_NOTE
+  io.puts '<!-- markdown for worker options is generated by '\
+    "`#{Pathname($PROGRAM_NAME).cleanpath}` -->"
   io.puts
 
   ImageOptim::Worker.klasses.sort_by(&:name).each do |klass|

data/script/worker_analysis

@@ -12,7 +12,7 @@ require 'digest'
 require 'erb'
 require 'ostruct'
 
-DIR = 'tmp'
+DIR = 'tmp'.freeze
 Pathname(DIR).mkpath
 
 Array.class_eval do
@@ -127,8 +127,8 @@ class Analyser
         entry[0]
       end
 
-      def set!(key, etag, &block)
-        value = block.call
+      def set!(key, etag, &_block)
+        value = yield
         DB[Marshal.dump(key)] = Marshal.dump([value, etag])
         value
       end
@@ -284,7 +284,7 @@ class Analyser
         chain_result = ChainResult.new(src.format, steps)
         chain_result.difference = difference_with(result_image)
 
-        block.call(chain_result)
+        yield chain_result
 
         workers_left = workers.reject do |w|
           w.cons_id == worker.cons_id || w.run_order < worker.run_order

data/spec/image_optim/bin_resolver/simple_version_spec.rb

@@ -32,26 +32,26 @@ describe ImageOptim::BinResolver::SimpleVersion do
       1.0.0.0
     ].each do |variation|
       it "normalizes #{variation}" do
-        expect(v variation).to eq(1)
+        expect(v(variation)).to eq(1)
       end
     end
   end
 
   describe 'conversion' do
     it 'converts Integer' do
-      expect(v 117).to eq('117')
+      expect(v(117)).to eq('117')
     end
 
     it 'converts Float' do
-      expect(v 1.17).to eq('1.17')
+      expect(v(1.17)).to eq('1.17')
     end
 
     it 'converts String' do
-      expect(v '1.17').to eq('1.17')
+      expect(v('1.17')).to eq('1.17')
     end
 
     it 'converts self' do
-      expect(v(v 1.17)).to eq('1.17')
+      expect(v(v(1.17))).to eq('1.17')
     end
   end
 end

data/spec/image_optim/bin_resolver_spec.rb

@@ -209,7 +209,7 @@ describe ImageOptim::BinResolver do
       allow(bin).to receive(:check!).once
       allow(bin).to receive(:check_fail!){ mutex.synchronize{ count += 1 } }
 
-      10.times.map do
+      Array.new(10) do
         Thread.new do
           resolver.resolve!(:ls)
         end

data/spec/image_optim/railtie_spec.rb

@@ -7,7 +7,7 @@ describe 'ImageOptim::Railtie' do
   def init_rails_app
     Class.new(Rails::Application) do
       # Rails 4 requires application class to have name
-      def self.name
+      define_singleton_method :name do
         'Dummy'
       end
 

data/spec/image_optim/runner/option_parser_spec.rb

@@ -6,6 +6,12 @@ describe ImageOptim::Runner::OptionParser do
     stub_const('OptionParser', ImageOptim::Runner::OptionParser)
   end
 
+  def exit_with_status(status)
+    raise_error(SystemExit) do |e|
+      expect(e.status).to eq(status)
+    end
+  end
+
   describe :parse! do
     it 'returns empty hash for arguments without options' do
       args = %w[foo bar]
@@ -65,8 +71,8 @@ describe ImageOptim::Runner::OptionParser do
 
         expect do
           OptionParser.parse!(%w[--help])
-        end.to output("#{help}\n").to_stdout &
-          raise_error(SystemExit){ |e| expect(e.status).to eq(0) }
+        end.to exit_with_status(0) &
+               output("#{help}\n").to_stdout
       end
     end
 
@@ -80,8 +86,8 @@ describe ImageOptim::Runner::OptionParser do
 
         expect do
           OptionParser.parse!(%w[--unknown-option])
-        end.to output("invalid option: --unknown-option\n\n#{help}\n").
-          to_stderr & raise_error(SystemExit){ |e| expect(e.status).to eq(1) }
+        end.to exit_with_status(1) &
+               output("invalid option: --unknown-option\n\n#{help}\n").to_stderr
       end
     end
   end

data/spec/image_optim_spec.rb

@@ -28,16 +28,15 @@ describe ImageOptim do
     allow(ImageOptim::Config).to receive(:local).and_return({})
   end
 
-  disable_all_workers = Hash[ImageOptim::Worker.klasses.map do |klass|
-    [klass.bin_sym, false]
-  end]
+  isolated_options_base = {:skip_missing_workers => false}
+  ImageOptim::Worker.klasses.each do |klass|
+    isolated_options_base[klass.bin_sym] = false
+  end
 
   ImageOptim::Worker.klasses.each do |worker_klass|
     describe "#{worker_klass.bin_sym} worker" do
       it 'optimizes at least one test image' do
-        options = disable_all_workers.dup
-        options.merge!(worker_klass.bin_sym => true)
-        options.merge!(:skip_missing_workers => false)
+        options = isolated_options_base.merge(worker_klass.bin_sym => true)
 
         image_optim = ImageOptim.new(options)
         if Array(worker_klass.init(image_optim)).empty?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.22.1
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-21 00:00:00.000000000 Z
+date: 2016-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -126,14 +126,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: '0.37'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: '0.37'
 description: 
 email: 
 executables: