From 9d06b6cf6c762fd5f3b6ba21314d94155bdbd80d Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Wed, 8 May 2019 11:04:24 -0500 Subject: [PATCH] Only apply mimemagick fixes if it is defined which in the current situation is true for paperclip dependency --- lib/dunlop/engine.rb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/dunlop/engine.rb b/lib/dunlop/engine.rb index 3cf4444..cfcb016 100644 --- a/lib/dunlop/engine.rb +++ b/lib/dunlop/engine.rb @@ -76,15 +76,17 @@ module Dunlop #FIXES - #A CSV FILE STARTING WITH MZ IS RECOGNIZED AS X-MS-DOS-EXECUTABLE - # https://github.com/minad/mimemagic/issues/67 - if mime_magic_ms_dos_index = MimeMagic::MAGIC.index{|r| r == ['application/x-ms-dos-executable', [[0, 'MZ']]]} - MimeMagic::MAGIC.delete_at(mime_magic_ms_dos_index) - end + if defined?(MimeMagic) + #A CSV FILE STARTING WITH MZ IS RECOGNIZED AS X-MS-DOS-EXECUTABLE + # https://github.com/minad/mimemagic/issues/67 + if mime_magic_ms_dos_index = MimeMagic::MAGIC.index{|r| r == ['application/x-ms-dos-executable', [[0, 'MZ']]]} + MimeMagic::MAGIC.delete_at(mime_magic_ms_dos_index) + end - if mime_magix_x_executable_index = MimeMagic::MAGIC.index{|r| r.first == 'application/x-executable'} - if mime_magix_x_executable_mz_index = MimeMagic::MAGIC[mime_magix_x_executable_index][1].index{|r| r == [0, "MZ"]} - MimeMagic::MAGIC[mime_magix_x_executable_index][1].delete_at(mime_magix_x_executable_mz_index) + if mime_magix_x_executable_index = MimeMagic::MAGIC.index{|r| r.first == 'application/x-executable'} + if mime_magix_x_executable_mz_index = MimeMagic::MAGIC[mime_magix_x_executable_index][1].index{|r| r == [0, "MZ"]} + MimeMagic::MAGIC[mime_magix_x_executable_index][1].delete_at(mime_magix_x_executable_mz_index) + end end end end