[Fix #51463] Raise an error when invalid :on or :except options are given to #resource or #resources
#51464
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
joshuay03
changed the title
:on or :except options are given to #resource or #resouces:on or :except options are given to #resource or #resouces
joshuay03
force-pushed
the
raise-error-on-invalid-resources-on-or-except-args
branch
2 times, most recently
from
f0fb46c
to
ad8ac7b
Compare
joshuay03
force-pushed
the
raise-error-on-invalid-resources-on-or-except-args
branch
2 times, most recently
from
475d14a
to
8b6140c
Compare
joshuay03
changed the title
:on or :except options are given to #resource or #resouces:on or :except options are given to #resource or #resources
joshuay03
force-pushed
the
raise-error-on-invalid-resources-on-or-except-args
branch
3 times, most recently
from
4a6ac93
to
fc2da04
Compare
|
Hmm the test failures are scenarios where the scope's Addressed in these changes. |
…ons are given to `#resource` or `#resources`
joshuay03
force-pushed
the
raise-error-on-invalid-resources-on-or-except-args
branch
from
fc2da04
to
a0d7574
Compare
pixeltrix
reviewed
Apr 15, 2024
| attr_reader :controller, :path, :param | ||
|
|
||
| def initialize(entities, api_only, shallow, options = {}) | ||
| if options[:param].to_s.include?(":") | ||
| raise ArgumentError, ":param option can't contain colons" | ||
| end | ||
|
|
||
| if (invalid_actions = (options.values_at(:only, :except).flatten.compact - default_actions)).any? | ||
| raise ArgumentError, "expected :only and :except to be one or more of #{default_actions}, got #{invalid_actions}" | ||
| end |
There was a problem hiding this comment.
The method assert_valid_keys would be a better approach as it's used elsewhere within Rails to perform the same task, e.g.
rails/actionview/lib/action_view/helpers/output_safety_helper.rb
Lines 43 to 50 in 778039b
There was a problem hiding this comment.
I don't think it works here since we're asserting the values and not the keys.
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.
Motivation / Background
Fixes #51463.
Detail
Raises an
ArgumentErrorwhen aActionDispatch::Routing::Mapper::Resources::Resourceis initalized with:onor:exceptoptions that aren't default (index, create, new, show, update, and destroy) actions .Additional information
See my comment below as to why this seems like more changes than it needs to be.
Checklist
Before submitting the PR make sure the following are checked:
[Fix #issue-number]