Merge branch '919_more_sensible_download_error_message' of git://gith…

…ub.com/rezwyi/carrierwave
mdesantis · Jan 6, 2013 · d86a74b · d86a74b
2 parents 21cea48 + fcbbfb3
commit d86a74b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/carrierwave/uploader/download.rb b/lib/carrierwave/uploader/download.rb
@@ -37,8 +37,8 @@ def file
           end
           @file
 
-        rescue
-          raise CarrierWave::DownloadError, "could not download file"
+        rescue Exception => e
+          raise CarrierWave::DownloadError, "could not download file cause: #{e.message}"
         end
 
         def method_missing(*args, &block)

diff --git a/spec/uploader/download_spec.rb b/spec/uploader/download_spec.rb
@@ -102,6 +102,12 @@
       @uploader.url.should == '/uploads/tmp/20071201-1234-345-2255/test.jpg'
     end
 
+    it 'should not obscure original exception message' do
+      expect {
+        @uploader.download!('http://www.example.com/missing.jpg')
+      }.to raise_error(CarrierWave::DownloadError, 'could not download file cause: 404 ')
+    end
+
     describe '#download! with an extension_white_list' do
       before do
         @uploader_class.class_eval do