image_optimizer 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b3565bc486b1461c702bb3ee612b49e37f7b93c
-  data.tar.gz: 9bbfdb3742662c8fec9f0b70a79cf677fcf60d2a
+  metadata.gz: ad635514a39378a2f01e3dd15515cf9433b341bd
+  data.tar.gz: 3612dc1b7da6cd2e19603f5c82c8a8e259ccd0a9
 SHA512:
-  metadata.gz: 3cd3ee2a99e823b2df4e4108724d8e28456f95e2f0b5d290b50b95a7a009631ba7a460aef666ae4d3a18abc3984063ab201e0246223fe921deb8fc375892c380
-  data.tar.gz: c8389fa53dd8c10169957c83bbaa83ff12c3823bb6d722b6871a11fdd5efb7626d4cbf7997836605b309a25da50784d13cbe0493486a12b37c3a1ffcdefbe3a2
+  metadata.gz: 59de349a631136309aa0d97942c49ffb76ca39c249187e91850dd949471c23a16bd85b3e4fef1c0c6ada72f442f01d86c58ce6b75efc68449f83a8dcb5cc4027
+  data.tar.gz: 16d02acc88a30773dbed18dc3f7594faa26004dbc8bcfb9491237fd9b737cc8b73efd427f26b482e4518e8c56e710a676384a7fbf30c9cf4a8315416e6db07b6

data/README.md

@@ -24,10 +24,12 @@ Tested against ruby 2.0.x, 2.1.x, 2.2.x, 2.3.x, and ruby-head
 
 3. Gifsicle, which can be installed from [www.lcdf.org/gifsicle/](https://www.lcdf.org/gifsicle/)
 
+4. Pngquant, which can be installed from [pngquant.org]https://pngquant.org/
+
 Or install the utilities via homebrew:
 
 ```bash
-$ brew install optipng jpegoptim gifsicle
+$ brew install optipng jpegoptim gifsicle pngquant
 ```
 
 Then add this line to your application's Gemfile:
@@ -56,6 +58,13 @@ performs PNG integrity checks and corrections.
 ImageOptimizer.new('path/to/file.png').optimize
 ```
 
+Pngquant is a command-line utility and a library for lossy compression of PNG images.
+The conversion reduces file sizes significantly (often as much as 70%) and preserves full alpha transparency. Generated images are compatible with all modern web browsers, and have better fallback in IE6 than 24-bit PNGs.
+
+```ruby
+PNGQuantOptimizer.new('path/to/file.png').optimize
+```
+
 #### Optimize JPEG formats:
 
 jpegoptim provides lossless optimization for JPEG files based on optimizing the Huffman tables.
@@ -107,6 +116,10 @@ optimizer will ignore the value.
 ImageOptimizer.new('path/to/file.png', level: 3).optimize
 ```
 
+Pngquant is called with the '--skip-if-larger', '--speed 1','--force', '--verbose', '--ext .png' flags.
+This runs pngquant on all png files in the current directory and subdirectory and optimized them in place. Flag '--skip-if-larger' skips images which are  smaller. Flag '--ext .png' set custom extension (suffix) for output filename. By default -or8.png or -fs8.png is used.
+
+
 ##### Don't Remove metadata from PNG
 
 By default, `optipng` is called with the `-strip all` flag, which removes all the

data/checksum/image_optimizer-1.7.0.gem.sha512

@@ -0,0 +1 @@
+fe9e49e0b6c275d15ced45c3b860ec8cf1c1379278a12d12f1fd8aa10641911ff86715f3f9f8603e4e2a93c2815b6c396d252b0c17e49dcf54584803237a9feb

data/lib/image_optimizer.rb

@@ -4,6 +4,7 @@ require 'image_optimizer/image_optimizer_base'
 require 'image_optimizer/jpeg_optimizer'
 require 'image_optimizer/png_optimizer'
 require 'image_optimizer/gif_optimizer'
+require 'image_optimizer/pngquant_optimizer'
 
 class ImageOptimizer
   include Shell
@@ -18,6 +19,7 @@ class ImageOptimizer
     identify_format if options[:identify]
     JPEGOptimizer.new(path, options).optimize
     PNGOptimizer.new(path, options).optimize
+    PNGQuantOptimizer.new(path, options).optimize
     GIFOptimizer.new(path, options).optimize
   end
 

data/lib/image_optimizer/pngquant_optimizer.rb

@@ -0,0 +1,31 @@
+class ImageOptimizer
+  class PNGQuantOptimizer < ImageOptimizerBase
+
+  private
+
+    def command_options
+      flags = ['--skip-if-larger', '--speed 1',
+               '--force', '--verbose', '--ext .png']
+      flags << quantity
+      flags << path
+    end
+
+    def quantity
+      return "--quality 100" unless (0..100).include?(options[:quality])
+      "--quality #{options[:quality]}"
+    end
+
+    def extensions
+      %w[png]
+    end
+
+    def type
+      'png'
+    end
+
+    def bin_name
+      'pngquant'
+    end
+
+  end
+end

data/lib/image_optimizer/version.rb

@@ -1,3 +1,3 @@
 class ImageOptimizer
-  VERSION = '1.6.1'
+  VERSION = '1.7.0'
 end

data/spec/image_optimizer/pngquant_optimizer_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe ImageOptimizer::PNGQuantOptimizer do
+  describe '#optimize' do
+    let(:options) { {} }
+    let(:pngquant_optimizer) { ImageOptimizer::PNGQuantOptimizer.new('/path/to/file.png', options) }
+    after { ImageOptimizer::PNGQuantOptimizer.instance_variable_set(:@bin, nil) }
+    subject { pngquant_optimizer.optimize }
+
+    context 'pngquant optimizing utility is installed' do
+      before do
+        allow(ImageOptimizer::PNGQuantOptimizer).to receive(:which).and_return('/usr/local/bin/pngquant')
+      end
+
+      it 'optimizes the png' do
+        optimizer_options = %w[--skip-if-larger --speed\ 1 --force --verbose --ext\ .png --quality\ 100 /path/to/file.png]
+        expect(pngquant_optimizer).to receive(:system).with('/usr/local/bin/pngquant', *optimizer_options)
+        subject
+      end
+
+      context 'ENV variable path to pngquant' do
+        let(:image_pngquant_bin_path) { '/app/vendor/bundle/ruby/2.0.0/gems/image_pngquant_bin-0.0.2/bin/pngquant' }
+        before do
+          ENV['PNGQUANT_BIN'] = image_pngquant_bin_path
+        end
+        after do
+          ENV['PNGQUANT_BIN'] = nil
+        end
+
+        it 'should optimize using the given path' do
+          optimizer_options = %w[--skip-if-larger --speed\ 1 --force --verbose --ext\ .png --quality\ 100 /path/to/file.png]
+          expect(pngquant_optimizer).to receive(:system).with(image_pngquant_bin_path, *optimizer_options)
+          subject
+        end
+      end
+
+      context 'with quality parameter' do
+        let(:options) { { :quality => 100 } }
+
+        it 'optimizes the png with the quality' do
+          optimizer_options = %w[--skip-if-larger --speed\ 1 --force --verbose --ext\ .png --quality\ 100 /path/to/file.png]
+          expect(pngquant_optimizer).to receive(:system).with('/usr/local/bin/pngquant', *optimizer_options)
+          subject
+        end
+      end
+    end
+
+    context 'optimizing utility is not installed' do
+      before do
+        allow(ImageOptimizer::PNGQuantOptimizer).to receive(:which).and_return(nil)
+      end
+
+      it 'warns the user if the png' do
+        expect(pngquant_optimizer).to receive(:warn).with('Attempting to optimize a png without pngquant installed. Skipping...')
+        subject
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_optimizer
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Julian Tescher
@@ -30,7 +30,7 @@ cert_chain:
   8lVFrLvGNGPCLQmEf498hBYT99EVYiuiI0F7YlTmBdzL1uwTMk5le/b0NguYdSJ7
   qKlUP9usSwMVc+qmaOg1EYfPGYvt63qS
   -----END CERTIFICATE-----
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -127,17 +127,20 @@ files:
 - checksum/image_optimizer-1.5.0.gem.sha512
 - checksum/image_optimizer-1.6.0.gem.sha512
 - checksum/image_optimizer-1.6.1.gem.sha512
+- checksum/image_optimizer-1.7.0.gem.sha512
 - image_optimizer.gemspec
 - lib/image_optimizer.rb
 - lib/image_optimizer/gif_optimizer.rb
 - lib/image_optimizer/image_optimizer_base.rb
 - lib/image_optimizer/jpeg_optimizer.rb
 - lib/image_optimizer/png_optimizer.rb
+- lib/image_optimizer/pngquant_optimizer.rb
 - lib/image_optimizer/shell.rb
 - lib/image_optimizer/version.rb
 - spec/image_optimizer/gif_optimizer_spec.rb
 - spec/image_optimizer/jpeg_optimizer_spec.rb
 - spec/image_optimizer/png_optimizer_spec.rb
+- spec/image_optimizer/pngquant_optimizer_spec.rb
 - spec/image_optimizer/shell_spec.rb
 - spec/image_optimizer/version_spec.rb
 - spec/image_optimizer_spec.rb
@@ -170,6 +173,7 @@ test_files:
 - spec/image_optimizer/gif_optimizer_spec.rb
 - spec/image_optimizer/jpeg_optimizer_spec.rb
 - spec/image_optimizer/png_optimizer_spec.rb
+- spec/image_optimizer/pngquant_optimizer_spec.rb
 - spec/image_optimizer/shell_spec.rb
 - spec/image_optimizer/version_spec.rb
 - spec/image_optimizer_spec.rb