image_squeeze 0.1.1 → 0.1.2

data/lib/image_squeeze.rb

@@ -20,7 +20,7 @@ class ImageSqueeze
   attr_reader :processors
   attr_reader :tmpdir
   
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
   
   # Image Types
   GIF = 'gif'
@@ -85,10 +85,10 @@ class ImageSqueeze
     filename = output_filename = result.filename
     if File.extname(result.filename) != result.output_extension
       output_filename = filename.sub(Regexp.new(Regexp.escape(File.extname(result.filename)) + '$'), result.output_extension)
-      FileUtils.cp(result.output_filename, output_filename)
+      FileUtils.mv(result.output_filename, output_filename)
       FileUtils.rm(result.filename)
     else
-      FileUtils.cp(result.output_filename, result.filename)
+      FileUtils.mv(result.output_filename, result.filename)
     end
     output_filename
   end

data/test/functional/squeeze_test.rb

@@ -45,7 +45,7 @@ class SqueezeTest < Test::Unit::TestCase
     image_squeezer = custom_image_squeezer(AlwaysOptimize)
     filename = fixtures('already_optimized_gif.gif')
     old_size = File.size(filename)
-    result = image_squeezer.squeeze!(filename)
+    image_squeezer.squeeze!(filename)
     
     assert File.size(filename) < old_size
   end
@@ -53,7 +53,7 @@ class SqueezeTest < Test::Unit::TestCase
   def test_squeezebang_removes_old_file_when_extension_is_changed
     image_squeezer = custom_image_squeezer(PNGOutput)
     filename = fixtures('already_optimized_gif.gif')
-    result = image_squeezer.squeeze!(filename)
+    image_squeezer.squeeze!(filename)
     
     assert !File.exists?(filename), "Old file should be gone"
     assert File.exists?(filename.gsub(/\.gif/, '.png')), "New file should exist"
@@ -62,7 +62,7 @@ class SqueezeTest < Test::Unit::TestCase
   def test_squeezebang_handles_changing_extension_when_dot_extension_is_repeated
     image_squeezer = custom_image_squeezer(PNGOutput)
     filename = fixtures('gif.gif.gif.gif')
-    result = image_squeezer.squeeze!(filename)
+    image_squeezer.squeeze!(filename)
     
     assert !File.exists?(filename), "Old file should be gone"
     assert File.exists?(filename.gsub(/\.gif$/, '.png')), "New file should exist"
@@ -72,7 +72,7 @@ class SqueezeTest < Test::Unit::TestCase
     image_squeezer = custom_image_squeezer(AlwaysBigger)
     filename = fixtures('already_optimized_gif.gif')
     old_size = File.size(filename)
-    result = image_squeezer.squeeze!(filename)
+    image_squeezer.squeeze!(filename)
     assert_equal old_size, File.size(filename)
   end
   
@@ -87,6 +87,26 @@ class SqueezeTest < Test::Unit::TestCase
     FileUtils.rm(result.output_filename) if result && result.output_filename && File.exists?(result.output_filename)
   end
   
+  def test_finalize_result_should_remove_old_file_when_extension_doesnt_change
+    image_squeezer = custom_image_squeezer(AlwaysOptimize)
+    filename = fixtures('already_optimized_gif.gif')
+    result = image_squeezer.squeeze(filename)
+
+    assert File.exists?(result.output_filename)
+    image_squeezer.finalize_result(result)
+    assert !File.exists?(result.output_filename)
+  end
+
+  def test_finalize_result_should_remove_old_file_when_extension_changes
+    image_squeezer = custom_image_squeezer(PNGOutput)
+    filename = fixtures('already_optimized_gif.gif')
+    result = image_squeezer.squeeze(filename)
+
+    assert File.exists?(result.output_filename)
+    image_squeezer.finalize_result(result)
+    assert !File.exists?(result.output_filename)
+  end
+  
   private
   class AlwaysOptimize < ImageSqueeze::Processor
     def self.squeeze(filename, output_filename)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Andrew Grim