valkyrie 3.4.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4fcef8213a3e959929dbdb15bffd20c70bf3a5a07ff977a4937271d137d51a7
-  data.tar.gz: 875ced504589316a4d837fbd4d2d8bfe2e590d0e5f5f3c792edefe1461575a25
+  metadata.gz: '019ff2935ad45b095aa1a480fa630b3acd45486ba398fcc33b881c76f94856c9'
+  data.tar.gz: 6d5be6b5d178daaef17769f561fd2d3bc2d6795ea8d33bd76ccf038772b290c5
 SHA512:
-  metadata.gz: 98945b1fdd7f8cce636eea9abf5fc44c05d8291d1955b22ff91e218e12b81f4b3b617f52d0c846b179e040f623665a62027c60de2b50c50d7b027a7008d78e12
-  data.tar.gz: 844db5f6507ff3678ffe3c253a29dedd7753d26da6495ffcf51e2a275e6175fc9a904361a5724ec385330366eb84eaf13acf66db014bc783201e2e06e11168fb
+  metadata.gz: '08ca3c0f78259f19bbf327363177c0560926d791e832cff00a6707540f00051ee02b1e2aade681104aa90140e1aa5c268a43686df6d49cc6d2545381362c9088'
+  data.tar.gz: 7edd93eb4e765b35f458cf1c6d372103249d191bd580f78e96f4a7e5c2f7012071371eb5bfc4315121d448fa17ecb7b09a76c58cf0658a0859a4ca654b6d2c3a

data/.circleci/config.yml

@@ -24,11 +24,7 @@ jobs:
         environment:
           CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC"
           JAVA_OPTIONS: "-Djetty.http.port=8988"
-      - image: samvera/fcrepo4:5.1.0
-        environment:
-          CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC"
-          JAVA_OPTIONS: "-Djetty.http.port=8998 -Dfcrepo.dynamic.jms.port=61618 -Dfcrepo.dynamic.stomp.port=61614"
-      - image: fcrepo/fcrepo:6.4.0
+      - image: fcrepo/fcrepo:6.5.1-RC3-tomcat9
         environment:
           CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true"
           JAVA_OPTS: "-Djetty.http.port=8978 -Dfcrepo.dynamic.jms.port=61619 -Dfcrepo.dynamic.stomp.port=61615 -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true"
@@ -65,7 +61,7 @@ jobs:
       - run: gem install bundler -v '~> 2.0'
       - restore_cache:
          keys:
-           - bundle-{{ checksum "<< parameters.gemfile >>" }}-{{ checksum "valkyrie.gemspec" }}-<< parameters.ruby >>-6
+           - bundle-{{ checksum "<< parameters.gemfile >>" }}-{{ checksum "valkyrie.gemspec" }}-<< parameters.ruby >>-7
       - run: sudo apt update -y && sudo apt-get install -y libpq-dev lsof
       - run:
           name: Set BUNDLE_GEMFILE
@@ -75,7 +71,7 @@ jobs:
           name: Install dependencies
           command: bundle install --path=vendor/bundle --jobs 4 --retry 3
       - save_cache:
-          key: bundle-{{ checksum "<< parameters.gemfile >>" }}-{{ checksum "valkyrie.gemspec" }}-<< parameters.ruby >>-6
+          key: bundle-{{ checksum "<< parameters.gemfile >>" }}-{{ checksum "valkyrie.gemspec" }}-<< parameters.ruby >>-7
           paths:
             - "vendor/bundle"
             - "gemfiles/vendor/bundle"
@@ -103,10 +99,6 @@ workflows:
           gemfile: "gemfiles/activerecord_7_1.gemfile"
           ruby: 3.3.5
           name: "Ruby3-3_rails7-1"
-      - build:
-          gemfile: "gemfiles/activerecord_7_0.gemfile"
-          ruby: 3.3.5
-          name: "Ruby3-3_rails7-0"
       - build:
           gemfile: "gemfiles/activerecord_7_2.gemfile"
           ruby: 3.2.5
@@ -115,10 +107,6 @@ workflows:
           gemfile: "gemfiles/activerecord_7_1.gemfile"
           ruby: 3.2.5
           name: "Ruby3-2_rails7-1"
-      - build:
-          gemfile: "gemfiles/activerecord_7_0.gemfile"
-          ruby: 3.2.5
-          name: "Ruby3-2_rails7-0"
       - build:
           gemfile: "gemfiles/activerecord_7_2.gemfile"
           ruby: 3.1.6
@@ -127,10 +115,6 @@ workflows:
           gemfile: "gemfiles/activerecord_7_1.gemfile"
           ruby: 3.1.6
           name: "Ruby3-1_rails7-1"
-      - build:
-          gemfile: "gemfiles/activerecord_7_0.gemfile"
-          ruby: 3.1.6
-          name: "Ruby3-1_rails7-0"
       - build:
           gemfile: "gemfiles/faraday_1.gemfile"
           ruby: 3.1.6
@@ -145,6 +129,10 @@ workflows:
               only:
                 - master
     jobs:
+      - build:
+          gemfile: "gemfiles/activerecord_8_0.gemfile"
+          ruby: 3.3.5
+          name: "Ruby3-3_rails8-0"
       - build:
           gemfile: "gemfiles/activerecord_7_2.gemfile"
           ruby: 3.3.5
@@ -153,10 +141,6 @@ workflows:
           gemfile: "gemfiles/activerecord_7_1.gemfile"
           ruby: 3.3.5
           name: "Ruby3-3_rails7-1"
-      - build:
-          gemfile: "gemfiles/activerecord_7_0.gemfile"
-          ruby: 3.3.5
-          name: "Ruby3-3_rails7-0"
       - build:
           gemfile: "gemfiles/activerecord_7_2.gemfile"
           ruby: 3.2.5
@@ -177,10 +161,6 @@ workflows:
           gemfile: "gemfiles/activerecord_7_1.gemfile"
           ruby: 3.1.6
           name: "Ruby3-1_rails7-1"
-      - build:
-          gemfile: "gemfiles/activerecord_7_0.gemfile"
-          ruby: 3.1.6
-          name: "Ruby3-1_rails7-0"
       - build:
           gemfile: "gemfiles/faraday_1.gemfile"
           ruby: 3.1.6

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 /vendor
 /gemfiles/*.lock
+.byebug_history

data/.lando.yml

@@ -27,31 +27,13 @@ services:
     environment:
       CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC"
     portforward: 8988
-  valkyrie_fedora_5:
-    type: compose
-    app_mount: false
-    volumes:
-      fedora5:
-    services:
-      image: fcrepo/fcrepo:5.1.1-multiplatform
-      command:
-        - "catalina.sh"
-        - "run"
-      volumes:
-      - fedora5:/data
-      ports:
-      - 8998:8080
-      environment:
-        CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true"
-        JAVA_OPTS: "-Dfcrepo.dynamic.jms.port=61620 -Dfcrepo.dynamic.stomp.port=61617 -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true"
-    portforward: true
   valkyrie_fedora_6:
     type: compose
     app_mount: false
     volumes:
       fedora6:
     services:
-      image: fcrepo/fcrepo:6.4.0
+      image: fcrepo/fcrepo:6.5.1-RC3-tomcat9
       command:
         - "catalina.sh"
         - "run"

data/Appraisals

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+appraise "activerecord-8-0" do
+  gem "activerecord", "~> 8.0.0"
+end
+
 appraise "activerecord-7-2" do
   gem "activerecord", "~> 7.2.0"
 end
@@ -8,11 +12,7 @@ appraise "activerecord-7-1" do
   gem "activerecord", "~> 7.1.0"
 end
 
-appraise "activerecord-7-0" do
-  gem "activerecord", "~> 7.0.0"
-end
-
 appraise "faraday-1" do
   gem "faraday", "~> 1.0"
-  gem "activerecord", "~> 7.0.0"
+  gem "activerecord", "~> 7.1.0"
 end

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# v3.5.1 2026-01-16
+
+* Remove Fedora 5. ([tpendragon](https://github.com/tpendragon))
+* Limit LSOF command to the current process ID ([hackartisan](https://github.com/hackartisan))
+
+# v3.5.0 2024-12-10
+
+* Provides new boolean configuration setting `auto_cast_iso8601_as_datetime`  ([dchandekstark](https://github.com/dchandekstark))
+* Align behavior of server managed properties with Fedora. ([dlpierce](https://github.com/dlpierce))
+* Check for nil id to avoid InvalidURIError ([dlpierce](https://github.com/dlpierce))
+* Support Fedora 6.5 ([dlpierce](https://github.com/dlpierce))
+* Make storage adapters report their protocol string ([dlpierce](https://github.com/dlpierce))
+
 # v3.4.0 2024-10-11
 
 ## Changes since last release

data/README.md

@@ -224,14 +224,14 @@ custom adapters, but your application will still work.
 Using the shared specs in your own models is described in more detail on the [Shared Specs Wiki
 page](https://github.com/samvera/valkyrie/wiki/Shared-Specs).
 
-### Fedora 5/6 Compatibility
+### Fedora 6 Compatibility
 When configuring your adapter, include the `fedora_version` parameter in your metadata or storage adapter
 config.  If Fedora requires auth, you can also include that in the URL, e.g.:
 
    ```
    Valkyrie::Storage::Fedora.new(
      connection: Ldp::Client.new("http://fedoraAdmin:fedoraAdmin@localhost:8988/rest"),
-     fedora_version: 5
+     fedora_version: 6
    )
    ```
 #### Pairtree paths in Fedora 4/6

data/gemfiles/{activerecord_7_0.gemfile → activerecord_8_0.gemfile}

@@ -3,7 +3,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 7.0.0"
+gem "activerecord", "~> 8.0.0"
 gem "ldp"
 gem "pg"
 gem "rsolr"

data/gemfiles/faraday_1.gemfile

@@ -3,7 +3,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 7.0.0"
+gem "activerecord", "~> 7.1.0"
 gem "ldp"
 gem "pg"
 gem "rsolr"

data/lib/valkyrie/persistence/fedora/persister/orm_converter.rb

@@ -105,7 +105,8 @@ module Valkyrie::Persistence::Fedora
           # @param [Property] value
           # @return [Boolean]
           def self.handles?(value)
-            value.statement.object.to_s.start_with?("http://www.w3.org/ns/ldp", "http://fedora.info")
+            value.statement.predicate == RDF.type &&
+              value.statement.object.to_s.start_with?('http://www.w3.org/ns/ldp#', 'http://fedora.info/definitions/v4/repository#')
           end
 
           # Provide the NullApplicator Class for any Property in a deny listed namespace
@@ -562,7 +563,7 @@ module Valkyrie::Persistence::Fedora
           # @return [Array<String>]
           def denylist
             [
-              "http://fedora.info/definitions",
+              "http://fedora.info/definitions/v4/repository#",
               "http://www.iana.org/assignments/relation/last"
             ]
           end

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

@@ -162,6 +162,7 @@ module Valkyrie::Persistence::Fedora
     # @return [Valkyrie::Resource]
     # @raise [Valkyrie::Persistence::ObjectNotFoundError]
     def resource_from_uri(uri)
+      raise ::Valkyrie::Persistence::ObjectNotFoundError if uri.nil?
       resource = Ldp::Resource.for(connection, uri, connection.get(uri))
       resource_factory.to_resource(object: resource)
     rescue ::Ldp::Gone, ::Ldp::NotFound

data/lib/valkyrie/persistence/fedora.rb

@@ -20,6 +20,6 @@ module Valkyrie::Persistence
     require 'valkyrie/persistence/fedora/ordered_reader'
     require 'valkyrie/persistence/fedora/list_node'
 
-    DEFAULT_FEDORA_VERSION = 5
+    DEFAULT_FEDORA_VERSION = 6
   end
 end

data/lib/valkyrie/persistence/postgres/metadata_adapter.rb

@@ -9,12 +9,12 @@ module Valkyrie::Persistence::Postgres
   #
   # @see https://github.com/samvera-labs/valkyrie/wiki/Set-up-Valkyrie-database-in-a-Rails-Application
   class MetadataAdapter
-    # @return [Class] {Valkyrie::Persistence::Postgres::Persister}
+    # @return [Valkyrie::Persistence::Postgres::Persister]
     def persister
       Valkyrie::Persistence::Postgres::Persister.new(adapter: self)
     end
 
-    # @return [Class] {Valkyrie::Persistence::Postgres::QueryService}
+    # @return [Valkyrie::Persistence::Postgres::QueryService]
     def query_service
       @query_service ||= Valkyrie::Persistence::Postgres::QueryService.new(
         resource_factory: resource_factory,
@@ -22,7 +22,7 @@ module Valkyrie::Persistence::Postgres
       )
     end
 
-    # @return [Class] {Valkyrie::Persistence::Postgres::ResourceFactory}
+    # @return [Valkyrie::Persistence::Postgres::ResourceFactory]
     def resource_factory
       @resource_factory ||= Valkyrie::Persistence::Postgres::ResourceFactory.new(adapter: self)
     end

data/lib/valkyrie/persistence/shared/json_value_mapper.rb

@@ -139,6 +139,7 @@ module Valkyrie::Persistence::Shared
       # @return [Boolean]
       # rubocop:disable Metrics/CyclomaticComplexity
       def self.handles?(value)
+        return false unless ::Valkyrie.config.auto_cast_iso8601_as_datetime
         return false unless value.is_a?(String)
         return false unless value[4] == "-" && value[10] == "T"
         year = value.to_s[0..3]

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

@@ -86,8 +86,13 @@ RSpec.shared_examples 'a Valkyrie query provider' do
       expect { query_service.find_by(id: Valkyrie::ID.new("123123123")) }.to raise_error ::Valkyrie::Persistence::ObjectNotFoundError
     end
 
+    it 'returns a Valkyrie::Persistence::ObjectNotFoundError for an empty string' do
+      expect { query_service.find_by(id: '') }.to raise_error ::Valkyrie::Persistence::ObjectNotFoundError
+    end
+
     it 'raises an error if the id is not a Valkyrie::ID or a string' do
       expect { query_service.find_by(id: 123) }.to raise_error ArgumentError
+      expect { query_service.find_by(id: nil) }.to raise_error ArgumentError
     end
   end
 
@@ -117,8 +122,13 @@ RSpec.shared_examples 'a Valkyrie query provider' do
       expect { query_service.find_by_alternate_identifier(alternate_identifier: Valkyrie::ID.new("123123123")) }.to raise_error ::Valkyrie::Persistence::ObjectNotFoundError
     end
 
+    it "raises a Valkyrie::Persistence::ObjectNotFoundError for a non-found alternate identifier" do
+      expect { query_service.find_by_alternate_identifier(alternate_identifier: '') }.to raise_error ::Valkyrie::Persistence::ObjectNotFoundError
+    end
+
     it 'raises an error if the alternate identifier is not a Valkyrie::ID or a string' do
       expect { query_service.find_by_alternate_identifier(alternate_identifier: 123) }.to raise_error ArgumentError
+      expect { query_service.find_by_alternate_identifier(alternate_identifier: nil) }.to raise_error ArgumentError
     end
 
     it 'can have multiple alternate identifiers' do

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

@@ -12,6 +12,7 @@ RSpec.shared_examples 'a Valkyrie::StorageAdapter' do
     Valkyrie::Specs.send(:remove_const, :CustomResource)
   end
   subject { storage_adapter }
+  it { is_expected.to respond_to(:protocol) }
   it { is_expected.to respond_to(:handles?).with_keywords(:id) }
   it { is_expected.to respond_to(:find_by).with_keywords(:id) }
   it { is_expected.to respond_to(:delete).with_keywords(:id) }
@@ -63,19 +64,21 @@ RSpec.shared_examples 'a Valkyrie::StorageAdapter' do
     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
+    expect(pre_open_files.size).to be <= open_files.size
   end
 
   def open_files
-    `lsof +D .`.split("\n").map { |r| r.split("\t").last }
+    GC.start
+    `lsof -p #{Process.pid}`.split("\n").map { |r| r.split(/\s+/).last }
   end
 
   it "can upload, validate, re-fetch, and delete a file" do
     resource = Valkyrie::Specs::CustomResource.new(id: "test#{SecureRandom.uuid}")
     sha1 = Digest::SHA1.file(file).to_s
     size = file.size
-    expect(uploaded_file = storage_adapter.upload(file: file, original_filename: 'foo.jpg', resource: resource, fake_upload_argument: true)).to be_kind_of Valkyrie::StorageAdapter::File
+    uploaded_file = storage_adapter.upload(file: file, original_filename: 'foo.jpg', resource: resource, fake_upload_argument: true)
 
+    expect(uploaded_file).to be_kind_of Valkyrie::StorageAdapter::File
     expect(uploaded_file).to respond_to(:checksum).with_keywords(:digests)
     expect(uploaded_file).to respond_to(:valid?).with_keywords(:size, :digests)
     expect(uploaded_file.checksum(digests: [Digest::SHA1.new])).to eq([sha1])
@@ -133,28 +136,42 @@ RSpec.shared_examples 'a Valkyrie::StorageAdapter' do
     # Deleting a version should leave the current versions
     if storage_adapter.supports?(:version_deletion)
       storage_adapter.delete(id: uploaded_file.version_id)
-      expect(storage_adapter.find_versions(id: uploaded_file.id).length).to eq 1
+      remnants = storage_adapter.find_versions(id: uploaded_file.id)
+      expect(remnants.length).to eq 1
+      expect(remnants.first.version_id).to eq new_version.version_id
       expect { storage_adapter.find_by(id: uploaded_file.version_id) }.to raise_error Valkyrie::StorageAdapter::FileNotFound
     end
     current_length = storage_adapter.find_versions(id: new_version.id).length
 
     # Restoring a previous version is just pumping its file into upload_version
     newest_version = storage_adapter.upload_version(file: new_version, id: new_version.id)
+    current_length += 1
     expect(newest_version.version_id).not_to eq new_version.id
     expect(storage_adapter.find_by(id: newest_version.id).version_id).to eq newest_version.version_id
 
     # I can restore a version twice
     newest_version = storage_adapter.upload_version(file: new_version, id: new_version.id)
+    current_length += 1
     expect(newest_version.version_id).not_to eq new_version.id
     expect(storage_adapter.find_by(id: newest_version.id).version_id).to eq newest_version.version_id
-    expect(storage_adapter.find_versions(id: newest_version.id).length).to eq current_length + 2
+    expect(storage_adapter.find_versions(id: newest_version.id).length).to eq current_length
+
+    # Fedora 6.5 may not create versions when the timestamp is the same?
+    # See: https://fedora-repository.atlassian.net/browse/FCREPO-3958
+    sleep 1 if storage_adapter.supports?(:list_deleted_versions)
 
     # NOTE: We originally wanted deleting the current record to push it into the
     # versions history, but FCRepo 4/5/6 doesn't work that way, so we changed to
     # instead make deleting delete everything.
     storage_adapter.delete(id: new_version.id)
     expect { storage_adapter.find_by(id: new_version.id) }.to raise_error Valkyrie::StorageAdapter::FileNotFound
-    expect(storage_adapter.find_versions(id: new_version.id).length).to eq 0
+
+    if storage_adapter.supports?(:list_deleted_versions)
+      expect(storage_adapter.find_versions(id: new_version.id).length).to eq current_length
+    else
+      expect(storage_adapter.find_versions(id: new_version.id).length).to eq 0
+    end
+
   ensure
     f&.close
   end

data/lib/valkyrie/storage/disk.rb

@@ -3,6 +3,8 @@ module Valkyrie::Storage
   # Implements the DataMapper Pattern to store binary data on disk
   class Disk
     attr_reader :base_path, :path_generator, :file_mover
+    PROTOCOL = 'disk://'
+
     def initialize(base_path:, path_generator: BucketedStorage, file_mover: FileUtils.method(:mv))
       @base_path = Pathname.new(base_path.to_s)
       @path_generator = path_generator.new(base_path: base_path)
@@ -18,13 +20,13 @@ module Valkyrie::Storage
       new_path = path_generator.generate(resource: resource, file: file, original_filename: original_filename)
       FileUtils.mkdir_p(new_path.parent)
       file_mover.call(file.path, new_path)
-      find_by(id: Valkyrie::ID.new("disk://#{new_path}"))
+      find_by(id: Valkyrie::ID.new("#{protocol}#{new_path}"))
     end
 
     # @param id [Valkyrie::ID]
     # @return [Boolean] true if this adapter can handle this type of identifer
     def handles?(id:)
-      id.to_s.start_with?("disk://#{base_path}")
+      id.to_s.start_with?("#{protocol}#{base_path}")
     end
 
     # @param feature [Symbol] Feature to test for.
@@ -33,8 +35,13 @@ module Valkyrie::Storage
       false
     end
 
+    # @return [String] identifier prefix
+    def protocol
+      PROTOCOL
+    end
+
     def file_path(id)
-      id.to_s.gsub(/^disk:\/\//, '')
+      id.to_s.delete_prefix(protocol)
     end
 
     # Return the file associated with the given identifier

data/lib/valkyrie/storage/fedora.rb

@@ -27,7 +27,7 @@ module Valkyrie::Storage
     # @param id [Valkyrie::ID]
     # @return [Boolean] true if this adapter can handle this type of identifer
     def handles?(id:)
-      id.to_s.start_with?(PROTOCOL)
+      id.to_s.start_with?(protocol)
     end
 
     # @param feature [Symbol] Feature to test for.
@@ -36,9 +36,16 @@ module Valkyrie::Storage
       return true if feature == :versions
       # Fedora 6 auto versions and you can't delete versions.
       return true if feature == :version_deletion && fedora_version < 6
+      # Fedora 6.5+ lists versions for deleted objects
+      return true if feature == :list_deleted_versions && fedora_version >= 6.5
       false
     end
 
+    # @return [String] identifier prefix
+    def protocol
+      PROTOCOL
+    end
+
     # Return the file associated with the given identifier
     # @param id [Valkyrie::ID]
     # @return [Valkyrie::StorageAdapter::StreamFile]
@@ -61,7 +68,7 @@ module Valkyrie::Storage
       # Fedora 6 auto versions, so check to see if there's a version for this
       # initial upload. If not, then mint one (fedora 4/5)
       version_id = current_version_id(id: valkyrie_identifier(uri: identifier)) || mint_version(identifier, latest_version(identifier))
-      perform_find(id: Valkyrie::ID.new(identifier.to_s.sub(/^.+\/\//, PROTOCOL)), version_id: version_id)
+      perform_find(id: Valkyrie::ID.new(identifier.to_s.sub(/^.+\/\//, protocol)), version_id: version_id)
     end
 
     # @param id [Valkyrie::ID] ID of the Valkyrie::StorageAdapter::StreamFile to
@@ -77,7 +84,7 @@ module Valkyrie::Storage
       end
       upload_file(fedora_uri: uri, io: file)
       version_id = mint_version(uri, latest_version(uri))
-      perform_find(id: Valkyrie::ID.new(uri.to_s.sub(/^.+\/\//, PROTOCOL)), version_id: version_id)
+      perform_find(id: Valkyrie::ID.new(uri.to_s.sub(/^.+\/\//, protocol)), version_id: version_id)
     end
 
     # @param id [Valkyrie::ID]
@@ -88,7 +95,9 @@ module Valkyrie::Storage
       version_list.map do |version|
         id = valkyrie_identifier(uri: version["@id"])
         perform_find(id: id, version_id: id)
-      end
+      rescue Valkyrie::StorageAdapter::FileNotFound
+        nil
+      end.compact
     end
 
     # Delete the file in Fedora associated with the given identifier.
@@ -107,7 +116,7 @@ module Valkyrie::Storage
       if fedora_version == 4
         version_graph&.fetch("http://fedora.info/definitions/v4/repository#hasVersion", [])
       else
-        # Fedora 5/6 use Memento.
+        # Fedora 6 uses Memento.
         version_graph&.fetch("http://www.w3.org/ns/ldp#contains", [])&.sort_by { |x| x["@id"] }&.reverse
       end
     end
@@ -167,12 +176,6 @@ module Valkyrie::Storage
       end
       # If there's a deletion marker, don't return anything. (Fedora 4)
       return nil if response.status == 410
-      # This is awful, but versioning is locked to per-second increments,
-      # returns a 409 in Fedora 5 if there's a conflict.
-      if response.status == 409
-        sleep(0.5)
-        return mint_version(identifier, version_name)
-      end
       raise "Version unable to be created" unless response.status == 201
       valkyrie_identifier(uri: response.headers["location"].gsub("/fcr:metadata", ""))
     end
@@ -197,12 +200,12 @@ module Valkyrie::Storage
     # Translate the Valkrie ID into a URL for the fedora file
     # @return [RDF::URI]
     def fedora_identifier(id:)
-      identifier = id.to_s.sub(PROTOCOL, "#{connection.http.scheme}://")
+      identifier = id.to_s.sub(protocol, "#{connection.http.scheme}://")
       RDF::URI(identifier)
     end
 
     def valkyrie_identifier(uri:)
-      id = uri.to_s.sub("http://", PROTOCOL)
+      id = uri.to_s.sub("http://", protocol)
       Valkyrie::ID.new(id)
     end
 
@@ -211,7 +214,7 @@ module Valkyrie::Storage
     # @return [IOProxy]
     def response(id:)
       response = connection.http.get(fedora_identifier(id: id))
-      raise Valkyrie::StorageAdapter::FileNotFound unless response.success?
+      raise Valkyrie::StorageAdapter::FileNotFound, "HTTP #{response.status} #{response.body}" unless response.success?
       IOProxy.new(response.body)
     end
 

data/lib/valkyrie/storage/memory.rb

@@ -6,6 +6,8 @@ module Valkyrie::Storage
   #   in cases where you want to preserve real data
   class Memory
     attr_reader :cache
+    PROTOCOL = 'memory://'
+
     def initialize
       @cache = {}
     end
@@ -16,7 +18,7 @@ module Valkyrie::Storage
     # @param _extra_arguments [Hash] additional arguments which may be passed to other adapters
     # @return [Valkyrie::StorageAdapter::StreamFile]
     def upload(file:, original_filename:, resource: nil, **_extra_arguments)
-      identifier = Valkyrie::ID.new("memory://#{resource.id}")
+      identifier = Valkyrie::ID.new("#{protocol}#{resource.id}")
       version_id = Valkyrie::ID.new("#{identifier}##{SecureRandom.uuid}")
       cache[identifier] ||= {}
       cache[identifier][:current] = Valkyrie::StorageAdapter::StreamFile.new(id: identifier, io: file, version_id: version_id)
@@ -67,7 +69,7 @@ module Valkyrie::Storage
     # @param id [Valkyrie::ID]
     # @return [Boolean] true if this adapter can handle this type of identifer
     def handles?(id:)
-      id.to_s.start_with?("memory://")
+      id.to_s.start_with?(protocol)
     end
 
     # @param feature [Symbol] Feature to test for.
@@ -83,6 +85,11 @@ module Valkyrie::Storage
       end
     end
 
+    # @return [String] identifier prefix
+    def protocol
+      PROTOCOL
+    end
+
     def id_and_version(id)
       id, version = id.to_s.split("#")
       [Valkyrie::ID.new(id), version]

data/lib/valkyrie/storage/versioned_disk.rb

@@ -7,6 +7,8 @@ module Valkyrie::Storage
   # with "deletionmarker" in the name of the file.
   class VersionedDisk
     attr_reader :base_path, :path_generator, :file_mover
+    PROTOCOL = 'versiondisk://'
+
     def initialize(base_path:, path_generator: ::Valkyrie::Storage::Disk::BucketedStorage, file_mover: FileUtils.method(:cp))
       @base_path = Pathname.new(base_path.to_s)
       @path_generator = path_generator.new(base_path: base_path)
@@ -26,7 +28,7 @@ module Valkyrie::Storage
       return sleep(0.001) && upload(file: file, original_filename: original_filename, resource: resource, paused: true, **extra_arguments) if !paused && File.exist?(new_path)
       FileUtils.mkdir_p(new_path.parent)
       file_mover.call(file.try(:path) || file.try(:disk_path), new_path)
-      find_by(id: Valkyrie::ID.new("versiondisk://#{new_path}"))
+      find_by(id: Valkyrie::ID.new("#{protocol}#{new_path}"))
     end
 
     def current_timestamp
@@ -50,13 +52,13 @@ module Valkyrie::Storage
       return sleep(0.001) && upload_version(id: id, file: file, paused: true) if !paused && File.exist?(new_path)
       FileUtils.mkdir_p(new_path.parent)
       file_mover.call(file.try(:path) || file.try(:disk_path), new_path)
-      find_by(id: Valkyrie::ID.new("versiondisk://#{new_path}"))
+      find_by(id: Valkyrie::ID.new("#{protocol}#{new_path}"))
     end
 
     # @param id [Valkyrie::ID]
     # @return [Boolean] true if this adapter can handle this type of identifer
     def handles?(id:)
-      id.to_s.start_with?("versiondisk://#{base_path}")
+      id.to_s.start_with?("#{protocol}#{base_path}")
     end
 
     # @param feature [Symbol] Feature to test for.
@@ -66,6 +68,11 @@ module Valkyrie::Storage
       false
     end
 
+    # @return [String] identifier prefix
+    def protocol
+      PROTOCOL
+    end
+
     # Return the file associated with the given identifier
     # @param id [Valkyrie::ID]
     # @return [Valkyrie::StorageAdapter::File]
@@ -95,7 +102,7 @@ module Valkyrie::Storage
     # @return [Array<Valkyrie::StorageAdapter::File>]
     def find_versions(id:)
       version_files(id: id).select { |x| !x.to_s.include?("deletionmarker") }.map do |file|
-        find_by(id: Valkyrie::ID.new("versiondisk://#{file}"))
+        find_by(id: Valkyrie::ID.new("#{protocol}#{file}"))
       end
     end
 
@@ -106,7 +113,7 @@ module Valkyrie::Storage
     end
 
     def file_path(version_id)
-      version_id.to_s.gsub(/^versiondisk:\/\//, '')
+      version_id.to_s.gsub(/^#{Regexp.escape(protocol)}/, '')
     end
 
     # @return VersionId A VersionId value that's resolved a current reference,
@@ -128,6 +135,10 @@ module Valkyrie::Storage
         @id = id
       end
 
+      def protocol
+        PROTOCOL
+      end
+
       def current_reference_id
         self.class.new(Valkyrie::ID.new(string_id.gsub(version, "current")))
       end
@@ -139,13 +150,13 @@ module Valkyrie::Storage
       end
 
       def file_path
-        @file_path ||= string_id.gsub(/^versiondisk:\/\//, '')
+        @file_path ||= string_id.gsub(/^#{Regexp.escape(protocol)}/, '')
       end
 
       def version_files
         root = Pathname.new(file_path)
         root.parent.children.select { |file| file.basename.to_s.end_with?(filename) }.sort.reverse.map do |file|
-          VersionId.new(Valkyrie::ID.new("versiondisk://#{file}"))
+          VersionId.new(Valkyrie::ID.new("#{protocol}#{file}"))
         end
       end
 

data/lib/valkyrie/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Valkyrie
-  VERSION = "3.4.0"
+  VERSION = "3.5.1"
 end

data/lib/valkyrie.rb

@@ -101,6 +101,10 @@ module Valkyrie
       self[:index_tsim_only_threshold].to_i
     end
 
+    def auto_cast_iso8601_as_datetime
+      self[:auto_cast_iso8601_as_datetime]
+    end
+
     # @api public
     #
     # The returned anonymous method (e.g. responds to #call) has a signature of
@@ -123,7 +127,8 @@ module Valkyrie
     def defaults
       {
         resource_class_resolver: method(:default_resource_class_resolver),
-        index_tsim_only_threshold: 1000
+        index_tsim_only_threshold: 1000,
+        auto_cast_iso8601_as_datetime: true
       }
     end
 

data/valkyrie.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'dry-struct'
   spec.add_dependency 'activemodel'
   spec.add_dependency 'dry-types', '~> 1.0'
-  spec.add_dependency 'rdf', '~> 3.0', '>= 3.0.10'
+  spec.add_dependency 'rdf', '~> 3.0', '>= 3.3.2'
   spec.add_dependency 'activesupport'
   spec.add_dependency 'railties' # To use generators and engines
   spec.add_dependency 'reform', '~> 2.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.1
 platform: ruby
 authors:
 - Trey Pendragon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-11 00:00:00.000000000 Z
+date: 2026-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -61,7 +61,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.10
+        version: 3.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,7 +71,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.10
+        version: 3.3.2
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -452,9 +452,9 @@ files:
 - db/migrate/20180212092225_create_updated_at_index.rb
 - db/migrate/20180802220739_add_optimistic_locking_to_orm_resources.rb
 - db/schema.rb
-- gemfiles/activerecord_7_0.gemfile
 - gemfiles/activerecord_7_1.gemfile
 - gemfiles/activerecord_7_2.gemfile
+- gemfiles/activerecord_8_0.gemfile
 - gemfiles/faraday_1.gemfile
 - lib/valkyrie.rb
 - lib/valkyrie/adapter_container.rb