fixes #1905

test/factories/upload.rb

@@ -22,6 +22,22 @@ FactoryGirl.define do
       end
     end
 
+    factory(:exif_jpg_upload) do
+      content_type "image/jpeg"
+      file_path do
+        FileUtils.cp("#{Rails.root}/test/files/test-exif-small.jpg", "#{Rails.root}/tmp")
+        "#{Rails.root}/tmp/test-exif-small.jpg"
+      end
+    end
+
+    factory(:blank_jpg_upload) do
+      content_type "image/jpeg"
+      file_path do
+        FileUtils.cp("#{Rails.root}/test/files/test-blank.jpg", "#{Rails.root}/tmp")
+        "#{Rails.root}/tmp/test-blank.jpg"
+      end
+    end
+
     factory(:large_jpg_upload) do
       file_ext "jpg"
       content_type "image/jpeg"

test/unit/upload_test.rb

@@ -69,13 +69,27 @@ class UploadTest < ActiveSupport::TestCase
           assert_equal(756, @upload.image_height)
         end
 
-        should "discover the dimensions for a JPG" do
+        should "discover the dimensions for a JPG with JFIF data" do
           @upload = FactoryGirl.create(:jpg_upload)
           assert_nothing_raised {@upload.calculate_dimensions(@upload.file_path)}
           assert_equal(500, @upload.image_width)
           assert_equal(335, @upload.image_height)
         end
 
+        should "discover the dimensions for a JPG with EXIF data" do
+          @upload = FactoryGirl.create(:exif_jpg_upload)
+          assert_nothing_raised {@upload.calculate_dimensions(@upload.file_path)}
+          assert_equal(529, @upload.image_width)
+          assert_equal(600, @upload.image_height)
+        end
+
+        should "discover the dimensions for a JPG with no header data" do
+          @upload = FactoryGirl.create(:blank_jpg_upload)
+          assert_nothing_raised {@upload.calculate_dimensions(@upload.file_path)}
+          assert_equal(668, @upload.image_width)
+          assert_equal(996, @upload.image_height)
+        end
+
         should "discover the dimensions for a PNG" do
           @upload = FactoryGirl.create(:png_upload)
           assert_nothing_raised {@upload.calculate_dimensions(@upload.file_path)}