Merge pull request #34 from Nitrodist/allow-errors-to-bubble-up

Allow errors to bubble up

lib/carrierwave/video.rb

@@ -90,7 +90,8 @@ def with_trancoding_callbacks(&block)
             end
           end
 
-          raise CarrierWave::ProcessingError.new("Failed to transcode with FFmpeg. Check ffmpeg install and verify video is not corrupt or cut short. Original error: #{e}")
+          raise e
+
         ensure
           reset_logger
           send_callback(callbacks[:ensure])

lib/carrierwave/video/ffmpeg_options.rb

@@ -77,7 +77,7 @@ def watermark_params
       private
 
         def defaults
-          @defaults ||= { resolution: '640x360', watermark: {} }.tap do |h|
+          @defaults ||= { resolution: @resolution, watermark: {} }.tap do |h|
             case format
             when 'mp4'
               h[:video_codec] = 'libx264'

spec/lib/carrierwave_video_spec.rb

@@ -103,7 +103,6 @@ def model
         let(:e) { StandardError.new("test error") }
         before { expect(File).to receive(:rename).and_raise(e) }
 
-
         it "calls before_transcode and ensure" do
           expect(converter.model).to receive(:method1).with(format, opts).ordered
           expect(converter.model).not_to receive(:method2)
@@ -112,7 +111,7 @@ def model
 
           expect do
             converter.encode_video(format, opts)
-          end.to raise_exception(CarrierWave::ProcessingError)
+          end.to raise_exception(e.class)
         end
       end
     end
@@ -145,7 +144,7 @@ def model
 
           expect do
             converter.encode_video(format, logger: :logger)
-          end.to raise_exception(CarrierWave::ProcessingError)
+          end.to raise_exception(e.class)
         end
       end
     end