image_optimizer 1.1.0 → 1.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjE3ODlhNDA0YjBhZTdlODNlNGViZmYzNWZjZGU0NmU5NWE5NzJjZg==
+    ZGQwZDcwZDNiZjQ5ODMwNTEzNzU3ZWY2MzM5MzMzMDg2Zjk3Y2YzNg==
   data.tar.gz: !binary |-
-    MzM2NGEyZWNkNzdlNGRkOGQ0OTUyMzIzZDYyNWJmYWZiNjFkNWU1Mw==
-!binary "U0hBNTEy":
+    Zjc2OGU1NGQyNzFhMDcxMDVkYzQ5OWJjMDliMjgwZjAxNzliZjg5Mg==
+SHA512:
   metadata.gz: !binary |-
-    ZjUwZTJlZDM1ZTg5NWFiMjk5ZTEzNjAxM2FlYTc0NDA5YjA5OTk5YzAzMjUz
-    OWYwZTNlNzEwNzU5MWUzNTA1NGUxM2I5ZDY1MWFhZjE0ODE2OTMyM2NlOGI2
-    MTUzYTc0NjkzM2YwMGUzNGFlZmEzNTI3ODYzMjcyMTg5OTFmYmI=
+    ZWI3ZDQ2YjgxNzVjYjk5ZGY5NDE3ZDZjY2RjNGM1MGI3NmQ4MDA5OTc2MDk2
+    MzEwZmIxOTMwNTdiMmEzNzg1YzU3MjgwNGRkY2RmMDc1NjdhNWVhMjI2M2Vj
+    MmVkZTdkMTc1MjI1MDRiMTI5MzNjZGU3ZWYxNWJhMmUxNTcxNjU=
   data.tar.gz: !binary |-
-    OTI0YjAwMmU2NDMzNWRlMDllNTczNDU5ZmUwZmUxOWYzMDQzMTc0YWNmZjI4
-    MzQ1N2NmZTE2N2Q1YWZjYTljNGQ5OTRkNjA5NjgxYjQxMmM5NmZmZTI1ZGVk
-    NDkxMWI3MTRhNzE3MTQ1MGE4MWVlYTVjZGRhM2IxOTQ4OGQ5ZjA=
+    ZTk1ZGM2M2IzMTQ0ZDZlM2Q3MGRlYmQwZTk3OWUwZTcwMjQzNWFmYzYzMmJl
+    YjVjMDc4YzAwNTViOTA1NTA4ZGQzMDgwOGIzYWI0NmYxMGU0NDdiMTk0NzVj
+    YmVjOTlmM2ZjMmM4OGNhMGU2NWM0NjZkNjkxYTA3ZjdiYjUzNWY=

data.tar.gz.sig

@@ -1,2 +1 @@
-�>��D������D��Ϻ`� F����g�Ym�r�[���{�2i��ʼno�U.Ðn8:?x}���7�ד����$|�Y�/c;H�m.�,/��H
-kr�
+���t�gk#\�����e�8����w���/�s`�Oծz�܋��
"����������ڂ��h�>��n}չJ�@'Z&���s?��@o�S�)�:?����r��hYPӶ�4}�ٕ\�z<"BIW!���E{�|S�2�KI�w��y*�S��a��j�:#����6���(㣎Nf��D�k����q~B�ʦ�BMZ�(l:�qax��4�	�N.=���9���$ξ��}�<�*ZF�v�'�=C�KI�зUWu�

data/.travis.yml

@@ -3,10 +3,11 @@ rvm:
   - jruby-18mode
   - jruby-19mode
   - jruby-head
-  - 1.9.3
+  - 1.8.7
   - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - ruby-head
   - rbx-18mode
   - rbx-19mode
-  - ruby-head
-  - 1.8.7
-  - ree
+  - ree

data/README.md

@@ -2,16 +2,18 @@
 
 This gem allows you to simply optimize images via jpegoptim or OptiPNG.
 
-Tested against ruby 1.8.7, 1.9.2, 1.9.3, 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, ruby-head, jruby-18mode, jruby-19mode, jruby-head, rbx-18mode,
+rbx-19mode, and ree
 
 [![Build Status](https://secure.travis-ci.org/jtescher/image_optimizer.png)]
 (http://travis-ci.org/jtescher/image_optimizer)
 [![Dependency Status](https://gemnasium.com/jtescher/image_optimizer.png)]
 (https://gemnasium.com/jtescher/image_optimizer)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/jtescher/image_optimizer)
+[![Code Climate](https://codeclimate.com/github/jtescher/image_optimizer.png)]
+(https://codeclimate.com/github/jtescher/image_optimizer)
 [![Coverage Status](https://coveralls.io/repos/jtescher/image_optimizer/badge.png)]
 (https://coveralls.io/r/jtescher/image_optimizer)
+[![Gem Version](https://badge.fury.io/rb/image_optimizer.png)](http://badge.fury.io/rb/image_optimizer)
 
 ## Installation
 
@@ -56,11 +58,22 @@ ImageOptimizer.new('path/to/file.png').optimize
 #### Optimize JPEG formats:
 
 jpegoptim provides lossless optimization for JPEG files based on optimizing the Huffman tables.
+All jpegs will be progressively optimized for a better web experience
 
 ```ruby
 ImageOptimizer.new('path/to/file.jpg').optimize
 ```
 
+##### Lossy JPEG optimization
+
+Pass an optional `quality` parameter to target a specific lossy JPG quality level (0-100), default is lossless
+optimization. PNGs will ignore the quality setting.
+
+```ruby
+ImageOptimizer.new('path/to/file.jpg', quality: 80).optimize
+```
+
+
 ## Contributing
 
 1. Fork it

data/image_optimizer.gemspec

@@ -20,8 +20,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency "rspec",     "~> 2.14.1"
-  gem.add_development_dependency "rake",      "~> 10.1.0"
-  gem.add_development_dependency "simplecov", "~> 0.7.1"
-  gem.add_development_dependency "coveralls", "~> 0.6.7"
+  gem.add_development_dependency "rspec"
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "simplecov"
+  gem.add_development_dependency "coveralls"
+  gem.add_development_dependency "mime-types", "~> 1.25.1"
 end

data/lib/image_optimizer.rb

@@ -1,16 +1,17 @@
-require "image_optimizer/version"
-require "image_optimizer/jpeg_optimizer"
-require "image_optimizer/png_optimizer"
+require 'image_optimizer/version'
+require 'image_optimizer/jpeg_optimizer'
+require 'image_optimizer/png_optimizer'
 
 class ImageOptimizer
-  attr_reader :path
+  attr_reader :path, :options
 
-  def initialize(path)
-    @path = path
+  def initialize(path, options = {})
+    @path    = path
+    @options = options
   end
 
   def optimize
-    JPEGOptimizer.new(path).optimize
+    JPEGOptimizer.new(path, options).optimize
     PNGOptimizer.new(path).optimize
   end
-end
+end

data/lib/image_optimizer/jpeg_optimizer.rb

@@ -1,9 +1,10 @@
 class ImageOptimizer
   class JPEGOptimizer
-    attr_reader :path
+    attr_reader :path, :quality
 
-    def initialize(path)
+    def initialize(path, options = {})
       @path = path
+      @quality = options[:quality]
     end
 
     def optimize
@@ -23,11 +24,15 @@ class ImageOptimizer
     end
 
     def extension(path)
-      path.split(".").last.downcase
+      path.split('.').last.downcase
     end
 
     def optimize_jpeg
-      system "#{jpeg_optimizer_bin} -f --strip-all #{path}"
+      system "#{jpeg_optimizer_bin} -f --strip-all #{optional_max_quality} --all-progressive #{path}"
+    end
+
+    def optional_max_quality
+      "--max=#{quality}" if (0..100).include?(quality)
     end
 
     def jpeg_optimizer_present?

data/lib/image_optimizer/png_optimizer.rb

@@ -23,7 +23,7 @@ class ImageOptimizer
     end
 
     def extension(path)
-      path.split(".").last.downcase
+      path.split('.').last.downcase
     end
 
     def optimize_png

data/lib/image_optimizer/version.rb

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

data/spec/image_optimizer/jpeg_optimizer_spec.rb

@@ -7,7 +7,8 @@ describe ImageOptimizer::JPEGOptimizer do
 
     it 'optimizes the jpeg' do
       jpeg_optimizer.stub(:jpeg_optimizer_bin => '/usr/local/bin/jpegoptim')
-      jpeg_optimizer.should_receive(:system).with("/usr/local/bin/jpegoptim -f --strip-all #{file_path}")
+      optimizer_options = '-f --strip-all  --all-progressive'
+      jpeg_optimizer.should_receive(:system).with("/usr/local/bin/jpegoptim #{optimizer_options} #{file_path}")
       jpeg_optimizer.optimize
     end
 
@@ -20,7 +21,16 @@ 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
-      jpeg_optimizer.should_receive(:system).with("#{image_optim_jpegoptim_bin_path} -f --strip-all #{file_path}")
+      optimizer_options = '-f --strip-all  --all-progressive'
+      jpeg_optimizer.should_receive(:system).with("#{image_optim_jpegoptim_bin_path} #{optimizer_options} #{file_path}")
+      jpeg_optimizer.optimize
+    end
+
+    it 'accepts an optional quality parameter' do
+      jpeg_optimizer = ImageOptimizer::JPEGOptimizer.new(file_path, :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}")
       jpeg_optimizer.optimize
     end
   end

data/spec/image_optimizer/version_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe ImageOptimizer do
-  it "should have a VERSION constant" do
+  it 'should have a VERSION constant' do
     ImageOptimizer::VERSION.should_not be_empty
   end
-end
+end

data/spec/image_optimizer_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
 describe ImageOptimizer do
-  describe "#optimize" do
+  describe '#optimize' do
     it 'delegates to jpeg and png optimizers' do
       ImageOptimizer::JPEGOptimizer.any_instance.should_receive(:optimize)
       ImageOptimizer::PNGOptimizer.any_instance.should_receive(:optimize)
       ImageOptimizer.new('/path/to/image.jpg').optimize
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_optimizer
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Julian Tescher
@@ -35,64 +35,78 @@ cert_chain:
   V3NaK2F3dzJpU05DNVhGaEEvOHhzSzBCbHRZUkY5blAKSEE0MVV0RHhySmtI
   TDNOMXo4Z1BNWFNyRlQ0MUZSMndnazgrbDE0UCs3ZzFVVFBpZDJFSXdmdDJ4
   T2JGZUE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: 1.25.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: 1.25.1
 description: A simple image optimizer
 email:
 - jatescher@gmail.com
@@ -137,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Simply optimize images via jpegoptim or OptiPNG