image-optimizer 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/image-optimizer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "image-optimizer"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Koz\u{e1}k"]
-  s.date = "2012-08-05"
+  s.date = "2012-08-06"
   s.email = "martinkozak@martinkozak.net"
   s.executables = ["image-optimizer"]
   s.extra_rdoc_files = [

data/lib/image-optimizer.rb

@@ -9,28 +9,36 @@ module ImageOptimizer
   
     ##
     # Indicates, callback is called before the optimization.
+    #
     # @var [Symbol]
+    # @since 0.2
     #
     
     BEFORE = :before
   
     ##
     # Indicates, callback is called before the optimization.
+    #
     # @var [Symbol]
+    # @since 0.2
     #
     
     AFTER = :after
     
     ##
     # Indicates, callback returns the method.
+    #
     # @var [Symbol]
+    # @since 0.2
     #
     
     METHOD = :method
         
     ##
     # Optimizers availiability cache.
+    #
     # @var [Hash]
+    # @since 0.2
     # 
     
     @optimizers
@@ -103,6 +111,7 @@ module ImageOptimizer
     #
     # @param [Symbol, String] command  command name
     # @return [Boolean]
+    # @since 0.2
     #
     
     def self.available?(command)

data/lib/image-optimizer/jpeg.rb

@@ -1,28 +1,31 @@
 # encoding: utf-8
 # (c) 2012 Martin Kozák (martinkozak@martinkozak.net)
 
+require "shellwords"
+
 module ImageOptimizer
 
     ##
     # JPEG optimizing module.
-    # @since 1.0
+    # @since 0.2
     #
     
     module Jpeg
         
         def self.optimize(path, &block)
+            path_escaped = Shellwords::escape(path)
             
             # calls back
             block.call(path.dup, ImageOptimizer::BEFORE)
             
             if ImageOptimizer.available? :jpegoptim
                 block.call(:jpegoptim, ImageOptimizer::METHOD)
-                `jpegoptim --strip-all #{path} 2> /dev/null`
+                `jpegoptim --strip-all #{path_escaped} 2> /dev/null`
             end
             
             if ImageOptimizer.available? :jpegtran
                 block.call(:jpegtran, ImageOptimizer::METHOD)
-                `jpegtran -arithmetic -optimize -progressive -copy none #{path} 2> /dev/null`
+                `jpegtran -arithmetic -optimize -progressive -copy none #{path_escaped} 2> /dev/null`
             end
             
             # calls back

data/lib/image-optimizer/png.rb

@@ -4,17 +4,19 @@
 require "hash-utils"
 require "fileutils"
 require "tmpdir"
+require "shellwords"
 
 module ImageOptimizer
   
     ##
     # PNG optimizing module.
-    # @since 1.0
+    # @since 0.2
     #
     
     module Png
         
         def self.optimize(path, &block)
+            path_escaped = Shellwords::escape(path)
           
             # calls back
             block.call(path.dup, ImageOptimizer::BEFORE)
@@ -41,7 +43,7 @@ module ImageOptimizer
 
                 # xcf2png
                 block.call(:xcf2png, ImageOptimizer::METHOD)
-                `xcf2png #{xcf_path} > #{png_path} 2> /dev/null`
+                `xcf2png #{Shellwords::escape(xcf_path)} > #{Shellwords::escape(png_path)} 2> /dev/null`
                 FileUtils.rm(xcf_path)
                 
                 if protect
@@ -51,16 +53,17 @@ module ImageOptimizer
             # Old method (ImageMagick)
             elsif ImageOptimizer.available? :convert
                 block.call(:convert, ImageOptimizer::METHOD)
-                `convert #{path} -quality 100 #{path} 2> /dev/null`
+                `convert #{path_escaped} -quality 100 #{path_escaped} 2> /dev/null`
             end
 
             # General optimizers
-            if ImageOptimizer.available? :pngcrush
-                block.call(:pngcrush, ImageOptimizer::METHOD)
-                `pngcrush -reduce -brute -ow #{path} 2> /dev/null`
-            elsif ImageOptimizer.available? :optipng
+            if ImageOptimizer.available? :optipng
                 block.call(:optipng, ImageOptimizer::METHOD)
-                `optipng -o 7 #{path} 2> /dev/null`
+                `optipng -o 7 #{path_escaped} 2> /dev/null`
+            elsif ImageOptimizer.available? :pngcrush
+                block.call(:pngcrush, ImageOptimizer::METHOD)
+                `pngcrush -reduce -brute -ow #{path_escaped} 2> /dev/null`
+
             end            
           
             # calls back

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image-optimizer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-05 00:00:00.000000000 Z
+date: 2012-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaop
@@ -128,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3356677403226077411
+      hash: 4132611269577949455
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: