Merge 7e45492 into 8f7e425

comfy · Mar 27, 2021 · e84d1d3 · e84d1d3
2 parents 8f7e425 + 7e45492
commit e84d1d3
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
 

diff --git a/test/gemfiles/6.0.gemfile b/test/gemfiles/6.0.gemfile
@@ -8,7 +8,7 @@ gem "rails", ">= 6.0"
 
 group :development, :test do
   gem "byebug",             "~> 10.0.0", platforms: %i[mri mingw x64_mingw]
-  gem "capybara",           "~> 2.17.0"
+  gem "capybara",           "~> 3.26.0"
   gem "kaminari",           "~> 1.1.1"
   gem "puma",               "~> 3.12.2"
   gem "rubocop",            "~> 0.55.0", require: false