Merge pull request #2810 from refinery/refactored-image-fu-to-prevent…

…-bugs

Refactored image_fu helper to only use geometry when not nil.

core/app/helpers/refinery/image_helper.rb

@@ -21,14 +21,15 @@ def content_fu(content, thumbnail)
     # and we wanted to display a thumbnail cropped to 200x200 then we can use image_fu like this:
     # <%= image_fu @model.image, '200x200' %> or with no thumbnail: <%= image_fu @model.image %>
     def image_fu(image, geometry = nil, options = {})
-      if image.present?
-        dimensions = (image.thumbnail_dimensions(geometry) rescue {})
+      return nil if image.blank?
 
-        image_tag(image.thumbnail(:geometry => geometry,
-                                  :strip => options[:strip]).url, {
-          :alt => image.respond_to?(:title) ? image.title : image.image_name,
-        }.merge(dimensions).merge(options))
-      end
+      thumbnail_args = options.slice(:strip)
+      thumbnail_args[:geometry] = geometry if geometry
+
+      image_tag_args = (image.thumbnail_dimensions(geometry) rescue {})
+      image_tag_args[:alt] = image.respond_to?(:title) ? image.title : image.image_name
+
+      image_tag(image.thumbnail(thumbnail_args).url, image_tag_args.merge(options))
     end
   end
 end