0
@@ -8,6 +8,7 @@ Tempfile.class_eval do
0
   end
0
 end
0
 
0
+require 'geometry'
0
 ActiveRecord::Base.send(:extend, Technoweenie::AttachmentFu::ActMethods)
0
 Technoweenie::AttachmentFu.tempfile_path = ATTACHMENT_FU_TEMPFILE_PATH if Object.const_defined?(:ATTACHMENT_FU_TEMPFILE_PATH)
0
 FileUtils.mkdir_p Technoweenie::AttachmentFu.tempfile_path
0
\ No newline at end of file

0
@@ -1,6 +1,6 @@
0
 module Technoweenie # :nodoc:
0
   module AttachmentFu # :nodoc:
0
-    @@default_processors = %w(Rmagick ImageScience)
0
+    @@default_processors = %w(ImageScience Rmagick)
0
     @@tempfile_path      = File.join(RAILS_ROOT, 'tmp', 'attachment_fu')
0
     @@content_types      = ['image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png']
0
     mattr_reader :content_types, :tempfile_path, :default_processors

0
@@ -19,17 +19,30 @@ module Technoweenie # :nodoc:
0
           def process_attachment_with_processing
0
             return unless process_attachment_without_processing || !image?
0
             with_image { |img| resize_image_or_thumbnail! img }
0
-            with_image do |img|
0
+          end
0
+
0
+          # Performs the actual resizing operation for a thumbnail
0
+          def resize_image(img, size)
0
+            # create a dummy temp file to write to
0
+            self.temp_path = write_to_temp_file(filename)
0
+            grab_dimensions = lambda do |img|
0
               self.width  = img.width  if respond_to?(:width)
0
               self.height = img.height if respond_to?(:height)
0
+              img.save temp_path
0
               callback_with_args :after_resize, img
0
             end
0
-          end
0
 
0
-          # Performs the actual resizing operation for a thumbnail
0
-          def resize_image(img, size)
0
-            self.temp_path = write_to_temp_file('foo')
0
-            img.thumbnail(temp_path, (size.is_a?(Array) ? size.first : size).to_i)
0
+            size = size.first if size.is_a?(Array) && size.length == 1
0
+            if size.is_a?(Fixnum) || (size.is_a?(Array) && size.first.is_a?(Fixnum))
0
+              if size.is_a?(Fixnum)
0
+                img.thumbnail(size, &grab_dimensions)
0
+              else
0
+                img.resize(size[0], size[1], &grab_dimensions)
0
+              end
0
+            else
0
+              new_size = [img.width, img.height] / size.to_s
0
+              img.resize(new_size[0], new_size[1], &grab_dimensions)
0
+            end
0
           end
0
       end
0
     end

0
@@ -83,9 +83,10 @@ class MinimalAttachment < ActiveRecord::Base
0
   end
0
 end
0
 
0
-class ImageScienceAttachment < ActiveRecord::Base
0
-  if Object.const_defined?(:ImageScience)
0
+begin
0
+  class ImageScienceAttachment < ActiveRecord::Base
0
     has_attachment :file_system_path => 'vendor/plugins/attachment_fu/test/files',
0
-      :processor => :image_science, :thumbnails => { :thumb => [50, 50], :geometry => '53>', :width => 40 }, :resize_to => [55,55]
0
+      :processor => :image_science, :thumbnails => { :thumb => [50, 51], :geometry => '31>' }, :resize_to => 55
0
   end
0
-end
0
+rescue MissingSourceFile
0
+end
0
\ No newline at end of file

0
@@ -1,5 +1,5 @@
0
 require 'test/unit'
0
-require File.expand_path(File.join(File.dirname(__FILE__), '../lib/geometry'))
0
+require File.expand_path(File.join(File.dirname(__FILE__), '../lib/geometry')) unless Object.const_defined?(:Geometry)
0
 
0
 class GeometryTest < Test::Unit::TestCase
0
   def test_should_resize

0
@@ -8,21 +8,20 @@ class ImageScienceTest < Test::Unit::TestCase
0
       attachment = upload_file :filename => '/files/rails.png'
0
       assert_valid attachment
0
       assert attachment.image?
0
+      # test image science thumbnail
0
       assert_equal 43, attachment.width
0
       assert_equal 55, attachment.height
0
       
0
       thumb      = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
0
       geo        = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
0
-      width      = attachment.thumbnails.detect { |t| t.filename =~ /_width/ }
0
       
0
-      assert_equal 39, thumb.width
0
-      assert_equal 50, thumb.height
0
-    
0
-      assert_equal 41, geo.width
0
-      assert_equal 53, geo.height
0
-    
0
-      assert_equal 31, width.width
0
-      assert_equal 40, width.height
0
+      # test exact resize dimensions
0
+      assert_equal 50, thumb.width
0
+      assert_equal 51, thumb.height
0
+      
0
+      # test geometry string
0
+      assert_equal 31, geo.width
0
+      assert_equal 40, geo.height
0
     end
0
   else
0
     def test_flunk