Beginning of "!" geometry handling

lib/geometry.rb

@@ -1,9 +1,9 @@
 # This Geometry class was yanked from RMagick.  However, it lets ImageMagick handle the actual change_geometry.
-# Use #new_dimensions_for to get new dimensons
+# Use #new_dimensions_for to get new dimensions
 # Used so I can use spiffy RMagick geometry strings with ImageScience
 class Geometry
-  # ! and @ are removed until support for them is added
-  FLAGS = ['', '%', '<', '>']#, '!', '@']
+  # @ is removed until support for them is added
+  FLAGS = ['', '%', '<', '>', '!']#, '@']
   RFLAGS = { '%' => :percent,
              '!' => :aspect,
              '<' => :>,
@@ -59,6 +59,9 @@ def new_dimensions_for(orig_width, orig_height)
         scale_y = @height.zero? ? @width : @height
         new_width    = scale_x.to_f * (orig_width.to_f  / 100.0)
         new_height   = scale_y.to_f * (orig_height.to_f / 100.0)
+      when :aspect
+        new_width = @width unless @width.nil?
+        new_height = @height unless @height.nil?
       when :<, :>, nil
         scale_factor =
           if new_width.zero? || new_height.zero?

lib/technoweenie/attachment_fu/processors/image_science_processor.rb

@@ -52,7 +52,18 @@ def resize_image(img, size)
               end
             else
               new_size = [img.width, img.height] / size.to_s
-              img.resize(new_size[0], new_size[1], &grab_dimensions)
+              if size.ends_with?('!')
+                aspect = new_size[0].to_f / new_size[1].to_f
+                ih, iw = img.height, img.width
+                w, h = (ih * aspect), (iw / aspect)
+                w = [iw, w].min.to_i
+                h = [ih, h].min.to_i
+                img.with_crop((iw-w)/2, (ih-h)/2, (iw+w)/2, (ih+h)/2) { |crop|
+                  crop.resize(new_size[0], new_size[1], &grab_dimensions)
+                }
+              else
+                img.resize(new_size[0], new_size[1], &grab_dimensions)
+              end
             end
           end
       end

test/geometry_test.rb

@@ -97,6 +97,12 @@ def test_should_resize_with_greater_and_no_height
       "100>" => [50, 64]
   end
 
+  def test_should_resize_with_aspect
+    assert_geometry 50, 64,
+      "35x35!" => [35, 35],
+      "70x70!" => [70, 70]
+  end
+
   protected
     def assert_geometry(width, height, values)
       values.each do |geo, result|

test/test_helper.rb

@@ -1,3 +1,4 @@
+
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 
 ENV['RAILS_ENV'] = 'test'