Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Fix “::Collection” definition with autoloading #6758

Merged
merged 1 commit into from
Mar 28, 2024
Merged

Fix “::Collection” definition with autoloading #6758

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion app/models/collection.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,16 @@

# Provide plain collection model if not defined by the application.
# Needed until Hyrax internals do not assume its existence.
class ::Collection < Hyrax.config.collection_class; end unless '::Collection'.safe_constantize
class ::Collection < Hyrax.config.collection_class; end unless ActiveSupport::Dependencies.then do |deps|
# In autoloading environments, when referencing +::Collection+ from the
# initializer, make sure that +safe_constantize+ wouldn’t just try loading
# this file again (which would produce a runtime error). Do this by manually
# searching for the file which should define +::Collection+ and checking if it
# is the one being currently loaded.
break true if Object.const_defined?(:Collection)
file_path = deps.search_for_file("collection")
expanded = File.expand_path(file_path)
expanded.delete_suffix!(".rb")
break false if deps.loading.include?(expanded)
'::Collection'.safe_constantize
end