image_squeeze 0.1.3 → 0.1.4

data/lib/image_squeeze.rb

@@ -16,12 +16,14 @@ require 'image_squeeze/processors/jpeg_tran_non_progressive_processor'
 require 'image_squeeze/processors/gifsicle_processor'
 require 'image_squeeze/processors/gif_to_png_processor'
 require 'image_squeeze/processors/optipng_processor'
+require 'image_squeeze/processors/png_to_progressive_jpeg_processor'
+require 'image_squeeze/processors/png_to_non_progressive_jpeg_processor'
 
 class ImageSqueeze
   attr_reader :processors
   attr_reader :tmpdir
   
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
   
   # Image Types
   GIF = 'gif'
@@ -114,6 +116,8 @@ class ImageSqueeze
     if ImageSqueeze::Utils.image_utility_available?('jpegtran', 'jpeg')
       processors << JPEGTranProgressiveProcessor
       processors << JPEGTranNonProgressiveProcessor
+      processors << PNGToProgressiveJPEGProcessor if ImageSqueeze::Utils.image_utility_available?('convert', 'png')
+      processors << PNGToNonProgressiveJPEGProcessor if ImageSqueeze::Utils.image_utility_available?('convert', 'png')
     end
     processors
   end

data/lib/image_squeeze/processors/png_to_non_progressive_jpeg_processor.rb

@@ -0,0 +1,22 @@
+class ImageSqueeze
+  class PNGToNonProgressiveJPEGProcessor < Processor
+    def self.input_type
+      PNG
+    end
+    
+    def self.output_extension
+      '.jpg'
+    end
+    
+    def self.squeeze(filename, output_filename)
+      intermediate_tmp_filename = "%s-%s" % [output_filename, '.tmp']
+      
+      system("convert #{filename} JPG:#{intermediate_tmp_filename} 2> /dev/null")
+      response = JPEGTranNonProgressiveProcessor.squeeze(intermediate_tmp_filename, output_filename) # run it through PNGCrush afterwards
+      
+      FileUtils.rm(intermediate_tmp_filename) # clean up after ourselves
+      
+      response
+    end
+  end
+end

data/lib/image_squeeze/processors/png_to_progressive_jpeg_processor.rb

@@ -0,0 +1,22 @@
+class ImageSqueeze
+  class PNGToProgressiveJPEGProcessor < Processor
+    def self.input_type
+      PNG
+    end
+    
+    def self.output_extension
+      '.jpg'
+    end
+    
+    def self.squeeze(filename, output_filename)
+      intermediate_tmp_filename = "%s-%s" % [output_filename, '.tmp']
+      
+      system("convert #{filename} JPG:#{intermediate_tmp_filename} 2> /dev/null")
+      response = JPEGTranProgressiveProcessor.squeeze(intermediate_tmp_filename, output_filename) # run it through PNGCrush afterwards
+      
+      FileUtils.rm(intermediate_tmp_filename) # clean up after ourselves
+      
+      response
+    end
+  end
+end

data/test/functional/default_processors_test.rb

@@ -44,18 +44,22 @@ class DefaultProcessorsTest < Test::Unit::TestCase
   def test_gif_to_png_processor_with_unoptimized_gif
     assert_processor_optimizes_file(ImageSqueeze::GIFToPNGProcessor, 'unoptimized_gif.gif')
   end
+  
+  def test_png_to_progressive_jpg
+    assert_processor_optimizes_file(ImageSqueeze::PNGToProgressiveJPEGProcessor, 'better_as_jpg.png')
+  end
 
-  def test_gif_to_png_processor_with_already_optimized_animated_gif
-    assert_processor_doesnt_optimize_file(ImageSqueeze::GIFToPNGProcessor, 'already_optimized_gif.gif')
+  def test_png_to_non_progressive_jpg
+    assert_processor_optimizes_file(ImageSqueeze::PNGToProgressiveJPEGProcessor, 'better_as_jpg.png')
   end
-  
+
   private
   def assert_processor_optimizes_file(processor, file)
     squeezer = ImageSqueeze.new(:processors => [processor])
     filename = fixtures(file)
     old_size = File.size(filename)
     new_filename = squeezer.squeeze!(filename)
-    assert File.size(new_filename) < old_size, "New file size of #{File.size(new_filename)} should be smaller than original of #{old_size}"
+    assert new_filename && File.size(new_filename) < old_size, "New file should be smaller than original of #{old_size}"
   end
   
   def assert_processor_doesnt_optimize_file(processor, file)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: image_squeeze
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Andrew Grim
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 -07:00
-default_executable: 
+date: 2012-07-16 00:00:00 Z
 dependencies: []
 
 description: a library for automated lossless image optimization
@@ -36,6 +35,8 @@ files:
 - lib/image_squeeze/processors/jpeg_tran_progressive_processor.rb
 - lib/image_squeeze/processors/optipng_processor.rb
 - lib/image_squeeze/processors/png_crush_processor.rb
+- lib/image_squeeze/processors/png_to_non_progressive_jpeg_processor.rb
+- lib/image_squeeze/processors/png_to_progressive_jpeg_processor.rb
 - lib/image_squeeze/processors/processor.rb
 - lib/image_squeeze/result.rb
 - lib/image_squeeze/utils.rb
@@ -44,6 +45,7 @@ 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
@@ -63,7 +65,6 @@ files:
 - LICENSE
 - Rakefile
 - README.md
-has_rdoc: true
 homepage: http://github.com/stopdropandrew/image_squeeze
 licenses: []
 
@@ -93,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: a library for automated lossless image optimization