From a369db50f892d0f91c513556de5937e41e383bdb Mon Sep 17 00:00:00 2001 From: massongit Date: Sat, 27 Mar 2021 12:55:31 +0900 Subject: [PATCH 1/2] Replace mimemagic with marcel --- comfortable_mexican_sofa.gemspec | 2 +- lib/comfortable_mexican_sofa/seeds.rb | 2 +- lib/comfortable_mexican_sofa/seeds/file/importer.rb | 2 +- lib/comfortable_mexican_sofa/seeds/page/importer.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/comfortable_mexican_sofa.gemspec b/comfortable_mexican_sofa.gemspec index 0492d7665..020110b6d 100644 --- a/comfortable_mexican_sofa.gemspec +++ b/comfortable_mexican_sofa.gemspec @@ -24,7 +24,7 @@ Gem::Specification.new do |s| s.add_dependency "haml-rails", ">= 1.0.0" s.add_dependency "jquery-rails", ">= 4.3.1" s.add_dependency "kramdown", ">= 1.0.0" - s.add_dependency "mimemagic", ">= 0.3.2" + s.add_dependency "marcel", ">= 1.0.0" s.add_dependency "mini_magick", ">= 4.8.0" s.add_dependency "rails", ">= 5.2.0" s.add_dependency "rails-i18n", ">= 5.0.0" diff --git a/lib/comfortable_mexican_sofa/seeds.rb b/lib/comfortable_mexican_sofa/seeds.rb index 6bdf8fe5a..ba4077c6d 100644 --- a/lib/comfortable_mexican_sofa/seeds.rb +++ b/lib/comfortable_mexican_sofa/seeds.rb @@ -6,7 +6,7 @@ module ComfortableMexicanSofa::Seeds class Error < StandardError; end - require "mimemagic" + require "marcel" class Importer diff --git a/lib/comfortable_mexican_sofa/seeds/file/importer.rb b/lib/comfortable_mexican_sofa/seeds/file/importer.rb index 7b8aadacd..8340e163a 100644 --- a/lib/comfortable_mexican_sofa/seeds/file/importer.rb +++ b/lib/comfortable_mexican_sofa/seeds/file/importer.rb @@ -38,7 +38,7 @@ def import! file.file = { io: file_handler, filename: filename, - content_type: MimeMagic.by_magic(file_handler) + content_type: Marcel::Magic.by_magic(file_handler) } end diff --git a/lib/comfortable_mexican_sofa/seeds/page/importer.rb b/lib/comfortable_mexican_sofa/seeds/page/importer.rb index 7f97168ec..15d58accc 100644 --- a/lib/comfortable_mexican_sofa/seeds/page/importer.rb +++ b/lib/comfortable_mexican_sofa/seeds/page/importer.rb @@ -192,7 +192,7 @@ def files_content(record, identifier, path, frag_content) { io: file_handler, filename: filename, - content_type: MimeMagic.by_magic(file_handler) + content_type: Marcel::Magic.by_magic(file_handler) } end From c1c0eb7e8ba95bb806b74f1c5ff09d45801d39cd Mon Sep 17 00:00:00 2001 From: massongit Date: Sun, 28 Mar 2021 01:13:36 +0900 Subject: [PATCH 2/2] Set rails limit version to less than 6.1.0 --- comfortable_mexican_sofa.gemspec | 2 +- test/gemfiles/6.0.gemfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/comfortable_mexican_sofa.gemspec b/comfortable_mexican_sofa.gemspec index 0492d7665..9f9726fff 100644 --- a/comfortable_mexican_sofa.gemspec +++ b/comfortable_mexican_sofa.gemspec @@ -26,7 +26,7 @@ Gem::Specification.new do |s| s.add_dependency "kramdown", ">= 1.0.0" s.add_dependency "mimemagic", ">= 0.3.2" s.add_dependency "mini_magick", ">= 4.8.0" - s.add_dependency "rails", ">= 5.2.0" + s.add_dependency "rails", ">= 5.2.0", "< 6.1.0" s.add_dependency "rails-i18n", ">= 5.0.0" s.add_dependency "sassc-rails", ">= 2.0.0" end diff --git a/test/gemfiles/6.0.gemfile b/test/gemfiles/6.0.gemfile index 8e0ff1cf3..f37ca224d 100644 --- a/test/gemfiles/6.0.gemfile +++ b/test/gemfiles/6.0.gemfile @@ -4,7 +4,7 @@ source "http://rubygems.org" gemspec path: "../../" -gem "rails", ">= 6.0" +gem "rails", ">= 6.0", "< 6.1" group :development, :test do gem "byebug", "~> 10.0.0", platforms: %i[mri mingw x64_mingw]