hyrax 5.0.0.rc2 → 5.0.0.rc3

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|

data/lib/hyrax/specs/shared_specs/hydra_works.rb

@@ -19,11 +19,41 @@ RSpec.shared_examples 'a Hyrax::Resource' do
     end
   end
 
-  it { is_expected.to respond_to :collection? }
-  it { is_expected.to respond_to :file? }
-  it { is_expected.to respond_to :file_set? }
-  it { is_expected.to respond_to :pcdm_object? }
-  it { is_expected.to respond_to :work? }
+  describe '#class' do
+    subject(:klass) { resource.class }
+
+    it { is_expected.to respond_to :collection? }
+    it { is_expected.to respond_to :file? }
+    it { is_expected.to respond_to :file_set? }
+    it { is_expected.to respond_to :pcdm_collection? }
+    it { is_expected.to respond_to :pcdm_object? }
+    it { is_expected.to respond_to :work? }
+  end
+
+  it do
+    is_expected.to respond_to :collection?
+    expect(resource.collection?).to eq resource.class.collection?
+  end
+  it do
+    is_expected.to respond_to :file?
+    expect(resource.file?).to eq resource.class.file?
+  end
+  it do
+    is_expected.to respond_to :file_set?
+    expect(resource.file_set?).to eq resource.class.file_set?
+  end
+  it do
+    is_expected.to respond_to :pcdm_collection?
+    expect(resource.pcdm_collection?).to eq resource.class.pcdm_collection?
+  end
+  it do
+    is_expected.to respond_to :pcdm_object?
+    expect(resource.pcdm_object?).to eq resource.class.pcdm_object?
+  end
+  it do
+    is_expected.to respond_to :work?
+    expect(resource.work?).to eq resource.class.work?
+  end
 end
 
 RSpec.shared_examples 'belongs to collections' do
@@ -128,15 +158,21 @@ end
 RSpec.shared_examples 'a Hyrax::PcdmCollection' do
   subject(:collection) { described_class.new }
 
-  it { is_expected.to be_collection }
-  it { is_expected.to be_pcdm_object }
-  it { is_expected.not_to be_file_set }
-  it { is_expected.not_to be_work }
-
   it_behaves_like 'a Hyrax::Resource'
   it_behaves_like 'a model with core metadata'
   it_behaves_like 'has members'
 
+  describe '#class' do
+    subject(:klass) { collection.class }
+
+    it { is_expected.to be_collection }
+    it { is_expected.not_to be_file }
+    it { is_expected.not_to be_file_set }
+    it { is_expected.to be_pcdm_collection }
+    it { is_expected.not_to be_pcdm_object }
+    it { is_expected.not_to be_work }
+  end
+
   describe '#collection_type_gid' do
     let(:gid) { Hyrax::CollectionType.find_or_create_default_collection_type.to_global_id.to_s }
 
@@ -151,8 +187,20 @@ end
 RSpec.shared_examples 'a Hyrax::AdministrativeSet' do
   subject(:admin_set) { described_class.new }
 
+  it_behaves_like 'a Hyrax::Resource'
   it_behaves_like 'a model with core metadata'
 
+  describe '#class' do
+    subject(:klass) { admin_set.class }
+
+    it { is_expected.to be_collection }
+    it { is_expected.not_to be_file }
+    it { is_expected.not_to be_file_set }
+    it { is_expected.to be_pcdm_collection }
+    it { is_expected.not_to be_pcdm_object }
+    it { is_expected.not_to be_work }
+  end
+
   it 'has an #alternative_title' do
     expect { admin_set.alternative_title = ['Moomin'] }
       .to change { admin_set.alternative_title }
@@ -191,11 +239,16 @@ RSpec.shared_examples 'a Hyrax::Work' do
   it_behaves_like 'belongs to collections'
   it_behaves_like 'has members'
 
-  it { is_expected.not_to be_collection }
-  it { is_expected.not_to be_file }
-  it { is_expected.not_to be_file_set }
-  it { is_expected.to be_pcdm_object }
-  it { is_expected.to be_work }
+  describe '#class' do
+    subject(:klass) { work.class }
+
+    it { is_expected.not_to be_collection }
+    it { is_expected.not_to be_file }
+    it { is_expected.not_to be_file_set }
+    it { is_expected.not_to be_pcdm_collection }
+    it { is_expected.to be_pcdm_object }
+    it { is_expected.to be_work }
+  end
 
   describe '#admin_set_id' do
     it 'is nil by default' do
@@ -259,11 +312,16 @@ RSpec.shared_examples 'a Hyrax::FileSet', valkyrie_adapter: :test_adapter do
   it_behaves_like 'a model with core metadata'
   it_behaves_like 'a model with basic metadata'
 
-  it { is_expected.not_to be_collection }
-  it { is_expected.not_to be_file }
-  it { is_expected.to be_file_set }
-  it { is_expected.to be_pcdm_object }
-  it { is_expected.not_to be_work }
+  describe '#class' do
+    subject(:klass) { fileset.class }
+
+    it { is_expected.not_to be_collection }
+    it { is_expected.not_to be_file }
+    it { is_expected.to be_file_set }
+    it { is_expected.not_to be_pcdm_collection }
+    it { is_expected.to be_pcdm_object }
+    it { is_expected.not_to be_work }
+  end
 
   describe 'files' do
     it 'has empty file_ids by default' do

data/lib/hyrax/specs/shared_specs/indexers.rb

@@ -18,7 +18,7 @@ RSpec.shared_examples 'a Hyrax::Resource indexer' do
   describe '#to_solr' do
     it 'indexes base resource fields' do
       expect(indexer.to_solr)
-        .to include(has_model_ssim: resource.class.name,
+        .to include(has_model_ssim: resource.to_rdf_representation,
                     human_readable_type_tesim: resource.human_readable_type,
                     alternate_ids_sim: a_collection_containing_exactly(*ids))
     end

data/lib/hyrax/transactions/admin_set_destroy.rb

@@ -8,7 +8,8 @@ module Hyrax
     #
     # @since 3.4.0
     class AdminSetDestroy < Transaction
-      DEFAULT_STEPS = ['admin_set_resource.check_empty',
+      DEFAULT_STEPS = ['admin_set_resource.check_default',
+                       'admin_set_resource.check_empty',
                        'admin_set_resource.delete',
                        'admin_set_resource.delete_acl'].freeze
 

data/lib/hyrax/transactions/container.rb

@@ -37,6 +37,7 @@ module Hyrax
       require 'hyrax/transactions/steps/apply_collection_type_permissions'
       require 'hyrax/transactions/steps/apply_permission_template'
       require 'hyrax/transactions/steps/change_depositor'
+      require 'hyrax/transactions/steps/check_for_default_admin_set'
       require 'hyrax/transactions/steps/check_for_empty_admin_set'
       require 'hyrax/transactions/steps/delete_access_control'
       require 'hyrax/transactions/steps/delete_all_file_metadata'
@@ -170,6 +171,10 @@ module Hyrax
       end
 
       namespace 'admin_set_resource' do |ops| # Hyrax::AdministrativeSet resource
+        ops.register 'check_default' do
+          Steps::CheckForDefaultAdminSet.new
+        end
+
         ops.register 'check_empty' do
           Steps::CheckForEmptyAdminSet.new
         end

data/lib/hyrax/transactions/steps/add_to_parent.rb

@@ -25,6 +25,7 @@ module Hyrax
 
           user ||= ::User.find_by_user_key(obj.depositor)
           Hyrax.publisher.publish('object.metadata.updated', object: parent, user: user)
+          Hyrax.publisher.publish('object.membership.updated', object: parent, user: user)
 
           Success(obj)
         rescue Valkyrie::Persistence::ObjectNotFoundError => _err

data/lib/hyrax/transactions/steps/check_for_default_admin_set.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+require 'dry/monads'
+
+module Hyrax
+  module Transactions
+    module Steps
+      ##
+      # Validates non-defaultness of the {Hyrax::AdministrativeSet}; gives `Success`
+      # when not the default and `Failure` otherwise.
+      #
+      # Use this step to guard against destroying the default AdminSet.
+      class CheckForDefaultAdminSet
+        include Dry::Monads[:result]
+
+        ##
+        # @param [#find_inverse_references_by] query_service
+        def initialize(query_service: Hyrax.query_service)
+          @query_service = query_service
+        end
+
+        ##
+        # @param [Hyrax::AdministrativeSet] admin_set
+        #
+        # @return [Dry::Monads::Result]
+        def call(admin_set)
+          return Failure["Administrative set cannot be deleted as it is the default set", admin_set] if admin_set.id == Hyrax.config.default_admin_set_id
+          Success(admin_set)
+        end
+      end
+    end
+  end
+end

data/lib/hyrax/transactions/steps/check_for_empty_admin_set.rb

@@ -26,7 +26,7 @@ module Hyrax
           members = @query_service
                     .find_inverse_references_by(property: :admin_set_id,
                                                 resource: admin_set)
-          return Failure[:admin_set_has_members, members] if members.any?
+          return Failure["Administrative set cannot be deleted as it is not empty", members] if members.any?
 
           Success(admin_set)
         end

data/lib/hyrax/transactions/steps/save.rb

@@ -40,7 +40,7 @@ module Hyrax
             save_lease_or_embargo(unsaved)
             saved = @persister.save(resource: unsaved)
           rescue StandardError => err
-            return Failure(["Failed save on #{change_set}\n\t#{err.message}", change_set.resource])
+            return Failure.new(["Failed save on #{change_set}\n\t#{err.message}", change_set.resource], err.backtrace.first)
           end
 
           # if we have a permission manager, it's acting as a local cache of another resource.
@@ -58,6 +58,7 @@ module Hyrax
         private
 
         def valid_future_date?(item, attribute)
+          return true if item.fields[attribute].blank?
           raise StandardError, "#{item.model} must use a future date" if item.fields[attribute] < Time.zone.now
         end
 

data/lib/hyrax/transactions/steps/set_user_as_creator.rb

@@ -23,7 +23,7 @@ module Hyrax
 
           Success(change_set)
         rescue NoMethodError => err
-          Failure([err.message, change_set])
+          Failure.new([err.message, change_set], err.backtrace.first)
         end
 
         ##

data/lib/hyrax/transactions/steps/update_work_members.rb

@@ -29,6 +29,8 @@ module Hyrax
           obj.member_ids -= destroys.map { |id| Valkyrie::ID.new(id) }
 
           save_resource(obj, user)
+          Hyrax.publisher.publish('object.membership.updated', object: obj, user: user)
+
           Success(obj)
         end
 

data/lib/hyrax/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hyrax
-  VERSION = '5.0.0.rc2'
+  VERSION = '5.0.0.rc3'
 end

data/lib/hyrax.rb

@@ -41,6 +41,7 @@ module Hyrax
     autoload :Configuration
     autoload :ControlledVocabularies
     autoload :EventStore
+    autoload :Forms
     autoload :RedisEventStore
     autoload :ResourceSync
     autoload :Zotero

data/lib/tasks/embargo_lease.rake

@@ -21,6 +21,7 @@ namespace :hyrax do
 
       Hyrax.query_service.find_many_by_ids(ids: ids).each do |resource|
         Hyrax::LeaseManager.release_lease_for(resource: resource) &&
+          Hyrax.persister.save(resource: resource.lease) &&
           Hyrax::AccessControlList(resource).save
       end
     end

data/lib/valkyrie/indexing/solr/indexing_adapter.rb

@@ -9,7 +9,7 @@ module Valkyrie
         ##
         # @!attribute [r] connection
         #   @return [RSolr::Client]
-        attr_reader :connection
+        attr_accessor :connection
 
         ##
         # @param connection [RSolr::Client] The RSolr connection to index to.
@@ -37,6 +37,10 @@ module Valkyrie
           connection.commit
         end
 
+        def reset!
+          self.connection = default_connection
+        end
+
         private
 
         def persist(resources)
@@ -66,9 +70,14 @@ module Valkyrie
             return {}
           end
 
-          { 'host' => bl_index.host,
+          {
+            'host' => bl_index.host,
+            'user' => bl_index.user,
+            'password' => bl_index.password,
+            'scheme' => bl_index.scheme,
             'port' => bl_index.port,
-            'core' => 'hyrax-valkyrie' }
+            'core' => bl_index.path.split("/")[2] || 'hyrax-valkyrie'
+          }.compact
         end
 
         def connection_url
@@ -78,12 +87,17 @@ module Valkyrie
                      {}
                    end
 
-          # if any configuration is missing, derive it from Blacklight
+          # Given how we're building blacklight_based_config, there won't be a URL.  So let's avoid
+          # that whole logic path.
+          return config['url'] if config['url'].present?
+
+          # Derive any missing configuration from Blacklight.
           config = blacklight_based_config.with_indifferent_access.merge(config)
 
-          return config['url'] if config['url'].present?
+          url = "#{config.fetch('scheme', 'http')}://"
+          url = "#{url}#{config['user']}:#{config['password']}@" if config.key?('user') && config.key?('password')
 
-          "http://#{config['host']}:#{config['port']}/solr/#{config['core']}"
+          "#{url}#{config['host']}:#{config['port']}/solr/#{config['core']}"
         end
 
         def default_connection
@@ -91,7 +105,7 @@ module Valkyrie
         end
 
         def resource_indexer
-          Hyrax::ValkyrieIndexer
+          Hyrax::Indexers::ResourceIndexer
         end
       end
     end

data/lib/wings/active_fedora_converter/default_work.rb

@@ -77,11 +77,10 @@ module Wings
     # default work class builder
     def self.DefaultWork(resource_class) # rubocop:disable Naming/MethodName
       class_cache[resource_class] ||= Class.new(DefaultWork) do
-        self.valkyrie_class = resource_class
-
+        self.valkyrie_class = resource_class.respond_to?(:valkyrie_class) ? resource_class.valkyrie_class : resource_class
         # skip reserved attributes, we assume we don't need to translate valkyrie internals
-        schema = resource_class.schema.reject do |key|
-          resource_class.reserved_attributes.include?(key.name)
+        schema = valkyrie_class.schema.reject do |key|
+          valkyrie_class.reserved_attributes.include?(key.name)
         end
 
         Wings::ActiveFedoraConverter.apply_properties(self, schema)
@@ -142,7 +141,7 @@ module Wings
       end
 
       def indexing_service
-        Hyrax::ValkyrieIndexer.for(resource: valkyrie_resource)
+        Hyrax::Indexers::ResourceIndexer.for(resource: valkyrie_resource)
       end
 
       def to_global_id

data/lib/wings/active_fedora_converter/file_metadata_node.rb

@@ -36,7 +36,7 @@ module Wings
     end
 
     def indexing_service
-      Hyrax::ValkyrieIndexer.for(resource: valkyrie_resource)
+      Hyrax::Indexers::ResourceIndexer.for(resource: valkyrie_resource)
     end
 
     def to_solr

data/lib/wings/model_registry.rb

@@ -24,6 +24,10 @@ module Wings
       instance.register(*args)
     end
 
+    def self.unregister(*args)
+      instance.unregister(*args)
+    end
+
     def self.lookup(*args)
       instance.lookup(*args)
     end
@@ -40,6 +44,10 @@ module Wings
       @map[valkyrie.name] = active_fedora.name
     end
 
+    def unregister(valkyrie)
+      @map.delete(valkyrie.name)
+    end
+
     def lookup(valkyrie)
       valkyrie = valkyrie._canonical_valkyrie_model if
         valkyrie.respond_to?(:_canonical_valkyrie_model)