valkyrie 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ba113a4df1fa120076006223d629be9d186f96736fbb363781bc78f6c038013
-  data.tar.gz: 89e485a082def7836f884354b136c081496b5a9f36e98c2f9f31127dc053ab28
+  metadata.gz: '019ff2935ad45b095aa1a480fa630b3acd45486ba398fcc33b881c76f94856c9'
+  data.tar.gz: 6d5be6b5d178daaef17769f561fd2d3bc2d6795ea8d33bd76ccf038772b290c5
 SHA512:
-  metadata.gz: 3d3537379fb136ec2ca843e2dd13d85a22c46a9c74d94f1ca3cfb1ab32f4a193394ab1ff9deae649939e3260b0ba9e9d8f423f3fb87d40043d107ff646fb74bc
-  data.tar.gz: 4a908d4d2574d5017bc81af1683d714b028b5d1ab17e086ff0f8ea6d0a764348f3efd3f308aeedac4623956ccfce915a5c5d611ab84d7e9e2d08c22d5afe623a
+  metadata.gz: '08ca3c0f78259f19bbf327363177c0560926d791e832cff00a6707540f00051ee02b1e2aade681104aa90140e1aa5c268a43686df6d49cc6d2545381362c9088'
+  data.tar.gz: 7edd93eb4e765b35f458cf1c6d372103249d191bd580f78e96f4a7e5c2f7012071371eb5bfc4315121d448fa17ecb7b09a76c58cf0658a0859a4ca654b6d2c3a

data/.circleci/config.yml

@@ -24,10 +24,6 @@ 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
         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"
@@ -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,24 +27,6 @@ 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

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,8 @@
+# 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/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.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

@@ -64,11 +64,12 @@ 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

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,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

data/lib/valkyrie/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Valkyrie
-  VERSION = "3.5.0"
+  VERSION = "3.5.1"
 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.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - Trey Pendragon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-10 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