From 531fcf8fd20c8bdea71a6dfcf496e54671668297 Mon Sep 17 00:00:00 2001 From: Pere Joan Martorell Calaf Date: Fri, 26 Mar 2021 17:00:18 +0100 Subject: [PATCH] Replace mimemagic with marcel gem --- lib/paperclip.rb | 3 +-- lib/paperclip/content_type_detector.rb | 2 +- paperclip.gemspec | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/paperclip.rb b/lib/paperclip.rb index d44db3ce3..dcc4173d3 100644 --- a/lib/paperclip.rb +++ b/lib/paperclip.rb @@ -64,9 +64,8 @@ require "mime/types" end -require 'mimemagic' -require 'mimemagic/overlay' require 'logger' +require 'marcel' require 'terrapin' require 'paperclip/railtie' if defined?(Rails::Railtie) diff --git a/lib/paperclip/content_type_detector.rb b/lib/paperclip/content_type_detector.rb index b98779551..b9715c357 100644 --- a/lib/paperclip/content_type_detector.rb +++ b/lib/paperclip/content_type_detector.rb @@ -68,7 +68,7 @@ def type_from_file_contents def type_from_mime_magic @type_from_mime_magic ||= File.open(@filepath) do |file| - MimeMagic.by_magic(file).try(:type) + Marcel::Magic.by_magic(file).try(:type) end end diff --git a/paperclip.gemspec b/paperclip.gemspec index 94d8e6685..434ac1ba0 100644 --- a/paperclip.gemspec +++ b/paperclip.gemspec @@ -28,7 +28,7 @@ Gem::Specification.new do |s| s.add_dependency('activesupport', '>= 4.2.0') s.add_dependency('terrapin', '~> 0.6.0') s.add_dependency('mime-types') - s.add_dependency('mimemagic', '~> 0.3.0') + s.add_dependency('marcel', '~> 1.0.0') s.add_development_dependency('activerecord', '>= 4.2.0') s.add_development_dependency('shoulda')