hyrax 4.0.0.beta1 → 4.0.0.rc1

data/app/indexers/hyrax/valkyrie_work_indexer.rb

@@ -25,6 +25,8 @@ module Hyrax
         solr_doc['depositor_tesim'] = [resource.depositor]
         solr_doc['hasRelatedMediaFragment_ssim'] = [resource.representative_id.to_s]
         solr_doc['hasRelatedImage_ssim'] = [resource.thumbnail_id.to_s]
+        index_embargo(solr_doc)
+        index_lease(solr_doc)
       end
     end
 
@@ -39,5 +41,24 @@ module Hyrax
       admin_set = Hyrax.query_service.find_by(id: resource.admin_set_id)
       admin_set.title
     end
+
+    def index_embargo(doc)
+      if Hyrax::EmbargoManager.new(resource: resource).under_embargo?
+        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
+      end
+      doc
+    end
+
+    def index_lease(doc)
+      if Hyrax::LeaseManager.new(resource: resource).under_lease?
+        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
+      end
+
+      doc
+    end
   end
 end

data/app/jobs/characterize_job.rb

@@ -32,7 +32,11 @@ class CharacterizeJob < Hyrax::ApplicationJob
     # Ensure a fresh copy of the repo file's latest version is being worked on, if no filepath is directly provided
     filepath = Hyrax::WorkingDirectory.copy_repository_resource_to_working_directory(Hydra::PCDM::File.find(file_id), file_set.id) unless filepath && File.exist?(filepath)
     characterize(file_set, file_id, filepath)
-    CreateDerivativesJob.perform_later(file_set, file_id, filepath)
+
+    Hyrax.publisher.publish('file.characterized',
+                            file_set: file_set,
+                            file_id: file_id,
+                            path_hint: filepath)
   end
 
   private
@@ -48,7 +52,7 @@ class CharacterizeJob < Hyrax::ApplicationJob
     reset_title = file_set.title.first == file_set.label
 
     characterization_service.run(file_set.characterization_proxy, filepath)
-    Rails.logger.debug "Ran characterization on #{file_set.characterization_proxy.id} (#{file_set.characterization_proxy.mime_type})"
+    Hyrax.logger.debug "Ran characterization on #{file_set.characterization_proxy.id} (#{file_set.characterization_proxy.mime_type})"
     file_set.characterization_proxy.alpha_channels = channels(filepath) if file_set.image? && Hyrax.config.iiif_image_server?
     file_set.characterization_proxy.save!
 
@@ -61,8 +65,9 @@ class CharacterizeJob < Hyrax::ApplicationJob
     # mod time. This is done in the versioning code.
     file_set.date_modified = Hyrax::TimeService.time_in_utc if file_set.characterization_proxy.original_checksum.first != previous_checksum
 
-    # set title to label if that's how it was before this characterization
-    file_set.title = [file_set.characterization_proxy.original_name.force_encoding("UTF-8")] if reset_title
+    file_set.characterization_proxy.original_name.force_encoding("UTF-8")
+    # set title to label (i.e. file name, `original_name`) if that's how it was before this characterization
+    file_set.title = [file_set.characterization_proxy.original_name] if reset_title
     # always set the label to the original_name
     file_set.label = file_set.characterization_proxy.original_name
 

data/app/jobs/import_url_job.rb

@@ -77,7 +77,7 @@ class ImportUrlJob < Hyrax::ApplicationJob
   def copy_remote_file(name)
     filename = File.basename(name)
     dir = Dir.mktmpdir
-    Rails.logger.debug("ImportUrlJob: Copying <#{uri}> to #{dir}")
+    Hyrax.logger.debug("ImportUrlJob: Copying <#{uri}> to #{dir}")
 
     File.open(File.join(dir, filename), 'wb') do |f|
       write_file(f)
@@ -85,7 +85,7 @@ class ImportUrlJob < Hyrax::ApplicationJob
     rescue StandardError => e
       send_error(e.message)
     end
-    Rails.logger.debug("ImportUrlJob: Closing #{File.join(dir, filename)}")
+    Hyrax.logger.debug("ImportUrlJob: Closing #{File.join(dir, filename)}")
   end
 
   ##

data/app/jobs/valkyrie_create_derivatives_job.rb

@@ -9,8 +9,6 @@ class ValkyrieCreateDerivativesJob < Hyrax::ApplicationJob
     # Call derivatives with the file_set.
     derivative_service = Hyrax::DerivativeService.for(file_metadata)
     derivative_service.create_derivatives(file.disk_path)
-    # Trigger a reindex to get the thumbnail path.
-    Hyrax.publisher.publish('file.metadata.updated', metadata: file_metadata, user: nil)
   end
 
   private

data/app/models/admin_set.rb

@@ -97,6 +97,14 @@ class AdminSet < ActiveFedora::Base
     permission_template.reset_access_controls_for(collection: self)
   end
 
+  # @api public
+  #
+  # return an id for the AdminSet.
+  # defaults to calling Hyrax::Noid, but needs a fall back if noid is off
+  def assign_id
+    super || SecureRandom.uuid
+  end
+
   private
 
   def destroy_permission_template

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

@@ -86,7 +86,7 @@ module Hyrax
       doc = permissions_doc(id)
       return [] if doc.nil?
       groups = Array(doc[self.class.read_group_field]) + Array(doc[self.class.edit_group_field])
-      Rails.logger.debug("[CANCAN] download_groups: #{groups.inspect}")
+      Hyrax.logger.debug("[CANCAN] download_groups: #{groups.inspect}")
       groups
     end
 
@@ -95,7 +95,7 @@ module Hyrax
       doc = permissions_doc(id)
       return [] if doc.nil?
       users = Array(doc[self.class.read_user_field]) + Array(doc[self.class.edit_user_field])
-      Rails.logger.debug("[CANCAN] download_users: #{users.inspect}")
+      Hyrax.logger.debug("[CANCAN] download_users: #{users.inspect}")
       users
     end
 
@@ -414,7 +414,7 @@ module Hyrax
     # @param document_id [String] the id of the document.
     def user_is_depositor?(document_id)
       doc = Hyrax::SolrService.search_by_id(document_id, fl: 'depositor_ssim')
-      current_user.user_key == doc.fetch('depositor_ssim').first
+      current_user.user_key == doc['depositor_ssim']&.first
     end
 
     def curation_concerns_models

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

@@ -10,7 +10,6 @@ module Hyrax
     include Hyrax::HumanReadableType
     include Hyrax::HasRepresentative
     include Hyrax::Permissions
-    include Hyrax::CollectionNesting
 
     included do
       validates_with HasOneTitleValidator
@@ -40,9 +39,12 @@ module Hyrax
     end
 
     delegate(*Hyrax::CollectionType.settings_attributes, to: :collection_type)
+    ActiveSupport::Deprecation.deprecate_methods(self, *Hyrax::CollectionType.settings_attributes)
 
     # Get the collection_type when accessed
     def collection_type
+      Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0.  " \
+                         "Instead, use Hyrax::CollectionType.for(collection: collection).")
       @collection_type ||= Hyrax::CollectionType.find_by_gid!(collection_type_gid)
     end
 
@@ -50,25 +52,6 @@ module Hyrax
       self.collection_type_gid = new_collection_type.to_global_id
     end
 
-    # Add members using the members association.
-    def add_members(new_member_ids)
-      Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0.  " \
-                         "Instead, use Hyrax::Collections::CollectionMemberService.add_members_by_ids.")
-      Hyrax::Collections::CollectionMemberService.add_members_by_ids(collection_id: id,
-                                                                     new_member_ids: new_member_ids,
-                                                                     user: nil)
-    end
-
-    # Add member objects by adding this collection to the objects' member_of_collection association.
-    # @param [Enumerable<String>] the ids of the new child collections and works collection ids
-    def add_member_objects(new_member_ids)
-      Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0.  " \
-                         "Instead, use Hyrax::Collections::CollectionMemberService.add_members_by_ids.")
-      Hyrax::Collections::CollectionMemberService.add_members_by_ids(collection_id: id,
-                                                                     new_member_ids: new_member_ids,
-                                                                     user: nil)
-    end
-
     # @return [Enumerable<ActiveFedora::Base>] an enumerable over the children of this collection
     def member_objects
       ActiveFedora::Base.where("member_of_collection_ids_ssim:#{id}")
@@ -94,22 +77,6 @@ module Hyrax
           "hyrax/#{collection}/#{element}"
         end
       end
-
-      def collection_type_gid_document_field_name
-        Deprecation.warn('use Hyrax.config.collection_type_index_field instead')
-        Hyrax.config.collection_type_index_field
-      end
-    end
-
-    # @deprecated to be removed in 4.0.0; this feature was replaced with a
-    #   hard-coded null implementation
-    # @return [Fixnum] 0
-    def bytes
-      Deprecation.warn('#bytes has been deprecated for removal in Hyrax 4.0.0; ' \
-                       'The implementation of the indexed Collection size ' \
-                       'feature is extremely inefficient, so it has been removed. ' \
-                       'This method now returns a hard-coded `0` for compatibility.')
-      0
     end
 
     # @api public
@@ -120,18 +87,6 @@ module Hyrax
       Hyrax::PermissionTemplate.find_by!(source_id: id)
     end
 
-    ##
-    # @deprecated use PermissionTemplate#reset_access_controls_for instead
-    #
-    # Calculate and update who should have read/edit access to the collections based on who
-    # has access in PermissionTemplateAccess
-    def reset_access_controls!
-      Deprecation.warn("reset_access_controls! is deprecated; use PermissionTemplate#reset_access_controls_for instead.")
-
-      permission_template
-        .reset_access_controls_for(collection: self, interpret_visibility: true)
-    end
-
     private
 
     # Solr field name works use to index member ids

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

@@ -35,6 +35,7 @@ module Hyrax
 
     # Cast to a SolrDocument by querying from Solr
     def to_presenter
+      Deprecation.warn "Method #to_presenter will be removed in Hyrax 5.0. Use Hyrax::FileSetsController#presenter.solr_document or `@presenter.solr_document` from a view instead."
       Blacklight::SearchService.new(config: CatalogController.blacklight_config).fetch(id).last
     end
   end

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

@@ -10,7 +10,7 @@ module Hyrax
       # Override of ActiveModel::Model name that allows us to use our custom name class
       def model_name(name_class: _hyrax_default_name_class)
         @_model_name ||= begin
-          namespace = parents.detect do |n|
+          namespace = module_parents.detect do |n|
             n.respond_to?(:use_relative_model_naming?) && n.use_relative_model_naming?
           end
           name_class.new(self, namespace)

data/app/models/concerns/hyrax/solr_document/metadata.rb

@@ -69,6 +69,7 @@ module Hyrax
         attribute :date_created, Solr::Array, "date_created_tesim"
         attribute :rights_statement, Solr::Array, "rights_statement_tesim"
         attribute :rights_notes, Solr::Array, "rights_notes_tesim"
+        attribute :bibliographic_citation, Solr::Array, "bibliographic_citation_tesim"
         attribute :access_right, Solr::Array, "access_right_tesim"
         attribute :mime_type, Solr::String, "mime_type_ssi"
         attribute :workflow_state, Solr::String, "workflow_state_name_ssim"

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

@@ -22,13 +22,5 @@ module Hyrax
     def suppressed?
       Hyrax::ResourceStatus.new(resource: self).inactive?
     end
-
-    ##
-    # @deprecated Use `Sipity::Entity(entity)` instead.
-    def to_sipity_entity
-      Deprecation.warn "Use `Sipity::Entity(entity)` instead."
-      raise "Can't create an entity until the model has been persisted" unless persisted?
-      @sipity_entity ||= Sipity::Entity(to_global_id)
-    end
   end
 end

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

@@ -20,7 +20,6 @@ module Hyrax
     include ProxyDeposit
     include Works::Metadata
     include WithEvents
-    include Hyrax::CollectionNesting
 
     included do
       property :owner, predicate: RDF::URI.new('http://opaquenamespace.org/ns/hydra/owner'), multiple: false

data/app/models/file_download_stat.rb

@@ -9,13 +9,13 @@ class FileDownloadStat < Hyrax::Statistic
     def ga_statistics(start_date, file)
       profile = Hyrax::Analytics.profile
       unless profile
-        Rails.logger.error("Google Analytics profile has not been established. Unable to fetch statistics.")
+        Hyrax.logger.error("Google Analytics profile has not been established. Unable to fetch statistics.")
         return []
       end
-      profile.hyrax__analytics__google__download(sort: 'date',
-                                                 start_date: start_date,
-                                                 end_date: Date.yesterday,
-                                                 limit: 10_000)
+      profile.hyrax__download(sort: 'date',
+                              start_date: start_date,
+                              end_date: Date.yesterday,
+                              limit: 10_000)
              .for_file(file.id)
     end
 

data/app/models/hyrax/collection_type.rb

@@ -36,14 +36,6 @@ module Hyrax
       assign_machine_id
     end
 
-    # this class attribute is deprecated in favor of {.settings_attributes}
-    # these need to carefully align with boolean flag attributes/table columns,
-    # so making it settable is a liability. deprecating is challenging because
-    # +class_attribute+ calls +singleton_class.class_eval { redefine_method }+
-    # as the +name=+ implementation. there should be few callers outside hyrax.
-    class_attribute :collection_type_settings_methods, instance_writer: false
-    self.collection_type_settings_methods = SETTINGS_ATTRIBUTES
-
     # These are provided as a convenience method based on prior design discussions.
     alias_attribute :discovery, :discoverable
     alias_attribute :sharing, :sharable
@@ -52,6 +44,14 @@ module Hyrax
     alias_attribute :visibility, :assigns_visibility
     alias_attribute :branding, :brandable
 
+    # Find the collection type associated with the collection
+    # @param [::Collection, Hyrax::PcdmCollection] collection
+    # @return [Hyrax::PcdmCollection | ::Collection] an instance of Hyrax::CollectionType with id = the model_id portion of the gid (e.g. 3)
+    # @raise [ActiveRecord::RecordNotFound] if record matching gid is not found
+    def self.for(collection:)
+      find_by_gid!(collection.collection_type_gid)
+    end
+
     # Find the collection type associated with the Global Identifier (gid)
     # @param [String] gid - Global Identifier for this collection_type (e.g. gid://internal/hyrax-collectiontype/3)
     # @return [Hyrax::CollectionType] if record matching gid is found, an instance of Hyrax::CollectionType with id = the model_id portion of the gid (e.g. 3)
@@ -78,7 +78,7 @@ module Hyrax
       raise(URI::InvalidURIError) if gid.nil?
       GlobalID::Locator.locate(gid)
     rescue NameError
-      Rails.logger.warn "#{self.class}##{__method__} called with #{gid}, which is " \
+      Hyrax.logger.warn "#{self.class}##{__method__} called with #{gid}, which is " \
                         "a legacy collection type global id format. If this " \
                         "collection type gid is attached to a collection in " \
                         "your repository you'll want to run " \
@@ -115,14 +115,6 @@ module Hyrax
       ActiveFedora::Base.where(Hyrax.config.collection_type_index_field.to_sym => to_global_id.to_s)
     end
 
-    ##
-    # @deprecated Use #collections.any? instead
-    #
-    # @return [Boolean] True if there is at least one collection of this type
-    def collections?
-      Deprecation.warn('Use #collections.any? instead.') && collections.any?
-    end
-
     # @return [Boolean] True if this is the Admin Set type
     def admin_set?
       machine_id == ADMIN_SET_MACHINE_ID

data/app/models/hyrax/embargo.rb

@@ -15,7 +15,7 @@ module Hyrax
     attribute :embargo_history,           Valkyrie::Types::Array
 
     def active?
-      (embargo_release_date.present? && Time.zone.today < embargo_release_date)
+      (embargo_release_date.present? && Hyrax::TimeService.time_in_utc < embargo_release_date)
     end
   end
 end

data/app/models/hyrax/file_metadata.rb

@@ -13,11 +13,13 @@ module Hyrax
       file.is_a?(Valkyrie::Resource)
 
     Hyrax.custom_queries.find_file_metadata_by(id: file.id)
-  rescue Hyrax::ObjectNotFoundError, Ldp::BadRequest
+  rescue Hyrax::ObjectNotFoundError, Ldp::BadRequest, Valkyrie::Persistence::ObjectNotFoundError
     Hyrax.logger.debug('Could not find an existing metadata node for file ' \
                        "with id #{file.id}. Initializing a new one")
 
-    FileMetadata.new(file_identifier: file.id, alternative_ids: [file.id])
+    FileMetadata.new(file_identifier: file.id,
+                     alternative_ids: [file.id],
+                     original_filename: File.basename(file.io))
   end
 
   class FileMetadata < Valkyrie::Resource
@@ -65,7 +67,7 @@ module Hyrax
     attribute :label, ::Valkyrie::Types::Set
     attribute :original_filename, ::Valkyrie::Types::String
     attribute :mime_type, ::Valkyrie::Types::String.default(GENERIC_MIME_TYPE)
-    attribute :type, ::Valkyrie::Types::Set.default([Use::ORIGINAL_FILE].freeze)
+    attribute :type, ::Valkyrie::Types::Set.default([Use::ORIGINAL_FILE].freeze) # Use += to add types, not <<
 
     # attributes set by fits
     attribute :format_label, ::Valkyrie::Types::Set
@@ -125,15 +127,6 @@ module Hyrax
     # attributes set by fits for video
     attribute :aspect_ratio, ::Valkyrie::Types::Set
 
-    # @param [ActionDispatch::Http::UploadedFile] file
-    # @deprecated Use #new instead; for removal in 4.0.0
-    def self.for(file:)
-      Deprecation.warn "#{self.class}##{__method__} is deprecated; use #new instead."
-      new(label: file.original_filename,
-          original_filename: file.original_filename,
-          mime_type: file.content_type)
-    end
-
     ##
     # @return [Boolean]
     def original_file?

data/app/models/hyrax/file_set.rb

@@ -31,7 +31,7 @@ module Hyrax
   # @see https://wiki.duraspace.org/display/samvera/Hydra%3A%3AWorks+Shared+Modeling
   class FileSet < Hyrax::Resource
     include Hyrax::Schema(:core_metadata)
-    include Hyrax::Schema(:basic_metadata)
+    include Hyrax::Schema(:file_set_metadata)
 
     def self.model_name(name_class: Hyrax::Name)
       @_model_name ||= name_class.new(self, nil, 'FileSet')
@@ -42,8 +42,8 @@ module Hyrax
 
     attribute :file_ids, Valkyrie::Types::Array.of(Valkyrie::Types::ID) # id for FileMetadata resources
     attribute :thumbnail_id, Valkyrie::Types::ID.optional # id for FileMetadata resource
-    attribute :original_file_id, Valkyrie::Types::ID # id for FileMetadata resource
-    attribute :extracted_text_id, Valkyrie::Types::ID # id for FileMetadata resource
+    attribute :original_file_id, Valkyrie::Types::ID.optional # id for FileMetadata resource
+    attribute :extracted_text_id, Valkyrie::Types::ID.optional # id for FileMetadata resource
 
     ##
     # @return [Valkyrie::ID]
@@ -51,14 +51,6 @@ module Hyrax
       id
     end
 
-    ##
-    # @return [Valkyrie::ID]
-    # If one is set then return it, otherwise use self as the ID to allow for
-    # derivative generators to find the on-disk path for the thumbnail.
-    def thumbnail_id
-      self.[](:thumbnail_id) || id
-    end
-
     ##
     # @return [Boolean] true
     def pcdm_object?

data/app/models/hyrax/lease.rb

@@ -15,7 +15,7 @@ module Hyrax
     attribute :lease_history,           Valkyrie::Types::Array
 
     def active?
-      (lease_expiration_date.present? && Time.zone.today < lease_expiration_date)
+      (lease_expiration_date.present? && Hyrax::TimeService.time_in_utc < lease_expiration_date)
     end
   end
 end

data/app/models/hyrax/statistic.rb

@@ -31,13 +31,13 @@ module Hyrax
         path = polymorphic_path(object)
         profile = Hyrax::Analytics.profile
         unless profile
-          Rails.logger.error("Google Analytics profile has not been established. Unable to fetch statistics.")
+          Hyrax.logger.error("Google Analytics profile has not been established. Unable to fetch statistics.")
           return []
         end
-        profile.hyrax__analytics__google__pageviews(sort: 'date',
-                                                    start_date: start_date,
-                                                    end_date: Date.yesterday,
-                                                    limit: 10_000)
+        profile.hyrax__pageview(sort: 'date',
+                                start_date: start_date,
+                                end_date: Date.yesterday,
+                                limit: 10_000)
                .for_path(path)
       end
 

data/app/models/hyrax/work.rb

@@ -106,8 +106,8 @@ module Hyrax
     attribute :proxy_depositor,          Valkyrie::Types::String
     attribute :state,                    Valkyrie::Types::URI.default(Hyrax::ResourceStatus::ACTIVE)
     attribute :rendering_ids,            Valkyrie::Types::Array.of(Valkyrie::Types::ID).meta(ordered: true)
-    attribute :representative_id,        Valkyrie::Types::ID
-    attribute :thumbnail_id,             Valkyrie::Types::ID
+    attribute :representative_id,        Valkyrie::Types::ID.optional
+    attribute :thumbnail_id,             Valkyrie::Types::ID.optional
 
     ##
     # @return [Boolean] true

data/app/models/proxy_deposit_request.rb

@@ -7,7 +7,7 @@ class ProxyDepositRequest < ActiveRecord::Base
   include ActionView::Helpers::UrlHelper
 
   class_attribute :work_query_service_class
-  self.work_query_service_class = Hyrax::WorkQueryService
+  self.work_query_service_class = Hyrax.config.use_valkyrie? ? Hyrax::WorkResourceQueryService : Hyrax::WorkQueryService
 
   delegate :deleted_work?, :work, :to_s, to: :work_query_service
 

data/app/models/sipity.rb

@@ -57,32 +57,32 @@ module Sipity
   # @return [Sipity::Entity]
   # rubocop:disable Naming/MethodName, Metrics/CyclomaticComplexity, Metrics/MethodLength
   def Entity(input, &block) # rubocop:disable Metrics/AbcSize
-    Rails.logger.debug("Trying to make an Entity for #{input.inspect}")
+    Hyrax.logger.debug("Trying to make an Entity for #{input.inspect}")
 
     result = case input
              when Sipity::Entity
                input
              when URI::GID, GlobalID
-               Rails.logger.debug("Entity() got a GID, searching by proxy")
+               Hyrax.logger.debug("Entity() got a GID, searching by proxy")
                Entity.find_by(proxy_for_global_id: input.to_s)
              when SolrDocument
-               Rails.logger.debug("Entity() got a SolrDocument, retrying on #{input.to_model}")
+               Hyrax.logger.debug("Entity() got a SolrDocument, retrying on #{input.to_model}")
                Entity(input.to_model)
              when Draper::Decorator
-               Rails.logger.debug("Entity() got a Decorator, retrying on #{input.model}")
+               Hyrax.logger.debug("Entity() got a Decorator, retrying on #{input.model}")
                Entity(input.model)
              when Sipity::Comment
-               Rails.logger.debug("Entity() got a Comment, retrying on #{input.entity}")
+               Hyrax.logger.debug("Entity() got a Comment, retrying on #{input.entity}")
                Entity(input.entity)
              when Valkyrie::Resource
-               Rails.logger.debug("Entity() got a Resource, retrying on #{Hyrax::GlobalID(input)}")
+               Hyrax.logger.debug("Entity() got a Resource, retrying on #{Hyrax::GlobalID(input)}")
                Entity(Hyrax::GlobalID(input))
              else
-               Rails.logger.debug("Entity() got something else, testing #to_global_id")
+               Hyrax.logger.debug("Entity() got something else, testing #to_global_id")
                Entity(input.to_global_id) if input.respond_to?(:to_global_id)
              end
 
-    Rails.logger.debug("Entity(): attempting conversion on #{result}")
+    Hyrax.logger.debug("Entity(): attempting conversion on #{result}")
     handle_conversion(input, result, :to_sipity_entity, &block)
   rescue URI::GID::MissingModelIdError
     Entity(nil)
@@ -104,10 +104,33 @@ module Sipity
   end
   module_function :Role
 
+  ##
+  # Cast an object to a Workflow id
+  # rubocop:disable Metrics/MethodLength
+  def WorkflowId(input, &block) # rubocop:disable Naming/MethodName
+    result = case input
+             when Sipity::Workflow
+               input.id
+             when Integer
+               input
+             when String
+               input.to_i
+             else
+               if input.respond_to?(workflow_id)
+                 input.workflow_id
+               else
+                 WorkflowId(Entity(input))
+               end
+             end
+    handle_conversion(input, result, :to_workflow_id, &block)
+  end
+  module_function :WorkflowId
+  # rubocop:enable Metrics/MethodLength
+
   ##
   # Cast an object to a WorkflowAction in a given workflow
   def WorkflowAction(input, workflow, &block) # rubocop:disable Naming/MethodName
-    workflow_id = PowerConverter.convert_to_sipity_workflow_id(workflow)
+    workflow_id = WorkflowId(workflow)
 
     result = case input
              when WorkflowAction
@@ -138,11 +161,9 @@ module Sipity
   # A parent error class for all workflow errors caused by bad state
   class StateError < RuntimeError; end
 
-  class ConversionError < PowerConverter::ConversionError
-    def initialize(value, **options)
-      options[:scope] ||= nil
-      options[:to]    ||= nil
-      super(value, options)
+  class ConversionError < RuntimeError
+    def initialize(value)
+      super("Unable to convert #{value.inspect}")
     end
   end
 

data/app/presenters/hyrax/admin_set_presenter.rb

@@ -34,6 +34,11 @@ module Hyrax
       @collection_type ||= Hyrax::CollectionType.find_or_create_admin_set_type
     end
 
+    # Overrides delegate because admin sets do not index collection type gid
+    def collection_type_gid
+      collection_type.to_global_id
+    end
+
     def show_path
       Hyrax::Engine.routes.url_helpers.admin_admin_set_path(id, locale: I18n.locale)
     end

data/app/presenters/hyrax/collection_presenter.rb

@@ -43,7 +43,7 @@ module Hyrax
     # Terms is the list of fields displayed by
     # app/views/collections/_show_descriptions.html.erb
     def self.terms
-      [:total_items, :size, :resource_type, :creator, :contributor, :keyword, :license, :publisher, :date_created, :subject,
+      [:total_items, :alternative_title, :size, :resource_type, :creator, :contributor, :keyword, :license, :publisher, :date_created, :subject,
        :language, :identifier, :based_near, :related_url]
     end
 

data/app/presenters/hyrax/displays_image.rb

@@ -69,7 +69,7 @@ module Hyrax
           result = original_file_id
 
           if result.blank?
-            Rails.logger.warn "original_file_id for #{id} not found, falling back to Fedora."
+            Hyrax.logger.warn "original_file_id for #{id} not found, falling back to Fedora."
             result = Hyrax::VersioningService.versioned_file_id ::FileSet.find(id).original_file
           end
 

data/app/presenters/hyrax/iiif_manifest_presenter.rb

@@ -47,6 +47,12 @@ module Hyrax
       Array(super).first || ''
     end
 
+    ##
+    # @return [String]
+    def hostname
+      @hostname || 'localhost'
+    end
+
     ##
     # @return [Boolean]
     def file_set?
@@ -209,6 +215,14 @@ module Hyrax
                iiif_endpoint: iiif_endpoint(latest_file_id, base_url: hostname))
       end
 
+      ##
+      # @return [#can?]
+      def ability
+        @ability ||= NullAbility.new
+      end
+
+      ##
+      # @return [String]
       def hostname
         @hostname || 'localhost'
       end
@@ -222,10 +236,6 @@ module Hyrax
 
     private
 
-    def hostname
-      @hostname || 'localhost'
-    end
-
     def metadata_fields
       Hyrax.config.iiif_metadata_fields
     end