From c85652209431fbe574cfc6c4ea6cf0b5b1aaf7ed Mon Sep 17 00:00:00 2001 From: Adrian Mann Date: Tue, 16 Mar 2021 13:19:07 +0000 Subject: [PATCH] Fix Rails 6.1 validations by Adding ** to call. (#48) * Adding ** to call. --- lib/paperclip/validators/attachment_content_type_validator.rb | 2 +- lib/paperclip/validators/attachment_file_name_validator.rb | 2 +- lib/paperclip/validators/attachment_presence_validator.rb | 2 +- lib/paperclip/validators/attachment_size_validator.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/paperclip/validators/attachment_content_type_validator.rb b/lib/paperclip/validators/attachment_content_type_validator.rb index 52023a894..1db7c2ae8 100644 --- 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 index 281a29313..c4106cf51 100644 --- 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 index 0a97119f3..a26a902ba 100644 --- 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 index 469d04f39..9b96776d6 100644 --- 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)