pass options to errors.add as kwargs
#50
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![hound[bot]](https://avatars.githubusercontent.com/in/3598?s=60&v=4){kind=small}
| @@ -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(", ")) | |||
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [87/80]
Style/StringLiterals: Prefer single-quoted strings when you don't need string interpolation or special symbols.
| @@ -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(", ")) | |||
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [90/80]
Style/StringLiterals: Prefer single-quoted strings when you don't need string interpolation or special symbols.
| @@ -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? | |||
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [103/80]
| @@ -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( | |||
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [102/80]
|
Oops, #48 already addresses this. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rails 6.1 expects the options to
ActiveModel::Errors#addto be kwargs and Ruby 3.0 raises awrong number of argumentserror if we try to pass in the options as a hash.Passing them in as kwargs should work with earlier versions or Rails, where the options param was a hash, as well.