image_optim 0.2.1 → 0.3.0

data/bin/image_optim

@@ -48,14 +48,61 @@ if ARGV.empty?
   abort "specify image paths to optimize\n\n#{option_parser.help}"
 else
   io = ImageOptim.new(options)
-  paths = ARGV
+  paths = ARGV.reject do |arg|
+    unless File.file?(arg)
+      $stderr << "WARN: #{arg} is not a file\n"
+    end
+  end
   paths = paths.with_progress('optimizing') if paths.length > 1
 
-  lines = paths.map do |path|
-    before = File.size(path)
-    result = io.optimize_image!(path)
-    after = File.size(path)
-    "#{result ? '%5.2f%%' % (100.0 * after / before) : '--.--%'}  #{path}"
+  module Space
+    SIZE_SYMBOLS = %w[B K M G T P E Z Y].freeze
+    PRECISION = 1
+    LENGTH = 4 + PRECISION + 1
+    COEF = 1 / Math.log(10)
+
+    EMPTY_SPACE = ' ' * LENGTH
+    NOT_COUNTED_SPACE = '!' * LENGTH
+
+    class << self
+      attr_writer :base10
+      def denominator
+        @denominator ||= @base10 ? 1000.0 : 1024.0
+      end
+
+      def space(size, options = {})
+        case size
+        when false
+          NOT_COUNTED_SPACE.bold.red
+        when 0, nil
+          EMPTY_SPACE
+        else
+          number, degree = size, 0
+          while number.abs >= 1000 && degree < SIZE_SYMBOLS.length - 1
+            number /= denominator
+            degree += 1
+          end
+
+          "#{degree == 0 ? number.to_s : "%.#{PRECISION}f" % number}#{SIZE_SYMBOLS[degree]}".rjust(LENGTH)
+        end
+      end
+    end
+  end
+
+  def size_percent(src_size, dst_size)
+    '%5.2f%% %s' % [100 - 100.0 * dst_size / src_size, Space.space(src_size - dst_size)]
+  end
+
+  results = io.optimize_images(paths) do |src, dst|
+    if dst
+      src_size, dst_size = src.size, dst.size
+      percent = size_percent(src_size, dst_size)
+      dst.replace(src)
+      ["#{percent}  #{src}", src_size, dst_size]
+    else
+      ["------ #{Space::EMPTY_SPACE}  #{src}", src.size, src.size]
+    end
   end
-  puts lines
+  lines, src_sizes, dst_sizes = results.transpose
+  $stdout.puts lines, "Total: #{size_percent(src_sizes.inject(:+), dst_sizes.inject(:+))}\n"
 end

data/image_optim.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.2.1'
+  s.version     = '0.3.0'
   s.summary     = %q{Optimize 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']

data/lib/image_optim.rb

@@ -94,33 +94,23 @@ class ImageOptim
   def optimize_image!(original)
     original = ImagePath.new(original)
     if result = optimize_image(original)
-      original.temp_path(original.dirname) do |temp|
-        original.copy(temp)
-        temp.write(result.read)
-        temp.rename(original)
-      end
+      result.replace(original)
       true
     end
   end
 
-  # Optimize multiple images, returning list of results
-  # yields path and result if block given
-  def optimize_images(paths)
-    apply_threading(paths).map do |path|
-      result = optimize_image(path)
-      yield path, result if block_given?
-      result
-    end
+  # Optimize multiple images
+  # if block given yields path and result for each image and returns array of yield results
+  # else return array of results
+  def optimize_images(paths, &block)
+    run_method_for(paths, :optimize_image, &block)
   end
 
-  # Optimize multiple images in place, returning list of results
-  # yields path and result if block given
-  def optimize_images!(paths)
-    apply_threading(paths).map do |path|
-      result = optimize_image!(path)
-      yield path, result if block_given?
-      result
-    end
+  # Optimize multiple images in place
+  # if block given yields path and result for each image and returns array of yield results
+  # else return array of results
+  def optimize_images!(paths, &block)
+    run_method_for(paths, :optimize_image!, &block)
   end
 
   # Optimization methods with default options
@@ -138,8 +128,21 @@ class ImageOptim
 
 private
 
+  def run_method_for(paths, method_name, &block)
+    method = method(method_name)
+    apply_threading(paths).map do |path|
+      path = ImagePath.new(path)
+      result = method.call(path)
+      if block
+        block.call(path, result)
+      else
+        result
+      end
+    end
+  end
+
   def apply_threading(array)
-    if threads > 1 && array.length > 1
+    if threads > 1
       array.in_threads(threads)
     else
       array

data/lib/image_optim/image_path.rb

@@ -14,6 +14,16 @@ class ImageOptim
       FileUtils.copy_file(self, dst, true)
     end
 
+    # Atomic replace src with self
+    def replace(src)
+      src = self.class.new(src)
+      src.temp_path(src.dirname) do |temp|
+        src.copy(temp)
+        temp.write(read)
+        temp.rename(src)
+      end
+    end
+
     # Get format using ImageSize
     def format
       open{ |f| ImageSize.new(f) }.format

data/spec/image_optim_spec.rb

@@ -8,12 +8,8 @@ image_dir = spec_dir / 'images'
 def temp_copy_path(original)
   original.class.temp_dir do |dir|
     temp_path = dir / original.basename
-    begin
-      original.copy(temp_path)
-      yield temp_path
-    ensure
-      temp_path.unlink if temp_path.exist?
-    end
+    original.copy(temp_path)
+    yield temp_path
   end
 end
 
@@ -117,4 +113,45 @@ describe ImageOptim do
       end
     end
   end
+
+  describe "optimize multiple" do
+    let(:srcs){ ('a'..'z').to_a }
+
+    before do
+      srcs.each do |src|
+        ImageOptim::ImagePath.should_receive(:new).with(src).and_return(src)
+      end
+    end
+
+    %w[optimize_images optimize_images!].each do |list_method|
+      single_method = list_method.sub('images', 'image')
+      describe "without block" do
+        it "should optimize images and return array of results" do
+          io = ImageOptim.new
+          dsts = []
+          srcs.each do |src|
+            dst = "#{src}_"
+            io.should_receive(single_method).with(src).and_return(dst)
+            dsts << dst
+          end
+          io.send(list_method, srcs).should == dsts
+        end
+      end
+
+      describe "given block" do
+        it "should optimize images, yield path and result for each and return array of yield results" do
+          io = ImageOptim.new
+          srcs.each do |src|
+            io.should_receive(single_method).with(src).and_return("#{src}_")
+          end
+          results = []
+          io.send(list_method, srcs) do |src, dst|
+            result = "#{src} #{dst}"
+            results << "#{src} #{dst}"
+            result
+          end.should == results
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: image_optim
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ivan Kuchin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-10 00:00:00 Z
+date: 2012-01-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fspath