hyrax 5.0.0.rc2 → 5.0.0.rc3

data/app/indexers/hyrax/valkyrie_indexer.rb

@@ -2,121 +2,17 @@
 
 module Hyrax
   ##
-  # @api public
-  #
-  # Transforms +Valkyrie::Resource+ models to solr-ready key-value hashes. Use
-  # {#to_solr} to retrieve the indexable hash.
-  #
-  # The default {Hyrax::ValkyrieIndexer} implementation provides minimal
-  # indexing for the Valkyrie id and the reserved +#created_at+ and
-  # +#updated_at+ attributes.
-  #
-  # Custom indexers inheriting from others are responsible for providing a full
-  # index hash. A common pattern for doing this is to employ method composition
-  # to retrieve the parent's data, then modify it:
-  # +def to_solr; super.tap { |index_document| transform(index_document) }; end+.
-  # This technique creates infinitely composible index building behavior, with
-  # indexers that can always see the state of the resource and the full current
-  # index document.
-  #
-  # It's recommended to *never* modify the state of +resource+ in an indexer.
-  #
-  # @example defining a custom indexer with composition
-  #   class MyIndexer < ValkyrieIndexer
-  #     def to_solr
-  #       super.tap do |index_document|
-  #         index_document[:my_field_tesim]   = resource.my_field.map(&:to_s)
-  #         index_document[:other_field_ssim] = resource.other_field
-  #       end
-  #     end
-  #   end
-  #
-  # @example pairing an indexer with a model class
-  #   class Book < Hyrax::Resource
-  #     attribute :author
-  #   end
-  #
-  #   # match by name "#{model_class}Indexer"
-  #   class BookIndexer < ValkyrieIndexer
-  #     def to_solr
-  #       super.tap do |index_document|
-  #         index_document[:author_si] = resource.author
-  #       end
-  #     end
-  #   end
-  #
-  #   ValkyrieIndexer.for(resource: Book.new) # => #<BookIndexer:0x0000563715a9f1f8 ...>
-  #
-  # @see Valkyrie::Indexing::Solr::IndexingAdapter
-  class ValkyrieIndexer
-    ##
-    # @!attribute [r] resource
-    #   @api public
-    #   @return [Valkyrie::Resource]
-    attr_reader :resource
-
-    ##
-    # @api private
-    # @param [Valkyrie::Resource] resource
-    def initialize(resource:)
-      @resource = resource
-    end
-
-    ##
-    # @api public
-    # @return [HashWithIndifferentAccess<Symbol, Object>]
-    def to_solr
-      {
-        "id": resource.id.to_s,
-        "date_uploaded_dtsi": resource.created_at,
-        "date_modified_dtsi": resource.updated_at,
-        "system_create_dtsi": resource.created_at,
-        "system_modified_dtsi": resource.updated_at,
-        "has_model_ssim": resource.internal_resource
-      }.with_indifferent_access
-    end
-
-    ##
-    # @api private
-    # @note provided for ActiveFedora compatibility.
-    def generate_solr_document
-      to_solr.stringify_keys
+  # @deprecated use +Hyrax::Indexers::ResourceIndexer+ instead
+  class ValkyrieIndexer < Hyrax::Indexers::ResourceIndexer
+    def initialize(*args, **kwargs)
+      Deprecation.warn "`Hyrax::ValkyrieIndexer` is deprecated. Use `Hyrax::Indexers::ResourceIndexer` instead."
+      super
     end
 
     class << self
-      ##
-      # @api public
-      # @param resource [Valkyrie::Resource] an instance of a +Valkyrie::Resource+
-      #   or an inherited class
-      # @note This factory will attempt to return an indexer following a naming convention
-      #   where the indexer for a resource class is expected to be the class name
-      #   appended with 'Indexer'.  It will return default {ValkyrieIndexer} if
-      #   an indexer class following the naming convention is not found.
-      #
-      # @return [Valkyrie::Indexer] an instance of ValkyrieIndexer or an inherited class based on naming convention
-      #
-      # @example
-      #     ValkyrieIndexer.for(resource: Book.new) # => #<BookIndexer ...>
-      def for(resource:)
-        case resource
-        when Hyrax::FileSet
-          Hyrax::ValkyrieFileSetIndexer.new(resource: resource)
-        else
-          indexer_class_for(resource).new(resource: resource)
-        end
-      end
-
-      private
-
-      ##
-      # @param [Object]
-      # @return [Class]
-      def indexer_class_for(resource)
-        indexer_class = "#{resource.class.name}Indexer".safe_constantize
-
-        return indexer_class if indexer_class.is_a?(Class) &&
-                                indexer_class.instance_methods.include?(:to_solr)
-        resource.try(:work?) ? Hyrax::ValkyrieWorkIndexer : ValkyrieIndexer
+      def for(*args, **kwargs)
+        Deprecation.warn "`Hyrax::ValkyrieIndexer.for` is deprecated. Use `Hyrax::Indexers::ResourceIndexer.for` instead."
+        Hyrax::Indexers::ResourceIndexer.for(*args, **kwargs)
       end
     end
   end

data/app/indexers/hyrax/valkyrie_work_indexer.rb

@@ -2,70 +2,11 @@
 
 module Hyrax
   ##
-  # Indexes Hyrax::Work objects
-  class ValkyrieWorkIndexer < Hyrax::ValkyrieIndexer
-    include Hyrax::ResourceIndexer
-    include Hyrax::PermissionIndexer
-    include Hyrax::VisibilityIndexer
-    include Hyrax::LocationIndexer
-    include Hyrax::ThumbnailIndexer
-    include Hyrax::Indexer(:core_metadata)
-
-    def to_solr # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
-      super.tap do |solr_doc|
-        solr_doc['generic_type_si'] = 'Work'
-        solr_doc['suppressed_bsi'] = suppressed?(resource)
-        solr_doc['admin_set_id_ssim'] = [resource.admin_set_id.to_s]
-        admin_set_label = admin_set_label(resource)
-        solr_doc['admin_set_sim']   = admin_set_label
-        solr_doc['admin_set_tesim'] = admin_set_label
-        solr_doc["#{Hyrax.config.admin_set_predicate.qname.last}_ssim"] = [resource.admin_set_id.to_s]
-        solr_doc['member_of_collection_ids_ssim'] = resource.member_of_collection_ids.map(&:to_s)
-        solr_doc['member_ids_ssim'] = resource.member_ids.map(&:to_s)
-        solr_doc['depositor_ssim'] = [resource.depositor]
-        solr_doc['depositor_tesim'] = [resource.depositor]
-        solr_doc['hasRelatedMediaFragment_ssim'] = [resource.representative_id.to_s]
-        solr_doc['hasRelatedImage_ssim'] = [resource.thumbnail_id.to_s]
-        solr_doc['hasFormat_ssim'] = resource.rendering_ids.map(&:to_s) if resource.rendering_ids.present?
-        index_embargo(solr_doc)
-        index_lease(solr_doc)
-      end
-    end
-
-    private
-
-    def suppressed?(resource)
-      Hyrax::ResourceStatus.new(resource: resource).inactive?
-    end
-
-    def admin_set_label(resource)
-      return if resource.admin_set_id.blank?
-      admin_set = Hyrax.query_service.find_by(id: resource.admin_set_id)
-      admin_set.title
-    end
-
-    def index_embargo(doc)
-      if resource.embargo&.active?
-        doc['embargo_release_date_dtsi'] = resource.embargo.embargo_release_date&.to_datetime
-        doc['visibility_after_embargo_ssim'] = resource.embargo.visibility_after_embargo
-        doc['visibility_during_embargo_ssim'] = resource.embargo.visibility_during_embargo
-      else
-        doc['embargo_history_ssim'] = resource&.embargo&.embargo_history
-      end
-
-      doc
-    end
-
-    def index_lease(doc)
-      if resource.lease&.active?
-        doc['lease_expiration_date_dtsi'] = resource.lease.lease_expiration_date&.to_datetime
-        doc['visibility_after_lease_ssim'] = resource.lease.visibility_after_lease
-        doc['visibility_during_lease_ssim'] = resource.lease.visibility_during_lease
-      else
-        doc['lease_history_ssim'] = resource&.lease&.lease_history
-      end
-
-      doc
+  # @deprecated use +Hyrax::Indexers::PcdmObjectIndexer+ instead
+  class ValkyrieWorkIndexer < Hyrax::Indexers::PcdmObjectIndexer
+    def initialize(*args, **kwargs)
+      Deprecation.warn "`Hyrax::ValkyrieWorkIndexer` is deprecated. Use `Hyrax::Indexers::PcdmObjectIndexer` instead."
+      super
     end
   end
 end

data/app/indexers/hyrax/work_indexer.rb

@@ -15,6 +15,7 @@ module Hyrax
         # This enables us to return a Work when we have a FileSet that matches
         # the search query.  While at the same time allowing us not to return Collections
         # when a work in the collection matches the query.
+        # NOTE: file_set_ids_ssim is not indexed for valkyrie resources
         solr_doc['file_set_ids_ssim'] = solr_doc['member_ids_ssim']
         solr_doc['visibility_ssi'] = object.visibility
 

data/app/jobs/create_work_job.rb

@@ -49,6 +49,7 @@ class CreateWorkJob < Hyrax::ApplicationJob
       .with_step_args(
         'work_resource.add_file_sets' => { uploaded_files: files },
         'change_set.set_user_as_depositor' => { user: user },
+        'work_resource.change_depositor' => { user: ::User.find_by_user_key(form.on_behalf_of) },
         'work_resource.save_acl' => { permissions_params: permissions_params }
       )
       .call(form)

data/app/models/admin_set.rb

@@ -28,7 +28,26 @@ class AdminSet < ActiveFedora::Base
   DEFAULT_WORKFLOW_NAME = Hyrax.config.default_active_workflow_name
 
   validates_with Hyrax::HasOneTitleValidator
+
+  ##
+  # @!group Class Attributes
+  #
+  # @!attribute internal_resource
+  #   @return [String]
+  class_attribute :internal_resource, default: "AdminSet"
+
   class_attribute :human_readable_short_description
+  # @!endgroup Class Attributes
+  ##
+
+  def self.to_rdf_representation
+    internal_resource
+  end
+
+  def to_rdf_representation
+    internal_resource
+  end
+
   self.indexer = Hyrax::AdminSetIndexer
 
   property :title,             predicate: ::RDF::Vocab::DC.title
@@ -39,7 +58,7 @@ class AdminSet < ActiveFedora::Base
            predicate: Hyrax.config.admin_set_predicate,
            class_name: 'ActiveFedora::Base'
 
-  before_destroy :check_if_not_default_set, :check_if_empty
+  before_destroy :check_if_not_default_set, :check_if_empty, prepend: true
   after_destroy :destroy_permission_template
 
   def collection_type_gid

data/app/models/collection.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+# 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

data/app/models/concerns/hyrax/ability/admin_set_ability.rb

@@ -3,49 +3,34 @@ module Hyrax
   module Ability
     module AdminSetAbility
       def admin_set_abilities # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+        models = Hyrax::ModelRegistry.admin_set_classes
         if admin?
-          can :manage, [AdminSet, Hyrax::AdministrativeSet]
-          can :manage_any, AdminSet
-          can :manage_any, Hyrax::AdministrativeSet
-          can :create_any, AdminSet
-          can :create_any, Hyrax::AdministrativeSet
-          can :view_admin_show_any, AdminSet
-          can :view_admin_show_any, Hyrax::AdministrativeSet
+          can :manage, models
+          can :manage_any, models
+          can :create_any, models
+          can :view_admin_show_any, models
         else
-          if Hyrax::Collections::PermissionsService.can_manage_any_admin_set?(ability: self)
-            can :manage_any, AdminSet
-            can :manage_any, Hyrax::AdministrativeSet
-          end
+          can :manage_any, models if Hyrax::Collections::PermissionsService.can_manage_any_admin_set?(ability: self)
           if Hyrax::CollectionTypes::PermissionsService.can_create_admin_set_collection_type?(ability: self)
-            can :create, [AdminSet, Hyrax::AdministrativeSet]
-            can :create_any, AdminSet
-            can :create_any, Hyrax::AdministrativeSet
-          end
-          if Hyrax::Collections::PermissionsService.can_view_admin_show_for_any_admin_set?(ability: self)
-            can :view_admin_show_any, AdminSet
-            can :view_admin_show_any, Hyrax::AdministrativeSet
+            can :create, models
+            can :create_any, models
           end
+          can :view_admin_show_any, models if Hyrax::Collections::PermissionsService.can_view_admin_show_for_any_admin_set?(ability: self)
           # [:edit, :update, :destroy] for AdminSet is controlled by Hydra::Ability #edit_permissions
-          can [:edit, :update, :destroy], Hyrax::AdministrativeSet do |admin_set| # for test by solr_doc, see solr_document_ability.rb
+          can [:edit, :update, :destroy], models do |admin_set| # for test by solr_doc, see solr_document_ability.rb
             test_edit(admin_set.id)
           end
 
-          can :deposit, AdminSet do |admin_set| # for test by solr_doc, see collection_ability.rb
-            Hyrax::Collections::PermissionsService.can_deposit_in_collection?(ability: self, collection_id: admin_set.id)
-          end
-          can :deposit, Hyrax::AdministrativeSet do |admin_set| # for test by solr_doc, see collection_ability.rb
+          can :deposit, models do |admin_set| # for test by solr_doc, see collection_ability.rb
             Hyrax::Collections::PermissionsService.can_deposit_in_collection?(ability: self, collection_id: admin_set.id)
           end
 
-          can :view_admin_show, AdminSet do |admin_set| # admin show page # for test by solr_doc, see collection_ability.rb
-            Hyrax::Collections::PermissionsService.can_view_admin_show_for_collection?(ability: self, collection_id: admin_set.id)
-          end
-          can :view_admin_show, Hyrax::AdministrativeSet do |admin_set| # admin show page # for test by solr_doc, see collection_ability.rb
+          can :view_admin_show, models do |admin_set| # admin show page # for test by solr_doc, see collection_ability.rb
             Hyrax::Collections::PermissionsService.can_view_admin_show_for_collection?(ability: self, collection_id: admin_set.id)
           end
 
           # [:read] for AdminSet is controlled by Hydra::Ability #read_permissions
-          can :read, Hyrax::AdministrativeSet do |admin_set| # admin show page # for test by solr_doc, see collection_ability.rb
+          can :read, models do |admin_set| # admin show page # for test by solr_doc, see collection_ability.rb
             test_read(admin_set.id)
           end
         end

data/app/models/concerns/hyrax/ability/collection_ability.rb

@@ -3,52 +3,50 @@ module Hyrax
   module Ability
     module CollectionAbility
       def collection_abilities # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-        models = [Hyrax::PcdmCollection, Hyrax.config.collection_class].uniq
+        models = Hyrax::ModelRegistry.collection_classes
         if admin?
-          models.each do |collection_model|
-            can :manage, collection_model
-            can :manage_any, collection_model
-            can :create_any, collection_model
-            can :view_admin_show_any, collection_model
-          end
+          can :manage, models
+          can :manage_any, models
+          can :create_any, models
+          can :view_admin_show_any, models
         else
-          models.each { |collection_model| can :manage_any, collection_model } if
-            Hyrax::Collections::PermissionsService.can_manage_any_collection?(ability: self)
+          can :manage_any, models if Hyrax::Collections::PermissionsService.can_manage_any_collection?(ability: self)
 
-          models.each { |collection_model| can :create_any, collection_model } if
-            Hyrax::CollectionTypes::PermissionsService.can_create_any_collection_type?(ability: self)
+          can :create_any, models if Hyrax::CollectionTypes::PermissionsService.can_create_any_collection_type?(ability: self)
 
-          models.each { |collection_model| can :view_admin_show_any, collection_model } if
-          Hyrax::Collections::PermissionsService.can_view_admin_show_for_any_collection?(ability: self)
+          can :view_admin_show_any, models if Hyrax::Collections::PermissionsService.can_view_admin_show_for_any_collection?(ability: self)
 
-          models.each do |collection_model|
-            can [:edit, :update, :destroy], collection_model do |collection|
-              test_edit(collection.id)
-            end
+          can [:edit, :update, :destroy], models do |collection|
+            test_edit(collection.id)
+          end
 
-            can :deposit, collection_model do |collection|
-              Hyrax::Collections::PermissionsService.can_deposit_in_collection?(ability: self, collection_id: collection.id)
-            end
+          can :deposit, models do |collection|
+            Hyrax::Collections::PermissionsService.can_deposit_in_collection?(ability: self, collection_id: collection.id)
+          end
 
-            can :view_admin_show, collection_model do |collection| # admin show page
-              Hyrax::Collections::PermissionsService.can_view_admin_show_for_collection?(ability: self, collection_id: collection.id)
-            end
+          can :view_admin_show, models do |collection| # admin show page
+            Hyrax::Collections::PermissionsService.can_view_admin_show_for_collection?(ability: self, collection_id: collection.id)
+          end
 
-            can :read, collection_model do |collection| # public show page
-              test_read(collection.id)
-            end
+          can :read, models do |collection| # public show page
+            test_read(collection.id)
           end
 
           can :deposit, ::SolrDocument do |solr_doc|
             Hyrax::Collections::PermissionsService.can_deposit_in_collection?(ability: self, collection_id: solr_doc.id) # checks collections and admin_sets
           end
-          can :deposit, String do |collection_id|
-            Hyrax::Collections::PermissionsService.can_deposit_in_collection?(ability: self, collection_id: collection_id)
+
+          can :deposit, [::String, ::Valkyrie::ID] do |collection_id|
+            Hyrax::Collections::PermissionsService.can_deposit_in_collection?(ability: self, collection_id: collection_id.to_s)
           end
 
           can :view_admin_show, ::SolrDocument do |solr_doc| # admin show page
             Hyrax::Collections::PermissionsService.can_view_admin_show_for_collection?(ability: self, collection_id: solr_doc.id) # checks collections and admin_sets
           end
+
+          can :view_admin_show, [::String, ::Valkyrie::ID] do |collection_id| # admin show page
+            Hyrax::Collections::PermissionsService.can_view_admin_show_for_collection?(ability: self, collection_id: collection_id.to_s) # checks collections and admin_sets
+          end
         end
       end
     end

data/app/models/concerns/hyrax/ability/resource_ability.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+module Hyrax
+  module Ability
+    module ResourceAbility
+      def resource_abilities
+        if admin?
+          can [:manage], ::Hyrax::Resource
+        else
+          can [:edit, :update, :destroy], ::Hyrax::Resource do |res|
+            test_edit(res.id)
+          end
+          can :read, ::Hyrax::Resource do |res|
+            test_read(res.id)
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/concerns/hyrax/ability.rb

@@ -53,6 +53,7 @@ module Hyrax
       include Hyrax::Ability::CollectionAbility
       include Hyrax::Ability::CollectionTypeAbility
       include Hyrax::Ability::PermissionTemplateAbility
+      include Hyrax::Ability::ResourceAbility
       include Hyrax::Ability::SolrDocumentAbility
 
       class_attribute :admin_group_name, :registered_group_name, :public_group_name
@@ -76,6 +77,7 @@ module Hyrax
                              :collection_abilities,
                              :collection_type_abilities,
                              :permission_template_abilities,
+                             :resource_abilities,
                              :solr_document_abilities,
                              :trophy_abilities]
     end
@@ -102,7 +104,7 @@ module Hyrax
     # Returns true if can create at least one type of work and they can deposit
     # into at least one AdminSet
     def can_create_any_work?
-      Hyrax.config.curation_concerns.any? do |curation_concern_type|
+      curation_concerns_models.any? do |curation_concern_type|
         can?(:create, curation_concern_type)
       end && admin_set_with_deposit?
     end
@@ -122,8 +124,8 @@ module Hyrax
     #
     # Overrides hydra-head, (and restores the method from blacklight-access-controls)
     def download_permissions
-      can :download, String do |id|
-        test_download(id)
+      can :download, [::String, ::Valkyrie::ID] do |id|
+        test_download(id.to_s)
       end
 
       can :download, ::SolrDocument do |obj|
@@ -187,8 +189,8 @@ module Hyrax
     #   self.ability_logic += [:proxy_deposit_abilities]
     def proxy_deposit_abilities
       if Flipflop.transfer_works?
-        can :transfer, String do |id|
-          user_is_depositor?(id)
+        can :transfer, [::String, Valkyrie::ID] do |id|
+          user_is_depositor?(id.to_s)
         end
       end
 
@@ -366,7 +368,7 @@ module Hyrax
       alias_action :show, to: :read
       alias_action :discover, to: :read
       can :update, :appearance
-      can :manage, String # The identifier of a work or FileSet
+      can :manage, [String, Valkyrie::ID] # The identifier of a work or FileSet
       can :manage, curation_concerns_models
       can :manage, Sipity::WorkflowResponsibility
       can :manage, :collection_types
@@ -412,14 +414,14 @@ module Hyrax
     end
 
     # Returns true if the current user is the depositor of the specified work
-    # @param document_id [String] the id of the document.
+    # @param document_id [String, Valkyrie::ID] the id of the document.
     def user_is_depositor?(document_id)
-      doc = Hyrax::SolrService.search_by_id(document_id, fl: 'depositor_ssim')
+      doc = Hyrax::SolrService.search_by_id(document_id.to_s, fl: 'depositor_ssim')
       current_user.user_key == doc['depositor_ssim']&.first
     end
 
     def curation_concerns_models
-      [::FileSet, ::Hyrax::FileSet, Hyrax.config.collection_class] + Hyrax.config.curation_concerns
+      Hyrax::ModelRegistry.collection_classes + Hyrax::ModelRegistry.file_set_classes + Hyrax::ModelRegistry.work_classes
     end
 
     def can_review_submissions?

data/app/models/concerns/hyrax/collection_behavior.rb

@@ -17,7 +17,15 @@ module Hyrax
 
       self.indexer = Hyrax::CollectionIndexer
 
+      ##
+      # @!group Class Attributes
+      #
+      # @!attribute internal_resource
+      #   @return [String]
+      class_attribute :internal_resource, default: "Collection"
+
       class_attribute :index_collection_type_gid_as, instance_writer: false
+      ##
       self.index_collection_type_gid_as = [:symbol]
 
       property :collection_type_gid, predicate: ::RDF::Vocab::SCHEMA.additionalType, multiple: false do |index|

data/app/models/concerns/hyrax/solr_document_behavior.rb

@@ -53,25 +53,25 @@ module Hyrax
     ##
     # @return [Boolean]
     def collection?
-      hydra_model == Hyrax.config.collection_class
+      Hyrax::ModelRegistry.collection_classes.include?(hydra_model)
     end
 
     ##
     # @return [Boolean]
     def file_set?
-      hydra_model == ::FileSet || hydra_model == Hyrax::FileSet
+      Hyrax::ModelRegistry.file_set_classes.include?(hydra_model)
     end
 
     ##
     # @return [Boolean]
     def admin_set?
-      hydra_model == Hyrax.config.admin_set_class
+      Hyrax::ModelRegistry.admin_set_classes.include?(hydra_model)
     end
 
     ##
     # @return [Boolean]
     def work?
-      Hyrax.config.curation_concerns.include? hydra_model
+      Hyrax::ModelRegistry.work_classes.include?(hydra_model)
     end
 
     # Method to return the model
@@ -86,6 +86,7 @@ module Hyrax
     end
 
     def creator
+      # TODO: should we replace "hydra_model == AdminSet" with by #admin_set?
       solr_term = hydra_model == AdminSet ? "creator_ssim" : "creator_tesim"
       fetch(solr_term, [])
     end
@@ -122,7 +123,16 @@ module Hyrax
     end
 
     def lease_enforced?
-      lease_expiration_date.present?
+      return false if lease_expiration_date.blank?
+
+      indexed_lease_visibility = first('visibility_during_lease_ssim')
+      # if we didn't index an embargo visibility, assume the release date means
+      # it's enforced
+      return true if indexed_lease_visibility.blank?
+
+      # if the visibility and the visibility during lease are the same, we're
+      # enforcing the lease
+      self['visibility_ssi'] == indexed_lease_visibility
     end
 
     private

data/app/models/concerns/hyrax/work_behavior.rb

@@ -30,6 +30,10 @@ module Hyrax
       self.default_system_virus_scanner = Hyrax::VirusScanner
     end
 
+    def to_rdf_representation
+      self.class.to_rdf_representation
+    end
+
     module ClassMethods
       # This governs which partial to draw when you render this type of object
       def _to_partial_path # :nodoc:

data/app/models/featured_work.rb

@@ -1,21 +1,29 @@
 # frozen_string_literal: true
 class FeaturedWork < ActiveRecord::Base
-  FEATURE_LIMIT = 5
+  ##
+  # @!group Class Attributes
+  #
+  # @!attribute feature_limit [r|w]
+  #   @return [Integer]
+  class_attribute :feature_limit, default: 5
+  # @!endgroup Class Attributes
+  ##
+
   validate :count_within_limit, on: :create
-  validates :order, inclusion: { in: proc { 0..FEATURE_LIMIT } }
+  validates :order, inclusion: { in: proc { 0..feature_limit } }
 
   default_scope { order(:order) }
 
   def count_within_limit
     return if FeaturedWork.can_create_another?
-    errors.add(:base, "Limited to #{FEATURE_LIMIT} featured works.")
+    errors.add(:base, "Limited to #{feature_limit} featured works.")
   end
 
   attr_accessor :presenter
 
   class << self
     def can_create_another?
-      FeaturedWork.count < FEATURE_LIMIT
+      FeaturedWork.count < feature_limit
     end
   end
 end

data/app/models/file_set.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+# Provide plain file set model if not defined by the application.
+# Needed until Hyrax internals do not assume its existence.
+class ::FileSet < Hyrax.config.file_set_class; end unless '::FileSet'.safe_constantize

data/app/models/hyrax/administrative_set.rb

@@ -33,7 +33,7 @@ module Hyrax
 
     ##
     # @return [Boolean] true
-    def collection?
+    def self.pcdm_collection?
       true
     end
 

data/app/models/hyrax/change_set.rb

@@ -21,8 +21,8 @@ module Hyrax
 
       ##
       # @return [String]
-      def self.inspect
-        return "Hyrax::ChangeSet(#{model_class})" if name.blank?
+      define_singleton_method :inspect do
+        return "Hyrax::ChangeSet(#{resource_class})" if name.blank?
         super
       end
     end