image_proc 1.0.3 → 2.0.0

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.0.0 / 2009-01-09
+
+* Make all methods return the destination path only
+
 === 1.0.3 / 2009-01-09
 
 * Ensure the destination path is always returned

data/lib/image_proc.rb

@@ -4,12 +4,12 @@ require 'open3'
 # design. Sort of like the Processors in attachment_fu but less. Less.
 #
 #    width, height = ImageProc.get_bounds("image.png")
-#    thumb_filename = ImageProc.resize("image.png", "thumb.png", :width => 50. :height => 50)
+#    destination_path = ImageProc.resize("image.png", "thumb.png", :width => 50. :height => 50)
 #
 # 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.3'
+  VERSION = '2.0.0'
 
   class Error < RuntimeError; end
   class MissingInput < Error; end
@@ -62,8 +62,8 @@ class ImageProc
     end
   end
   
-  def resize_with_geom_string(from_path, to_path, str) #:nodoc:
-    w, h = opts.scan(/^\d+x\d+$/).to_a.flatten
+  def resize_with_geom_string(from_path, to_path, geom_str) #:nodoc:
+    w, h = geom_str.scan(/^(\d+)x(\d+)$/).to_a.flatten.map{|e| e.to_i }
     resize(from_path, to_path, :width => w, :height => h)
     result_w, result_h = get_bounds(to_path)
     [to_path, result_w, result_h]
@@ -87,7 +87,7 @@ class ImageProc
     if opts[:width] && opts[:height] && opts[:fill]
       resize_fit_fill(from_path, to_path, opts[:width], opts[:height])
     elsif opts[:width] && opts[:height]
-      resize_fit(from_path, to_path, opts[:width], opts[:height])
+      resize_fit_both(from_path, to_path, opts[:width], opts[:height])
     elsif opts[:width]
       resize_fit_width(from_path, to_path, opts[:width])
     elsif opts[:height]
@@ -110,6 +110,7 @@ class ImageProc
     validate_input_output_files(from_path, to_path)
     @target_w, @target_h = to_width, to_height
     resetting_state_afterwards { process_exact }
+    to_path
   end
 
   # Resize an image fitting it into a rect.
@@ -117,6 +118,7 @@ class ImageProc
     validate_input_output_files(from_path, to_path)
     @target_w, @target_h = fit_sizes(get_bounds(from_path), :width => to_width, :height => to_height)
     resetting_state_afterwards { process_exact }
+    to_path
   end
   alias_method :resize_fit, :resize_fit_both
 
@@ -126,6 +128,7 @@ class ImageProc
     
     @target_w, @target_h = fit_sizes get_bounds(from_path), :width => width
     resetting_state_afterwards { process_exact }
+    to_path
   end
 
   # Same as resize_fit_width  
@@ -133,6 +136,7 @@ class ImageProc
     validate_input_output_files(from_path, to_path)
     @target_w, @target_h = fit_sizes(get_bounds(from_path), :height => height)
     resetting_state_afterwards { process_exact }
+    to_path
   end
 
   # Will resize the image so that it's part always fills the rect of +width+ and +height+
@@ -142,6 +146,7 @@ class ImageProc
     validate_input_output_files(from_path, to_path)
     @target_w, @target_h = fit_sizes_with_crop get_bounds(from_path), :height => height, :width => width
     resetting_state_afterwards { process_exact }
+    to_path
   end
   
   # Will fit the passed array of [input_width, input_heitght] proportionally and return an array of
@@ -225,7 +230,6 @@ class ImageProc
     # cleanup any stale ivars and return the path to result and the resulting bounds
     def resetting_state_afterwards
       begin
-        @dest = @dest % [@target_w, @target_h] if File.basename(@dest).include?('%')
         kept = [@dest, @target_w, @target_h]; yield
       ensure
         @source, @dest, @source_w, @dest_w, @source_h, @dest_h = nil

data/test/resize_test_helper.rb

@@ -66,7 +66,7 @@ module ResizeTestHelper
 
     sources.each_with_index do | source, index |
       assert_nothing_raised do
-        path, w, h  = @processor.resize_exact(source, OUTPUTS + '/' + names[index], 65, 65)
+        path  = @processor.resize_exact(source, OUTPUTS + '/' + names[index], 65, 65)
         assert_equal OUTPUTS + '/' + File.basename(source), path, "The proc should return the path to the result as first ret"
       end
       
@@ -79,7 +79,7 @@ module ResizeTestHelper
   def test_resize_fitting_proportionally_into_square
     with_each_horizontal_path_and_name do | source, name |
       assert_nothing_raised do
-        path, w, h  = @processor.resize_fit(source, OUTPUTS + '/' + name, 300, 300)
+        path  = @processor.resize_fit(source, OUTPUTS + '/' + name, 300, 300)
         assert_equal OUTPUTS + '/' + File.basename(source), path, "The proc should return the path to the result as first ret"
       end
       
@@ -100,7 +100,7 @@ module ResizeTestHelper
   def test_fit_square_is_alias_for_proportional_resize
     with_each_horizontal_path_and_name do | source, name |
       assert_nothing_raised do
-        path, w, h  = @processor.resize_fit_square(source, OUTPUTS + '/' + name, 300)
+        path  = @processor.resize_fit_square(source, OUTPUTS + '/' + name, 300)
         assert_equal OUTPUTS + '/' + File.basename(source), path, "The proc should return the path to the result as first ret"
       end
       
@@ -129,24 +129,13 @@ module ResizeTestHelper
          path, w, h  = @processor.resize_fit(source, OUTPUTS + '/' + name, 100, 20)
          assert_equal OUTPUTS + '/' + File.basename(source), path, "The proc should return the path to the result as first ret"
        end
-
+       
        result_p = OUTPUTS + '/' + File.basename(source)
        assert File.exist?(result_p), "#{result_p} should have been created"
        assert_equal [13, 20], get_bounds(result_p), "The image of #{get_bounds(source).join("x")} should have been fit into rect proortionally"
      end
   end
   
-  def test_replaces_wildcards_in_filenames_after_resizing
-    source = INPUTS + '/' + @landscapes[0]
-    with_wildcards = OUTPUTS + '/resized_%dx%d' + File.extname(@landscapes[0])
-    reference_path = with_wildcards % [300, 200]
-    assert_nothing_raised do
-      path, w, h  = @processor.resize_fit(source, with_wildcards, 300, 300)
-      assert_equal path, reference_path, "The wildcards should be replaced with computed width and height and the file saved"
-      assert_equal [300, 200], get_bounds(reference_path)
-    end
-  end
-  
   def test_resize_is_alias_for_fit_with_geometry_string
      with_each_horizontal_path_and_name do | source, name |
        assert_nothing_raised { @processor.resize(source, OUTPUTS + '/' + name, :width => 300, :height => 300) }
@@ -210,8 +199,11 @@ module ResizeTestHelper
       end
       
       result_p = OUTPUTS + '/' + File.basename(source)
-      assert File.exist?(result_p), "#{result_p} should have been created"
-      assert_equal [323, 485], get_bounds(result_p), "The image of #{get_bounds(source).join("x")} should have been fit into width"
+      
+      assert File.exist?(result_p),
+        "#{result_p} should have been created"
+      assert_equal [323, 485], get_bounds(result_p), 
+        "The image of #{get_bounds(source).join("x")} should have been fit into width"
     end
   end
   

data/test/test_image_proc.rb

@@ -3,14 +3,17 @@ require 'fileutils'
 require 'resize_test_helper'
 require 'image_proc'
 
-#class TestQuickProcessViaClassWithGeomString < Test::Unit::TestCase
-#  def test_works
-#    source = File.dirname(__FILE__) + '/input/horizontal.jpg'
-#    dest = File.dirname(__FILE__) + '/output/resized.jpg'
-#    assert_nothing_raised { ImageProc.resize(source, dest, "50x50") }
-#    FileUtils.rm dest
-#  end
-#end
+# This will go away.
+class TestQuickProcessViaClassWithGeomString < Test::Unit::TestCase
+  def test_works
+    source = File.dirname(__FILE__) + '/input/horizontal.jpg'
+    dest = File.dirname(__FILE__) + '/output/resized.jpg'
+    ImageProc.resize_with_geom_string(source, dest, "50x50")
+    assert_equal [50,33], ImageProc.get_bounds(dest)
+  ensure
+    FileUtils.rm(dest) if File.exist?(dest)
+  end
+end
 
 class TestQuickProcessWithOptions < Test::Unit::TestCase
   

metadata

@@ -2,7 +2,7 @@
 name: image_proc
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.3
+  version: 2.0.0
 platform: ruby
 authors: 
 - Julik
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-03 00:00:00 Z
+date: 2011-07-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe