valkyrie 2.1.0 → 3.0.0.pre.beta.1

data/lib/valkyrie/persistence/solr/orm_converter.rb

@@ -48,7 +48,7 @@ module Valkyrie::Persistence::Solr
     # Construct a Time object from the datestamp for the resource creation date indexed in Solr
     # @return [Time]
     def created_at
-      DateTime.parse(solr_document.fetch("created_at_dtsi").to_s).utc
+      DateTime.parse(solr_document.fetch("created_at_dtsi").to_s).new_offset(0)
     end
 
     # Construct a Time object from the datestamp for the date of the last resource update indexed in Solr
@@ -79,7 +79,7 @@ module Valkyrie::Persistence::Solr
 
     # Construct the Hash containing the Valkyrie Resource attributes using the Solr Document
     # @note this filters for attributes which have been indexed as stored multivalued texts (tsim)
-    # @see https://github.com/samvera-labs/valkyrie/blob/master/solr/config/schema.xml
+    # @see https://github.com/samvera-labs/valkyrie/blob/main/solr/config/schema.xml
     # @see https://lucene.apache.org/solr/guide/defining-fields.html#defining-fields
     # @return [Hash]
     def attribute_hash
@@ -445,7 +445,7 @@ module Valkyrie::Persistence::Solr
       # @return [Boolean]
       def self.handles?(value)
         return false unless value.to_s.start_with?("datetime-")
-        DateTime.iso8601(value.sub(/^datetime-/, '')).utc
+        DateTime.iso8601(value.sub(/^datetime-/, '')).new_offset(0)
       rescue
         false
       end
@@ -453,7 +453,7 @@ module Valkyrie::Persistence::Solr
       # Parses and casts the Solr field value into a UTC DateTime value
       # @return [Time]
       def result
-        DateTime.parse(value.sub(/^datetime-/, '')).utc
+        DateTime.parse(value.sub(/^datetime-/, '')).new_offset(0)
       end
     end
   end

data/lib/valkyrie/persistence/solr/persister.rb

@@ -6,7 +6,7 @@ module Valkyrie::Persistence::Solr
   # Most methods are delegated to {Valkyrie::Persistence::Solr::Repository}
   class Persister
     attr_reader :adapter
-    delegate :connection, :resource_factory, to: :adapter
+    delegate :connection, :query_service, :resource_factory, :write_only?, :soft_commit?, to: :adapter
 
     # @param adapter [Valkyrie::Persistence::Solr::MetadataAdapter] The adapter with the
     #   configured solr connection.
@@ -15,11 +15,23 @@ module Valkyrie::Persistence::Solr
     end
 
     # (see Valkyrie::Persistence::Memory::Persister#save)
-    def save(resource:)
-      repository([resource]).persist.first
+    # @return [Boolean] If write_only, whether saving succeeded.
+    def save(resource:, external_resource: false)
+      if write_only?
+        repository([resource]).persist
+      else
+        raise Valkyrie::Persistence::ObjectNotFoundError, "The object #{resource.id} is previously persisted but not found at save time." unless external_resource || valid_for_save?(resource)
+        repository([resource]).persist.first
+      end
+    end
+
+    def valid_for_save?(resource)
+      return true unless resource.persisted? # a new resource
+      query_service.find_by(id: resource.id).present? # a persisted resource must be found
     end
 
     # (see Valkyrie::Persistence::Memory::Persister#save_all)
+    # @return [Boolean] If write_only, whether saving succeeded.
     def save_all(resources:)
       repository(resources).persist
     end
@@ -39,7 +51,7 @@ module Valkyrie::Persistence::Solr
     # @param [Array<Valkyrie::Resource>] resources
     # @return [Valkyrie::Persistence::Solr::Repository]
     def repository(resources)
-      Valkyrie::Persistence::Solr::Repository.new(resources: resources, connection: connection, resource_factory: resource_factory)
+      Valkyrie::Persistence::Solr::Repository.new(resources: resources, persister: self)
     end
   end
 end

data/lib/valkyrie/persistence/solr/queries/find_by_alternate_identifier_query.rb

@@ -32,7 +32,7 @@ module Valkyrie::Persistence::Solr::Queries
     # @note the field used here is alternate_ids_ssim and the value is prefixed by "id-"
     # @return [Hash]
     def resource
-      connection.get("select", params: { q: "alternate_ids_ssim:\"id-#{alternate_identifier}\"", fl: "*", rows: 1 })["response"]["docs"].first
+      @resource ||= connection.get("select", params: { q: "alternate_ids_ssim:\"id-#{alternate_identifier}\"", fl: "*", rows: 1 })["response"]["docs"].first
     end
   end
 end

data/lib/valkyrie/persistence/solr/queries/find_by_id_query.rb

@@ -31,7 +31,7 @@ module Valkyrie::Persistence::Solr::Queries
     # Query Solr for for the first document with the ID in a field
     # @return [Hash]
     def resource
-      connection.get("select", params: { q: "id:\"#{id}\"", fl: "*", rows: 1 })["response"]["docs"].first
+      @resource ||= connection.get("select", params: { q: "id:\"#{id}\"", fl: "*", rows: 1 })["response"]["docs"].first
     end
   end
 end

data/lib/valkyrie/persistence/solr/queries/find_members_query.rb

@@ -27,7 +27,7 @@ module Valkyrie::Persistence::Solr::Queries
     # Results are ordered by the member IDs specified in the Valkyrie Resource attribute
     # @yield [Valkyrie::Resource]
     def each
-      return [] unless resource.id.present?
+      return [] if resource.id.blank?
       member_ids.map { |id| unordered_members.find { |member| member.id == id } }.reject(&:nil?).each do |member|
         yield member
       end

data/lib/valkyrie/persistence/solr/query_service.rb

@@ -97,19 +97,19 @@ module Valkyrie::Persistence::Solr
 
     private
 
-      # (see Valkyrie::Persistence::Memory::QueryService#validate_id)
-      def validate_id(id)
-        raise ArgumentError, 'id must be a Valkyrie::ID' unless id.is_a? Valkyrie::ID
-      end
+    # (see Valkyrie::Persistence::Memory::QueryService#validate_id)
+    def validate_id(id)
+      raise ArgumentError, 'id must be a Valkyrie::ID' unless id.is_a? Valkyrie::ID
+    end
 
-      # (see Valkyrie::Persistence::Memory::QueryService#ensure_persisted)
-      def ensure_persisted(resource)
-        raise ArgumentError, 'resource is not saved' unless resource.persisted?
-      end
+    # (see Valkyrie::Persistence::Memory::QueryService#ensure_persisted)
+    def ensure_persisted(resource)
+      raise ArgumentError, 'resource is not saved' unless resource.persisted?
+    end
 
-      # (see Valkyrie::Persistence::Memory::QueryService#ordered_property?)
-      def ordered_property?(resource:, property:)
-        resource.ordered_attribute?(property)
-      end
+    # (see Valkyrie::Persistence::Memory::QueryService#ordered_property?)
+    def ordered_property?(resource:, property:)
+      resource.ordered_attribute?(property)
+    end
   end
 end

data/lib/valkyrie/persistence/solr/repository.rb

@@ -3,17 +3,18 @@ module Valkyrie::Persistence::Solr
   # Responsible for handling the logic for persisting or deleting multiple
   # objects into or out of solr.
   class Repository
-    COMMIT_PARAMS = { softCommit: true, versions: true }.freeze
+    SOFT_COMMIT_PARAMS = { softCommit: true, versions: true }.freeze
+    NO_COMMIT_PARAMS = { versions: true }.freeze
 
-    attr_reader :resources, :connection, :resource_factory
+    attr_reader :resources, :persister
+    delegate :connection, :resource_factory, :write_only?, :soft_commit?, to: :persister
 
     # @param [Array<Valkyrie::Resource>] resources
     # @param [RSolr::Client] connection
     # @param [ResourceFactory] resource_factory
-    def initialize(resources:, connection:, resource_factory:)
+    def initialize(resources:, persister:)
       @resources = resources
-      @connection = connection
-      @resource_factory = resource_factory
+      @persister = persister
     end
 
     # Persist the resources into Solr
@@ -24,6 +25,7 @@ module Valkyrie::Persistence::Solr
         solr_document(resource)
       end
       results = add_documents(documents)
+      return true if write_only?
       versions = results["adds"]&.each_slice(2)&.to_h
       documents.map do |document|
         document["_version_"] = versions.fetch(document[:id])
@@ -35,7 +37,7 @@ module Valkyrie::Persistence::Solr
     # @return [RSolr::HashWithResponse]
     # rubocop:disable Style/IfUnlessModifier
     def add_documents(documents)
-      connection.add documents, params: COMMIT_PARAMS
+      connection.add documents, params: commit_params
     rescue RSolr::Error::Http => exception
       # Error 409 conflict is returned when versions do not match
       if exception.response&.fetch(:status) == 409
@@ -48,7 +50,7 @@ module Valkyrie::Persistence::Solr
     # Deletes a Solr Document using the ID
     # @return [Array<Valkyrie::Resource>] resources which have been deleted from Solr
     def delete
-      connection.delete_by_id resources.map { |resource| resource.id.to_s }, params: COMMIT_PARAMS
+      connection.delete_by_id resources.map { |resource| resource.id.to_s }, params: commit_params
       resources
     end
 
@@ -75,5 +77,13 @@ module Valkyrie::Persistence::Solr
       raise Valkyrie::Persistence::StaleObjectError, "One or more resources have been updated by another process." if resources.count > 1
       raise Valkyrie::Persistence::StaleObjectError, "The object #{resources.first.id} has been updated by another process."
     end
+
+    def commit_params
+      if persister.soft_commit?
+        SOFT_COMMIT_PARAMS
+      else
+        NO_COMMIT_PARAMS
+      end
+    end
   end
 end

data/lib/valkyrie/resource/access_controls.rb

@@ -11,7 +11,7 @@ module Valkyrie
     #       attribute :nested_resource
     #     end
     #
-    # @see https://github.com/samvera/hydra-head/tree/master/hydra-access-controls
+    # @see https://github.com/samvera/hydra-head/tree/main/hydra-access-controls
     # @see lib/valkyrie/indexers/access_controls_indexer/rb
     module AccessControls
       def self.included(klass)

data/lib/valkyrie/resource.rb

@@ -15,7 +15,6 @@ module Valkyrie
   # @see lib/valkyrie/specs/shared_specs/resource.rb
   # rubocop:disable Metrics/ClassLength
   class Resource < Dry::Struct
-    include Draper::Decoratable
     # Allows a Valkyrie::Resource to be instantiated without providing every
     # available key, and makes sure the defaults are set up if no value is
     # given.

data/lib/valkyrie/specs/shared_specs/change_set.rb

@@ -75,7 +75,7 @@ RSpec.shared_examples 'a Valkyrie::ChangeSet' do |*_flags|
 
   describe "#optimistic_locking_enabled?" do
     it "delegates down to the resource" do
-      expect(change_set.optimistic_locking_enabled?).to eq false
+      expect(change_set.optimistic_locking_enabled?).to eq change_set.resource.optimistic_locking_enabled?
     end
   end
 end

data/lib/valkyrie/specs/shared_specs/file.rb

@@ -9,6 +9,7 @@ RSpec.shared_examples 'a Valkyrie::StorageAdapter::File' do
   it { is_expected.to respond_to(:read) }
   it { is_expected.to respond_to(:rewind) }
   it { is_expected.to respond_to(:id) }
+  it { is_expected.to respond_to(:close) }
   describe "#disk_path" do
     it "returns an existing disk path" do
       expect(File.exist?(file.disk_path)).to eq true

data/lib/valkyrie/specs/shared_specs/persister.rb

@@ -50,6 +50,24 @@ RSpec.shared_examples 'a Valkyrie::Persister' do |*flags|
     expect(reloaded.nested_resource.first.title).to eq ["Nested"]
   end
 
+  context "when a persisted resource is not in the database" do
+    it "throws an ObjectNotFoundError" do
+      expect(resource).not_to be_persisted
+      saved = persister.save(resource: resource)
+
+      expect(saved).to be_persisted
+      persister.delete(resource: saved)
+
+      expect { persister.save(resource: saved) }.to raise_error(Valkyrie::Persistence::ObjectNotFoundError)
+    end
+    it "is okay if it's from another persister" do
+      memory_adapter = Valkyrie::Persistence::Memory::MetadataAdapter.new
+      saved = memory_adapter.persister.save(resource: resource)
+
+      expect { persister.save(resource: saved, external_resource: true) }.not_to raise_error
+    end
+  end
+
   it "can persist single values" do
     resource.single_value = "A single value"
 
@@ -194,9 +212,9 @@ RSpec.shared_examples 'a Valkyrie::Persister' do |*flags|
     reloaded = query_service.find_by(id: book.id)
 
     expect(reloaded.title.first.to_i).to eq(time1.to_i)
-    expect(reloaded.title.first.zone).to eq('UTC')
+    expect(reloaded.title.first.zone).to eq('+00:00')
     expect(reloaded.author.first.to_i).to eq(time2.to_i)
-    expect(reloaded.author.first.zone).to eq('UTC')
+    expect(reloaded.author.first.zone).to eq('+00:00')
     expect(reloaded.other_author.first).to eq "2019-01"
   end
 
@@ -351,7 +369,7 @@ RSpec.shared_examples 'a Valkyrie::Persister' do |*flags|
           # update the resource in the datastore to make its token stale
           persister.save(resource: resource)
 
-          expect { persister.save(resource: resource) }.to raise_error(Valkyrie::Persistence::StaleObjectError, "The object #{resource.id} has been updated by another process.")
+          expect { persister.save(resource: resource) }.to raise_error(Valkyrie::Persistence::StaleObjectError)
         end
       end
 
@@ -425,7 +443,7 @@ RSpec.shared_examples 'a Valkyrie::Persister' do |*flags|
           persister.save(resource: resource2)
 
           expect { persister.save_all(resources: [resource1, resource2, resource3]) }
-            .to raise_error(Valkyrie::Persistence::StaleObjectError, "One or more resources have been updated by another process.")
+            .to raise_error(Valkyrie::Persistence::StaleObjectError)
         end
       end
     end

data/lib/valkyrie/specs/shared_specs/queries.rb

@@ -464,6 +464,13 @@ RSpec.shared_examples 'a Valkyrie query provider' do
     end
   end
 
+  describe ".custom_queries" do
+    it "raises NoMethodError when the custom query does not exist" do
+      expect(query_service.custom_queries).not_to respond_to :very_fake_query
+      expect { query_service.custom_queries.very_fake_query }.to raise_error(NoMethodError)
+    end
+  end
+
   describe ".register_query_handler" do
     it "can register a query handler" do
       class QueryHandler

data/lib/valkyrie/specs/shared_specs/resource.rb

@@ -31,7 +31,7 @@ RSpec.shared_examples 'a Valkyrie::Resource' do
       end
     end
 
-    describe "#fields" do
+    describe ".fields" do
       it "returns a set of fields" do
         expect(meta_klass).to respond_to(:fields).with(0).arguments
         expect(meta_klass.fields).to include(:id)

data/lib/valkyrie/specs/shared_specs/storage_adapter.rb

@@ -30,6 +30,25 @@ RSpec.shared_examples 'a Valkyrie::StorageAdapter' do
     expect(uploaded_file.valid?(digests: { sha1: sha1 })).to be true
   end
 
+  it "doesn't leave a file handle open on upload/find_by" do
+    # No file handle left open from upload.
+    resource = Valkyrie::Specs::CustomResource.new(id: "testdiscovery")
+    pre_open_files = open_files
+    uploaded_file = storage_adapter.upload(file: file, original_filename: 'foo.jpg', resource: resource, fake_upload_argument: true)
+    file.close
+    expect(pre_open_files.size).to eq open_files.size
+
+    # No file handle left open from find_by
+    pre_open_files = open_files
+    the_file = storage_adapter.find_by(id: uploaded_file.id)
+    expect(the_file).to be_kind_of Valkyrie::StorageAdapter::File
+    expect(pre_open_files.size).to eq open_files.size
+  end
+
+  def open_files
+    `lsof +D . | awk '{print $9}'`.split.uniq[1..-1]
+  end
+
   it "can upload, validate, re-fetch, and delete a file" do
     resource = Valkyrie::Specs::CustomResource.new(id: "test")
     sha1 = Digest::SHA1.file(file).to_s

data/lib/valkyrie/specs/shared_specs/write_only/metadata_adapter.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+RSpec.shared_examples 'a write-only Valkyrie::MetadataAdapter' do |passed_adapter|
+  before do
+    raise 'adapter must be set with `let(:adapter)`' unless
+      defined? adapter
+  end
+  subject { passed_adapter || adapter }
+  let(:persister) { adapter.persister }
+  it { is_expected.to respond_to(:persister).with(0).arguments }
+  it { is_expected.to respond_to(:id).with(0).arguments }
+
+  describe "#id" do
+    it "is a valid string representation of an MD5 hash" do
+      expect(adapter.id).to be_a Valkyrie::ID
+      expect(adapter.id.to_s.length).to eq 32
+      expect(adapter.id.to_s).to match(/^[a-f,0-9]+$/)
+    end
+  end
+
+  describe "#write_only?" do
+    it "returns true" do
+      expect(adapter).to be_write_only
+    end
+  end
+
+  describe "persister" do
+    before do
+      class WriteOnlyCustomResource < Valkyrie::Resource
+        include Valkyrie::Resource::AccessControls
+        attribute :title
+        attribute :author
+        attribute :other_author
+        attribute :member_ids
+        attribute :nested_resource
+        attribute :single_value, Valkyrie::Types::String.optional
+        attribute :ordered_authors, Valkyrie::Types::Array.of(Valkyrie::Types::Anything).meta(ordered: true)
+        attribute :ordered_nested, Valkyrie::Types::Array.of(WriteOnlyCustomResource).meta(ordered: true)
+      end
+    end
+    after do
+      Object.send(:remove_const, :WriteOnlyCustomResource)
+    end
+
+    subject { persister }
+    let(:resource_class) { WriteOnlyCustomResource }
+    let(:resource) { resource_class.new }
+
+    it { is_expected.to respond_to(:save).with_keywords(:resource) }
+    it { is_expected.to respond_to(:save_all).with_keywords(:resources) }
+    it { is_expected.to respond_to(:delete).with_keywords(:resource) }
+
+    it "can save a resource" do
+      expect(persister.save(resource: resource)).to eq true
+    end
+
+    it "can save multiple resources at once" do
+      resource2 = resource_class.new
+      results = persister.save_all(resources: [resource, resource2])
+      expect(results).to eq true
+    end
+  end
+end

data/lib/valkyrie/specs/shared_specs.rb

@@ -13,3 +13,5 @@ require 'valkyrie/specs/shared_specs/change_set_persister.rb'
 require 'valkyrie/specs/shared_specs/file.rb'
 require 'valkyrie/specs/shared_specs/change_set.rb'
 require 'valkyrie/specs/shared_specs/solr_indexer.rb'
+# Write-only tests.
+require 'valkyrie/specs/shared_specs/write_only/metadata_adapter.rb'

data/lib/valkyrie/storage/disk.rb

@@ -36,11 +36,34 @@ module Valkyrie::Storage
     # @return [Valkyrie::StorageAdapter::File]
     # @raise Valkyrie::StorageAdapter::FileNotFound if nothing is found
     def find_by(id:)
-      Valkyrie::StorageAdapter::File.new(id: Valkyrie::ID.new(id.to_s), io: ::File.open(file_path(id), 'rb'))
+      Valkyrie::StorageAdapter::File.new(id: Valkyrie::ID.new(id.to_s), io: LazyFile.open(file_path(id), 'rb'))
     rescue Errno::ENOENT
       raise Valkyrie::StorageAdapter::FileNotFound
     end
 
+    ## LazyFile takes File.open parameters but doesn't leave a file handle open on
+    # instantiation. This way StorageAdapter#find_by doesn't open a handle
+    # silently and never clean up after itself.
+    class LazyFile
+      def self.open(path, mode)
+        # Open the file regularly and close it, so it can error if it doesn't
+        # exist.
+        File.open(path, mode).close
+        new(path, mode)
+      end
+
+      delegate(*(File.instance_methods - Object.instance_methods), to: :_inner_file)
+
+      def initialize(path, mode)
+        @__path = path
+        @__mode = mode
+      end
+
+      def _inner_file
+        @_inner_file ||= File.open(@__path, @__mode)
+      end
+    end
+
     # Delete the file on disk associated with the given identifier.
     # @param id [Valkyrie::ID]
     def delete(id:)

data/lib/valkyrie/storage/fedora.rb

@@ -37,7 +37,7 @@ module Valkyrie::Storage
     def upload(file:, original_filename:, resource:, content_type: "application/octet-stream", # rubocop:disable Metrics/ParameterLists
                resource_uri_transformer: default_resource_uri_transformer, **_extra_arguments)
       identifier = resource_uri_transformer.call(resource, base_url) + '/original'
-      sha1 = fedora_version == 5 ? "sha" : "sha1"
+      sha1 = [5, 6].include?(fedora_version) ? "sha" : "sha1"
       connection.http.put do |request|
         request.url identifier
         request.headers['Content-Type'] = content_type
@@ -83,24 +83,24 @@ module Valkyrie::Storage
 
     private
 
-      # @return [IOProxy]
-      def response(id:)
-        response = connection.http.get(fedora_identifier(id: id))
-        raise Valkyrie::StorageAdapter::FileNotFound unless response.success?
-        IOProxy.new(response.body)
-      end
+    # @return [IOProxy]
+    def response(id:)
+      response = connection.http.get(fedora_identifier(id: id))
+      raise Valkyrie::StorageAdapter::FileNotFound unless response.success?
+      IOProxy.new(response.body)
+    end
 
-      def default_resource_uri_transformer
-        lambda do |resource, base_url|
-          id = CGI.escape(resource.id.to_s)
-          RDF::URI.new(base_url + id)
-        end
+    def default_resource_uri_transformer
+      lambda do |resource, base_url|
+        id = CGI.escape(resource.id.to_s)
+        RDF::URI.new(base_url + id)
       end
+    end
 
-      def base_url
-        pre_divider = base_path.starts_with?(SLASH) ? '' : SLASH
-        post_divider = base_path.ends_with?(SLASH) ? '' : SLASH
-        "#{connection.http.url_prefix}#{pre_divider}#{base_path}#{post_divider}"
-      end
+    def base_url
+      pre_divider = base_path.starts_with?(SLASH) ? '' : SLASH
+      post_divider = base_path.ends_with?(SLASH) ? '' : SLASH
+      "#{connection.http.url_prefix}#{pre_divider}#{base_path}#{post_divider}"
+    end
   end
 end

data/lib/valkyrie/storage_adapter.rb

@@ -67,7 +67,7 @@ module Valkyrie
     class File < Dry::Struct
       attribute :id, Valkyrie::Types::Any
       attribute :io, Valkyrie::Types::Any
-      delegate :size, :read, :rewind, to: :io
+      delegate :size, :read, :rewind, :close, to: :io
       def stream
         io
       end
@@ -106,20 +106,20 @@ module Valkyrie
 
       private
 
-        def tmp_file_name
-          id.to_s.tr(':/', '__')
-        end
+      def tmp_file_name
+        id.to_s.tr(':/', '__')
+      end
 
-        def tmp_file_path
-          ::File.join(Dir.tmpdir, tmp_file_name)
-        end
+      def tmp_file_path
+        ::File.join(Dir.tmpdir, tmp_file_name)
+      end
 
-        def tmp_file
-          @tmp_file ||= ::File.open(tmp_file_path, 'w+b') do |f|
-            IO.copy_stream(io, f)
-            f
-          end
+      def tmp_file
+        @tmp_file ||= ::File.open(tmp_file_path, 'w+b') do |f|
+          IO.copy_stream(io, f)
+          f
         end
+      end
     end
   end
 end

data/lib/valkyrie/types.rb

@@ -84,7 +84,7 @@ module Valkyrie
     Set = Array.constructor do |value|
       value = Array[value]
       clean_values = value.reject do |val|
-        val == '' || (val.is_a?(Valkyrie::ID) && val.to_s == '')
+        (val.is_a?(Valkyrie::ID) && val.to_s == '') || val == ''
       end.reject(&:nil?).uniq
 
       clean_values.map do |val|

data/lib/valkyrie/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Valkyrie
-  VERSION = "2.1.0"
+  VERSION = "3.0.0-beta.1"
 end

data/lib/valkyrie/vocab/pcdm_use.rb

@@ -39,10 +39,22 @@ module Valkyrie::Vocab
          "rdf:subClassOf": %(http://pcdm.org/resources#File),
          "rdfs:isDefinedBy": %(pcdmuse:),
          type: "rdfs:Class"
+    term :PreservationFile,
+         comment: %(Best quality representation of the Object appropriate for long-term
+           preservation.),
+         label: "preservation file",
+         "dct:replaces": %(http://pcdm.org/use#PreservationMasterFile),
+         "rdf:subClassOf": %(http://pcdm.org/resources#File),
+         "rdfs:isDefinedBy": %(pcdmuse:),
+         type: "rdfs:Class"
+    warn "[DEPRECATION] PCDM is deprecating '#{self.class}#PreservationMasterFile'. Use #{self.class}#PreservationFile instead."
+    # @deprecated
     term :PreservationMasterFile,
          comment: %(Best quality representation of the Object appropriate for long-term
            preservation.),
          label: "preservation master file",
+         "dct:isReplacedBy": %(http://pcdm.org/use#PreservationFile),
+         "owl:deprecated": true,
          "rdf:subClassOf": %(http://pcdm.org/resources#File),
          "rdfs:isDefinedBy": %(pcdmuse:),
          type: "rdfs:Class"

data/lib/valkyrie.rb

@@ -5,7 +5,6 @@ require 'active_support'
 require 'active_support/core_ext'
 require 'dry-types'
 require 'dry-struct'
-require 'draper'
 require 'reform'
 require 'rdf'
 require 'valkyrie/rdf_patches'
@@ -87,19 +86,6 @@ module Valkyrie
       Valkyrie::StorageAdapter.find(super.to_sym)
     end
 
-    # @api public
-    # Configure id_string_equality to be true in order to make Valkyrie::ID
-    # equal to the string value they contain. This will be the default behavior
-    # in v3.0.0.
-    #
-    # @return [Boolean] Whether `Valkyrie::ID` should be equal to their string counterpart.
-    def id_string_equality
-      super
-    end
-
-    # @!attribute [w] id_string_equality=
-    #   The setter for #id_string_equality; see it's implementation
-
     # @api public
     #
     # The returned anonymous method (e.g. responds to #call) has a signature of
@@ -119,19 +105,19 @@ module Valkyrie
 
     private
 
-      def defaults
-        {
-          resource_class_resolver: method(:default_resource_class_resolver)
-        }
-      end
-
-      # String constantize is a "by convention" factory. This works, but assumes
-      # the ruby class once used to persist is the model used to now reify.
-      #
-      # @param [String] class_name
-      def default_resource_class_resolver(class_name)
-        class_name.constantize
-      end
+    def defaults
+      {
+        resource_class_resolver: method(:default_resource_class_resolver)
+      }
+    end
+
+    # String constantize is a "by convention" factory. This works, but assumes
+    # the ruby class once used to persist is the model used to now reify.
+    #
+    # @param [String] class_name
+    def default_resource_class_resolver(class_name)
+      class_name.constantize
+    end
   end
 
   module_function :config, :logger, :logger=, :config_root_path, :environment, :config_file, :config_hash