Prevent CurrentAttributes defaults from leaking
#50714
Merged
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
Follow-up to rails#50677. Prior to this commit, all `ActiveSupport::CurrentAttributes` subclasses stored their default values in the same `Hash`, causing default values to leak between classes. This commit ensures each subclass maintains a separate `Hash`. This commit also simplifies the resolution of default values, replacing the `merge_defaults!` method with `resolve_defaults`.
seanpdoyle
reviewed
Jan 11, 2024
| @@ -188,12 +188,12 @@ def method_added(name) | |||
| end | |||
| end | |||
|
|
|||
| class_attribute :defaults, instance_writer: false, default: {} | |||
| class_attribute :defaults, instance_writer: false, default: {}.freeze | |||
There was a problem hiding this comment.
Thank you for following this up!
I mistook the guidance provided by the class_attribute documentation as clone-on-inherit instead of mutation-free overrides:
Declare a class-level attribute whose value is inheritable by subclasses. Subclasses can change their own value and it will not impact parent class.
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.
Follow-up to #50677.
Prior to this commit, all
ActiveSupport::CurrentAttributessubclasses stored their default values in the sameHash, causing default values to leak between classes. This commit ensures each subclass maintains a separateHash.This commit also simplifies the resolution of default values, replacing the
merge_defaults!method withresolve_defaults.