image_optimizer 1.2.0 → 1.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGQwZDcwZDNiZjQ5ODMwNTEzNzU3ZWY2MzM5MzMzMDg2Zjk3Y2YzNg==
+    N2Q4ZWYzYjZjMWMzYTkwMTUxNTExMzBkNTFjNjZkNTBmNGFjODJiZQ==
   data.tar.gz: !binary |-
-    Zjc2OGU1NGQyNzFhMDcxMDVkYzQ5OWJjMDliMjgwZjAxNzliZjg5Mg==
+    ODc5MzY0MzA4NjY2YTgzZTYzZDUzZTA2MDBmMzBmY2Q2OGZhZGVkMA==
 SHA512:
   metadata.gz: !binary |-
-    ZWI3ZDQ2YjgxNzVjYjk5ZGY5NDE3ZDZjY2RjNGM1MGI3NmQ4MDA5OTc2MDk2
-    MzEwZmIxOTMwNTdiMmEzNzg1YzU3MjgwNGRkY2RmMDc1NjdhNWVhMjI2M2Vj
-    MmVkZTdkMTc1MjI1MDRiMTI5MzNjZGU3ZWYxNWJhMmUxNTcxNjU=
+    MTM3MjhhYmEwZTJjNTI4Y2MxYTcxOGM3M2ZiZTk5Nzk2NTUzMjA4ZWE1NmU2
+    YmFhMzhjNjRhNzY1NTVkMjk5ZWI0MDNhOTYxNDc5MTU5ZWU3NmJhMWQ4NThh
+    YjYyNjg2YjMyMzhmYjI3ODMxOTdiNzU5OTgxOWFmODBmZWFmYjY=
   data.tar.gz: !binary |-
-    ZTk1ZGM2M2IzMTQ0ZDZlM2Q3MGRlYmQwZTk3OWUwZTcwMjQzNWFmYzYzMmJl
-    YjVjMDc4YzAwNTViOTA1NTA4ZGQzMDgwOGIzYWI0NmYxMGU0NDdiMTk0NzVj
-    YmVjOTlmM2ZjMmM4OGNhMGU2NWM0NjZkNjkxYTA3ZjdiYjUzNWY=
+    NDdlZTM1N2Q3YTMwMWNhNGQxZDQ4Mzc3Mjg5ZWIzM2NmYzY2Y2IzOWQzNGVj
+    N2M1YjlkMmU3ZTU0MjQ0N2VjMWVhZTA3NWQ3YTNhYjM2Nzc1YWM4MDUxZWFl
+    Njc2OGMzMDllYThjNGE3NWQzZDU5ZThhMjI2MDc1MmJmNGJhMDU=

data/.travis.yml

@@ -7,7 +7,15 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - ruby-head
-  - rbx-18mode
-  - rbx-19mode
+  - rbx-2.1.0
+  - rbx-2.2.0
   - ree
+matrix:
+  allow_failures:
+    - rvm: jruby-18mode
+    - rvm: 1.8.7
+    - rvm: rbx-2.1.0
+    - rvm: rbx-2.2.0
+    - rvm: ree

data/README.md

@@ -2,8 +2,8 @@
 
 This gem allows you to simply optimize images via jpegoptim or OptiPNG.
 
-Tested against ruby 1.8.7, 1.9.2, 1.9.3, 2.0.0, ruby-head, jruby-18mode, jruby-19mode, jruby-head, rbx-18mode,
-rbx-19mode, and ree
+Tested against ruby 1.8.7, 1.9.2, 1.9.3, 2.0.0, 2.1.0, ruby-head, jruby-18mode, jruby-19mode, jruby-head, rbx-2.1.0,
+rbx-2.2.0, and ree
 
 [![Build Status](https://secure.travis-ci.org/jtescher/image_optimizer.png)]
 (http://travis-ci.org/jtescher/image_optimizer)
@@ -64,6 +64,17 @@ All jpegs will be progressively optimized for a better web experience
 ImageOptimizer.new('path/to/file.jpg').optimize
 ```
 
+## Optimization Options
+
+##### Quiet optimization
+
+To have optimization performed in quiet mode without logging progress, an optional `quiet` parameter may be passed.
+Default is false.
+
+```ruby
+ImageOptimizer.new('path/to/file.jpg', quiet: true).optimize
+```
+
 ##### Lossy JPEG optimization
 
 Pass an optional `quality` parameter to target a specific lossy JPG quality level (0-100), default is lossless

data/lib/image_optimizer.rb

@@ -12,6 +12,6 @@ class ImageOptimizer
 
   def optimize
     JPEGOptimizer.new(path, options).optimize
-    PNGOptimizer.new(path).optimize
+    PNGOptimizer.new(path, options).optimize
   end
 end

data/lib/image_optimizer/jpeg_optimizer.rb

@@ -1,10 +1,10 @@
 class ImageOptimizer
   class JPEGOptimizer
-    attr_reader :path, :quality
+    attr_reader :path, :options
 
     def initialize(path, options = {})
       @path = path
-      @quality = options[:quality]
+      @options = options
     end
 
     def optimize
@@ -28,11 +28,22 @@ class ImageOptimizer
     end
 
     def optimize_jpeg
-      system "#{jpeg_optimizer_bin} -f --strip-all #{optional_max_quality} --all-progressive #{path}"
+      system(jpeg_optimizer_bin, *command_options)
     end
 
-    def optional_max_quality
-      "--max=#{quality}" if (0..100).include?(quality)
+    def command_options
+      flags = ['-f', '--strip-all', '--all-progressive']
+      flags << max_quantity if (0..100).include?(options[:quality])
+      flags << quiet if options[:quiet]
+      flags << path
+    end
+
+    def max_quantity
+      "--max=#{options[:quality]}"
+    end
+
+    def quiet
+      '--quiet'
     end
 
     def jpeg_optimizer_present?

data/lib/image_optimizer/png_optimizer.rb

@@ -1,9 +1,10 @@
 class ImageOptimizer
   class PNGOptimizer
-    attr_reader :path
+    attr_reader :path, :options
 
-    def initialize(path)
+    def initialize(path, options = {})
       @path = path
+      @options = options
     end
 
     def optimize
@@ -27,7 +28,17 @@ class ImageOptimizer
     end
 
     def optimize_png
-      system "#{png_optimizer_bin} -o7 #{path}"
+      system(png_optimizer_bin, *command_options)
+    end
+
+    def command_options
+      flags = %w[-o7]
+      flags << quiet if options[:quiet]
+      flags << path
+    end
+
+    def quiet
+      '-quiet'
     end
 
     def png_optimizer_present?

data/lib/image_optimizer/version.rb

@@ -1,3 +1,3 @@
 class ImageOptimizer
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/spec/image_optimizer/jpeg_optimizer_spec.rb

@@ -2,13 +2,12 @@ require 'spec_helper'
 
 describe ImageOptimizer::JPEGOptimizer do
   describe '#optimize' do
-    let(:file_path) { '/path/to/file.jpg' }
-    let(:jpeg_optimizer) { ImageOptimizer::JPEGOptimizer.new(file_path) }
+    let(:jpeg_optimizer) { ImageOptimizer::JPEGOptimizer.new('/path/to/file.jpg') }
 
     it 'optimizes the jpeg' do
       jpeg_optimizer.stub(:jpeg_optimizer_bin => '/usr/local/bin/jpegoptim')
-      optimizer_options = '-f --strip-all  --all-progressive'
-      jpeg_optimizer.should_receive(:system).with("/usr/local/bin/jpegoptim #{optimizer_options} #{file_path}")
+      optimizer_options = %w[-f --strip-all --all-progressive /path/to/file.jpg]
+      jpeg_optimizer.should_receive(:system).with('/usr/local/bin/jpegoptim', *optimizer_options)
       jpeg_optimizer.optimize
     end
 
@@ -21,16 +20,24 @@ describe ImageOptimizer::JPEGOptimizer do
     it 'detects if there is an ENV variable path to jpegoptim' do
       image_optim_jpegoptim_bin_path = '/app/vendor/bundle/ruby/2.0.0/gems/image_optim_bin-0.0.2/bin/jpegoptim'
       ENV['JPEGOPTIM_BIN'] = image_optim_jpegoptim_bin_path
-      optimizer_options = '-f --strip-all  --all-progressive'
-      jpeg_optimizer.should_receive(:system).with("#{image_optim_jpegoptim_bin_path} #{optimizer_options} #{file_path}")
+      optimizer_options = %w[-f --strip-all --all-progressive /path/to/file.jpg]
+      jpeg_optimizer.should_receive(:system).with(image_optim_jpegoptim_bin_path, *optimizer_options)
       jpeg_optimizer.optimize
     end
 
     it 'accepts an optional quality parameter' do
-      jpeg_optimizer = ImageOptimizer::JPEGOptimizer.new(file_path, :quality => 50)
+      jpeg_optimizer = ImageOptimizer::JPEGOptimizer.new('/path/to/file.jpg', :quality => 50)
       jpeg_optimizer.stub(:jpeg_optimizer_bin => '/usr/local/bin/jpegoptim')
-      optimizer_options = '-f --strip-all --max=50 --all-progressive'
-      jpeg_optimizer.should_receive(:system).with("/usr/local/bin/jpegoptim #{optimizer_options} #{file_path}")
+      optimizer_options = %w[-f --strip-all --all-progressive --max=50 /path/to/file.jpg]
+      jpeg_optimizer.should_receive(:system).with('/usr/local/bin/jpegoptim', *optimizer_options)
+      jpeg_optimizer.optimize
+    end
+
+    it 'accepts an optional quiet parameter' do
+      jpeg_optimizer = ImageOptimizer::JPEGOptimizer.new('/path/to/file.jpg', :quiet => true)
+      jpeg_optimizer.stub(:jpeg_optimizer_bin => '/usr/local/bin/jpegoptim')
+      optimizer_options = %w[-f --strip-all --all-progressive --quiet /path/to/file.jpg]
+      jpeg_optimizer.should_receive(:system).with('/usr/local/bin/jpegoptim', *optimizer_options)
       jpeg_optimizer.optimize
     end
   end

data/spec/image_optimizer/png_optimizer_spec.rb

@@ -2,12 +2,11 @@ require 'spec_helper'
 
 describe ImageOptimizer::PNGOptimizer do
   describe '#optimize' do
-    let(:file_path) { '/path/to/file.png' }
-    let(:png_optimizer) { ImageOptimizer::PNGOptimizer.new(file_path) }
+    let(:png_optimizer) { ImageOptimizer::PNGOptimizer.new('/path/to/file.png') }
 
     it 'optimizes the png' do
       png_optimizer.stub(:png_optimizer_bin => '/usr/local/bin/optipng')
-      png_optimizer.should_receive(:system).with("/usr/local/bin/optipng -o7 #{file_path}")
+      png_optimizer.should_receive(:system).with('/usr/local/bin/optipng', '-o7', '/path/to/file.png')
       png_optimizer.optimize
     end
 
@@ -20,7 +19,14 @@ describe ImageOptimizer::PNGOptimizer do
     it 'detects if there is an ENV variable path to optipng' do
       image_optim_optipng_bin_path = '/app/vendor/bundle/ruby/2.0.0/gems/image_optim_bin-0.0.2/bin/optipng'
       ENV['OPTIPNG_BIN'] = image_optim_optipng_bin_path
-      png_optimizer.should_receive(:system).with("#{image_optim_optipng_bin_path} -o7 #{file_path}")
+      png_optimizer.should_receive(:system).with(image_optim_optipng_bin_path, '-o7', '/path/to/file.png')
+      png_optimizer.optimize
+    end
+
+    it 'accepts an optional quiet parameter' do
+      png_optimizer = ImageOptimizer::PNGOptimizer.new('/path/to/file.png', :quiet => true)
+      png_optimizer.stub(:png_optimizer_bin => '/usr/local/bin/optipng')
+      png_optimizer.should_receive(:system).with('/usr/local/bin/optipng', '-o7', '-quiet', '/path/to/file.png')
       png_optimizer.optimize
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_optimizer
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Julian Tescher
@@ -35,7 +35,7 @@ cert_chain:
   V3NaK2F3dzJpU05DNVhGaEEvOHhzSzBCbHRZUkY5blAKSEE0MVV0RHhySmtI
   TDNOMXo4Z1BNWFNyRlQ0MUZSMndnazgrbDE0UCs3ZzFVVFBpZDJFSXdmdDJ4
   T2JGZUE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Simply optimize images via jpegoptim or OptiPNG