valkyrie 3.5.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ba113a4df1fa120076006223d629be9d186f96736fbb363781bc78f6c038013
-  data.tar.gz: 89e485a082def7836f884354b136c081496b5a9f36e98c2f9f31127dc053ab28
+  metadata.gz: dd992e314f4262841181b047c1069253b9ae74131fe5e88760ff266ee934d7b4
+  data.tar.gz: 0b9d0d17a2853fb2eda435a3afc2a6202af17b19a4d5d0ad4ecfbeaea0e34de5
 SHA512:
-  metadata.gz: 3d3537379fb136ec2ca843e2dd13d85a22c46a9c74d94f1ca3cfb1ab32f4a193394ab1ff9deae649939e3260b0ba9e9d8f423f3fb87d40043d107ff646fb74bc
-  data.tar.gz: 4a908d4d2574d5017bc81af1683d714b028b5d1ab17e086ff0f8ea6d0a764348f3efd3f308aeedac4623956ccfce915a5c5d611ab84d7e9e2d08c22d5afe623a
+  metadata.gz: a00872e00399a98d2435b846b6742af2095624e1054c80079e98b94b8ca8fe92d0f114d13f67668b348dfd0d3ab972c00abeef33f58cc5caab90fcc7b94ba76a
+  data.tar.gz: f8c7dcce4c7e2513d272e53a4c187eba830c16d37483dd0678f60921660b6d8b22f3dc051d9e459b6c7d6363b0c4b518c7be6cccec0c8ef854512075e8c2fbea

data/.circleci/config.yml

@@ -9,13 +9,13 @@ jobs:
         type: "string"
       ruby:
         description: "Ruby version"
-        default: "3.1.6"
+        default: "3.3.11"
         type: "string"
     docker:
       - image: cimg/ruby:<< parameters.ruby >>
         environment:
           RAILS_ENV: test
-      - image: postgres:10.6-alpine
+      - image: postgres:15.2
         environment:
           POSTGRES_USER: postgres
           POSTGRES_DB: Valkyrie_gem_test
@@ -24,16 +24,14 @@ 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.5.1-RC3-tomcat9
+      - image: fcrepo/fcrepo:6.5-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"
-      - image: solr:7.7-alpine
+      - image: solr:9.9.0
         command: bin/solr -cloud -noprompt -f -p 8994
+        environment:
+          SOLR_MODULES: "analysis-extras,extraction"
     environment:
       BUNDLE_GEMFILE: << parameters.gemfile >>
       POSTGRES_PORT: 5432
@@ -60,22 +58,21 @@ jobs:
             cd solr/config
             zip -1 -r solr_config.zip ./*
             curl -H "Content-type:application/octet-stream" --data-binary @solr_config.zip "http://localhost:8994/solr/admin/configs?action=UPLOAD&name=valkyrie"
-            curl -H 'Content-type: application/json' http://localhost:8994/api/collections/ -d '{create: {name: valkyrie-core-test, config: valkyrie, numShards: 1}}'
+            curl -H 'Content-type: application/json' http://localhost:8994/api/collections/ -d '{"name": "valkyrie-core-test", "config": "valkyrie", "numShards": 1}'
       # Install Bundler
       - 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
           command: |
             export BUNDLE_GEMFILE=~/project/<< parameters.gemfile >>
-      - run:
-          name: Install dependencies
-          command: bundle install --path=vendor/bundle --jobs 4 --retry 3
+      - run: bundle config set path 'vendor/bundle'
+      - run: bundle install
       - 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"
@@ -97,44 +94,24 @@ workflows:
     jobs:
       - build:
           gemfile: "gemfiles/activerecord_7_2.gemfile"
-          ruby: 3.3.5
+          ruby: 3.3.11
           name: "Ruby3-3_rails7-2"
       - build:
-          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
-          name: "Ruby3-2_rails7-2"
-      - build:
-          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"
+          gemfile: "gemfiles/activerecord_8_0.gemfile"
+          ruby: 3.3.11
+          name: "Ruby3-3_rails8-0"
       - build:
-          gemfile: "gemfiles/activerecord_7_2.gemfile"
-          ruby: 3.1.6
-          name: "Ruby3-1_rails7-2"
-      - build:
-          gemfile: "gemfiles/activerecord_7_1.gemfile"
-          ruby: 3.1.6
-          name: "Ruby3-1_rails7-1"
+          gemfile: "gemfiles/activerecord_8_1.gemfile"
+          ruby: 3.3.11
+          name: "Ruby3-3_rails8-1"
       - build:
-          gemfile: "gemfiles/activerecord_7_0.gemfile"
-          ruby: 3.1.6
-          name: "Ruby3-1_rails7-0"
+          gemfile: "gemfiles/activerecord_8_1.gemfile"
+          ruby: 3.4.9
+          name: "Ruby3-4_rails8-1"
       - build:
-          gemfile: "gemfiles/faraday_1.gemfile"
-          ruby: 3.1.6
-          name: "Faraday1"
+          gemfile: "gemfiles/activerecord_8_1.gemfile"
+          ruby: 4.0.5
+          name: "Ruby4-0_rails8-1"
 
   nightly:
     triggers:
@@ -147,41 +124,21 @@ workflows:
     jobs:
       - build:
           gemfile: "gemfiles/activerecord_7_2.gemfile"
-          ruby: 3.3.5
+          ruby: 3.3.11
           name: "Ruby3-3_rails7-2"
       - build:
-          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
-          name: "Ruby3-2_rails7-2"
-      - build:
-          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
-          name: "Ruby3-1_rails7-2"
+          gemfile: "gemfiles/activerecord_8_0.gemfile"
+          ruby: 3.3.11
+          name: "Ruby3-3_rails8-0"
       - build:
-          gemfile: "gemfiles/activerecord_7_1.gemfile"
-          ruby: 3.1.6
-          name: "Ruby3-1_rails7-1"
+          gemfile: "gemfiles/activerecord_8_1.gemfile"
+          ruby: 3.3.11
+          name: "Ruby3-3_rails8-1"
       - build:
-          gemfile: "gemfiles/activerecord_7_0.gemfile"
-          ruby: 3.1.6
-          name: "Ruby3-1_rails7-0"
+          gemfile: "gemfiles/activerecord_8_1.gemfile"
+          ruby: 3.4.9
+          name: "Ruby3-4_rails8-1"
       - build:
-          gemfile: "gemfiles/faraday_1.gemfile"
-          ruby: 3.1.6
-          name: "Faraday1"
+          gemfile: "gemfiles/activerecord_8_1.gemfile"
+          ruby: 4.0.5
+          name: "Ruby4-0_rails8-1"

data/.gitignore

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

data/.lando.yml

@@ -1,16 +1,19 @@
 name: valkyrie
 app_mount: false
 services:
-  valkyrie_test_solr_7:
+  valkyrie_test_solr_9:
     app_mount: false
-    type: solr:7
+    type: solr:9
     portforward: 8994
     core: valkyrie-core-test
     config:
       dir: solr/config
+    overrides:
+      environment:
+        SOLR_MODULES: "analysis-extras,extraction"
   valkyrie_database:
     app_mount: false
-    type: postgres:10
+    type: postgres:15
     portforward: 5433
   valkyrie_fedora_4:
     type: compose
@@ -27,31 +30,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.5.1-RC3-tomcat9
+      image: fcrepo/fcrepo:6.5-tomcat9
       command:
         - "catalina.sh"
         - "run"

data/Appraisals

@@ -1,18 +1,12 @@
 # frozen_string_literal: true
-
-appraise "activerecord-7-2" do
-  gem "activerecord", "~> 7.2.0"
+appraise "activerecord-8-1" do
+  gem "activerecord", "~> 8.1.0"
 end
 
-appraise "activerecord-7-1" do
-  gem "activerecord", "~> 7.1.0"
+appraise "activerecord-8-0" do
+  gem "activerecord", "~> 8.0.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"
+appraise "activerecord-7-2" do
+  gem "activerecord", "~> 7.2.0"
 end

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# v3.6.0 2026-07-23
+
+* Update dependencies. ([tpendragon](https://github.com/tpendragon))
+* Improve performance of Fedora 6. ([dolsysmith](https://github.com/dolsysmith))
+* Add streaming support to Fedora storage adapter. ([eltiffster](https://github.com/eltiffster))
+
+# 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))

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/{activerecord_7_1.gemfile → activerecord_8_1.gemfile}

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

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

@@ -42,7 +42,13 @@ module Valkyrie::Persistence::Fedora
       # @see https://www.w3.org/TR/ldp/#ldpc
       # @return [Ldp::Container::Basic]
       def graph_resource
-        @graph_resource ||= ::Ldp::Container::Basic.new(connection, subject, nil, base_path)
+        # If the resource is a nested resource with a hashed URI,
+        # we don't want to query Fedora for a URI formed from this resource ID,
+        # because it will return everything at the base_path,
+        # resulting in a unnecessary work (clearing out the graph)
+        # Passing nil here returns an empty graph, which doesn't seem to cause problems
+        s = resource.id.to_s.start_with?("#") ? nil : subject
+        @graph_resource ||= ::Ldp::Container::Basic.new(connection, s, nil, base_path)
       end
 
       # Generate a URI from the Valkyrie Resource ID to be used as the RDF subject for Fedora LDP resources

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/specs/shared_specs/storage_adapter.rb

@@ -58,17 +58,18 @@ RSpec.shared_examples 'a Valkyrie::StorageAdapter' do
     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
+    expect(pre_open_files.size).to be <= 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
+    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

data/lib/valkyrie/storage/disk.rb

@@ -41,7 +41,7 @@ module Valkyrie::Storage
     end
 
     def file_path(id)
-      id.to_s.gsub(/^#{Regexp.escape(protocol)}/, '')
+      id.to_s.delete_prefix(protocol)
     end
 
     # Return the file associated with the given identifier

data/lib/valkyrie/storage/fedora.rb

@@ -116,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
@@ -176,33 +176,10 @@ 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
 
-    class IOProxy
-      # @param response [Ldp::Resource::BinarySource]
-      attr_reader :size
-      def initialize(source)
-        @source = source
-        @size = source.size
-      end
-      delegate :each, :read, :rewind, to: :io
-
-      # There is no streaming support in faraday (https://github.com/lostisland/faraday/pull/604)
-      # @return [StringIO]
-      def io
-        @io ||= StringIO.new(@source)
-      end
-    end
-    private_constant :IOProxy
-
     # Translate the Valkrie ID into a URL for the fedora file
     # @return [RDF::URI]
     def fedora_identifier(id:)
@@ -217,11 +194,15 @@ module Valkyrie::Storage
 
     private
 
-    # @return [IOProxy]
+    # @return [StringIO]
     def response(id:)
-      response = connection.http.get(fedora_identifier(id: id))
+      io = StringIO.new
+      response = connection.http.get(fedora_identifier(id: id)) do |request|
+        request.options.on_data = proc { |chunk, _size| io.write(chunk) }
+      end
       raise Valkyrie::StorageAdapter::FileNotFound, "HTTP #{response.status} #{response.body}" unless response.success?
-      IOProxy.new(response.body)
+      io.rewind
+      io
     end
 
     def default_resource_uri_transformer

data/lib/valkyrie/version.rb

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

data/solr/config/schema.xml

@@ -48,43 +48,47 @@
 <schema name="Hydra Demo Index" version="1.5">
   <!-- attribute "name" is the name of this schema and is only used for display purposes.
        Applications should change this to reflect the nature of the search collection.
-       version="1.4" is Solr's version number for the schema syntax and semantics.  It should
+       version="1.5" is Solr's version number for the schema syntax and semantics.  It should
        not normally be changed by applications.
        1.0: multiValued attribute did not exist, all fields are multiValued by nature
        1.1: multiValued attribute introduced, false by default
        1.2: omitTermFreqAndPositions attribute introduced, true by default except for text fields.
        1.3: removed optional field compress feature
        1.4: default auto-phrase (QueryParser feature) to off
+       1.5: omitNorms defaults to true for primitive field types (int, float, boolean, string...)
+# TODO 1.6: useDocValuesAsStored defaults to true.
+# See https://github.com/samvera/active_fedora/issues/1346
      -->
 
   <types>
     <fieldType name="string" class="solr.StrField" sortMissingLast="true" />
-    <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>    
+    <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
     <fieldType name="rand" class="solr.RandomSortField" omitNorms="true"/>
-    
+
     <!-- Default numeric field types.  -->
-    <fieldType name="int" class="solr.TrieIntField" precisionStep="0" positionIncrementGap="0"/>
-    <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" positionIncrementGap="0"/>
-    <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
-    <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" positionIncrementGap="0"/>
-    
-    <!-- trie numeric field types for faster range queries -->
-    <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" positionIncrementGap="0"/>
-    <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" positionIncrementGap="0"/>
-    <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" positionIncrementGap="0"/>
-    <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
-    
+    <fieldType name="int" class="solr.IntPointField" docValues="true"/>
+    <fieldType name="float" class="solr.FloatPointField" docValues="true"/>
+    <fieldType name="long" class="solr.LongPointField" docValues="true"/>
+    <fieldType name="double" class="solr.DoublePointField" docValues="true"/>
+
+    <!-- PointField numeric field types for faster range queries -->
+    <fieldType name="tint" class="solr.IntPointField" docValues="true"/>
+    <fieldType name="tfloat" class="solr.FloatPointField" docValues="true"/>
+    <fieldType name="tlong" class="solr.LongPointField" docValues="true"/>
+    <fieldType name="tdouble" class="solr.DoublePointField" docValues="true"/>
+
     <!-- The format for this date field is of the form 1995-12-31T23:59:59Z
          Optional fractional seconds are allowed: 1995-12-31T23:59:59.999Z
       -->
-    <fieldType name="date" class="solr.TrieDateField" precisionStep="0" positionIncrementGap="0"/>
-    <!-- A Trie based date field for faster date range queries and date faceting. -->
-    <fieldType name="tdate" class="solr.TrieDateField" precisionStep="6" positionIncrementGap="0"/>
-    
-    
+    <fieldType name="date" class="solr.DatePointField" docValues="true"/>
+    <!-- A PointField based date field for faster date range queries and date faceting. -->
+    <fieldType name="tdate" class="solr.DatePointField" docValues="true"/>
+    <!-- A DateRange based date field for truly faster date range queries. -->
+    <fieldType name="dateRange" class="solr.DateRangeField" omitNorms="true" omitTermFreqAndPositions="true"/>
+
     <!-- This point type indexes the coordinates as separate fields (subFields)
       If subFieldType is defined, it references a type, and a dynamic field
-      definition is created matching *___<typename>.  Alternately, if 
+      definition is created matching *___<typename>.  Alternately, if
       subFieldSuffix is defined, that is used to create the subFields.
       Example: if subFieldType="double", then the coordinates would be
         indexed in fields myloc_0___double,myloc_1___double.
@@ -94,17 +98,14 @@
       users normally should not need to know about them.
      -->
     <fieldType name="point" class="solr.PointType" dimension="2" subFieldSuffix="_d"/>
-    
-    <!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
-    <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
-    
-    <!-- An alternative geospatial field type new to Solr 4.  It supports multiValued and polygon shapes.
+
+    <!-- A geospatial field type new to Solr 4.  It supports multiValued and polygon shapes.
       For more information about this and other Spatial fields new to Solr 4, see:
       http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4
     -->
     <fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
       geo="true" distErrPct="0.025" maxDistErr="0.000009" distanceUnits="degrees" />
-    
+
     <fieldType name="text" class="solr.TextField" omitNorms="false">
       <analyzer>
         <tokenizer class="solr.ICUTokenizerFactory"/>
@@ -112,7 +113,7 @@
         <filter class="solr.TrimFilterFactory"/>
       </analyzer>
     </fieldType>
-    
+
     <!-- A text field that only splits on whitespace for exact matching of words -->
     <fieldType name="text_ws" class="solr.TextField" positionIncrementGap="100">
       <analyzer>
@@ -120,7 +121,7 @@
         <filter class="solr.TrimFilterFactory"/>
       </analyzer>
     </fieldType>
-        
+
     <!-- single token analyzed text, for sorting.  Punctuation is significant. -->
     <fieldtype name="alphaSort" class="solr.TextField" sortMissingLast="true" omitNorms="true">
       <analyzer>
@@ -129,7 +130,7 @@
         <filter class="solr.TrimFilterFactory" />
       </analyzer>
     </fieldtype>
-    
+
     <!-- A text field with defaults appropriate for English -->
     <fieldType name="text_en" class="solr.TextField" positionIncrementGap="100">
       <analyzer>
@@ -144,7 +145,7 @@
         <filter class="solr.TrimFilterFactory"/>
       </analyzer>
     </fieldType>
-        
+
     <!-- queries for paths match documents at that path, or in descendent paths -->
     <fieldType name="descendent_path" class="solr.TextField">
       <analyzer type="index">
@@ -154,7 +155,7 @@
         <tokenizer class="solr.KeywordTokenizerFactory" />
       </analyzer>
     </fieldType>
-    
+
     <!-- queries for paths match documents at that path, or in ancestor paths -->
     <fieldType name="ancestor_path" class="solr.TextField">
       <analyzer type="index">
@@ -178,12 +179,12 @@
   <fields>
     <!-- If you remove this field, you must _also_ disable the update log in solrconfig.xml
     or Solr won't start. _version_ and update log are required for SolrCloud
-    --> 
+    -->
     <field name="_version_" type="long" indexed="true" stored="true"/>
-   
+
     <field name="id" type="string" stored="true" indexed="true" multiValued="false" required="true"/>
     <field name="timestamp" type="date" indexed="true" stored="true" default="NOW" multiValued="false"/>
-    
+
     <field name="lat" type="tdouble" stored="true" indexed="true" multiValued="false"/>
     <field name="lng" type="tdouble" stored="true" indexed="true" multiValued="false"/>
 
@@ -200,7 +201,7 @@
     <dynamicField name="*_timv" type="text" stored="false" indexed="true" multiValued="true" termVectors="true" termPositions="true" termOffsets="true"/>
     <dynamicField name="*_tsiv" type="text" stored="true" indexed="true" multiValued="false" termVectors="true" termPositions="true" termOffsets="true"/>
     <dynamicField name="*_tsimv" type="text" stored="true" indexed="true" multiValued="true" termVectors="true" termPositions="true" termOffsets="true"/>
-    
+
     <!-- English text (_te...) -->
     <dynamicField name="*_tei" type="text_en" stored="false" indexed="true" multiValued="false"/>
     <dynamicField name="*_teim" type="text_en" stored="false" indexed="true" multiValued="true"/>
@@ -212,7 +213,7 @@
     <dynamicField name="*_teimv" type="text_en" stored="false" indexed="true" multiValued="true" termVectors="true" termPositions="true" termOffsets="true"/>
     <dynamicField name="*_tesiv" type="text_en" stored="true" indexed="true" multiValued="false" termVectors="true" termPositions="true" termOffsets="true"/>
     <dynamicField name="*_tesimv" type="text_en" stored="true" indexed="true" multiValued="true" termVectors="true" termPositions="true" termOffsets="true"/>
-    
+
     <!-- string (_s...) -->
     <dynamicField name="*_si" type="string" stored="false" indexed="true" multiValued="false"/>
     <dynamicField name="*_sim" type="string" stored="false" indexed="true" multiValued="true"/>
@@ -221,7 +222,7 @@
     <dynamicField name="*_ssi" type="string" stored="true" indexed="true" multiValued="false"/>
     <dynamicField name="*_ssim" type="string" stored="true" indexed="true" multiValued="true"/>
     <dynamicField name="*_ssort" type="alphaSort" stored="false" indexed="true" multiValued="false"/>
-    
+
     <!-- integer (_i...) -->
     <dynamicField name="*_ii" type="int" stored="false" indexed="true" multiValued="false"/>
     <dynamicField name="*_iim" type="int" stored="false" indexed="true" multiValued="true"/>
@@ -229,15 +230,15 @@
     <dynamicField name="*_ism" type="int" stored="true" indexed="false" multiValued="true"/>
     <dynamicField name="*_isi" type="int" stored="true" indexed="true" multiValued="false"/>
     <dynamicField name="*_isim" type="int" stored="true" indexed="true" multiValued="true"/>
-    
-    <!-- trie integer (_it...) (for faster range queries) -->
+
+    <!-- IntegerPointField (_it...) (for faster range queries) -->
     <dynamicField name="*_iti" type="tint" stored="false" indexed="true" multiValued="false"/>
     <dynamicField name="*_itim" type="tint" stored="false" indexed="true" multiValued="true"/>
     <dynamicField name="*_its" type="tint" stored="true" indexed="false" multiValued="false"/>
     <dynamicField name="*_itsm" type="tint" stored="true" indexed="false" multiValued="true"/>
     <dynamicField name="*_itsi" type="tint" stored="true" indexed="true" multiValued="false"/>
     <dynamicField name="*_itsim" type="tint" stored="true" indexed="true" multiValued="true"/>
-    
+
     <!-- date (_dt...) -->
     <!-- The format for this date field is of the form 1995-12-31T23:59:59Z
          Optional fractional seconds are allowed: 1995-12-31T23:59:59.999Z -->
@@ -247,15 +248,24 @@
     <dynamicField name="*_dtsm" type="date" stored="true" indexed="false" multiValued="true"/>
     <dynamicField name="*_dtsi" type="date" stored="true" indexed="true" multiValued="false"/>
     <dynamicField name="*_dtsim" type="date" stored="true" indexed="true" multiValued="true"/>
-    
-    <!-- trie date (_dtt...) (for faster range queries) -->
+
+    <!-- DatePointField (_dtt...) (for faster range queries) -->
     <dynamicField name="*_dtti" type="tdate" stored="false" indexed="true" multiValued="false"/>
     <dynamicField name="*_dttim" type="tdate" stored="false" indexed="true" multiValued="true"/>
     <dynamicField name="*_dtts" type="tdate" stored="true" indexed="false" multiValued="false"/>
     <dynamicField name="*_dttsm" type="tdate" stored="true" indexed="false" multiValued="true"/>
     <dynamicField name="*_dttsi" type="tdate" stored="true" indexed="true" multiValued="false"/>
     <dynamicField name="*_dttsim" type="tdate" stored="true" indexed="true" multiValued="true"/>
-    
+
+
+    <!-- date range (_dr...) (for faster AND better range queries) -->
+    <dynamicField name="*_dri" type="dateRange" stored="false" indexed="true" multiValued="false"/>
+    <dynamicField name="*_drim" type="dateRange" stored="false" indexed="true" multiValued="true"/>
+    <dynamicField name="*_drsi" type="dateRange" stored="true" indexed="true" multiValued="false"/>
+    <dynamicField name="*_drsim" type="dateRange" stored="true" indexed="true" multiValued="true"/>
+    <dynamicField name="*_drs" type="dateRange" stored="true" indexed="true" multiValued="false"/> <!-- indexed anyway because DateRangeField errors otherwise -->
+    <dynamicField name="*_drsm" type="dateRange" stored="true" indexed="true" multiValued="true"/> <!-- indexed anyway because DateRangeField errors otherwise -->
+
     <!-- long (_l...) -->
     <dynamicField name="*_li" type="long" stored="false" indexed="true" multiValued="false"/>
     <dynamicField name="*_lim" type="long" stored="false" indexed="true" multiValued="true"/>
@@ -263,15 +273,15 @@
     <dynamicField name="*_lsm" type="long" stored="true" indexed="false" multiValued="true"/>
     <dynamicField name="*_lsi" type="long" stored="true" indexed="true" multiValued="false"/>
     <dynamicField name="*_lsim" type="long" stored="true" indexed="true" multiValued="true"/>
-    
-    <!-- trie long (_lt...) (for faster range queries) -->
+
+    <!-- LongPointField (_lt...) (for faster range queries) -->
     <dynamicField name="*_lti" type="tlong" stored="false" indexed="true" multiValued="false"/>
     <dynamicField name="*_ltim" type="tlong" stored="false" indexed="true" multiValued="true"/>
     <dynamicField name="*_lts" type="tlong" stored="true" indexed="false" multiValued="false"/>
     <dynamicField name="*_ltsm" type="tlong" stored="true" indexed="false" multiValued="true"/>
     <dynamicField name="*_ltsi" type="tlong" stored="true" indexed="true" multiValued="false"/>
     <dynamicField name="*_ltsim" type="tlong" stored="true" indexed="true" multiValued="true"/>
-    
+
     <!-- double (_db...) -->
     <dynamicField name="*_dbi" type="double" stored="false" indexed="true" multiValued="false"/>
     <dynamicField name="*_dbim" type="double" stored="false" indexed="true" multiValued="true"/>
@@ -279,15 +289,15 @@
     <dynamicField name="*_dbsm" type="double" stored="true" indexed="false" multiValued="true"/>
     <dynamicField name="*_dbsi" type="double" stored="true" indexed="true" multiValued="false"/>
     <dynamicField name="*_dbsim" type="double" stored="true" indexed="true" multiValued="true"/>
-    
-    <!-- trie double (_dbt...) (for faster range queries) -->
+
+    <!-- DoublePointField (_dbt...) (for faster range queries) -->
     <dynamicField name="*_dbti" type="tdouble" stored="false" indexed="true" multiValued="false"/>
     <dynamicField name="*_dbtim" type="tdouble" stored="false" indexed="true" multiValued="true"/>
     <dynamicField name="*_dbts" type="tdouble" stored="true" indexed="false" multiValued="false"/>
     <dynamicField name="*_dbtsm" type="tdouble" stored="true" indexed="false" multiValued="true"/>
     <dynamicField name="*_dbtsi" type="tdouble" stored="true" indexed="true" multiValued="false"/>
     <dynamicField name="*_dbtsim" type="tdouble" stored="true" indexed="true" multiValued="true"/>
-    
+
     <!-- float (_f...) -->
     <dynamicField name="*_fi" type="float" stored="false" indexed="true" multiValued="false"/>
     <dynamicField name="*_fim" type="float" stored="false" indexed="true" multiValued="true"/>
@@ -295,31 +305,23 @@
     <dynamicField name="*_fsm" type="float" stored="true" indexed="false" multiValued="true"/>
     <dynamicField name="*_fsi" type="float" stored="true" indexed="true" multiValued="false"/>
     <dynamicField name="*_fsim" type="float" stored="true" indexed="true" multiValued="true"/>
-    
-    <!-- trie float (_ft...) (for faster range queries) -->
+
+    <!-- FloatPointField (_ft...) (for faster range queries) -->
     <dynamicField name="*_fti" type="tfloat" stored="false" indexed="true" multiValued="false"/>
     <dynamicField name="*_ftim" type="tfloat" stored="false" indexed="true" multiValued="true"/>
     <dynamicField name="*_fts" type="tfloat" stored="true" indexed="false" multiValued="false"/>
     <dynamicField name="*_ftsm" type="tfloat" stored="true" indexed="false" multiValued="true"/>
     <dynamicField name="*_ftsi" type="tfloat" stored="true" indexed="true" multiValued="false"/>
     <dynamicField name="*_ftsim" type="tfloat" stored="true" indexed="true" multiValued="true"/>
-    
+
     <!-- boolean (_b...) -->
     <dynamicField name="*_bi" type="boolean" stored="false" indexed="true" multiValued="false"/>
     <dynamicField name="*_bs" type="boolean" stored="true" indexed="false" multiValued="false"/>
     <dynamicField name="*_bsi" type="boolean" stored="true" indexed="true" multiValued="false"/>
-    
+
     <!-- Type used to index the lat and lon components for the "location" FieldType -->
     <dynamicField name="*_coordinate" type="tdouble" indexed="true"  stored="false" />
 
-    <!-- location (_ll...) -->
-    <dynamicField name="*_lli" type="location" stored="false" indexed="true" multiValued="false"/>
-    <dynamicField name="*_llim" type="location" stored="false" indexed="true" multiValued="true"/>
-    <dynamicField name="*_lls" type="location" stored="true" indexed="false" multiValued="false"/>
-    <dynamicField name="*_llsm" type="location" stored="true" indexed="false" multiValued="true"/>
-    <dynamicField name="*_llsi" type="location" stored="true" indexed="true" multiValued="false"/>
-    <dynamicField name="*_llsim" type="location" stored="true" indexed="true" multiValued="true"/>
-
     <dynamicField name="*suggest" type="textSuggest" indexed="true" stored="false" multiValued="true" />
 
     <!-- you must define copyField source and dest fields explicity or schemaBrowser doesn't work -->
@@ -328,7 +330,7 @@
 
   </fields>
 
- <!-- Field to use to determine and enforce document uniqueness. 
+ <!-- Field to use to determine and enforce document uniqueness.
       Unless this field is marked with required="false", it will be a required field
    -->
  <uniqueKey>id</uniqueKey>

data/solr/config/solrconfig.xml

@@ -30,11 +30,6 @@
   -->
   <luceneMatchVersion>5.0.0</luceneMatchVersion>
   
-  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
-  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
-  <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
-
   <directoryFactory name="DirectoryFactory" 
                     class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}">
   </directoryFactory> 
@@ -284,6 +279,18 @@
       -->
   </searchComponent>
 
+<!-- suggest searchComponent and requestHandler disabled by default due to performance penalties -->
+<!--
+  <searchComponent name="suggest" class="solr.SuggestComponent">
+    <lst name="suggester">
+      <str name="name">mySuggester</str>
+      <str name="lookupImpl">FuzzyLookupFactory</str>
+      <str name="suggestAnalyzerFieldType">textSuggest</str>
+      <str name="buildOnCommit">true</str>
+      <str name="field">suggest</str>
+    </lst>
+  </searchComponent>
+
   <requestHandler name="/suggest" class="solr.SearchHandler" startup="lazy">
     <lst name="defaults">
       <str name="suggest">true</str>
@@ -294,7 +301,8 @@
       <str>suggest</str>
     </arr>
   </requestHandler>
-
+-->
+ 
   <requestHandler name="/update/extract" class="org.apache.solr.handler.extraction.ExtractingRequestHandler">
     <lst name="defaults">
       <str name="fmap.Last-Modified">last_modified</str>
@@ -309,4 +317,3 @@
     <!-- </lst> -->
   </requestHandler>
 </config>
-

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'
@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'faraday', '>= 0.9', '!= 2.0.0', '< 3'
   spec.add_dependency 'faraday-multipart'
 
-  spec.add_development_dependency "bundler", "> 1.16.0", "< 3"
+  spec.add_development_dependency "bundler", "> 1.16.0"
   spec.add_development_dependency "rake", ">= 10"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Trey Pendragon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-10 00:00:00.000000000 Z
+date: 2026-07-23 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
@@ -217,9 +217,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: 1.16.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -227,9 +224,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: 1.16.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -452,10 +446,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/faraday_1.gemfile
+- gemfiles/activerecord_8_0.gemfile
+- gemfiles/activerecord_8_1.gemfile
 - lib/valkyrie.rb
 - lib/valkyrie/adapter_container.rb
 - lib/valkyrie/change_set.rb

data/gemfiles/faraday_1.gemfile

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 7.0.0"
-gem "ldp"
-gem "pg"
-gem "rsolr"
-gem "faraday", "~> 1.0"
-
-gemspec path: "../"