image_optim 0.8.1 → 0.9.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmQ2Y2Q0NDBlYzJjYzQyODlhMjg1NjI1ZWJkODVhNzQwZGM4MzUwZA==
+    MTRmMzViYWYwZjQ2ZDQ3NzI4MzQ0MWZiNTA2MDgzNjc2OGU2MGM5ZA==
   data.tar.gz: !binary |-
-    NzYxNjRjMjFiYWY2MzQwODdkY2NkZTkwMDM3ODY1NGQ2NDc0NGZiMA==
+    NjEzZTE5MmQ5NzcyM2M5NzQ0YTc4Zjk0YTcxODAzN2IyOTM2ODJjNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjEwZGVmNjE2YTBmYmFiM2M1ZTlkNWI0YzgyOWEzZTAzNzFkNDcxNDIwMGNh
-    ODgyNGU5MjU5MTdlMjY4OGNmOGQ5NWUxYWU1MTZhZWEwNmE5ODI3NmZiNmE4
-    MjM4NzNlNmI0MGU4YTM5NzFlMmVkOGQ0YTU1MTE5NTBkMzE2OGE=
+    NjZmMzM0YWIzMGI2ODg4NWVjZGMyY2U0NjBkMjdjM2U2ZTQ0NzM1YTk1NzU2
+    ZjI1OTk5Mzk3ODZmY2Q5MTM3NTI4ZmI4ZGJjMWViNzA2NDJlN2Q1NWE2ZjBj
+    YjAyMDBiYzFhZWM4ZTA2NzdlOGEzYjU1MzgwMDEzNTJhMThmZGY=
   data.tar.gz: !binary |-
-    NWRmODhjMmE3Y2VhYTc0YTBjNjA2ZGIwNzY4ZGZiY2EzZTQxOWZhYjk0Mzhm
-    YmRkYTUyMDUxZTZmZjA0NzQ2MzU0ODkyZGRlYjIyOWEzYTQxODUxZTliM2Ni
-    MWVkMmJkNWVlMzZiOGM1ZTQzY2M5ZjEyNzZjYzkzOGU0YTZlMjY=
+    NGM2YmE2MGU3MDI0MjhjYWM5NzdjOWMwNWIyYzM2NzJmMTA3OWI4MzVhOGYy
+    YjUwZWFhMDQxNTg5MDk2YWY0YzUxODM2NTdkNjU3OGZhZjU0OTA5MTg5ZTY4
+    Y2Q2MGIzNjhjMmM4NDIyOTFiZTQzMzU5ZDhkYzAxODQ4MDJmZjQ=

data/.gitignore

@@ -6,6 +6,7 @@
 /.yardoc/
 /coverage/
 
+Gemfile.lock
 Makefile
 *.o
 *.bundle

data/.travis.yml

@@ -0,0 +1,21 @@
+language:
+  - ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
+  - ree
+script: bundle exec rspec
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq advancecomp gifsicle jhead jpegoptim libjpeg-progs optipng pngcrush
+  - wget http://static.jonof.id.au/dl/kenutils/pngout-20130221-linux.tar.gz
+  - tar -xzf pngout-*-linux.tar.gz
+  - mv pngout-*-linux pngout-linux
+env:
+  - PATH=pngout-linux/x86_64:$PATH

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec

data/README.markdown

@@ -4,6 +4,7 @@ Optimize (lossless compress) images (jpeg, png, gif) using external utilities:
 
 * [advpng](http://advancemame.sourceforge.net/doc-advpng.html) from [AdvanceCOMP](http://advancemame.sourceforge.net/comp-readme.html)
 * [gifsicle](http://www.lcdf.org/gifsicle/)
+* [jhead](http://www.sentex.net/~mwandel/jhead/)
 * [jpegoptim](http://www.kokkonen.net/tjko/projects.html)
 * jpegtran from [Independent JPEG Group's JPEG library](http://www.ijg.org/)
 * [optipng](http://optipng.sourceforge.net/)
@@ -46,11 +47,11 @@ Besides permanently setting environment variables in `~/.profile`, `~/.bash_prof
 
 ### Linux - Debian/Ubuntu
 
-    sudo apt-get install -y advancecomp gifsicle jpegoptim libjpeg-progs optipng pngcrush
+    sudo apt-get install -y advancecomp gifsicle jhead jpegoptim libjpeg-progs optipng pngcrush
 
 ### Linux - RHEL/Fedora/Centos
 
-    sudo yum install -y advancecomp gifsicle libjpeg optipng
+    sudo yum install -y advancecomp gifsicle jhead libjpeg optipng
 
 You will also need to install `jpegoptim` and `pngcrush` from source:
 
@@ -72,11 +73,11 @@ You will also need to install `jpegoptim` and `pngcrush` from source:
 
 ### OS X: Macports
 
-    sudo port install advancecomp gifsicle jpegoptim jpeg optipng pngcrush
+    sudo port install advancecomp gifsicle jhead jpegoptim jpeg optipng pngcrush
 
 ### OS X: Brew
 
-    brew install advancecomp gifsicle jpegoptim jpeg optipng pngcrush
+    brew install advancecomp gifsicle jhead jpegoptim jpeg optipng pngcrush
 
 ### pngout installation (optional)
 

data/TODO

@@ -1,7 +1,6 @@
 preserve color (leave_color branch)
 preserve all extra stuff
 global level of optimization #10
-autorotate jpeg based on exif (jhead -auotrot)
 timeout workers?
 	based on file size?
 fail worker instead of process on bin not present?

data/image_optim.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.8.1'
+  s.version     = '0.9.0'
   s.summary     = %q{Optimize (lossless compress) images (jpeg, png, gif) using external utilities (advpng, gifsicle, jpegoptim, jpegtran, optipng, pngcrush, pngout)}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']
@@ -15,8 +15,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = %w[lib]
 
-  s.add_dependency 'fspath', '~> 2.0.3'
+  s.add_dependency 'fspath', '~> 2.0.5'
   s.add_dependency 'image_size', '~> 1.1.2'
+  s.add_dependency 'exifr', '~> 1.1.3'
   s.add_dependency 'progress', '~> 2.4.0'
   s.add_dependency 'in_threads', '~> 1.1.1'
   s.add_development_dependency 'rspec'

data/lib/image_optim/image_path.rb

@@ -22,7 +22,7 @@ class ImageOptim
       src.temp_path(src.dirname) do |temp|
         src.copy(temp)
         temp.write(read)
-        temp.rename(src)
+        temp.rename(src.to_s)
       end
     end
 

data/lib/image_optim/worker/jhead.rb

@@ -0,0 +1,27 @@
+require 'image_optim/worker'
+require 'exifr'
+
+class ImageOptim
+  class Worker
+    class Jhead < Worker
+      def image_formats
+        [:jpeg]
+      end
+
+      def run_order
+        -10
+      end
+
+      def optimize(src, dst)
+        if (2..8).include?(EXIFR::JPEG.new(src.to_s).orientation.to_i)
+          src.copy(dst)
+          args = %W[-autorot #{dst}]
+          resolve_bin!(:jpegtran)
+          execute(:jhead, *args) && dst.size?
+        else
+          false
+        end
+      end
+    end
+  end
+end

data/lib/image_optim/worker.rb

@@ -46,7 +46,8 @@ class ImageOptim
     # List of formats which worker can optimize
     def image_formats
       format_from_name = self.class.name.downcase[/gif|jpeg|png/]
-      format_from_name ? [format_from_name.to_sym] : []
+      raise "#{self.class}: can't guess applicable format from worker name" unless format_from_name
+      [format_from_name.to_sym]
     end
 
     # Ordering in list of workers
@@ -68,18 +69,35 @@ class ImageOptim
 
     # Run command setting priority and hiding output
     def execute(bin, *arguments)
-      resolve_bin!(bin)
+      command = build_command!(bin, *arguments)
 
-      command = [bin, *arguments].map(&:to_s).shelljoin
       start = Time.now
 
-      system "env PATH=#{@image_optim.env_path.shellescape} nice -n #{@image_optim.nice} #{command} > /dev/null 2>&1"
+      success = run_command(command)
+
+      $stderr << "#{success ? '✓' : '✗'} #{Time.now - start}s #{command}\n" if @image_optim.verbose?
 
-      raise SignalException.new($?.termsig) if $?.signaled?
+      success
+    end
+
+    # Build command string
+    def build_command!(bin, *arguments)
+      resolve_bin!(bin)
 
-      $stderr << "#{$?.success? ? '✓' : '✗'} #{Time.now - start}s #{command}\n" if @image_optim.verbose?
+      [bin, *arguments].map(&:to_s).shelljoin
+    end
+
+    # Run command defining environment, setting nice level, removing output and reraising signal exception
+    def run_command(command)
+      success = system "env PATH=#{@image_optim.env_path.shellescape} nice -n #{@image_optim.nice} #{command} > /dev/null 2>&1"
+
+      if $?.signaled?
+        unless defined?(JRUBY_VERSION) && $?.exitstatus == $?.termsig # jruby does not differ non zero exit status and signal number
+          raise SignalException.new($?.termsig)
+        end
+      end
 
-      $?.success?
+      success
     end
   end
 end

data/lib/image_optim.rb

@@ -248,7 +248,7 @@ end
 
 %w[
   pngcrush pngout optipng advpng
-  jpegoptim jpegtran
+  jhead jpegoptim jpegtran
   gifsicle
 ].each do |worker|
   require "image_optim/worker/#{worker}"

data/spec/image_optim_spec.rb

@@ -3,7 +3,7 @@ require 'rspec'
 require 'image_optim'
 require 'tempfile'
 
-TEST_IMAGES = (ImageOptim::ImagePath.new(__FILE__).dirname.relative_path_from(Dir.pwd) / 'images').glob('*')
+TEST_IMAGES = ImageOptim::ImagePath.new(__FILE__).dirname.glob('images/**/*.*')
 
 Fixnum.class_eval do
   def in_range?(range)
@@ -208,8 +208,8 @@ describe ImageOptim do
     it "should resolve bin specified in ENV" do
       path = (FSPath(__FILE__).dirname / '../bin/image_optim').relative_path_from(Dir.pwd).to_s
       with_env 'IMAGE_OPTIM_BIN', path do
-        tmpdir = stub(:tmpdir)
-        symlink = stub(:symlink)
+        tmpdir = double(:tmpdir)
+        symlink = double(:symlink)
 
         image_optim = ImageOptim.new
         image_optim.should_receive(:bin_accessible?).with(symlink).once.and_return(true)
@@ -249,8 +249,8 @@ describe ImageOptim do
     it "should raise on failure to resolve bin specified in ENV" do
       path = (FSPath(__FILE__).dirname / '../bin/should_not_exist_bin').relative_path_from(Dir.pwd).to_s
       with_env 'SHOULD_NOT_EXIST_BIN', path do
-        tmpdir = stub(:tmpdir)
-        symlink = stub(:symlink)
+        tmpdir = double(:tmpdir)
+        symlink = double(:symlink)
 
         image_optim = ImageOptim.new
         image_optim.should_receive(:bin_accessible?).with(symlink).once.and_return(false)
@@ -275,4 +275,17 @@ describe ImageOptim do
       end
     end
   end
+
+  describe "auto orienting" do
+    original = ImageOptim::ImagePath.new(__FILE__).dirname / 'images/orient/original.jpg'
+    ImageOptim::ImagePath.new(__FILE__).dirname.glob('images/orient/?.jpg').each do |jpg|
+      it "should rotate #{jpg}" do
+        image_optim = ImageOptim.new
+        oriented = image_optim.optimize_image(jpg)
+        nrmse = `compare -metric RMSE #{original.to_s.shellescape} #{oriented.to_s.shellescape} /dev/null 2>&1`[/\((\d+(\.\d+)?)\)/, 1]
+        nrmse.should_not be_nil
+        nrmse.to_f.should be < 0.005
+      end
+    end
+  end
 end

data/spec/images/orient/generate

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+convert -size 2x2 xc:black -fill '#f00' -draw 'point 0,1' -fill '#0f0' -draw 'point 1,0' -fill '#00f' -draw 'point 1,1' -scale 64x64 original.png
+
+convert original.png             0.jpg
+convert original.png             1.jpg
+convert original.png -flop       2.jpg
+convert original.png -rotate 180 3.jpg
+convert original.png -flip       4.jpg
+convert original.png -transpose  5.jpg
+convert original.png -rotate 270 6.jpg
+convert original.png -transverse 7.jpg
+convert original.png -rotate 90  8.jpg
+
+convert original.png original.jpg
+rm original.png
+
+exiv2 -M"add Exif.Photo.UserComment image_optim-spec" *.jpg
+for i in {1..8}; do
+  exiv2 -M"add Exif.Image.Orientation Short $i" $i.jpg
+done

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-26 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: image_size
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.2
+- !ruby/object:Gem::Dependency
+  name: exifr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: progress
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +102,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
+- Gemfile
 - LICENSE.txt
 - README.markdown
 - TODO
@@ -100,6 +116,7 @@ files:
 - lib/image_optim/worker.rb
 - lib/image_optim/worker/advpng.rb
 - lib/image_optim/worker/gifsicle.rb
+- lib/image_optim/worker/jhead.rb
 - lib/image_optim/worker/jpegoptim.rb
 - lib/image_optim/worker/jpegtran.rb
 - lib/image_optim/worker/optipng.rb
@@ -112,6 +129,17 @@ files:
 - spec/images/icecream.gif
 - spec/images/image.jpg
 - spec/images/lena.jpg
+- spec/images/orient/0.jpg
+- spec/images/orient/1.jpg
+- spec/images/orient/2.jpg
+- spec/images/orient/3.jpg
+- spec/images/orient/4.jpg
+- spec/images/orient/5.jpg
+- spec/images/orient/6.jpg
+- spec/images/orient/7.jpg
+- spec/images/orient/8.jpg
+- spec/images/orient/generate
+- spec/images/orient/original.jpg
 - spec/images/transparency1.png
 - spec/images/transparency2.png
 - spec/images/vergroessert.jpg
@@ -148,6 +176,17 @@ test_files:
 - spec/images/icecream.gif
 - spec/images/image.jpg
 - spec/images/lena.jpg
+- spec/images/orient/0.jpg
+- spec/images/orient/1.jpg
+- spec/images/orient/2.jpg
+- spec/images/orient/3.jpg
+- spec/images/orient/4.jpg
+- spec/images/orient/5.jpg
+- spec/images/orient/6.jpg
+- spec/images/orient/7.jpg
+- spec/images/orient/8.jpg
+- spec/images/orient/generate
+- spec/images/orient/original.jpg
 - spec/images/transparency1.png
 - spec/images/transparency2.png
 - spec/images/vergroessert.jpg