FIX: refactor ImageSizer.resize

reverts 140d9c2

app/models/upload.rb

@@ -128,9 +128,7 @@ class Upload < ActiveRecord::Base
       end
 
     self.width, self.height = size = FastImage.new(path).size
-    if !size.blank?
-      self.thumbnail_width, self.thumbnail_height = ImageSizer.resize(*size)
-    end
+    self.thumbnail_width, self.thumbnail_height = ImageSizer.resize(*size)
     nil
   end
 

lib/image_sizer.rb

@@ -1,7 +1,7 @@
 module ImageSizer
 
   # Resize an image to the aspect ratio we want
-  def self.resize(width, height, opts = {})
+  def self.resize(width = nil, height = nil, opts = {})
     return if width.blank? || height.blank?
 
     max_width = (opts[:max_width] || SiteSetting.max_image_width).to_f

spec/components/image_sizer_spec.rb

@@ -24,6 +24,10 @@ describe ImageSizer do
     expect(ImageSizer.resize('100', '101')).to eq([100, 101])
   end
 
+  it 'returns nil if no width or height are provided' do
+    expect(ImageSizer.resize).to eq(nil)
+  end
+
   describe 'when larger than the maximum width' do
 
     before do