lib/carrierwave/processing/mini_magick.rb in carrierwave-2.2.6 vs lib/carrierwave/processing/mini_magick.rb in carrierwave-3.0.0.beta

@@ -86,11 +86,11 @@
     #
     # See http://www.imagemagick.org/script/command-line-options.php#format
     #
     # === Parameters
     #
-    # [format (#to_s)] an abreviation of the format
+    # [format (#to_s)] an abbreviation of the format
     #
     # === Yields
     #
     # [MiniMagick::Image] additional manipulations to perform
     #
@@ -261,12 +261,12 @@
 
       image = yield(image)
       FileUtils.mv image.path, current_path
 
       image.run_command("identify", current_path)
-    rescue ::MiniMagick::Error, ::MiniMagick::Invalid => e
-      message = I18n.translate(:"errors.messages.mini_magick_processing_error", :e => e)
+    rescue ::MiniMagick::Error, ::MiniMagick::Invalid
+      message = I18n.translate(:"errors.messages.processing_error")
       raise CarrierWave::ProcessingError, message
     ensure
       image.destroy! if image
     end
 
@@ -304,14 +304,14 @@
 
       FileUtils.mv result.path, current_path
 
       if File.extname(result.path) != File.extname(current_path)
         move_to = current_path.chomp(File.extname(current_path)) + File.extname(result.path)
-        file.content_type = ::MiniMime.lookup_by_filename(move_to).content_type
+        file.content_type = Marcel::Magic.by_path(move_to).try(:type)
         file.move_to(move_to, permissions, directory_permissions)
       end
-    rescue ::MiniMagick::Error, ::MiniMagick::Invalid => e
-      message = I18n.translate(:"errors.messages.mini_magick_processing_error", :e => e)
+    rescue ::MiniMagick::Error, ::MiniMagick::Invalid
+      message = I18n.translate(:"errors.messages.processing_error")
       raise CarrierWave::ProcessingError, message
     end
 
     private