image_proc 1.0.1 → 1.0.2

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.0.2 / 2009-01-09
+
+* Allow nil keys in ImageProc.resize() options and just scrub them.
+
 === 1.0.1 / 2009-01-09
 
 * Remove the old geometry string API

data/lib/image_proc.rb

@@ -9,7 +9,7 @@ require 'open3'
 # The whole idea is: a backend does not have to support cropping (we don't do it), it has only to be able to resize,
 # and a backend should have 2 public methods. That's the game.
 class ImageProc
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 
   class Error < RuntimeError; end
   class MissingInput < Error; end
@@ -64,11 +64,15 @@ class ImageProc
   # Resizes with specific options passed as a hash, and return the destination path to the resized image
   #   ImageProc.resize "/tmp/foo.jpg", "bla.jpg", :width => 120, :height => 30
   def resize(from_path, to_path, opts = {})
-    # raise InvalidOptions,
-    #   "The only allowed options are :width, :height and :fill" if (opts.keys - [:width, :height, :fill]).any?
-    raise InvalidOptions, "Geometry string is no longer supported as argument for resize()" if opts.is_a?(String)
+    if opts.is_a?(String)
+      STDERR.puts "String argument to resize() is really deprecated"
+      w, h = opts.scan(/^\d+x\d+$/).to_a.flatten
+      return resize(from_path, to_path, :width => w, :height => h)
+    end
+    
+    remove_nil_values!(opts)
+    raise InvalidOptions, "The only allowed options are :width, :height and :fill" if (opts.keys - [:width, :height, :fill]).any?
     raise InvalidOptions, "Pass width, height or both" unless (opts.keys & [:width, :height]).any?
-    opts.each_pair { |k,v|  raise InvalidOptions, "#{k.inspect} cannot be set to nil" if v.nil? }
     
     if opts[:width] && opts[:height] && opts[:fill]
       resize_fit_fill(from_path, to_path, opts[:width], opts[:height])
@@ -187,6 +191,11 @@ class ImageProc
   end
   
   private
+  
+    def remove_nil_values!(from_hash)
+      from_hash.keys.map{|k| from_hash.delete(k) if from_hash[k].nil? }
+    end
+    
     def force_keys!(in_hash, *keynames)
       unless (in_hash.keys & keynames).length == keynames.length
         raise Error, "This method requires #{keynames.join(', ')}" 

data/test/test_image_proc.rb

@@ -13,6 +13,7 @@ require 'image_proc'
 #end
 
 class TestQuickProcessWithOptions < Test::Unit::TestCase
+  
   def test_resize_with_options
     source = File.dirname(__FILE__) + '/input/horizontal.jpg'
     dest = File.dirname(__FILE__) + '/output/resized.jpg'
@@ -33,7 +34,7 @@ class TestQuickProcessWithOptions < Test::Unit::TestCase
       opts = {:too => 4, :doo => 10}
       ImageProc.resize(source, dest, opts)
     end
-
+    
     assert_raise(ImageProc::InvalidOptions) do
       source = File.dirname(__FILE__) + '/input/horizontal.jpg'
       dest = File.dirname(__FILE__) + '/output/resized.jpg'
@@ -41,6 +42,19 @@ class TestQuickProcessWithOptions < Test::Unit::TestCase
       ImageProc.resize(source, dest, opts)
     end
   end
+  
+  def test_resize_with_nil_options
+    source = File.dirname(__FILE__) + '/input/horizontal.jpg'
+    dest = File.dirname(__FILE__) + '/output/resized.jpg'
+    opts = {:height => 75, :fill => nil, :width => nil}
+    begin
+      assert_nothing_raised do
+        path = ImageProc.resize(source, dest, opts)
+      end
+    ensure
+      File.unlink(dest) rescue nil
+    end
+  end
 end
 
 class TestEngineAssignmentSticks < Test::Unit::TestCase

metadata

@@ -2,7 +2,7 @@
 name: image_proc
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Julik