image_optim 0.10.2 → 0.11.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWNmYzAxNjlhZjg3NzNiMjhlZTNiZThhNWVkNDQ0NjQzOGViZjhjMQ==
+    NWIyNWIzNTYyNmNhOGViOTE3NWU0NmFiMGYyYjk3NTM3ZDNkYzJhMA==
   data.tar.gz: !binary |-
-    ZWVhMDlmOWRhYjgxYjI0MzM2NzA2NzlmODE4MzY2MDQyYjE5NWQ4Mw==
+    Mjg0NmZlYTAzYmQyYTQyMDBhNjA0ZTg0MjVlYWIwNTE1MTJiYmE5MQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmNlNGQzZjBjOTZiYjk0OWI4OWEwZDgxYjc5MGI0YWQ3Y2I1ZTRhNDYxY2Mz
-    OWM4MTA4YjBlNjc4MWM5NWRlZWYyYmI5NjNlN2FlODRmMmZjOTdiNzEzNzY5
-    NzZiOTMyZDBkMzVmYTBmY2E4ZTg2YjI1ODViYWFjOTUxODM5OTI=
+    Y2QzMDBmZTAwNjY4OGIyNGMwZGNkMmQyZTMyODM3ZTc0NzY3YTE5Y2I4Mzcx
+    MmZhZDBjYzc4ZGU4MDE5MTI2YzNiOTgyNTU1NGE0Mzg3NDUzOWNkNGFlM2Jj
+    OTY4MGM5NGIxYWRiYjQxNmNiOWI0ZDllY2E3YjUwZjMyNGZmZGM=
   data.tar.gz: !binary |-
-    YTk5YTAwZDgwZDYwODJjNmQ1NTcxMTYyNDZlM2I3MTJkNWUwOGU4N2YyNzQz
-    MmE3YTQwMGI5ZjQ2M2ZlYTQzNzcwOTZjNDE0NjQ2YzM2NGEzOTUwNjRlNzll
-    ZDAxMDRlMDFjNDgyYmRiYjYyODhhMzBiNDIzOTRmMzFjOGU3NTc=
+    NmRjNmMwMDllZDk1ZjFkN2I5NTk1Nzc4ODhlZjFiMWZjMjBiNmQzOTBmZDYy
+    MmEzZTFmNWViYTg2NDAzOTM4ZjU0NTViZTJmYWU5MjI4MDcwYjc3ZDY2ZmE5
+    YzM5MGE3ZDVmMzA5OTg0NzI4Y2FjNmU0OWZkM2FjNTIxOWNjNDc=

data/.travis.yml

@@ -15,5 +15,6 @@ before_install:
   - wget http://static.jonof.id.au/dl/kenutils/pngout-20130221-linux.tar.gz
   - tar -xzf pngout-*-linux.tar.gz
   - mv pngout-*-linux pngout-linux
+  - npm install -g svgo
 env:
   - PATH=pngout-linux/x86_64:$PATH

data/README.markdown

@@ -1,6 +1,6 @@
 # image_optim
 
-Optimize (lossless compress) images (jpeg, png, gif) using external utilities:
+Optimize (lossless compress) images (jpeg, png, gif, svg) 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/)
@@ -10,6 +10,7 @@ Optimize (lossless compress) images (jpeg, png, gif) using external utilities:
 * [optipng](http://optipng.sourceforge.net/)
 * [pngcrush](http://pmt.sourceforge.net/pngcrush/)
 * [pngout](http://www.advsys.net/ken/util/pngout.htm)
+* [svgo](https://github.com/svg/svgo)
 
 Based on [ImageOptim.app](http://imageoptim.com/).
 
@@ -20,7 +21,9 @@ Based on [ImageOptim.app](http://imageoptim.com/).
 
 ## Gem installation
 
-    gem install image_optim
+```sh
+gem install image_optim
+```
 
 ## Binaries location
 
@@ -52,37 +55,49 @@ Besides permanently setting environment variables in `~/.profile`, `~/.bash_prof
 
 ### Linux - Debian/Ubuntu
 
-    sudo apt-get install -y advancecomp gifsicle jhead jpegoptim libjpeg-progs optipng pngcrush
+```bash
+sudo apt-get install -y advancecomp gifsicle jhead jpegoptim libjpeg-progs optipng pngcrush
+```
 
 ### Linux - RHEL/Fedora/Centos
 
-    sudo yum install -y advancecomp gifsicle jhead libjpeg optipng
+```bash
+sudo yum install -y advancecomp gifsicle jhead libjpeg optipng
+```
 
 You will also need to install `jpegoptim` and `pngcrush` from source:
 
 #### jpegoptim
 
-    cd /tmp
-    curl -O http://www.kokkonen.net/tjko/src/jpegoptim-1.2.4.tar.gz
-    tar zxf jpegoptim-1.2.4.tar.gz
-    cd jpegoptim-1.2.4
-    ./configure && make && make install
+```bash
+cd /tmp
+curl -O http://www.kokkonen.net/tjko/src/jpegoptim-1.3.0.tar.gz
+tar zxf jpegoptim-1.3.0.tar.gz
+cd jpegoptim-1.3.0
+./configure && make && make install
+```
 
 #### pngcrush
 
-    cd /tmp
-    curl -O http://iweb.dl.sourceforge.net/project/pmt/pngcrush/1.7.43/pngcrush-1.7.43.tar.gz
-    tar zxf pngcrush-1.7.43.tar.gz
-    cd pngcrush-1.7.43
-    make && cp -f pngcrush /usr/local/bin
+```bash
+cd /tmp
+curl -O http://iweb.dl.sourceforge.net/project/pmt/pngcrush/1.7.70/pngcrush-1.7.70.tar.gz
+tar zxf pngcrush-1.7.70.tar.gz
+cd pngcrush-1.7.70
+make && cp -f pngcrush /usr/local/bin
+```
 
 ### OS X: Macports
 
-    sudo port install advancecomp gifsicle jhead jpegoptim jpeg optipng pngcrush
+```bash
+sudo port install advancecomp gifsicle jhead jpegoptim jpeg optipng pngcrush
+```
 
 ### OS X: Brew
 
-    brew install advancecomp gifsicle jhead jpegoptim jpeg optipng pngcrush
+```bash
+brew install advancecomp gifsicle jhead jpegoptim jpeg optipng pngcrush
+```
 
 ### pngout installation (optional)
 
@@ -90,47 +105,67 @@ You can install `pngout` by downloading and installing the [binary versions](htt
 
 _Note: pngout is free to use even in commercial soft, but you can not redistribute, repackage or reuse it without consent and agreement of creator. [license](http://advsys.net/ken/utils.htm#pngoutkziplicense)_
 
+### svgo installation (optional)
+
+`svgo` is available from NPM.
+
+```bash
+npm install -g svgo
+```
+
 ## Usage
 
 ### From shell
 
-    image_optim *.{jpg,png,gif}
+```sh
+image_optim *.{jpg,png,gif,svg}
 
-    image_optim -h
+image_optim -h
+```
 
 ### From ruby
 
 Initilize optimizer:
 
-    image_optim = ImageOptim.new
+```ruby
+image_optim = ImageOptim.new
 
-    image_optim = ImageOptim.new(:pngout => false)
+image_optim = ImageOptim.new(:pngout => false)
 
-    image_optim = ImageOptim.new(:nice => 20)
+image_optim = ImageOptim.new(:nice => 20)
+```
 
 Optimize image getting temp path:
 
-    image_optim.optimize_image('a.png')
+```ruby
+image_optim.optimize_image('a.png')
+```
 
 Optimize image in place:
 
-    image_optim.optimize_image!('b.jpg')
+```ruby
+image_optim.optimize_image!('b.jpg')
+```
 
 Optimize image data:
 
-    image_optim.optimize_image_data(data)
+```ruby
+image_optim.optimize_image_data(data)
+```
 
 Multiple images:
 
-    image_optim.optimize_images(Dir['*.png']) do |unoptimized, optimized|
-      if optimized
-        puts "#{unoptimized} => #{optimized}"
-      end
-    end
+```ruby
+image_optim.optimize_images(Dir['*.png']) do |unoptimized, optimized|
+  if optimized
+    puts "#{unoptimized} => #{optimized}"
+  end
+end
 
-    image_optim.optimize_images!(Dir['*.*'])
+image_optim.optimize_images!(Dir['*.*'])
 
-    image_optim.optimize_images_data(datas)
+image_optim.optimize_images_data(datas)
+```
 
 ### From rails
 
@@ -149,10 +184,12 @@ Configuration in YAML format will be read and prepanded to options from two path
 
 Example configuration:
 
-    nice: 20
-    pngout: false # disable
-    optipng:
-      level: 5
+```yaml
+nice: 20
+pngout: false # disable
+optipng:
+  level: 5
+```
 
 ## Options
 

data/image_optim.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.10.2'
-  s.summary     = %q{Optimize (lossless compress) images (jpeg, png, gif) using external utilities (advpng, gifsicle, jpegoptim, jpegtran, optipng, pngcrush, pngout)}
+  s.version     = '0.11.0'
+  s.summary     = %q{Optimize (lossless compress) images (jpeg, png, gif, svg) using external utilities (advpng, gifsicle, jpegoptim, jpegtran, optipng, pngcrush, pngout, svgo)}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']
   s.license     = 'MIT'
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.require_paths = %w[lib]
 
   s.add_dependency 'fspath', '~> 2.1.0'
-  s.add_dependency 'image_size', '~> 1.1.2'
+  s.add_dependency 'image_size', '~> 1.2.0'
   s.add_dependency 'exifr', '~> 1.1.3'
   s.add_dependency 'progress', '~> 3.0.0'
   s.add_dependency 'in_threads', '~> 1.2.0'

data/lib/image_optim/handler.rb

@@ -23,5 +23,13 @@ class ImageOptim
         end
       end
     end
+
+    # Remove extra temp files
+    def cleanup
+      if @dst
+        @dst.unlink
+        @dst = nil
+      end
+    end
   end
 end

data/lib/image_optim/image_path.rb

@@ -43,6 +43,7 @@ class ImageOptim
         src.copy(temp)
         temp.write(read)
         temp.rename(src.to_s)
+        unlink
       end
     end
 

data/lib/image_optim/railtie.rb

@@ -4,7 +4,11 @@ class ImageOptim
   class Railtie < Rails::Railtie
     initializer 'image_optim.initializer' do |app|
       if app.config.assets.compress && app.config.assets.image_optim != false
-        image_optim = ImageOptim.new
+        image_optim = if app.config.assets.image_optim == true
+                        ImageOptim.new
+                      else
+                        ImageOptim.new(app.config.assets.image_optim || {})
+                      end
 
         processor = proc do |context, data|
           image_optim.optimize_image_data(data) || data
@@ -13,6 +17,7 @@ class ImageOptim
         app.assets.register_preprocessor 'image/gif', :image_optim, &processor
         app.assets.register_preprocessor 'image/jpeg', :image_optim, &processor
         app.assets.register_preprocessor 'image/png', :image_optim, &processor
+        app.assets.register_preprocessor 'image/svg+xml', :image_optim, &processor
       end
     end
   end

data/lib/image_optim/worker/svgo.rb

@@ -0,0 +1,12 @@
+require 'image_optim/worker'
+
+class ImageOptim
+  class Worker
+    class Svgo < Worker
+      def optimize(src, dst)
+        args = %W[-i #{src} -o #{dst}]
+        execute(:svgo, *args) && optimized?(src, dst)
+      end
+    end
+  end
+end

data/lib/image_optim/worker.rb

@@ -52,7 +52,7 @@ 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 = self.class.name.downcase[/gif|jpeg|png|svg/]
       raise "#{self.class}: can't guess applicable format from worker name" unless format_from_name
       [format_from_name.to_sym]
     end

data/lib/image_optim.rb

@@ -75,6 +75,7 @@ class ImageOptim
           worker.optimize(src, dst)
         end
       end
+      handler.cleanup
       if handler.result
         ImagePath::Optimized.new(handler.result, original)
       end
@@ -182,6 +183,7 @@ end
   pngcrush pngout optipng advpng
   jhead jpegoptim jpegtran
   gifsicle
+  svgo
 ].each do |worker|
   require "image_optim/worker/#{worker}"
 end

data/spec/image_optim/handler_spec.rb

@@ -40,5 +40,9 @@ describe ImageOptim::Handler do
       [src, dst].should == [temp_a, temp_b]; true
     end
     handler.result.should == temp_b
+
+    temp_a.should_receive(:unlink).once
+    handler.cleanup
+    handler.cleanup
   end
 end

data/spec/images/test.svg

@@ -0,0 +1,3 @@
+<svg width="1in" height="100" xmlns="http://www.w3.org/2000/svg">
+	<circle cx="36" cy="50" r="30" stroke="black" stroke-width="10" fill="red" />
+</svg>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-25 00:00:00.000000000 Z
+date: 2014-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: exifr
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +130,7 @@ files:
 - lib/image_optim/worker/optipng.rb
 - lib/image_optim/worker/pngcrush.rb
 - lib/image_optim/worker/pngout.rb
+- lib/image_optim/worker/svgo.rb
 - script/update_worker_options_in_readme
 - spec/image_optim/bin_resolver_spec.rb
 - spec/image_optim/config_spec.rb
@@ -153,6 +154,7 @@ files:
 - spec/images/orient/8.jpg
 - spec/images/orient/generate
 - spec/images/orient/original.jpg
+- spec/images/test.svg
 - spec/images/transparency1.png
 - spec/images/transparency2.png
 - spec/images/vergroessert.jpg
@@ -180,8 +182,8 @@ rubyforge_project: image_optim
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Optimize (lossless compress) images (jpeg, png, gif) using external utilities
-  (advpng, gifsicle, jpegoptim, jpegtran, optipng, pngcrush, pngout)
+summary: Optimize (lossless compress) images (jpeg, png, gif, svg) using external
+  utilities (advpng, gifsicle, jpegoptim, jpegtran, optipng, pngcrush, pngout, svgo)
 test_files:
 - spec/image_optim/bin_resolver_spec.rb
 - spec/image_optim/config_spec.rb
@@ -205,6 +207,7 @@ test_files:
 - spec/images/orient/8.jpg
 - spec/images/orient/generate
 - spec/images/orient/original.jpg
+- spec/images/test.svg
 - spec/images/transparency1.png
 - spec/images/transparency2.png
 - spec/images/vergroessert.jpg