Merge pull request #2113 from tf/auto-orient-images

Auto-orient images when determining dimensions

app/models/pageflow/image_file.rb

@@ -81,6 +81,8 @@ def self.scale_down_to_cover(width, height)
 
     def save_image_dimensions
       geo = Paperclip::Geometry.from_file(attachment.queued_for_write[:original])
+      geo.auto_orient
+
       self.width = geo.width
       self.height = geo.height
     rescue Paperclip::Errors::NotIdentifiedByImageMagickError

spec/state_machines/pageflow/image_and_text_track_processing_state_machine_spec.rb

@@ -37,6 +37,15 @@ module Pageflow
           expect(file.reload.height).to eq(15)
         end
 
+        it 'auto orients image when saving width and heigh' do
+          file = create(:image_file, :uploaded, file_name: '7x15_rotated.jpg')
+
+          file.process
+
+          expect(file.reload.width).to eq(15)
+          expect(file.reload.height).to eq(7)
+        end
+
         it 'sets width and height to nil if image cannot be identified' do
           file = create(:image_file, :uploaded, file_name: 'broken.jpg')