lately resolve active versions when retrieving #2669
+31
−3
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
rajyan
commented
Jul 14, 2023
Comment on lines
327
to
334
| def retrieve_versions_from_cache!(cache_name) | ||
| active_versions.each { |name, v| v.retrieve_from_cache!(cache_name) } | ||
| versions.each { |name, v| v.retrieve_from_cache!(cache_name) } | ||
| end | ||
|
|
||
| def retrieve_versions_from_store!(identifier) | ||
| active_versions.each { |name, v| v.retrieve_from_store!(identifier) } | ||
| versions.each { |name, v| v.retrieve_from_store!(identifier) } | ||
| end | ||
|
|
There was a problem hiding this comment.
We don't need to evaluate the condition here, like before the changes in #1351 .
We can keep all versions retrieved internally, evaluate the condition and return them only when users accesses.
| @@ -133,7 +133,7 @@ def version(name, options = {}, &block) | |||
|
|
|||
| class_eval <<-RUBY, __FILE__, __LINE__ + 1 | |||
| def #{name} | |||
| versions[:#{name}] | |||
| version_exists?(:#{name}) ? versions[:#{name}] : versions[:#{name}].class.new(model, mounted_as) | |||
There was a problem hiding this comment.
Lately resolving the condition here. Which would make it more consistent with the current state (active or not) of the version (which fixes #2148 too).
I think it is better to return nil for non-active versions, but returning a blank uploader for backwards compatibility.
|
I added some comments to make the change clearer. Hope this makes sense 😄 |
|
Looking at #2132 |
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.
I believe this fixes #2461 #2148
#2132Minimum reproducible example and details are in
#2461 (comment)