hyrax 5.0.0.rc2 → 5.0.0

data/lib/generators/hyrax/templates/config/initializers/1_valkyrie.rb

@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+require 'faraday/multipart'
+
+# require "shrine/storage/s3"
+# require "valkyrie/storage/shrine"
+# require "valkyrie/shrine/checksum/s3"
+
+# database = ENV.fetch("METADATA_DB_NAME", "nurax_pg_metadata")
+# Rails.logger.info "Establishing connection to postgresql on: " \
+#                   "#{ENV["DB_HOST"]}:#{ENV["DB_PORT"]}.\n" \
+#                   "Using database: #{database}."
+# connection = Sequel.connect(
+#   user: ENV["DB_USERNAME"],
+#   password: ENV["DB_PASSWORD"],
+#   host: ENV["DB_HOST"],
+#   port: ENV["DB_PORT"],
+#   database: database,
+#   max_connections: ENV.fetch("DB_POOL", 5),
+#   pool_timeout: ENV.fetch("DB_TIMEOUT", 5000),
+#   adapter: :postgres
+# )
+#
+# Valkyrie::MetadataAdapter
+#   .register(Valkyrie::Sequel::MetadataAdapter.new(connection: connection),
+#             :nurax_pg_metadata_adapter)
+Valkyrie::MetadataAdapter.register(
+  Valkyrie::Persistence::Postgres::MetadataAdapter.new,
+  :pg_metadata
+)
+
+# Fedora metadata adapter
+# Valkyrie::MetadataAdapter.register(
+#   Valkyrie::Persistence::Fedora::MetadataAdapter.new(
+#     connection: ::Ldp::Client.new(Hyrax.config.fedora_connection_builder.call(
+#       ENV.fetch('FCREPO_URL') { "http://localhost:8080/fcrepo/rest" }
+#     )),
+#     base_path: Rails.env,
+#     schema: Valkyrie::Persistence::Fedora::PermissiveSchema.new(Hyrax::SimpleSchemaLoader.new.permissive_schema_for_valkrie_adapter),
+#     fedora_version: 6
+#   ), :fedora_metadata
+# )
+
+Valkyrie.config.metadata_adapter = ENV.fetch('VALKYRIE_METADATA_ADAPTER') { :pg_metadata }.to_sym
+
+# shrine_s3_options = {
+#   bucket: ENV.fetch("REPOSITORY_S3_BUCKET") { "nurax_pg#{Rails.env}" },
+#   region: ENV.fetch("REPOSITORY_S3_REGION", "us-east-1"),
+#   access_key_id: (ENV["REPOSITORY_S3_ACCESS_KEY"] || ENV["MINIO_ACCESS_KEY"]),
+#   secret_access_key: (ENV["REPOSITORY_S3_SECRET_KEY"] || ENV["MINIO_SECRET_KEY"])
+# }
+#
+# if ENV["MINIO_ENDPOINT"].present?
+#   shrine_s3_options[:endpoint] = "http://#{ENV["MINIO_ENDPOINT"]}:#{ENV.fetch("MINIO_PORT", 9000)}"
+#   shrine_s3_options[:force_path_style] = true
+# end
+#
+# Valkyrie::StorageAdapter.register(
+#   Valkyrie::Storage::Shrine.new(Shrine::Storage::S3.new(**shrine_s3_options)),
+#   :repository_s3
+# )
+#
+# Valkyrie.config.storage_adapter = :repository_s3
+
+# Fedora storage adapter
+# Valkyrie::StorageAdapter.register(
+#   Valkyrie::Storage::Fedora.new(
+#     connection: ::Ldp::Client.new(Hyrax.config.fedora_connection_builder.call(
+#       ENV.fetch('FCREPO_URL') { "http://localhost:8080/fcrepo/rest" }
+#     )),
+#     base_path: Rails.env,
+#     fedora_version: 6
+#   ), :fedora_storage
+# )
+
+Valkyrie::StorageAdapter.register(
+  Valkyrie::Storage::VersionedDisk.new(base_path: Rails.root.join("storage", "files"),
+                                       file_mover: FileUtils.method(:cp)),
+  :versioned_disk_storage
+)
+
+Valkyrie.config.storage_adapter  = ENV.fetch('VALKYRIE_STORAGE_ADAPTER') { :versioned_disk_storage }.to_sym
+
+Valkyrie.config.indexing_adapter = :solr_index
+
+custom_queries = [Hyrax::CustomQueries::Navigators::CollectionMembers,
+                  Hyrax::CustomQueries::Navigators::ChildCollectionsNavigator,
+                  Hyrax::CustomQueries::Navigators::ParentCollectionsNavigator,
+                  Hyrax::CustomQueries::Navigators::ChildFileSetsNavigator,
+                  Hyrax::CustomQueries::Navigators::ChildWorksNavigator,
+                  Hyrax::CustomQueries::Navigators::ParentWorkNavigator,
+                  Hyrax::CustomQueries::Navigators::FindFiles,
+                  Hyrax::CustomQueries::FindAccessControl,
+                  Hyrax::CustomQueries::FindCollectionsByType,
+                  Hyrax::CustomQueries::FindFileMetadata,
+                  Hyrax::CustomQueries::FindIdsByModel,
+                  Hyrax::CustomQueries::FindManyByAlternateIds,
+                  Hyrax::CustomQueries::FindModelsByAccess,
+                  Hyrax::CustomQueries::FindCountBy,
+                  Hyrax::CustomQueries::FindByDateRange]
+custom_queries.each do |handler|
+  Hyrax.query_service.custom_queries.register_query_handler(handler)
+end

data/lib/generators/hyrax/templates/config/initializers/file_services.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+ActiveSupport::Reloader.to_prepare do
+  Hydra::Derivatives.config.output_file_service = Hyrax::ValkyriePersistDerivatives
+  Hydra::Derivatives.config.source_file_service = Hyrax::LocalFileService
+end

data/lib/generators/hyrax/templates/config/initializers/hyrax.rb

@@ -59,7 +59,7 @@ Hyrax.config do |config|
 
   # Hyrax uses NOIDs for files and collections instead of Fedora UUIDs
   # where NOID = 10-character string and UUID = 32-character string w/ hyphens
-  # config.enable_noids = true
+  config.enable_noids = false
 
   # Template for your repository's NOID IDs
   # config.noid_template = ".reeddeeddk"
@@ -235,20 +235,56 @@ Hyrax.config do |config|
   # Identify the model class name that will be used for Collections in your app
   # (i.e. ::Collection for ActiveFedora, Hyrax::PcdmCollection for Valkyrie)
   # config.collection_model = '::Collection'
-  # config.collection_model = 'Hyrax::PcdmCollection'
+  config.collection_model = 'Hyrax::PcdmCollection'
 
   # Identify the model class name that will be used for Admin Sets in your app
   # (i.e. AdminSet for ActiveFedora, Hyrax::AdministrativeSet for Valkyrie)
   # config.admin_set_model = 'AdminSet'
-  # config.admin_set_model = 'Hyrax::AdministrativeSet'
+  config.admin_set_model = 'Hyrax::AdministrativeSet'
+
+  # Identify the form that will be used for Admin Sets
+  # config.administrative_set_form = Hyrax::Forms::AdministrativeSetForm
+
+  # Identify the indexer that will be used for Admin Sets
+  # config.administrative_set_indexer = Hyrax::Indexers::AdministrativeSetIndexer
+
+  # Identify the form that will be used for File Sets
+  # config.file_set_form = Hyrax::Forms::FileSetForm
+
+  # Identify the indexer that will be used for File Sets
+  # config.file_set_indexer = Hyrax::Indexers::FileSetIndexer
+
+  # Service for resolving {FileMetadata} nodes by status, e.g. "primary", rather
+  # than use.
+  # config.file_set_file_service = Hyrax::FileSetFileService
+
+  # Identify the form that will be used for Collections
+  # config.pcdm_collection_form = Hyrax::Forms::PcdmCollectionForm
+
+  # Identify the indexer that will be used for Collections
+  # config.pcdm_collection_indexer = Hyrax::Indexers::PcdmCollectionIndexer
+
+  # Provide a proc for form generation for Objects
+  # config.pcdm_object_form_builder = lambda do |model_class|
+  #   Hyrax::Forms::PcdmObjectForm(model_class)
+  # end
+
+  # Provide a proc for indexer generation for Objects
+  # config.pcdm_object_indexer_builder = lambda do |model_class|
+  #   Hyrax::Indexers::PcdmObjectIndexer(model_class)
+  # end
+
+  ## Enable Valkyrie only mode
+  config.use_valkyrie = true
+  config.disable_wings = true
 
   # When your application is ready to use the valkyrie index instead of the one
   # maintained by active fedora, you will need to set this to true. You will
   # also need to update your Blacklight configuration.
-  # config.query_index_from_valkyrie = false
+  config.query_index_from_valkyrie = true
 
   ## Configure index adapter for Valkyrie::Resources to use solr readonly indexer
-  # config.index_adapter = :solr_index
+  config.index_adapter = :solr_index
 
   ## Fedora import/export tool
   #

data/lib/generators/hyrax/templates/config/initializers/publisher.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+# Hyrax.publisher.subscribe(HyraxListener.new)

data/lib/generators/hyrax/templates/config/initializers/riiif.rb

@@ -31,3 +31,80 @@ Rails.application.reloader.to_prepare do
 
   Riiif::Engine.config.cache_duration = 1.month
 end
+
+module Hyrax
+  # Adds file locking to Riiif::File
+  # @see RiiifFileResolver
+  class RiiifFile < Riiif::File
+    include ActiveSupport::Benchmarkable
+
+    attr_reader :id
+    def initialize(input_path, tempfile = nil, id:)
+      super(input_path, tempfile)
+      raise(ArgumentError, "must specify id") if id.blank?
+      @id = id
+    end
+
+    # Wrap extract in a read lock and benchmark it
+    def extract(transformation, image_info = nil)
+      Riiif::Image.file_resolver.file_locks[id].with_read_lock do
+        benchmark "RiiifFile extracted #{path} with #{transformation.to_params}", level: :debug do
+          super
+        end
+      end
+    end
+
+    private
+
+    def logger
+      Hyrax.logger
+    end
+  end
+
+  class RiiifFileResolver
+    include ActiveSupport::Benchmarkable
+
+    # @param [String] id from iiif manifest
+    # @return [Riiif::File]
+    def find(id)
+      path = nil
+      file_locks[id].with_write_lock do
+        path = build_path(id)
+        path = build_path(id, force: true) unless File.exist?(path) # Ensures the file is locally available
+      end
+      RiiifFile.new(path, id: id)
+    end
+
+    # tracks individual file locks
+    # @see RiiifFile
+    # @return [Concurrent::Map<Concurrent::ReadWriteLock>]
+    def file_locks
+      @file_locks ||= Concurrent::Map.new do |k, v|
+        k.compute_if_absent(v) { Concurrent::ReadWriteLock.new }
+      end
+    end
+
+    private
+
+    def build_path(id, force: false)
+      Riiif::Image.cache.fetch("riiif:" + Digest::MD5.hexdigest("path:#{id}"),
+                               expires_in: Riiif::Image.expires_in,
+                               force: force) do
+        load_file(id)
+      end
+    end
+
+    def load_file(id)
+      benchmark "RiiifFileResolver loaded #{id}", level: :debug do
+        fs_id = id.sub(/\A([^\/]*)\/.*/, '\1')
+        file_set = Hyrax.query_service.find_by(id: fs_id)
+        file_metadata = Hyrax.custom_queries.find_original_file(file_set: file_set)
+        file_metadata.file.disk_path.to_s # Stores a local copy in tmpdir
+      end
+    end
+
+    def logger
+      Hyrax.logger
+    end
+  end
+end

data/lib/generators/hyrax/templates/config/locales/hyrax.de.yml

@@ -50,7 +50,7 @@ de:
     directory:
       suffix: "@ Example.org"
     footer:
-      copyright_html: "<strong>Copyright © 2022 Samvera lizenziert</strong> unter der Apache Lizenz, Version 2.0"
+      copyright_html: "<strong>Copyright &copy; %{current_year} Samvera lizenziert</strong> unter der Apache Lizenz, Version 2.0"
       service_html: Ein Dienst von <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a> .
     institution_name: Institution
     institution_name_full: Name des Instituts

data/lib/generators/hyrax/templates/config/locales/hyrax.en.yml

@@ -50,7 +50,7 @@ en:
     directory:
       suffix: "@example.org"
     footer:
-      copyright_html: "<strong>Copyright &copy; 2022 Samvera</strong> Licensed under the Apache License, Version 2.0"
+      copyright_html: "<strong>Copyright &copy; %{current_year} Samvera</strong> Licensed under the Apache License, Version 2.0"
       service_html: A service of <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a>.
     institution_name: Institution
     institution_name_full: The Institution Name

data/lib/generators/hyrax/templates/config/locales/hyrax.es.yml

@@ -50,7 +50,7 @@ es:
     directory:
       suffix: "@example.org"
     footer:
-      copyright_html: "<strong>Copyright &copy; 2022 Samvera</strong> bajo licencia de Apache, Version 2.0"
+      copyright_html: "<strong>Copyright &copy; %{current_year} Samvera</strong> bajo licencia de Apache, Version 2.0"
       service_html: Un servicio de <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a>.
     institution_name: institución
     institution_name_full: El nombre de la institución

data/lib/generators/hyrax/templates/config/locales/hyrax.fr.yml

@@ -50,7 +50,7 @@ fr:
     directory:
       suffix: "@ Example.org"
     footer:
-      copyright_html: "<strong>Copyright © 2022 Samvera</strong> Licence sous Licence Apache, Version 2.0"
+      copyright_html: "<strong>Copyright &copy; %{current_year} Samvera</strong> Licence sous Licence Apache, Version 2.0"
       service_html: Un service de <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a> .
     institution_name: Institution
     institution_name_full: Nom de l'établissement

data/lib/generators/hyrax/templates/config/locales/hyrax.it.yml

@@ -50,7 +50,7 @@ it:
     directory:
       suffix: "@ example.org"
     footer:
-      copyright_html: "<strong>Copyright © 2022 Samvera</strong> Licenza sotto la licenza Apache, versione 2.0"
+      copyright_html: "<strong>Copyright &copy; %{current_year} Samvera</strong> Licenza sotto la licenza Apache, versione 2.0"
       service_html: Un servizio di <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a> .
     institution_name: Istituzione
     institution_name_full: Nome dell'Istituzione

data/lib/generators/hyrax/templates/config/locales/hyrax.pt-BR.yml

@@ -50,7 +50,7 @@ pt-BR:
     directory:
       suffix: "@ Example.org"
     footer:
-      copyright_html: "<strong>Copyright © 2022 Samvera </strong> Licenciado sob a Licença Apache, Versão 2.0"
+      copyright_html: "<strong>Copyright &copy; %{current_year} Samvera </strong> Licenciado sob a Licença Apache, Versão 2.0"
       service_html: Um serviço de <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a> .
     institution_name: Instituição
     institution_name_full: O Nome da Instituição

data/lib/generators/hyrax/templates/config/locales/hyrax.zh.yml

@@ -50,7 +50,7 @@ zh:
     directory:
       suffix: "@example.org"
     footer:
-      copyright_html: "<strong>版权所有 &copy; 2022 Samvera</strong> 根据Apache许可证2.0版许可"
+      copyright_html: "<strong>版权所有 &copy; %{current_year} Samvera</strong> 根据Apache许可证2.0版许可"
       service_html: 的服务<a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a>.
     institution_name: 机构
     institution_name_full: 机构名称

data/lib/generators/hyrax/templates/config/redis.yml

@@ -1,9 +1,6 @@
 development:
-  host: <%= ENV.fetch('REDIS_HOST', 'localhost') %>
-  port: <%= ENV.fetch('REDIS_PORT', 6379) %>
+  url: <%= ENV.fetch('REDIS_URL', 'redis://localhost:6379/0') %>
 test:
-  host: <%= ENV.fetch('REDIS_HOST', 'localhost') %>
-  port: <%= ENV.fetch('REDIS_PORT', 6379) %>
+  url: <%= ENV.fetch('REDIS_URL', 'redis://localhost:6379/0') %>
 production:
-  host: <%= ENV.fetch('REDIS_HOST', 'localhost') %>
-  port: <%= ENV.fetch('REDIS_PORT', 6379) %>
+  url: <%= ENV.fetch('REDIS_URL', 'redis://localhost:6379/0') %>

data/lib/generators/hyrax/templates/config/valkyrie_index.yml

@@ -1,12 +1,7 @@
+# This is a sample config file that points to a solr server for each environment
 development:
-  host: <%= ENV['VALKYRIE_SOLR_HOST'] %>
-  port: <%= ENV['VALKYRIE_SOLR_PORT'] %>
-  core: <%= ENV['VALKYRIE_SOLR_CORE'] || 'hyrax-valkyrie-dev' %>
+  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_DEVELOPMENT_PORT', 8983)}/solr/hydra-development" %>
 test:
-  host: <%= ENV['VALKYRIE_SOLR_HOST'] %>
-  port: <%= ENV['VALKYRIE_SOLR_PORT'] || 8987 %>
-  core: <%= ENV['VALKYRIE_SOLR_CORE'] || 'hyrax-valkyrie-test' %>
+  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_TEST_PORT', 8985)}/solr/hydra-test" %>
 production:
-  host: <%= ENV['VALKYRIE_SOLR_HOST'] %>
-  port: <%= ENV['VALKYRIE_SOLR_PORT'] %>
-  core: <%= ENV['VALKYRIE_SOLR_CORE'] %>
+  url: <%= ENV['SOLR_URL'] || "http://your.production.server:8080/bl_solr/core0" %>

data/lib/generators/hyrax/work_resource/templates/indexer.rb.erb

@@ -2,7 +2,7 @@
 
 # Generated via
 #  `rails generate hyrax:work_resource <%= class_name %>`
-class <%= class_name %>Indexer < Hyrax::ValkyrieWorkIndexer
+class <%= class_name %>Indexer < Hyrax::Indexers::PcdmObjectIndexer(<%= class_name %>)
   include Hyrax::Indexer(:basic_metadata)
   include Hyrax::Indexer(:<%= file_name %>)
 

data/lib/hyrax/configuration.rb

@@ -55,7 +55,7 @@ module Hyrax
   #
   # == Valkyrie
   #
-  # *Experimental:* Options for toggling Hyrax's experimental "Wings" valkyrie
+  # Options for toggling Hyrax's "Wings" valkyrie
   # adapter and configuring valkyrie.
   #
   # @see Hyrax.config
@@ -170,7 +170,7 @@ module Hyrax
     #  @return [Hash] of options like {ch12n_tool: :fits_servlet}
     attr_writer :characterization_options
     def characterization_options
-      @characterization_options ||= {}
+      @characterization_options ||= { ch12n_tool: ENV.fetch('CH12N_TOOL', 'fits').to_sym }
     end
 
     ##
@@ -267,6 +267,28 @@ module Hyrax
       @derivative_services ||= [Hyrax::FileSetDerivativesService]
     end
 
+    attr_writer :file_set_model
+    ##
+    # @return [#constantize] a string representation of the admin set
+    #   model
+    def file_set_model
+      @file_set_model ||= 'Hyrax::FileSet'
+    end
+
+    ##
+    # @return [Class] the configured admin set model class
+    def file_set_class
+      file_set_model.constantize
+    end
+
+    ##
+    # @!attribute [rw] file_set_file_service
+    #   @return [Class] implementer of {Hyrax::FileSetFileService}
+    attr_writer :file_set_file_service
+    def file_set_file_service
+      @file_set_file_service ||= Hyrax::FileSetFileService
+    end
+
     attr_writer :fixity_service
     def fixity_service
       @fixity_service ||= Hyrax::Fixity::ActiveFedoraFixityService
@@ -595,18 +617,20 @@ module Hyrax
     end
 
     ##
-    # @return [Boolean] whether to use the experimental valkyrie index
+    # @return [Boolean] whether to use the valkyrie index
     def query_index_from_valkyrie
       @query_index_from_valkyrie ||= false
     end
     attr_writer :query_index_from_valkyrie
 
     ##
-    # @return [Boolean] whether to use experimental valkyrie storage features
+    # @return [Boolean] whether to use valkyrie storage features
     def use_valkyrie?
+      return @use_valkyrie unless @use_valkyrie.nil?
       return true if disable_wings # always return true if wings is disabled
       ActiveModel::Type::Boolean.new.cast(ENV.fetch('HYRAX_VALKYRIE', false))
     end
+    attr_writer :use_valkyrie
     # @!endgroup
 
     attr_writer :feature_config_path
@@ -836,7 +860,7 @@ module Hyrax
     # @return [#constantize] a string representation of the collection
     #   model
     def collection_model
-      @collection_model ||= '::Collection'
+      @collection_model ||= 'Hyrax::PcdmCollection'
     end
 
     ##
@@ -850,7 +874,7 @@ module Hyrax
     # @return [#constantize] a string representation of the admin set
     #   model
     def admin_set_model
-      @admin_set_model ||= 'AdminSet'
+      @admin_set_model ||= 'Hyrax::AdministrativeSet'
     end
 
     ##
@@ -890,6 +914,70 @@ module Hyrax
       @index_field_mapper ||= ActiveFedora.index_field_mapper
     end
 
+    attr_writer :administrative_set_form
+    ##
+    # @return [Class]
+    def administrative_set_form
+      @administrative_set_form ||= Hyrax::Forms::AdministrativeSetForm
+    end
+
+    attr_writer :file_set_form
+    ##
+    # @return [Class]
+    def file_set_form
+      @file_set_form ||= Hyrax::Forms::FileSetForm
+    end
+
+    attr_writer :pcdm_collection_form
+    ##
+    # @return [Class]
+    def pcdm_collection_form
+      @pcdm_collection_form ||= Hyrax::Forms::PcdmCollectionForm
+    end
+
+    attr_writer :pcdm_object_form_builder
+    ##
+    # @return [Proc]
+    def pcdm_object_form_builder
+      return @pcdm_object_form_builder unless @pcdm_object_form_builder.nil?
+      "Hyrax::Forms::PcdmObjectForm".constantize # autoload
+      @pcdm_object_form_builder = lambda do |model_class|
+        Hyrax::Forms::PcdmObjectForm(model_class)
+      end
+    end
+
+    attr_writer :administrative_set_indexer
+    ##
+    # @return [Class]
+    def administrative_set_indexer
+      @administrative_set_indexer ||= Hyrax::Indexers::AdministrativeSetIndexer
+    end
+
+    attr_writer :file_set_indexer
+    ##
+    # @return [Class]
+    def file_set_indexer
+      @file_set_indexer ||= Hyrax::Indexers::FileSetIndexer
+    end
+
+    attr_writer :pcdm_collection_indexer
+    ##
+    # @return [Class]
+    def pcdm_collection_indexer
+      @pcdm_collection_indexer ||= Hyrax::Indexers::PcdmCollectionIndexer
+    end
+
+    attr_writer :pcdm_object_indexer_builder
+    ##
+    # @return [Proc]
+    def pcdm_object_indexer_builder
+      return @pcdm_object_indexer_builder unless @pcdm_object_indexer_builder.nil?
+      "Hyrax::Indexers::PcdmObjectIndexer".constantize # autoload
+      @pcdm_object_indexer_builder = lambda do |model_class|
+        Hyrax::Indexers::PcdmObjectIndexer(model_class)
+      end
+    end
+
     # Should a button with "Share my work" show on the front page to users who are not logged in?
     attr_writer :display_share_button_when_not_logged_in
     def display_share_button_when_not_logged_in?
@@ -936,7 +1024,7 @@ module Hyrax
     attr_writer :translate_id_to_uri
     def translate_id_to_uri
       @translate_id_to_uri ||= lambda do |id|
-        "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/#{::Noid::Rails.treeify(id)}"
+        "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/#{::Noid::Rails.treeify(id.to_s)}"
       end
     end
 

data/lib/hyrax/indexer.rb

@@ -14,7 +14,7 @@ module Hyrax
   #
   # @example building a module as a mixin
   #
-  #   class MyIndexer < Hyrax::ValkyrieIndexer
+  #   class MyIndexer < Hyrax::Indexers::ResourceIndexer
   #     include Hyrax::Indexer(:core_metadata)
   #   end
   #

data/lib/hyrax/publisher.rb

@@ -10,6 +10,8 @@ module Hyrax
   # reflect the kinds of resources the event applied to.
   #
   #   - `batch`: events related to the performance of `BatchCreateJob`
+  #   - `collection`: events related to the lifecycle of PCDM Collections
+  #   - `file`: events related to the lifecycle of File/FileMetadata
   #   - `file.set`: events related to the lifecycle of Hydra Works FileSets
   #   - `object`: events related to the lifecycle of all PCDM Objects
   #
@@ -73,7 +75,7 @@ module Hyrax
   #
   #   publisher.unsubscribe(event_listener)
   #
-  # @see https://dry-rb.org/gems/dry-events/0.2/
+  # @see https://dry-rb.org/gems/dry-events
   # @see Dry::Events::Publisher
   # @see https://github.com/samvera/hyrax/wiki/Hyrax's-Event-Bus-(Hyrax::Publisher)
   class Publisher
@@ -86,6 +88,7 @@ module Hyrax
     # are you adding an event?
     # make sure Hyrax is publishing events in the correct places (this is be non-trivial!)
     # and add it to the list at https://github.com/samvera/hyrax/wiki/Hyrax's-Event-Bus-(Hyrax::Publisher)
+    # and to the listener generator.
 
     # @!macro [new] a_registered_event
     #   @!attribute [r] $1
@@ -203,7 +206,7 @@ module Hyrax
     # @return Array[Object] the listeners Hyrax subscribes by default.
     def default_listeners
       @default_listeners ||=
-        [Hyrax::Listeners::AclIndexListener.new,
+        [Hyrax::Listeners::ACLIndexListener.new,
          Hyrax::Listeners::BatchNotificationListener.new,
          Hyrax::Listeners::FileMetadataListener.new,
          Hyrax::Listeners::FileSetLifecycleListener.new,

data/lib/hyrax/resource_sync/change_list_writer.rb

@@ -62,7 +62,7 @@ module Hyrax
       def build_resources(xml, doc_set)
         doc_set.each do |doc|
           model = doc.fetch('has_model_ssim', []).first.safe_constantize
-          if model.try(:collection?) || model == Hyrax.config.collection_class
+          if model.try(:collection?) || Hyrax::ModelRegistry.collection_classes.include?(model)
             build_resource(xml, doc, model, hyrax_routes)
           else
             build_resource(xml, doc, model, main_app_routes)

data/lib/hyrax/resource_sync/resource_list_writer.rb

@@ -32,7 +32,7 @@ module Hyrax
         end
       end
 
-      def build_collections(xml, searcher: AbstractTypeRelation.new(allowable_types: [::Collection, Hyrax.config.collection_class]))
+      def build_collections(xml, searcher: AbstractTypeRelation.new(allowable_types: Hyrax::ModelRegistry.collection_classes))
         searcher.search_in_batches(public_access) do |doc_set|
           build_resources(xml, doc_set, hyrax_routes)
         end

data/lib/hyrax/specs/capybara.rb

@@ -51,6 +51,7 @@ Capybara.app_host = "http://#{ip}:#{Capybara.server_port}"
 
 Capybara.default_driver = :rack_test # This is a faster driver
 Capybara.javascript_driver = :selenium_chrome_headless_sandboxless # This is slower
+Capybara.disable_animation = true
 Capybara.default_max_wait_time = ENV.fetch('CAPYBARA_WAIT_TIME', 10) # We may have a slow application, let's give it some time.
 
 Capybara::Screenshot.register_driver(:selenium_chrome_headless_sandboxless) do |driver, path|