image_squeeze 0.1.4 → 0.1.5

data/lib/image_squeeze.rb

@@ -23,7 +23,7 @@ class ImageSqueeze
   attr_reader :processors
   attr_reader :tmpdir
   
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
   
   # Image Types
   GIF = 'gif'

data/lib/image_squeeze/image_identifier.rb

@@ -17,8 +17,13 @@ class ImageSqueeze
     
   end
 
+  def self.transparent?(filename)
+    `identify -format "%A %r" #{filename} 2> /dev/null`.split(' ').first == 'True'
+  end
+
   private
   def self.identified_format(filename)
     `identify -format %m #{filename} 2> /dev/null`
   end
+  
 end

data/lib/image_squeeze/processors/png_to_non_progressive_jpeg_processor.rb

@@ -9,6 +9,11 @@ class ImageSqueeze
     end
     
     def self.squeeze(filename, output_filename)
+      if ImageSqueeze.transparent?(filename)
+        FileUtils.cp(filename, output_filename)
+        return
+      end
+      
       intermediate_tmp_filename = "%s-%s" % [output_filename, '.tmp']
       
       system("convert #{filename} JPG:#{intermediate_tmp_filename} 2> /dev/null")

data/lib/image_squeeze/processors/png_to_progressive_jpeg_processor.rb

@@ -9,6 +9,11 @@ class ImageSqueeze
     end
     
     def self.squeeze(filename, output_filename)
+      if ImageSqueeze.transparent?(filename)
+        FileUtils.cp(filename, output_filename)
+        return
+      end
+      
       intermediate_tmp_filename = "%s-%s" % [output_filename, '.tmp']
       
       system("convert #{filename} JPG:#{intermediate_tmp_filename} 2> /dev/null")

data/test/functional/default_processors_test.rb

@@ -46,12 +46,21 @@ class DefaultProcessorsTest < Test::Unit::TestCase
   end
   
   def test_png_to_progressive_jpg
-    assert_processor_optimizes_file(ImageSqueeze::PNGToProgressiveJPEGProcessor, 'better_as_jpg.png')
+    assert_processor_optimizes_file(ImageSqueeze::PNGToProgressiveJPEGProcessor, 'png_without_transparency.png')
+  end
+
+  def test_png_to_progressive_jpg_doesnt_convert_png_with_transparency
+    assert_processor_doesnt_optimize_file(ImageSqueeze::PNGToProgressiveJPEGProcessor, 'png_with_transparency.png')
   end
 
   def test_png_to_non_progressive_jpg
-    assert_processor_optimizes_file(ImageSqueeze::PNGToProgressiveJPEGProcessor, 'better_as_jpg.png')
+    assert_processor_optimizes_file(ImageSqueeze::PNGToNonProgressiveJPEGProcessor, 'png_without_transparency.png')
   end
+  
+  def test_png_to_non_progressive_jpg_doesnt_convert_png_with_transparency
+    assert_processor_doesnt_optimize_file(ImageSqueeze::PNGToNonProgressiveJPEGProcessor, 'png_with_transparency.png')
+  end
+
 
   private
   def assert_processor_optimizes_file(processor, file)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: image_squeeze
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Andrew Grim
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-16 00:00:00 Z
+date: 2012-07-17 00:00:00 Z
 dependencies: []
 
 description: a library for automated lossless image optimization
@@ -45,11 +45,12 @@ files:
 - test/fixtures/already_optimized_gif.gif
 - test/fixtures/already_optimized_jpg.jpg
 - test/fixtures/already_optimized_png.png
-- test/fixtures/better_as_jpg.png
 - test/fixtures/better_as_progressive.jpg
 - test/fixtures/better_without_progressive.jpg
 - test/fixtures/gif.gif.gif.gif
 - test/fixtures/mislabeled_gif.png
+- test/fixtures/png_with_transparency.png
+- test/fixtures/png_without_transparency.png
 - test/fixtures/textfile.txt
 - test/fixtures/unoptimized_animated_gif.gif
 - test/fixtures/unoptimized_gif.gif