[Validator] Fix issue with all_available_marcel_content_types mutatin…

…g Marcel::TYPE_EXTS (#356)
igorkasyanchuk · Jan 31, 2025 · 84f0596 · 84f0596
1 parent 9466e97
commit 84f0596
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/active_storage_validations/content_type_validator.rb b/lib/active_storage_validations/content_type_validator.rb
@@ -215,12 +215,14 @@ def invalid_content_type?(content_type)
         raise ArgumentError, "'image/jpg' is not a valid content type, you should use 'image/jpeg' instead"
       end
 
-      all_available_marcel_content_types.keys.exclude?(content_type.to_s)
+      all_available_marcel_content_types.exclude?(content_type.to_s)
     end
 
     def all_available_marcel_content_types
-      @all_available_marcel_content_types ||= Marcel::MAGIC.map {|dd| dd.first }
-                                                           .each_with_object(Marcel::TYPE_EXTS) { |(k,v), h| h[k] = v unless h.key?(k) }
+      @all_available_marcel_content_types ||= Marcel::TYPE_EXTS
+        .keys
+        .push(*Marcel::MAGIC.map(&:first))
+        .tap(&:uniq!)
     end
 
     def invalid_extension?(content_type)