uploadcolumn 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/upload_column/manipulators/rmagick.rb

@@ -1,16 +1,16 @@
 module UploadColumn
-  
+
   UploadError = Class.new(StandardError) unless defined?(UploadError)
   ManipulationError = Class.new(UploadError) unless defined?(ManipulationError)
-  
+
   module Manipulators
-    
+
     module RMagick
-      
+
       def load_manipulator_dependencies #:nodoc:
         require 'RMagick'
       end
-      
+
       def process!(instruction = nil, &block)
         if instruction.is_a?(Proc)
           manipulate!(&instruction)
@@ -21,7 +21,7 @@ module UploadColumn
         end
         manipulate!(&block) if block
       end
-      
+
       # Convert the image to format
       def convert!(format)
         manipulate! do |img|
@@ -29,14 +29,18 @@ module UploadColumn
           img
         end
       end
-      
+
       # Resize the image so that it will not exceed the dimensions passed
       # via geometry, geometry should be a string, formatted like '200x100' where
       # the first number is the height and the second is the width
       def resize!( geometry )
         manipulate! do |img|
           img.change_geometry( geometry ) do |c, r, i|
-            i.resize(c,r)
+            if i.rows > c || i.columns > r
+              i.resize(c,r)
+            else
+              i
+            end
           end
         end
       end
@@ -50,10 +54,10 @@ module UploadColumn
           img.crop_resized(h.to_i,w.to_i)
         end
       end
-      
+
       def manipulate!
         image = ::Magick::Image.read(self.path)
-        
+
         if image.size > 1
           list = ::Magick::ImageList.new
           image.each do |frame|
@@ -67,9 +71,10 @@ module UploadColumn
         # this is a more meaningful error message, which we could catch later
         raise ManipulationError.new("Failed to manipulate with rmagick, maybe it is not an image? Original Error: #{e}")
       end
-      
+
     end
-    
+
   end
-  
-end
+
+end
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Dave Hrycyszyn
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-19 00:00:00 +00:00
+date: 2010-03-20 00:00:00 +00:00
 default_executable: 
 dependencies: []