image_optim 0.1.0 → 0.2.0

data/image_optim.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.1.0'
+  s.version     = '0.2.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']
@@ -15,7 +15,7 @@ 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.1'
+  s.add_dependency 'fspath', '~> 2.0.3'
   s.add_dependency 'image_size', '~> 1.0.4'
   s.add_dependency 'progress', '~> 2.4.0'
   s.add_dependency 'in_threads', '~> 1.1.1'

data/lib/image_optim/worker.rb

@@ -44,13 +44,8 @@ class ImageOptim
     end
 
     # Optimize file, return new path or nil if optimization failed
-    def optimize(src)
-      dst = src.temp_path
-      if Util.run bin, *command_args(src, dst)
-        if dst.size? && dst.size < src.size
-          dst
-        end
-      end
+    def optimize(src, dst)
+      Util.run(bin, *command_args(src, dst)) && dst.size? && dst.size < src.size
     end
 
     # Name of binary determined from class name

data/lib/image_optim.rb

@@ -43,11 +43,11 @@ class ImageOptim
       end
       worker = klass.new(worker_options)
       klass.image_formats.each do |format|
-        workers_by_format[format] ||= []
-        workers_by_format[format] << worker
+        @workers_by_format[format] ||= []
+        @workers_by_format[format] << worker
       end
     end
-    workers_by_format.each do |format, workers|
+    @workers_by_format.each do |format, workers|
       workers.replace workers.sort_by(&:run_priority)
     end
 
@@ -64,14 +64,29 @@ class ImageOptim
     assert_options_empty!(options)
   end
 
+  # Get workers for image
+  def workers_for_image(path)
+    @workers_by_format[ImagePath.new(path).format]
+  end
+
   # Optimize one file, return new path or nil if optimization failed
   def optimize_image(original)
     original = ImagePath.new(original)
-    if workers = workers_by_format[original.format]
-      result = workers.inject(original) do |current, worker|
-        worker.optimize(current) || current
+    if workers = workers_for_image(original)
+      result = nil
+      ts = [original, original.temp_path]
+      workers.each do |worker|
+        if result && ts.length < 3
+          ts << original.temp_path
+        end
+        if worker.optimize(*ts.last(2))
+          result = ts.last
+          if ts.length == 3
+            ts[-2, 2] = ts[-1], ts[-2]
+          end
+        end
       end
-      result == original ? nil : result
+      result
     end
   end
 

data/spec/image_optim_spec.rb

@@ -17,26 +17,68 @@ def temp_copy_path(original)
   end
 end
 
+Tempfile.class_eval do
+  alias_method :initialize_orig, :initialize
+
+  def initialize(*args, &block)
+    self.class.initialize_called
+    initialize_orig(*args, &block)
+  end
+
+  def self.initialize_called
+    @@call_count ||= 0
+    @@call_count += 1
+  end
+
+  def self.reset_call_count
+    @@call_count = 0
+  end
+
+  def self.call_count
+    @@call_count
+  end
+end
+
+Fixnum.class_eval do
+  def in_range?(range)
+    range.include?(self)
+  end
+end
+
 describe ImageOptim do
   image_dir.glob('*') do |original|
     describe "optimizing #{original}" do
       it "should optimize image" do
         temp_copy_path(original) do |unoptimized|
-          optimized = ImageOptim.optimize_image(unoptimized)
+          Tempfile.reset_call_count
+          io = ImageOptim.new
+          optimized = io.optimize_image(unoptimized)
           optimized.should be_a(FSPath)
           unoptimized.read.should == original.read
           optimized.size.should > 0
           optimized.size.should < unoptimized.size
           optimized.read.should_not == unoptimized.read
+          if io.workers_for_image(unoptimized).length > 1
+            Tempfile.call_count.should be_in_range(1..2)
+          else
+            Tempfile.call_count.should === 1
+          end
         end
       end
 
       it "should optimize image in place" do
         temp_copy_path(original) do |path|
-          ImageOptim.optimize_image!(path).should be_true
+          Tempfile.reset_call_count
+          io = ImageOptim.new
+          io.optimize_image!(path).should be_true
           path.size.should > 0
           path.size.should < original.size
           path.read.should_not == original.read
+          if io.workers_for_image(path).length > 1
+            Tempfile.call_count.should be_in_range(2..3)
+          else
+            Tempfile.call_count.should === 2
+          end
         end
       end
 
@@ -58,7 +100,9 @@ describe ImageOptim do
 
     it "should ignore" do
       temp_copy_path(original) do |unoptimized|
+        Tempfile.reset_call_count
         optimized = ImageOptim.optimize_image(unoptimized)
+        Tempfile.call_count.should == 0
         optimized.should be_nil
         unoptimized.read.should == original.read
       end
@@ -66,7 +110,9 @@ describe ImageOptim do
 
     it "should ignore in place" do
       temp_copy_path(original) do |unoptimized|
+        Tempfile.reset_call_count
         ImageOptim.optimize_image!(unoptimized).should_not be_true
+        Tempfile.call_count.should == 0
         unoptimized.read.should == original.read
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: image_optim
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ivan Kuchin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-09 00:00:00 Z
+date: 2012-01-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fspath
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 9
         segments: 
         - 2
         - 0
-        - 1
-        version: 2.0.1
+        - 3
+        version: 2.0.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency