hyrax 5.0.0.rc1 → 5.0.0.rc3

data/app/indexers/concerns/hyrax/location_indexer.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Hyrax
+  ##
+  # Indexes properties common to Hyrax::Resource types
+  module LocationIndexer
+    def to_solr
+      super.tap do |index_document|
+        index_document[:based_near_label_tesim] = based_near_label_lookup(resource.based_near) if resource.respond_to? :based_near
+      end
+    end
+
+    private
+
+    def based_near_label_lookup(locations)
+      locations.map do |loc|
+        location_service.full_label(loc)
+      end
+    end
+
+    def location_service
+      Hyrax.config.location_service
+    end
+  end
+end

data/app/indexers/{hyrax → concerns/hyrax}/permission_indexer.rb

@@ -6,14 +6,14 @@ module Hyrax
   # permissions being up-to-date in the index to support `Hyrax::Ability`.
   #
   # @example
-  #   class MyIndexer < Hyrax::ValkyrieIndexer
+  #   class MyIndexer < Hyrax::Indexers::ResourceIndexer
   #     include Hyrax::PermissionIndexer
   #   end
   module PermissionIndexer
     def to_solr
       super.tap do |index_document|
         config      = Hydra.config.permissions
-        permissions = Hyrax::PermissionManager.new(resource: resource)
+        permissions = resource.permission_manager || Hyrax::PermissionManager.new(resource: resource)
 
         index_document[config.edit.group] = permissions.edit_groups.to_a
         index_document[config.edit.individual] = permissions.edit_users.to_a

data/app/indexers/{hyrax → concerns/hyrax}/visibility_indexer.rb

@@ -7,7 +7,7 @@ module Hyrax
   # views.
   #
   # @example
-  #   class MyIndexer < Hyrax::ValkyrieIndexer
+  #   class MyIndexer < Hyrax::Indexers::ResourceIndexer
   #     include Hyrax::VisibilityIndexer
   #   end
   module VisibilityIndexer

data/app/indexers/hyrax/administrative_set_indexer.rb

@@ -2,23 +2,11 @@
 
 module Hyrax
   ##
-  # Indexes Hyrax::AdministrativeSet objects
-  class AdministrativeSetIndexer < Hyrax::ValkyrieIndexer
-    include Hyrax::ResourceIndexer
-    include Hyrax::PermissionIndexer
-    include Hyrax::VisibilityIndexer
-    include Hyrax::Indexer(:core_metadata)
-
-    def to_solr # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
-      super.tap do |solr_doc|
-        solr_doc[Hyrax.config.collection_type_index_field.to_sym] = Array(resource.try(:collection_type_gid)&.to_s)
-        solr_doc[:alternative_title_tesim] = resource.alternative_title
-        solr_doc[:creator_ssim]            = [resource.creator]
-        solr_doc[:creator_tesim]           = [resource.creator]
-        solr_doc[:description_tesim]       = resource.description
-        solr_doc[:generic_type_sim]        = ['Admin Set']
-        solr_doc[:thumbnail_path_ss]       = Hyrax::CollectionThumbnailPathService.call(resource)
-      end
+  # @deprecated use +Hyrax::Indexers::AdministrativeSetIndexer+ instead
+  class AdministrativeSetIndexer < Hyrax::Indexers::AdministrativeSetIndexer
+    def initialize(*args, **kwargs)
+      Deprecation.warn "`Hyrax::AdministrativeSetIndexer` is deprecated. Use `Hyrax::Indexers::AdministrativeSetIndexer` instead."
+      super
     end
   end
 end

data/app/indexers/hyrax/indexers/administrative_set_indexer.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module Indexers
+    ##
+    # Indexes Hyrax::AdministrativeSet objects
+    class AdministrativeSetIndexer < Hyrax::Indexers::ResourceIndexer
+      include Hyrax::PermissionIndexer
+      include Hyrax::VisibilityIndexer
+      include Hyrax::Indexer(:core_metadata)
+
+      def to_solr # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+        super.tap do |solr_doc|
+          solr_doc[Hyrax.config.collection_type_index_field.to_sym] = Array(resource.try(:collection_type_gid)&.to_s)
+          solr_doc[:alternative_title_tesim] = resource.alternative_title
+          solr_doc[:creator_ssim]            = [resource.creator]
+          solr_doc[:creator_tesim]           = [resource.creator]
+          solr_doc[:description_tesim]       = resource.description
+          solr_doc[:generic_type_sim]        = ['Admin Set']
+          solr_doc[:thumbnail_path_ss]       = Hyrax::CollectionThumbnailPathService.call(resource)
+        end
+      end
+    end
+  end
+end

data/app/indexers/hyrax/indexers/file_set_indexer.rb

@@ -0,0 +1,144 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module Indexers
+    ##
+    # Indexes Hyrax::FileSet objects
+    class FileSetIndexer < Hyrax::Indexers::ResourceIndexer # rubocop:disable Metrics/ClassLength
+      include Hyrax::PermissionIndexer
+      include Hyrax::VisibilityIndexer
+      include Hyrax::ThumbnailIndexer
+      include Hyrax::Indexer(:core_metadata)
+      include Hyrax::Indexer(:file_set_metadata)
+
+      def to_solr # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+        super.tap do |solr_doc| # rubocop:disable Metrics/BlockLength
+          solr_doc['generic_type_si'] = 'FileSet'
+
+          # Metadata from the FileSet
+          solr_doc['file_ids_ssim']                = resource.file_ids&.map(&:to_s)
+          solr_doc['original_file_id_ssi']         = resource.iiif_id
+          solr_doc['extracted_text_id_ssi']        = resource.extracted_text_id.to_s
+          solr_doc['hasRelatedMediaFragment_ssim'] = resource.representative_id.to_s
+          solr_doc['hasRelatedImage_ssim']         = resource.thumbnail_id.to_s
+
+          index_lease(solr_doc)
+          index_embargo(solr_doc)
+
+          # Add in metadata from the primary file.
+          file_metadata = Hyrax.config.file_set_file_service.new(file_set: resource).primary_file
+          return solr_doc unless file_metadata
+
+          # Label is the actual file name. It's not editable by the user.
+          solr_doc['original_file_alternate_ids_tesim'] = file_metadata.alternate_ids&.map(&:to_s) if file_metadata.alternate_ids.present?
+
+          solr_doc['original_filename_tesi']  = file_metadata.original_filename if file_metadata.original_filename.present?
+          solr_doc['original_filename_ssi']   = file_metadata.original_filename if file_metadata.original_filename.present?
+          solr_doc['mime_type_tesi']          = file_metadata.mime_type if file_metadata.mime_type.present?
+          solr_doc['mime_type_ssi']           = file_metadata.mime_type if file_metadata.mime_type.present?
+
+          solr_doc['file_format_tesim']       = file_format(file_metadata)
+          solr_doc['file_format_sim']         = file_format(file_metadata)
+          solr_doc['file_size_lts']           = file_metadata.recorded_size[0]
+          solr_doc['type_tesim']              = file_metadata.pcdm_use.map(&:to_s) if file_metadata.pcdm_use.present?
+          solr_doc['pcdm_use_tesim'] = file_metadata.pcdm_use.map(&:to_s) if file_metadata.pcdm_use.present?
+
+          # attributes set by fits
+          solr_doc['format_label_tesim']      = file_metadata.format_label if file_metadata.format_label.present?
+          solr_doc['size_tesim']              = file_metadata.recorded_size if file_metadata.recorded_size.present?
+          solr_doc['well_formed_tesim']       = file_metadata.well_formed if file_metadata.well_formed.present?
+          solr_doc['valid_tesim']             = file_metadata.valid if file_metadata.valid.present?
+          solr_doc['fits_version_tesim']      = file_metadata.fits_version if file_metadata.fits_version.present?
+          solr_doc['exif_version_tesim']      = file_metadata.exif_version if file_metadata.exif_version.present?
+          solr_doc['checksum_tesim']          = file_metadata.checksum if file_metadata.checksum.present?
+
+          # shared attributes across multiple file types
+          solr_doc['frame_rate_tesim']        = file_metadata.frame_rate if file_metadata.frame_rate.present? # audio, video
+          solr_doc['bit_rate_tesim']          = file_metadata.bit_rate if file_metadata.bit_rate.present? # audio, video
+          solr_doc['duration_tesim']          = file_metadata.duration if file_metadata.duration.present? # audio, video
+          solr_doc['sample_rate_tesim']       = file_metadata.sample_rate if file_metadata.sample_rate.present? # audio, video
+
+          solr_doc['height_tesim']            = file_metadata.height if file_metadata.height.present? # image, video
+          solr_doc['width_tesim']             = file_metadata.width if file_metadata.width.present? # image, video
+          solr_doc['height_is']               = Integer(file_metadata.height.first) if file_metadata.height.present?
+          solr_doc['width_is']                = Integer(file_metadata.width.first) if file_metadata.width.present?
+
+          # attributes set by fits for audio files
+          solr_doc['bit_depth_tesim']         = file_metadata.bit_depth if file_metadata.bit_depth.present?
+          solr_doc['channels_tesim']          = file_metadata.channels if file_metadata.channels.present?
+          solr_doc['alpha_channels_ssi']      = file_metadata.channels.first if file_metadata.channels.present?
+          solr_doc['data_format_tesim']       = file_metadata.data_format if file_metadata.data_format.present?
+          solr_doc['offset_tesim']            = file_metadata.offset if file_metadata.offset.present?
+
+          # attributes set by fits for documents
+          solr_doc['file_title_tesim']        = file_metadata.file_title if file_metadata.file_title.present?
+          solr_doc['page_count_tesim']        = file_metadata.page_count if file_metadata.page_count.present?
+          solr_doc['language_tesim']          = file_metadata.language if file_metadata.language.present?
+          solr_doc['word_count_tesim']        = file_metadata.word_count if file_metadata.word_count.present?
+          solr_doc['character_count_tesim']   = file_metadata.character_count if file_metadata.character_count.present?
+          solr_doc['line_count_tesim']        = file_metadata.line_count if file_metadata.line_count.present?
+          solr_doc['character_set_tesim']     = file_metadata.character_set if file_metadata.character_set.present?
+          solr_doc['markup_basis_tesim']      = file_metadata.markup_basis if file_metadata.markup_basis.present?
+          solr_doc['paragraph_count_tesim']   = file_metadata.paragraph_count if file_metadata.paragraph_count.present?
+          solr_doc['markup_language_tesim']   = file_metadata.markup_language if file_metadata.markup_language.present?
+          solr_doc['table_count_tesim']       = file_metadata.table_count if file_metadata.table_count.present?
+          solr_doc['graphics_count_tesim']    = file_metadata.graphics_count if file_metadata.graphics_count.present?
+
+          # attributes set by fits for images
+          solr_doc['byte_order_tesim']        = file_metadata.byte_order if file_metadata.byte_order.present?
+          solr_doc['compression_tesim']       = file_metadata.compression if file_metadata.compression.present?
+          solr_doc['color_space_tesim']       = file_metadata.color_space if file_metadata.color_space.present?
+          solr_doc['profile_name_tesim']      = file_metadata.profile_name if file_metadata.profile_name.present?
+          solr_doc['profile_version_tesim']   = file_metadata.profile_version if file_metadata.profile_version.present?
+          solr_doc['orientation_tesim']       = file_metadata.orientation if file_metadata.orientation.present?
+          solr_doc['color_map_tesim']         = file_metadata.color_map if file_metadata.color_map.present?
+          solr_doc['image_producer_tesim']    = file_metadata.image_producer if file_metadata.image_producer.present?
+          solr_doc['capture_device_tesim']    = file_metadata.capture_device if file_metadata.capture_device.present?
+          solr_doc['scanning_software_tesim'] = file_metadata.scanning_software if file_metadata.scanning_software.present?
+          solr_doc['gps_timestamp_tesim']     = file_metadata.gps_timestamp if file_metadata.gps_timestamp.present?
+          solr_doc['latitude_tesim']          = file_metadata.latitude if file_metadata.latitude.present?
+          solr_doc['longitude_tesim']         = file_metadata.longitude if file_metadata.longitude.present?
+
+          # attributes set by fits for video
+          solr_doc['aspect_ratio_tesim']      = file_metadata.aspect_ratio if file_metadata.aspect_ratio.present?
+        end
+      end
+
+      private
+
+      def file_format(file)
+        if file.mime_type.present? && file.format_label.present?
+          "#{file.mime_type.split('/').last} (#{file.format_label.join(', ')})"
+        elsif file.mime_type.present?
+          file.mime_type.split('/').last
+        elsif file.format_label.present?
+          file.format_label
+        end
+      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
+      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
+    end
+  end
+end

data/app/indexers/hyrax/indexers/pcdm_collection_indexer.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module Indexers
+    ##
+    # Indexes properties common to PCDM Collections
+    class PcdmCollectionIndexer < Hyrax::Indexers::ResourceIndexer
+      include Hyrax::PermissionIndexer
+      include Hyrax::VisibilityIndexer
+      include Hyrax::LocationIndexer
+      include Hyrax::ThumbnailIndexer
+      include Hyrax::Indexer(:core_metadata)
+
+      self.thumbnail_path_service = CollectionThumbnailPathService
+
+      def to_solr
+        super.tap do |index_document|
+          index_document[Hyrax.config.collection_type_index_field.to_sym] = Array(resource.try(:collection_type_gid)&.to_s)
+          index_document[:generic_type_sim] = ['Collection']
+          index_document[:member_of_collection_ids_ssim] = resource.member_of_collection_ids.map(&:to_s)
+          index_document[:depositor_ssim] = [resource.depositor]
+          index_document[:depositor_tesim] = [resource.depositor]
+        end
+      end
+    end
+  end
+end

data/app/indexers/hyrax/indexers/pcdm_object_indexer.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module Indexers
+    ##
+    # Indexes non‐fileset PCDM objects
+    class PcdmObjectIndexer < Hyrax::Indexers::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
+      end
+    end
+  end
+end

data/app/indexers/hyrax/indexers/resource_indexer.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module Indexers
+    ##
+    # @api public
+    #
+    # Transforms +Valkyrie::Resource+ models to solr-ready key-value hashes. Use
+    # {#to_solr} to retrieve the indexable hash.
+    #
+    # The default {Hyrax::Indexers::ResourceIndexer} 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_doc| transform(index_doc) }; 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.
+    class ResourceIndexer
+      ##
+      # @!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.to_rdf_representation,
+          "human_readable_type_tesim": resource.human_readable_type,
+          "alternate_ids_sim": resource.alternate_ids.map(&:to_s)
+        }.with_indifferent_access
+      end
+
+      ##
+      # @api private
+      # @note provided for ActiveFedora compatibility.
+      def generate_solr_document
+        to_solr.stringify_keys
+      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 then attempt
+        #   to select an indexer based on the class of the resource, and will
+        #   return a default {Hyrax::Indexers::ResourceIndexer} if an indexer
+        #   class is otherwise not found.
+        #
+        # @return [Hyrax::Indexers::ResourceIndexer] an instance of +Hyrax::Indexers::ResourceIndexer+ or an inherited class
+        #
+        # @example
+        #     Hyrax::Indexers::ResourceIndexer.for(resource: Book.new) # => #<BookIndexer ...>
+        def for(resource:)
+          klass = "#{resource.class.name}Indexer".safe_constantize
+          klass = nil unless klass.is_a?(Class) && klass.instance_methods.include?(:to_solr)
+          klass ||= Hyrax::Indexers::ResourceIndexer(resource.class)
+          klass.new(resource: resource)
+        end
+      end
+    end
+  end
+end

data/app/indexers/hyrax/indexers.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module Indexers
+    ##
+    # Provides a model‐specific subclass for
+    # +Hyrax::Indexers::PcdmObjectIndexer+.
+    #
+    # The base Hyrax engine could get on without this, but it’s useful for
+    # downstream applications and reflects what we do for forms.
+    def self.PcdmObjectIndexer(work_class) # rubocop:disable Naming/MethodName
+      Class.new(Hyrax::Indexers::PcdmObjectIndexer) do
+        @model_class = work_class
+
+        class << self
+          attr_reader :model_class
+
+          ##
+          # @return [String]
+          def inspect
+            return "Hyrax::Indexers::PcdmObjectIndexer(#{model_class})" if name.blank?
+            super
+          end
+        end
+      end
+    end
+
+    ##
+    # @api public
+    #
+    # Returns the indexer class associated with a given model.
+    def self.ResourceIndexer(model_class) # rubocop:disable Metrics/MethodLength, Metrics/PerceivedComplexity, Naming/MethodName
+      @resource_indexers ||= {}.compare_by_identity
+      @resource_indexers[model_class] ||=
+        # +#respond_to?+ needs to be used here, not +#try+, because Dry::Types
+        # overrides the latter??
+        if model_class.respond_to?(:pcdm_collection?) && model_class.pcdm_collection?
+          if model_class <= Hyrax::AdministrativeSet
+            Hyrax.config.administrative_set_indexer
+          else
+            Hyrax.config.pcdm_collection_indexer
+          end
+        elsif model_class.respond_to?(:pcdm_object?) && model_class.pcdm_object?
+          if model_class.respond_to?(:file_set?) && model_class.file_set?
+            Hyrax.config.file_set_indexer
+          else
+            Hyrax.config.pcdm_object_indexer_builder.call(model_class)
+          end
+        else
+          Hyrax::Indexers::ResourceIndexer
+        end
+    end
+  end
+end

data/app/indexers/hyrax/pcdm_collection_indexer.rb

@@ -2,32 +2,11 @@
 
 module Hyrax
   ##
-  # Indexes properties common to PCDM Collections
-  class PcdmCollectionIndexer < Hyrax::ValkyrieIndexer
-    include Hyrax::ResourceIndexer
-    include Hyrax::PermissionIndexer
-    include Hyrax::VisibilityIndexer
-    include Hyrax::ThumbnailIndexer
-    include Hyrax::Indexer(:core_metadata)
-
-    self.thumbnail_path_service = CollectionThumbnailPathService
-
-    def to_solr
-      super.tap do |index_document|
-        index_document[Hyrax.config.collection_type_index_field.to_sym] = Array(resource.try(:collection_type_gid)&.to_s)
-        index_document[:generic_type_sim] = ['Collection']
-        index_document[:member_of_collection_ids_ssim] = resource.member_of_collection_ids.map(&:to_s)
-        index_document[:depositor_ssim] = [resource.depositor]
-        index_document[:depositor_tesim] = [resource.depositor]
-        # add all attributes that should be indexed for collections here
-        tesim_and_ssim_attributes = ['abstract', 'access_right', 'alternative_title', 'based_near',
-                                     'bibliographic_citation', 'contributor', 'identifier', 'import_url', 'publisher', 'label',
-                                     'language', 'license', 'publisher', 'rights_notes', 'rights_statement', 'source', 'subject']
-        tesim_and_ssim_attributes.each do |attribute|
-          index_document["#{attribute}_ssim"] = resource[attribute.to_s]
-          index_document["#{attribute}_tesim"] = resource[attribute.to_s]
-        end
-      end
+  # @deprecated use +Hyrax::Indexers::PcdmCollectionIndexer+ instead
+  class PcdmCollectionIndexer < Hyrax::Indexers::PcdmCollectionIndexer
+    def initialize(*args, **kwargs)
+      Deprecation.warn "`Hyrax::PcdmCollectionIndexer` is deprecated. Use `Hyrax::Indexers::PcdmCollectionIndexer` instead."
+      super
     end
   end
 end

data/app/indexers/hyrax/valkyrie_collection_indexer.rb

@@ -2,9 +2,11 @@
 
 module Hyrax
   ##
-  # Indexes properties common to PCDM Collections
-  #
-  # @deprecated use Hyrax::PcdmCollectionIndexer instead
-  class ValkyrieCollectionIndexer < Hyrax::PcdmCollectionIndexer
+  # @deprecated use +Hyrax::Indexers::PcdmCollectionIndexer+ instead
+  class ValkyrieCollectionIndexer < Hyrax::PcdmCollectionIndexer # also deprecated
+    def initialize(*args, **kwargs)
+      Deprecation.warn "`Hyrax::ValkyrieCollectionIndexer` is deprecated. Use `Hyrax::Indexers::PcdmCollectionIndexer` instead."
+      super
+    end
   end
 end