hyrax 3.4.2 → 4.0.0.beta2

data/app/helpers/hyrax/work_form_helper.rb

@@ -97,5 +97,112 @@ module Hyrax
         hash[presenter.title_or_label] = presenter.id
       end
     end
+
+    ##
+    # This helper retrieves errors based on form type.
+    #
+    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
+    # @return [String] specific error message
+    def in_works_ids_errors_for(form:)
+      case form
+      when Hyrax::ChangeSet
+        form.errors[:in_works_ids]
+      else
+        form.model.errors[:in_works_ids]
+      end
+    end
+
+    ##
+    # This helper retrieves errors based on form type.
+    #
+    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
+    # @return [String] specific error message
+    def ordered_member_ids_errors_for(form:)
+      case form
+      when Hyrax::ChangeSet
+        form.errors[:ordered_member_ids]
+      else
+        form.model.errors[:ordered_member_ids]
+      end
+    end
+
+    ##
+    # This helper retrieves errors based on form type.
+    #
+    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
+    # @return [String] specific error message
+    def visibility_errors_for(form:)
+      case form
+      when Hyrax::ChangeSet
+        form.errors[:visibility]
+      else
+        form.model.errors[:visibility]
+      end
+    end
+
+    ##
+    # This helper retrieves errors based on form type.
+    #
+    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
+    # @return [String] specific error message
+    def embargo_release_date_errors_for(form:)
+      case form
+      when Hyrax::ChangeSet
+        form.errors[:embargo_release_date]
+      else
+        form.model.errors[:embargo_release_date]
+      end
+    end
+
+    ##
+    # This helper retrieves errors based on form type.
+    #
+    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
+    # @return [String] specific error message
+    def visibility_after_embargo_errors_for(form:)
+      case form
+      when Hyrax::ChangeSet
+        form.errors[:visibility_after_embargo]
+      else
+        form.model.errors[:visibility_after_embargo]
+      end
+    end
+
+    ##
+    # This helper retrieves errors based on form type.
+    #
+    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
+    # @return [String] specific error message
+    def lease_expiration_date_errors_for(form:)
+      case form
+      when Hyrax::ChangeSet
+        form.errors[:lease_expiration_date_errors]
+      else
+        form.model.errors[:lease_expiration_date_errors]
+      end
+    end
+
+    ##
+    # This helper retrieves errors based on form type.
+    #
+    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
+    # @return [String] specific error message
+    def visibility_after_lease_errors_for(form:)
+      case form
+      when Hyrax::ChangeSet
+        form.errors[:visibility_after_lease]
+      else
+        form.model.errors[:visibility_after_lease]
+      end
+    end
+
+    ##
+    # This helper retrieves errors based on form type.
+    #
+    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
+    # @return [String] specific error message
+    def full_collections_errors(form:)
+      form.full_error(:collections) || form.full_error(:member_of_collection_ids)
+    end
   end
 end

data/app/indexers/hyrax/basic_metadata_indexer.rb

@@ -32,21 +32,15 @@ module Hyrax
     end
 
     def stored_and_facetable_index_config
-      stored_and_facetable_fields.each_with_object({}) do |name, hash|
-        hash[name] = index_object_for(name, as: [:stored_searchable, :facetable])
-      end
+      stored_and_facetable_fields.index_with { |name| index_object_for(name, as: [:stored_searchable, :facetable]) }
     end
 
     def stored_searchable_index_config
-      stored_fields.each_with_object({}) do |name, hash|
-        hash[name] = index_object_for(name, as: [:stored_searchable])
-      end
+      stored_fields.index_with { |name| index_object_for(name, as: [:stored_searchable]) }
     end
 
     def symbol_index_config
-      symbol_fields.each_with_object({}) do |name, hash|
-        hash[name] = index_object_for(name, as: [:symbol])
-      end
+      symbol_fields.index_with { |name| index_object_for(name, as: [:symbol]) }
     end
 
     def index_object_for(attribute_name, as: [])

data/app/indexers/hyrax/deep_indexing_service.rb

@@ -48,12 +48,12 @@ module Hyrax
     end
 
     def fetch_value(value)
-      Rails.logger.info "Fetching #{value.rdf_subject} from the authorative source. (this is slow)"
+      Hyrax.logger.info "Fetching #{value.rdf_subject} from the authorative source. (this is slow)"
       value.fetch(headers: { 'Accept' => default_accept_header })
     rescue IOError, SocketError => e
       # IOError could result from a 500 error on the remote server
       # SocketError results if there is no server to connect to
-      Rails.logger.error "Unable to fetch #{value.rdf_subject} from the authorative source.\n#{e.message}"
+      Hyrax.logger.error "Unable to fetch #{value.rdf_subject} from the authorative source.\n#{e.message}"
     end
 
     # Stripping off the */* to work around https://github.com/rails/rails/issues/9940

data/app/indexers/hyrax/pcdm_collection_indexer.rb

@@ -16,6 +16,7 @@ module Hyrax
       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

data/app/indexers/hyrax/valkyrie_file_set_indexer.rb

@@ -23,7 +23,7 @@ module Hyrax
         solr_doc['hasRelatedImage_ssim']         = resource.thumbnail_id.to_s
 
         # Add in metadata from the original file.
-        file_metadata = original_file
+        file_metadata = Hyrax::FileSetFileService.new(file_set: resource).original_file
         return solr_doc unless file_metadata
 
         # Label is the actual file name. It's not editable by the user.
@@ -99,12 +99,6 @@ module Hyrax
 
     private
 
-    def original_file
-      Hyrax.custom_queries.find_original_file(file_set: resource)
-    rescue Valkyrie::Persistence::ObjectNotFoundError
-      Hyrax.custom_queries.find_files(file_set: resource).first
-    end
-
     def file_format(file)
       if file.mime_type.present? && file.format_label.present?
         "#{file.mime_type.split('/').last} (#{file.format_label.join(', ')})"

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

@@ -29,7 +29,8 @@ class CharacterizeJob < Hyrax::ApplicationJob
   # @param [String, NilClass] filepath the cached file within the Hyrax.config.working_path
   def perform(file_set, file_id, filepath = nil)
     raise "#{file_set.class.characterization_proxy} was not found for FileSet #{file_set.id}" unless file_set.characterization_proxy?
-    filepath = Hyrax::WorkingDirectory.find_or_retrieve(file_id, file_set.id) unless filepath && File.exist?(filepath)
+    # 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)
 
     Hyrax.publisher.publish('file.characterized',
@@ -51,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!
 
@@ -65,7 +66,7 @@ class CharacterizeJob < Hyrax::ApplicationJob
     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] if reset_title
+    file_set.title = [file_set.characterization_proxy.original_name.force_encoding("UTF-8")] if reset_title
     # always set the label to the original_name
     file_set.label = file_set.characterization_proxy.original_name
 

data/app/jobs/create_derivatives_job.rb

@@ -7,9 +7,11 @@ class CreateDerivativesJob < Hyrax::ApplicationJob
   # @param [String, NilClass] filepath the cached file within the Hyrax.config.working_path
   def perform(file_set, file_id, filepath = nil)
     return if file_set.video? && !Hyrax.config.enable_ffmpeg
-    filename = Hyrax::WorkingDirectory.find_or_retrieve(file_id, file_set.id, filepath)
 
-    file_set.create_derivatives(filename)
+    # 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)
+
+    file_set.create_derivatives(filepath)
 
     # Reload from Fedora and reindex for thumbnail and extracted text
     file_set.reload

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/ingest_local_file_job.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+##
+# Ingest a local file using ActiveFedora & FileSetActor.
 class IngestLocalFileJob < Hyrax::ApplicationJob
   queue_as Hyrax.config.ingest_queue_name
 
@@ -6,25 +8,15 @@ class IngestLocalFileJob < Hyrax::ApplicationJob
   # @param [String] path
   # @param [User] user
   def perform(file_set, path, user)
-    case file_set
-    when ActiveFedora::Base
-      __perform(file_set, path, user, use_valkyrie: false)
-    else
-      __perform(file_set, path, user, use_valkyrie: true)
-    end
+    __perform(file_set, path, user)
   end
 
   private
 
-  # @note Based on the present implementation (see SHA a8597884e) of
-  # the Hyrax::Actors::FileSetActor, we wouldn't need to pass the
-  # `use_valkyrie` parameter.  However, I want to include this logic
-  # to demonstrate that "Yes, the IngestLocalFileJob has been tested
-  # for Valkyrie usage"
-  def __perform(file_set, path, user, use_valkyrie:)
+  def __perform(file_set, path, user)
     file_set.label ||= File.basename(path)
 
-    actor = Hyrax::Actors::FileSetActor.new(file_set, user, use_valkyrie: use_valkyrie)
+    actor = Hyrax::Actors::FileSetActor.new(file_set, user)
 
     if actor.create_content(File.open(path))
       Hyrax.config.callback.run(:after_import_local_file_success, file_set, user, path, warn: false)

data/app/jobs/inherit_permissions_job.rb

@@ -5,11 +5,7 @@ class InheritPermissionsJob < Hyrax::ApplicationJob
   # Perform the copy from the work to the contained filesets
   #
   # @param work containing access level and filesets
-  # @param use_valkyrie [Boolean] whether to use valkyrie support (deprecated)
-  def perform(work, use_valkyrie: :DEFAULT)
-    Deprecation.warn("use_valkyrie argument is deprecated, behavior depends on deserialized resource") unless
-      use_valkyrie == :DEFAULT
-
+  def perform(work)
     case work
     when ActiveFedora::Base
       af_perform(work)

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
 

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
@@ -18,7 +17,7 @@ module Hyrax
 
       self.indexer = Hyrax::CollectionIndexer
 
-      class_attribute :index_collection_type_gid_as, writer: false
+      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|
@@ -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
 

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

@@ -35,7 +35,8 @@ module Hyrax
 
     # Cast to a SolrDocument by querying from Solr
     def to_presenter
-      CatalogController.new.fetch(id).last
+      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
 end

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

@@ -6,12 +6,5 @@ module Hyrax
     included do
       belongs_to :admin_set, predicate: Hyrax.config.admin_set_predicate
     end
-
-    ##
-    # @deprecated Use `Sipity::Workflow.find_active_workflow_for` instead.
-    def active_workflow
-      Deprecation.warn 'Use `Sipity::Workflow.find_active_workflow_for` instead.'
-      Sipity::Workflow.find_active_workflow_for(admin_set_id: admin_set_id)
-    end
   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/user.rb

@@ -34,12 +34,12 @@ module Hyrax::User
     scope :without_system_accounts, -> { where("#{::User.user_key_field} not in (?)", [::User.batch_user_key, ::User.audit_user_key, ::User.system_user_key]) }
 
     # Validate and normalize ORCIDs
-    validates_with OrcidValidator
+    validates_with Hyrax::OrcidValidator
     after_validation :normalize_orcid
 
     # Set up user profile avatars
-    mount_uploader :avatar, AvatarUploader, mount_on: :avatar_file_name
-    validates_with AvatarValidator
+    mount_uploader :avatar, Hyrax::AvatarUploader, mount_on: :avatar_file_name
+    validates_with Hyrax::AvatarValidator
 
     # Add token to authenticate Arkivo API calls
     after_initialize :set_arkivo_token, unless: :persisted? if Hyrax.config.arkivo_api?

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

@@ -10,7 +10,6 @@ module Hyrax
     include Hydra::WithDepositor
     include HasRepresentative
     include HasRendering
-    include WithFileSets
     include Naming
     include CoreMetadata
     include InAdminSet
@@ -21,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/content_block.rb

@@ -24,12 +24,6 @@ class ContentBlock < ActiveRecord::Base
   end
 
   class << self
-    # @deprecated
-    def whitelisted?(key)
-      Deprecation.warn(self, "Samvera is deprecating '#{self}.whitelisted?' in Hyrax 3.0. Use #{self}.registered? instead.")
-      registered?(key)
-    end
-
     def registered?(key)
       NAME_REGISTRY.include?(key)
     end

data/app/models/file_download_stat.rb

@@ -9,7 +9,7 @@ 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',

data/app/models/hyrax/collection_type.rb

@@ -52,6 +52,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 +86,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 " \

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

@@ -65,7 +65,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])
+    attribute :type, ::Valkyrie::Types::Set.default([Use::ORIGINAL_FILE].freeze)
 
     # attributes set by fits
     attribute :format_label, ::Valkyrie::Types::Set

data/app/models/hyrax/file_set.rb

@@ -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]

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/permission_template.rb

@@ -91,30 +91,6 @@ module Hyrax
       raise Hyrax::ObjectNotFoundError
     end
 
-    # A bit of an analogue for a `belongs_to :admin_set` as it crosses from Fedora to the DB
-    # @deprecated Use #source instead
-    # @return [AdminSet]
-    # @raise [Hyrax::ObjectNotFoundError] when the we cannot find the AdminSet
-    def admin_set
-      Deprecation.warn("#admin_set is deprecated; use #source instead.")
-      return AdminSet.find(source_id) if AdminSet.exists?(source_id)
-      raise Hyrax::ObjectNotFoundError
-    rescue ActiveFedora::ActiveFedoraError # TODO: remove the rescue when active_fedora issue #1276 is fixed
-      raise Hyrax::ObjectNotFoundError
-    end
-
-    # A bit of an analogue for a `belongs_to :collection` as it crosses from Fedora to the DB
-    # @deprecated Use #source instead
-    # @return [Collection]
-    # @raise [Hyrax::ObjectNotFoundError] when the we cannot find the Collection
-    def collection
-      Deprecation.warn("#collection is deprecated; use #source instead.")
-      return ::Collection.find(source_id) if ::Collection.exists?(source_id)
-      raise Hyrax::ObjectNotFoundError
-    rescue ActiveFedora::ActiveFedoraError # TODO: remove the rescue when active_fedora issue #1276 is fixed
-      raise Hyrax::ObjectNotFoundError
-    end
-
     # Valid Release Period values
     RELEASE_TEXT_VALUE_FIXED = 'fixed'
     RELEASE_TEXT_VALUE_NO_DELAY = 'now'
@@ -219,17 +195,6 @@ module Hyrax
         [::Ability.registered_group_name, ::Ability.public_group_name]
     end
 
-    ##
-    # @deprecated Use #reset_access_controls_for instead
-    # @param interpret_visibility [Boolean] whether to retain the existing
-    #   visibility when applying permission template ACLs
-    # @return [Boolean]
-    def reset_access_controls(interpret_visibility: false)
-      Deprecation.warn("#reset_access_controls is deprecated; use #reset_access_controls_for instead.")
-      reset_access_controls_for(collection: source_model,
-                                interpret_visibility: interpret_visibility)
-    end
-
     ##
     # @param collection [::Collection, Hyrax::Resource]
     # @param interpret_visibility [Boolean] whether to retain the existing

data/app/models/hyrax/statistic.rb

@@ -31,7 +31,7 @@ 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',

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