image_optim 0.23.0 → 0.24.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzcwOTc4MmMxMjI0YWM4YmQ2NzcyZTE0NTRkNjM4YjNlMmMwZGExMA==
+    ZmNjZjBjNmNkYzRmNjQxMmZkMDg3ZGYzYjY5MTQ3MjllYmVjOTQ1MQ==
   data.tar.gz: !binary |-
-    ZmFmOWZhY2U5MTMyNjIwM2U3N2M0Y2U1NjVkNTJkNmNjYTk4NzQ0Yg==
+    YmZlNWUxYzFmZmU4NDFmZjgxZDYwOTNlNzBlZTA0NTc0YzQ4NzJkNA==
 SHA512:
   metadata.gz: !binary |-
-    NDMyNWI3ODA2ZTg5NTFjN2Y3YTJjMzU5MjAzZGM4ZDg3NzU4Y2IzYjU3NGZl
-    NmJkN2JiMTg3YmMyNmJjZjFkMDRlOGVlYWIzYjg2MmVhYzMxYTY5YjE0NDc5
-    N2ZlMmU2ZTQxNTU4NGMyYzcxMjU3MDM2MTllZGMxZjhiYjc0Y2E=
+    NGYzMjA1MTMxMTJhMzM1ODg1NTc4MGIyNzk5ZWNiMzFkMGRlMjQ5OTZjNTFm
+    YjJiZTdkZjgxYmQ3Y2U2MmNhMmRhYzE0YjkxZmJlY2EwMTg1MDNiMjUyMGNk
+    NjFhYWM3ZGVlOWY4MTRjYjg4ZDUwZmUyMzI1OTBhYTM4ZDI4ZGY=
   data.tar.gz: !binary |-
-    OWU2NjI5YjMyOWJmNmEzMGJjNGNmMjA0NmNlYWYyNzMxMDA0MTgyNDhjNmQz
-    NGU2NGY1Yzg4YzI3NTVkMjI4NTFiOGY1MzY0ZDlkYmI2MWFjNThmOTI3NGM0
-    M2ZmMjQ3OGIyZDc3YzY1NDI1MjU2N2U5ZDUyMDg3MDcwMzBkYTE=
+    MjQ0MjZkN2RhYjYyMWU2ZWJhYTVhMDkyMjI3YWY0NTM1ZTgxN2U5YjY2NTM3
+    YmQ3OWNkNzNjZmI4NjFjM2I0YTYxZWE1ODQ5ZjU0ODYyNTVkOGZjMmE1MDE4
+    YjIyODM5OTI3YzQ5N2Y4MmYxMDFkYTc0OGQ2MmNkMjQ4MGZmMGQ=

data/.appveyor.yml

@@ -81,15 +81,21 @@ test_script:
   - ps: |
       $path = $env:Path
       $rubypaths = ls -Path C:\Ruby*\bin
-      foreach ($rubypath in $rubypaths[0, -2, -1]) {
+      foreach ($rubypath in $rubypaths[-2, -1]) {
         echo "################################################################################"
         $env:Path = "$rubypath;" + $path
         ruby --version
+        bundle package --all
         bundle install --local -j4
         bundle exec rspec
         if ($LASTEXITCODE -gt 0) {
           exit 1
         }
+        rm tmp/optimize_test -recurse -force
+        cp spec/images tmp/optimize_test -recurse -force
+        bundle exec image_optim --allow-lossy -r tmp/optimize_test
+        if ($LASTEXITCODE -gt 0) {
+          exit 1
+        }
       }
       $env:Path = $path
-  - bundle exec image_optim --allow-lossy -r spec/images

data/.travis.yml

@@ -18,9 +18,6 @@ script: |
     set -ex
     if [ -n "$RUBOCOP" ]; then
       bundle exec rubocop
-    elif [ -n "$RAILS_VERSION" ] && [ -z "$CODECLIMATE" ]; then
-      bundle exec image_optim --info
-      bundle exec rspec spec/image_optim/railtie_spec.rb
     else
       bundle exec image_optim --info
       bundle exec rspec
@@ -40,16 +37,10 @@ before_install: |
 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: '2'
-    - env: RAILS_VERSION='~> 4.0' CODECLIMATE=1
+    - env: CODECLIMATE=true
       rvm: '2'
     - env: RUBOCOP=true
-      rvm: default
+      rvm: '2'
   allow_failures:
     - rvm: jruby-19mode
 addons:

data/CHANGELOG.markdown

@@ -2,6 +2,13 @@
 
 ## unreleased
 
+## v0.24.0 (2016-08-14)
+
+* Rails image assets optimization is extracted into [image\_optim\_rails gem](https://github.com/toy/image_optim_rails) [#127](https://github.com/toy/image_optim/issues/127) [@toy](https://github.com/toy)
+* Add proper handling of `ImageOptim.respond_to?` [@toy](https://github.com/toy)
+* Fix an issue not working OptiPNG `interlace` option [#136](https://github.com/toy/image_optim/pull/136) [@mrk21](https://github.com/mrk21)
+* Minimize number of file system calls in default implementation of `optimized?` [#137](https://github.com/toy/image_optim/issues/137) [@toy](https://github.com/toy)
+
 ## v0.23.0 (2016-07-17)
 
 * Added `cache_dir` and `cache_worker_digests` options to cache results [#83](https://github.com/toy/image_optim/issues/83) [@gpakosz](https://github.com/gpakosz)

data/Gemfile

@@ -5,12 +5,3 @@ gemspec
 if ENV['CODECLIMATE']
   gem 'codeclimate-test-reporter', :group => :test, :require => nil
 end
-
-%w[
-  rails
-  sprockets
-  sprockets-rails
-].each do |gem_name|
-  version = ENV[gem_name.tr('-', '_').upcase + '_VERSION']
-  gem gem_name, version if version
-end

data/README.markdown

@@ -58,7 +58,7 @@ With version:
 
 <!---<update-version>-->
 ```ruby
-gem 'image_optim', '~> 0.23'
+gem 'image_optim', '~> 0.24'
 ```
 <!---</update-version>-->
 
@@ -98,7 +98,7 @@ Besides permanently setting environment variables in `~/.profile`, `~/.bash_prof
 
 ### Binaries pack
 
-Easiest way to get latest versions of most binaries for `image_optim` for Linux and Mac OS X is by installing [`image_optim_pack`](https://github.com/toy/image_optim_pack) gem.
+Easiest way to get latest versions of most binaries for `image_optim` for Linux, Mac OS X, FreeBSD and OpenBSD is by installing [`image_optim_pack`](https://github.com/toy/image_optim_pack) gem.
 
 Check installation instructions in [Gem installation](#gem-installation) section.
 
@@ -241,12 +241,7 @@ image_optim.optimize_images_data(datas)
 
 ### From rails
 
-`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.
+Rails image assets optimization is extracted into [image\_optim\_rails gem](https://github.com/toy/image_optim_rails).
 
 ## Configuration
 

data/image_optim.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.23.0'
+  s.version     = '0.24.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']
@@ -15,6 +15,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = %w[lib]
 
+  s.post_install_message = <<-EOF
+Rails image assets optimization is extracted into image_optim_rails gem
+You can safely remove `config.assets.image_optim = false` if you are not going to use that gem
+EOF
+
   s.add_dependency 'fspath', '~> 3.0'
   s.add_dependency 'image_size', '~> 1.3'
   s.add_dependency 'exifr', '~> 1.2', '>= 1.2.2'
@@ -23,7 +28,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'image_optim_pack', '~> 0.2', '>= 0.2.2'
   s.add_development_dependency 'rspec', '~> 3.0'
-  if RUBY_VERSION >= '1.9.3'
+  if RUBY_VERSION >= '2.0'
     s.add_development_dependency 'rubocop', '~> 0.37'
   end
 end

data/lib/image_optim.rb

@@ -5,7 +5,6 @@ require 'image_optim/handler'
 require 'image_optim/image_meta'
 require 'image_optim/optimized_path'
 require 'image_optim/path'
-require 'image_optim/railtie' if defined?(Rails)
 require 'image_optim/worker'
 require 'in_threads'
 require 'shellwords'
@@ -168,25 +167,43 @@ class ImageOptim
     run_method_for(datas, :optimize_image_data, &block)
   end
 
-  # Optimization methods with default options
-  def self.method_missing(method, *args, &block)
-    if method_defined?(method) && method.to_s =~ /^optimize_image/
-      new.send(method, *args, &block)
-    else
-      super
+  class << self
+    # Optimization methods with default options
+    def method_missing(method, *args, &block)
+      if optimize_image_method?(method)
+        new.send(method, *args, &block)
+      else
+        super
+      end
     end
-  end
 
-  # Version of image_optim gem spec loaded
-  def self.version
-    Gem.loaded_specs['image_optim'].version.to_s
-  rescue
-    'DEV'
-  end
+    def respond_to_missing?(method, include_private = false)
+      optimize_image_method?(method) || super
+    end
 
-  # Full version of image_optim
-  def self.full_version
-    "image_optim v#{version}"
+    if RUBY_VERSION < '1.9'
+      def respond_to?(method, include_private = false)
+        optimize_image_method?(method) || super
+      end
+    end
+
+    # Version of image_optim gem spec loaded
+    def version
+      Gem.loaded_specs['image_optim'].version.to_s
+    rescue
+      'DEV'
+    end
+
+    # Full version of image_optim
+    def full_version
+      "image_optim v#{version}"
+    end
+
+  private
+
+    def optimize_image_method?(method)
+      method_defined?(method) && method.to_s =~ /^optimize_image/
+    end
   end
 
   # Are there workers for file at path?

data/lib/image_optim/space.rb

@@ -15,7 +15,7 @@ class ImageOptim
       else
         log_denominator = Math.log(size.abs) / Math.log(BASE)
         degree = [log_denominator.floor, SIZE_SYMBOLS.length - 1].min
-        number_string = if degree == 0
+        number_string = if degree.zero?
           size.to_s
         else
           denominator = BASE**degree

data/lib/image_optim/worker.rb

@@ -73,7 +73,8 @@ class ImageOptim
 
     # Check if operation resulted in optimized file
     def optimized?(src, dst)
-      dst.size? && dst.size < src.size
+      dst_size = dst.size?
+      dst_size && dst_size < src.size
     end
 
     # Short inspect

data/lib/image_optim/worker/optipng.rb

@@ -42,6 +42,10 @@ class ImageOptim
         end
         execute(:optipng, *args) && optimized?(src, dst)
       end
+
+      def optimized?(src, dst)
+        interlace ? dst.size? : super
+      end
     end
   end
 end

data/spec/image_optim/worker/optipng_spec.rb

@@ -55,4 +55,48 @@ describe ImageOptim::Worker::Optipng do
       end
     end
   end
+
+  describe '#optimized?' do
+    let(:src){ instance_double(ImageOptim::Path, src_options) }
+    let(:dst){ instance_double(ImageOptim::Path, dst_options) }
+    let(:src_options){ {:size => 10} }
+    let(:dst_options){ {:size? => 9} }
+    let(:instance){ described_class.new(ImageOptim.new, instance_options) }
+    let(:instance_options){ {} }
+
+    subject{ instance.optimized?(src, dst) }
+
+    context 'when interlace option is enabled' do
+      let(:instance_options){ {:interlace => true} }
+
+      context 'when dst is empty' do
+        let(:dst_options){ {:size? => nil} }
+        it{ is_expected.to be_falsy }
+      end
+
+      context 'when dst is not empty' do
+        let(:dst_options){ {:size? => 20} }
+        it{ is_expected.to be_truthy }
+      end
+    end
+
+    context 'when interlace option is disabled' do
+      let(:instance_options){ {:interlace => false} }
+
+      context 'when dst is empty' do
+        let(:dst_options){ {:size? => nil} }
+        it{ is_expected.to be_falsy }
+      end
+
+      context 'when dst is greater than or equal to src' do
+        let(:dst_options){ {:size? => 10} }
+        it{ is_expected.to be_falsy }
+      end
+
+      context 'when dst is less than src' do
+        let(:dst_options){ {:size? => 9} }
+        it{ is_expected.to be_truthy }
+      end
+    end
+  end
 end

data/spec/image_optim_spec.rb

@@ -227,4 +227,33 @@ describe ImageOptim do
       end
     end
   end
+
+  %w[
+    optimize_image
+    optimize_image!
+    optimize_image_data
+    optimize_images
+    optimize_images!
+    optimize_images_data
+  ].each do |method|
+    describe ".#{method}" do
+      it 'is checkable by respond_to?' do
+        expect(ImageOptim).to respond_to(method)
+      end
+
+      it 'calls same method on a new ImageOptim instance' do
+        image_optim = instance_double(ImageOptim)
+        method_arg = double
+        method_block = proc{ :x }
+
+        allow(ImageOptim).to receive(:new).and_return(image_optim)
+        expect(image_optim).to receive(method) do |arg, &block|
+          expect(arg).to eq(method_arg)
+          expect(block).to eq(method_block)
+        end
+
+        ImageOptim.send(method, method_arg, &method_block)
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -78,12 +78,12 @@ module CapabilityCheckHelpers
   def any_file_modes_allowed?
     Tempfile.open 'posix' do |f|
       File.chmod(0, f.path)
-      File.stat(f.path).mode & 0o777 == 0
+      (File.stat(f.path).mode & 0o777).zero?
     end
   end
 
   def inodes_supported?
-    File.stat(__FILE__).ino != 0
+    !File.stat(__FILE__).ino.zero?
   end
 
   def signals_supported?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-17 00:00:00.000000000 Z
+date: 2016-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -126,20 +126,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.37'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.37'
 description: 
 email: 
 executables:
@@ -178,7 +164,6 @@ files:
 - lib/image_optim/option_definition.rb
 - lib/image_optim/option_helpers.rb
 - lib/image_optim/path.rb
-- lib/image_optim/railtie.rb
 - lib/image_optim/runner.rb
 - lib/image_optim/runner/glob_helpers.rb
 - lib/image_optim/runner/option_parser.rb
@@ -216,7 +201,6 @@ files:
 - spec/image_optim/option_definition_spec.rb
 - spec/image_optim/option_helpers_spec.rb
 - spec/image_optim/path_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
@@ -256,7 +240,13 @@ homepage: http://github.com/toy/image_optim
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: ! 'Rails image assets optimization is extracted into image_optim_rails
+  gem
+
+  You can safely remove `config.assets.image_optim = false` if you are not going to
+  use that gem
+
+'
 rdoc_options: []
 require_paths:
 - lib
@@ -293,7 +283,6 @@ test_files:
 - spec/image_optim/option_definition_spec.rb
 - spec/image_optim/option_helpers_spec.rb
 - spec/image_optim/path_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

data/lib/image_optim/railtie.rb

@@ -1,66 +0,0 @@
-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 =
-        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|
-      next if app.config.assets.compress == false
-      next if app.config.assets.image_optim == false
-
-      @image_optim = ImageOptim.new(options(app))
-
-      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)
-      if app.config.assets.image_optim == true
-        {}
-      else
-        app.config.assets.image_optim || {}
-      end
-    end
-
-    def optimize_image_data(data)
-      @image_optim.optimize_image_data(data) || data
-    end
-
-    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
-    end
-  end
-end

data/spec/image_optim/railtie_spec.rb

@@ -1,147 +0,0 @@
-require 'spec_helper'
-
-describe 'ImageOptim::Railtie' do
-  require 'rails/all'
-  require 'image_optim/railtie'
-
-  def init_rails_app
-    Class.new(Rails::Application) do
-      # Rails 4 requires application class to have name
-      define_singleton_method :name do
-        'Dummy'
-      end
-
-      config.active_support.deprecation = :stderr
-      config.eager_load = false
-
-      config.logger = Logger.new('/dev/null')
-
-      config.assets.tap do |assets|
-        assets.enabled = true
-        assets.version = '1.0'
-        assets.cache_store = :null_store
-        assets.paths = %w[spec/images]
-
-        assets.delete(:compress)
-      end
-
-      yield config if block_given?
-    end.initialize!
-  end
-
-  after do
-    Rails.application = nil
-  end
-
-  describe 'initialization' do
-    it 'initializes by default' do
-      expect(ImageOptim).to receive(:new)
-      init_rails_app
-    end
-
-    it 'initializes if config.assets.image_optim is nil' do
-      expect(ImageOptim).to receive(:new)
-      init_rails_app do |config|
-        config.assets.image_optim = nil
-      end
-    end
-
-    it 'does not initialize if config.assets.image_optim is false' do
-      expect(ImageOptim).not_to receive(:new)
-      init_rails_app do |config|
-        config.assets.image_optim = false
-      end
-    end
-
-    it 'does not initialize if config.assets.compress is false' do
-      expect(ImageOptim).not_to receive(:new)
-      init_rails_app do |config|
-        config.assets.compress = false
-      end
-    end
-
-    describe 'options' do
-      it 'initializes with empty hash by default' do
-        expect(ImageOptim).to receive(:new).with({})
-        init_rails_app
-      end
-
-      it 'initializes with empty hash if config.assets.image_optim is true' do
-        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({})
-        init_rails_app do |config|
-          config.assets.image_optim = nil
-        end
-      end
-
-      it 'initializes with hash assigned to config.assets.image_optim' do
-        hash = double
-        expect(ImageOptim).to receive(:new).with(hash)
-        init_rails_app do |config|
-          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
-
-  describe 'optimizing assets' do
-    before do
-      stub_const('Path', ImageOptim::Path)
-    end
-
-    %w[
-      icecream.gif
-      lena.jpg
-      rails.png
-      test.svg
-    ].each do |asset_name|
-      it "optimizes #{asset_name}" do
-        asset = init_rails_app.assets.find_asset(asset_name)
-
-        asset_data = asset.source
-        original = Path.convert(asset.pathname)
-
-        expect(asset_data).to be_smaller_than(original)
-
-        Path.temp_file_path %W[spec .#{original.image_format}] do |temp|
-          temp.binwrite(asset_data)
-
-          expect(temp).to be_similar_to(original, 0)
-        end
-      end
-    end
-  end
-end if ENV['RAILS_VERSION']