Fix Rails 6.1 validations by Adding ** to call. (#48)

* Adding ** to call.
kreeti · Mar 16, 2021 · ab1016d · ab1016d
1 parent 5b85a11
commit ab1016d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/lib/paperclip/validators/attachment_content_type_validator.rb b/lib/paperclip/validators/attachment_content_type_validator.rb
@@ -47,7 +47,7 @@ def validate_blacklist(record, attribute, value)
       end
 
       def mark_invalid(record, attribute, types)
-        record.errors.add attribute, :invalid, options.merge(types: types.join(", "))
+        record.errors.add attribute, :invalid, **options.merge(types: types.join(", "))
       end
 
       def allowed_types

diff --git a/lib/paperclip/validators/attachment_file_name_validator.rb b/lib/paperclip/validators/attachment_file_name_validator.rb
@@ -43,7 +43,7 @@ def validate_blacklist(record, attribute, value)
       end
 
       def mark_invalid(record, attribute, patterns)
-        record.errors.add attribute, :invalid, options.merge(names: patterns.join(", "))
+        record.errors.add attribute, :invalid, **options.merge(names: patterns.join(", "))
       end
 
       def allowed

diff --git a/lib/paperclip/validators/attachment_presence_validator.rb b/lib/paperclip/validators/attachment_presence_validator.rb
@@ -4,7 +4,7 @@ module Paperclip
   module Validators
     class AttachmentPresenceValidator < ActiveModel::EachValidator
       def validate_each(record, attribute, _value)
-        record.errors.add(attribute, :blank, options) if record.send("#{attribute}_file_name").blank?
+        record.errors.add(attribute, :blank, **options) if record.send("#{attribute}_file_name").blank?
       end
 
       def self.helper_method_name

diff --git a/lib/paperclip/validators/attachment_size_validator.rb b/lib/paperclip/validators/attachment_size_validator.rb
@@ -39,7 +39,7 @@ def validate_each(record, attr_name, value)
             unless value.send(CHECKS[option], option_value)
               error_message_key = options[:in] ? :in_between : option
               error_attrs.each do |error_attr_name|
-                record.errors.add(error_attr_name, error_message_key, filtered_options(value).merge(
+                record.errors.add(error_attr_name, error_message_key, **filtered_options(value).merge(
                                                                         min: min_value_in_human_size(record),
                                                                         max: max_value_in_human_size(record),
                                                                         count: human_size(option_value)