hyrax 5.0.0.rc1 → 5.0.0.rc3

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/templates/db/migrate/20230725222727_create_hyrax_counter_metrics.rb.erb

@@ -0,0 +1,14 @@
+class CreateHyraxCounterMetrics < ActiveRecord::Migration<%= migration_version %>
+  def change
+    create_table :hyrax_counter_metrics do |t|
+      t.string :worktype
+      t.string :resource_type
+      t.integer :work_id
+      t.date :date
+      t.integer :total_item_investigations
+      t.integer :total_item_requests
+
+      t.timestamps
+    end
+  end
+end

data/lib/generators/hyrax/templates/db/migrate/20230803165135_change_work_id_to_string.rb.erb

@@ -0,0 +1,5 @@
+class ChangeWorkIdToString < ActiveRecord::Migration<%= migration_version %>
+  def change
+    change_column :hyrax_counter_metrics, :work_id, :string
+  end
+end

data/lib/generators/hyrax/templates/db/migrate/20230808102105_add_indices_to_hyrax_counter_metrics.rb.erb

@@ -0,0 +1,8 @@
+class AddIndicesToHyraxCounterMetrics < ActiveRecord::Migration<%= migration_version %>
+  def change
+    add_index :hyrax_counter_metrics, :worktype
+    add_index :hyrax_counter_metrics, :resource_type
+    add_index :hyrax_counter_metrics, :work_id
+    add_index :hyrax_counter_metrics, :date
+  end
+end

data/lib/generators/hyrax/templates/db/migrate/20230821153635_add_fields_to_counter_metric.rb.erb

@@ -0,0 +1,8 @@
+class AddFieldsToCounterMetric < ActiveRecord::Migration<%= migration_version %>
+  def change
+    add_column :hyrax_counter_metrics, :title, :string
+    add_column :hyrax_counter_metrics, :year_of_publication, :integer, index: true
+    add_column :hyrax_counter_metrics, :publisher, :string, index: true
+    add_column :hyrax_counter_metrics, :author, :string, index: true
+  end
+end

data/lib/generators/hyrax/templates/db/seeds.rb

@@ -7,7 +7,7 @@
 #   movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
 #   Character.create(name: 'Luke', movie: movies.first)
 #
-# To use this file, run the following command in the .internal_test_app:
+# To use this file, run the following command in the test app:
 #   rails generate hyrax:sample_data
 #
 # To re-use this file, you will likely want to clean out the test app content

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

@@ -5,7 +5,7 @@
 #
 # @see https://github.com/samvera/hyrax/wiki/Hyrax-Valkyrie-Usage-Guide#forms
 # @see https://github.com/samvera/valkyrie/wiki/ChangeSets-and-Dirty-Tracking
-class <%= class_name %>Form < Hyrax::Forms::ResourceForm(<%= class_name %>)
+class <%= class_name %>Form < Hyrax::Forms::PcdmObjectForm(<%= class_name %>)
   include Hyrax::FormFields(:basic_metadata)
   include Hyrax::FormFields(:<%= file_name %>)
 

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/generators/hyrax/work_resource/templates/metadata.yaml

@@ -2,6 +2,8 @@
 # index key names, and form properties.
 #
 # Attributes must have a type but all other configuration options are optional.
+# Please note: If using Valkyrie's Fedora Metadata Adapter, predicates for attributes
+# must be placed here.
 #
 # attributes:
 #   attribute_name:

data/lib/hyrax/configuration.rb

@@ -9,6 +9,8 @@ module Hyrax
   # engine options. For convenient reference, options are grouped into the
   # following functional areas:
   #
+  # - Analytics
+  # - Files
   # - Groups
   # - Identifiers
   # - IIIF
@@ -53,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
@@ -148,6 +150,154 @@ module Hyrax
     attr_writer :analytic_start_date
     attr_reader :analytic_start_date
 
+    # @!endgroup
+    # @!group Files
+
+    ##
+    # @!attribute [rw] characterization_service
+    #   @return [#run] the service to use for charactaerization for Valkyrie
+    #     objects
+    #   @ see Hyrax::Characterization::ValkyrieCharacterizationService
+    attr_writer :characterization_service
+    def characterization_service
+      @characterization_service ||=
+        Hyrax::Characterization::ValkyrieCharacterizationService
+    end
+
+    ##
+    # Options to pass to the characterization service
+    # @!attribute [rw] characterization_options
+    #  @return [Hash] of options like {ch12n_tool: :fits_servlet}
+    attr_writer :characterization_options
+    def characterization_options
+      @characterization_options ||= { ch12n_tool: ENV.fetch('CH12N_TOOL', 'fits').to_sym }
+    end
+
+    ##
+    # @!attribute [w] characterization_proxy
+    #   Which FileSet file to use for mime type resolution
+    #   @ see Hyrax::FileSetTypeService
+    attr_writer :characterization_proxy
+    def characterization_proxy
+      @characterization_proxy ||= :original_file
+    end
+
+    # Override characterization runner
+    attr_accessor :characterization_runner
+
+    def mime_types_map # rubocop:disable Metrics/MethodLength
+      {
+        audio_mime_types: [
+          'audio/mp3',
+          'audio/mpeg',
+          'audio/wav',
+          'audio/x-wave',
+          'audio/x-wav',
+          'audio/ogg'
+        ],
+        image_mime_types: [
+          'image/png',
+          'image/jpeg',
+          'image/jpg',
+          'image/jp2',
+          'image/bmp',
+          'image/gif',
+          'image/tiff'
+        ],
+        office_mime_types: [
+          'text/rtf',
+          'application/msword',
+          'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+          'application/vnd.oasis.opendocument.text',
+          'application/vnd.ms-excel',
+          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+          'application/vnd.ms-powerpoint',
+          'application/vnd.openxmlformats-officedocument.presentationml.presentation'
+        ],
+        pdf_mime_types: ['application/pdf'],
+        video_mime_types: [
+          'video/mpeg',
+          'video/mp4',
+          'video/webm',
+          'video/x-msvideo',
+          'video/avi',
+          'video/quicktime',
+          'application/mxf'
+        ]
+      }
+    end
+
+    # First see if we can get them from the FileSet model. If not, use
+    # configuration.
+    # @param [Symbol] type as listed in mime_types_map keys, aligned with
+    # FileSet method names for backwards compatibility.
+    def lookup_mimes(type)
+      vals = "FileSet".safe_constantize.try(type)
+      return vals if vals.is_a?(Array)
+      mime_types_map[type]
+    end
+
+    attr_writer :derivative_mime_type_mappings
+
+    ##
+    # Maps mimetypes to create_*_derivatives methods
+    #
+    # @note these used to be set by +Hydra::Works::MimeTypes+ methods injected
+    #   into `FileSet`. for backwards compatibility, those are used as defaults
+    #   if present, but since `FileSet` is an application side model (and slated
+    #   to be removed) we shouldn't count on it providing these methods.
+    #
+    # @see Hyrax::VaDerivativeService
+    def derivative_mime_type_mappings
+      @derivative_mime_type_mappings ||=
+        { audio: lookup_mimes(:audio_mime_types),
+          image: lookup_mimes(:image_mime_types),
+          office: lookup_mimes(:office_mime_types),
+          pdf: lookup_mimes(:pdf_mime_types),
+          video: lookup_mimes(:video_mime_types) }
+    end
+
+    attr_writer :derivative_services
+    # The registered candidate derivative services.  In the array, the first `valid?` candidate will
+    # handle the derivative generation.
+    #
+    # @return [Array] of objects that conform to Hyrax::DerivativeService interface.
+    # @see Hyrax::DerivativeService
+    def derivative_services
+      @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
+    end
+
+    attr_writer :max_days_between_fixity_checks
+    def max_days_between_fixity_checks
+      @max_days_between_fixity_checks ||= 7
+    end
     # @!endgroup
     # @!group Groups
 
@@ -440,6 +590,20 @@ module Hyrax
       @derivatives_storage_adapter = Valkyrie::StorageAdapter.find(adapter.to_sym)
     end
 
+    # A HTTP connection to use for Valkyrie Fedora requests
+    #
+    # @return [#call] lambda/proc that generates a Faraday connection
+    def fedora_connection_builder
+      @fedora_connection_builder ||= lambda { |url|
+        Faraday.new(url) do |f|
+          f.request :multipart
+          f.request :url_encoded
+          f.adapter Faraday.default_adapter
+        end
+      }
+    end
+    attr_writer :fedora_connection_builder
+
     ##
     # @return [#save, #save_all, #delete, #wipe!] an indexing adapter
     def index_adapter
@@ -453,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
@@ -485,45 +651,6 @@ module Hyrax
       @microdata_default_type ||= 'http://schema.org/CreativeWork'
     end
 
-    attr_writer :fixity_service
-    def fixity_service
-      @fixity_service ||= Hyrax::Fixity::ActiveFedoraFixityService
-    end
-
-    attr_writer :max_days_between_fixity_checks
-    def max_days_between_fixity_checks
-      @max_days_between_fixity_checks ||= 7
-    end
-
-    # Override characterization runner
-    attr_accessor :characterization_runner
-
-    ##
-    # @!attribute [rw] characterization_service
-    #   @return [#run] the service to use for charactaerization for Valkyrie
-    #     objects
-    #   @ see Hyrax::Characterization::ValkyrieCharacterizationService
-    attr_writer :characterization_service
-    def characterization_service
-      @characterization_service ||=
-        Hyrax::Characterization::ValkyrieCharacterizationService
-    end
-
-    ##
-    # @!attribute [w] characterization_proxy
-    #   Which FileSet file to use for mime type resolution
-    #   @ see Hyrax::FileSetTypeService
-    attr_writer :characterization_proxy
-    def characterization_proxy
-      @characterization_proxy ||= :original_file
-    end
-
-    ##
-    # Options to pass to the characterization service
-    # @!attribute [rw] characterization_options
-    #  @return [Hash] of options like {ch12n_tool: :fits_servlet}
-    attr_accessor :characterization_options
-
     # Attributes for the lock manager which ensures a single process/thread is mutating a ore:Aggregation at once.
     # @!attribute [w] lock_retry_count
     #   How many times to retry to acquire the lock before raising UnableToAcquireLockError
@@ -678,6 +805,11 @@ module Hyrax
       Qa::Authorities::Geonames.username = username
     end
 
+    def location_service
+      @location_service ||= Hyrax::LocationService.new
+    end
+    attr_writer :location_service
+
     attr_writer :active_deposit_agreement_acceptance
     def active_deposit_agreement_acceptance?
       return true if @active_deposit_agreement_acceptance.nil?
@@ -728,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
 
     ##
@@ -742,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
 
     ##
@@ -782,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?
@@ -828,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
 
@@ -882,16 +1078,6 @@ module Hyrax
       @range_for_number_of_results_to_display_per_page ||= [10, 20, 50, 100]
     end
 
-    attr_writer :derivative_services
-    # The registered candidate derivative services.  In the array, the first `valid?` candidate will
-    # handle the derivative generation.
-    #
-    # @return [Array] of objects that conform to Hyrax::DerivativeService interface.
-    # @see Hyrax::DerivativeService
-    def derivative_services
-      @derivative_services ||= [Hyrax::FileSetDerivativesService]
-    end
-
     attr_writer :visibility_map
     # A mapping from visibility string values to permissions; the default and
     # reference implementation is provided by {Hyrax::VisibilityMap}.

data/lib/hyrax/controlled_vocabularies/location.rb

@@ -14,7 +14,13 @@ module Hyrax
       end
 
       def full_label
-        Hyrax::LocationService.new.full_label(rdf_subject.to_s)
+        location_service.full_label(rdf_subject.to_s)
+      end
+
+      private
+
+      def location_service
+        Hyrax.config.location_service
       end
     end
   end

data/lib/hyrax/engine.rb

@@ -8,7 +8,6 @@ module Hyrax
     require 'breadcrumbs_on_rails'
     require 'clipboard/rails'
     require 'draper'
-    require 'dry/equalizer'
     require 'dry/events'
     require 'dry/struct'
     require 'dry/validation'

data/lib/hyrax/form_fields.rb

@@ -51,6 +51,12 @@ module Hyrax
         descendant.property field_name.to_sym, options.merge(display: true, default: [])
         descendant.validates field_name.to_sym, presence: true if options.fetch(:required, false)
       end
+
+      # Auto include any matching FormFieldBehaviors
+      schema_name = name.to_s.camelcase
+      behavior = "#{schema_name}FormFieldsBehavior".safe_constantize ||
+                 "Hyrax::#{schema_name}FormFieldsBehavior".safe_constantize
+      descendant.include(behavior) if behavior
     end
   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
@@ -137,6 +140,10 @@ module Hyrax
     #     a system user.
     register_event('file.metadata.updated')
 
+    # @since 5.0.0
+    # @macro a_registered_event
+    register_event('file.metadata.deleted')
+
     # @since 5.0.0
     # @macro a_registered_event
     register_event('file.uploaded')
@@ -199,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/redis_event_store.rb

@@ -25,15 +25,14 @@ module Hyrax
       #
       # @return [Redis]
       def instance
-        connection = Hyrax.config.redis_connection || Redis.current
-
-        if connection.is_a? Redis::Namespace
-          connection.namespace = namespace
-          connection
-        elsif connection == Redis.current
-          Redis.current = Redis::Namespace.new(namespace, redis: connection)
+        if  Hyrax.config.redis_connection&.is_a?(Redis::Namespace)
+          c = Hyrax.config.redis_connection
+          c.namespace = namespace
+          c
+        elsif Hyrax.config.redis_connection
+          Hyrax.config.redis_connection
         else
-          connection
+          Redis::Namespace.new(namespace, redis: Redis.new)
         end
       end
 

data/lib/hyrax/resource_name.rb

@@ -15,5 +15,9 @@ module Hyrax
       @route_key          = legacy_model.model_name.route_key
       @singular_route_key = legacy_model.model_name.singular_route_key
     end
+
+    def human
+      super.titleize
+    end
   end
 end

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