valkyrie 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bd57af32d07a78e2ac9a9a1c6217b8b601018413c1a08a67762565f92da91cd
-  data.tar.gz: 58e0073f9ef70694e77d016cf08869d90b920f2fca3a7c42e7141289a8b7121d
+  metadata.gz: a4fcef8213a3e959929dbdb15bffd20c70bf3a5a07ff977a4937271d137d51a7
+  data.tar.gz: 875ced504589316a4d837fbd4d2d8bfe2e590d0e5f5f3c792edefe1461575a25
 SHA512:
-  metadata.gz: 939dbb151e2cb770e9bfbac0cedbfc78a160ace0f3f1c482560659f1a6cd16ad0984ae1eb15caf49d4ef5926f3a01721e032f7c8363ea815e935064eb547f7c0
-  data.tar.gz: d2b295e1881cc0d8d45e1c69e6255fab7b5be4d3e277d3e01eaa53498ca7346131ac1c2180d73f675c93b9b4a03d73316b9f6a8256b6b40a7492dda8c088d16a
+  metadata.gz: 98945b1fdd7f8cce636eea9abf5fc44c05d8291d1955b22ff91e218e12b81f4b3b617f52d0c846b179e040f623665a62027c60de2b50c50d7b027a7008d78e12
+  data.tar.gz: 844db5f6507ff3678ffe3c253a29dedd7753d26da6495ffcf51e2a275e6175fc9a904361a5724ec385330366eb84eaf13acf66db014bc783201e2e06e11168fb

data/.circleci/config.yml

@@ -9,7 +9,7 @@ jobs:
         type: "string"
       ruby:
         description: "Ruby version"
-        default: "2.7.7"
+        default: "3.1.6"
         type: "string"
     docker:
       - image: cimg/ruby:<< parameters.ruby >>
@@ -96,57 +96,45 @@ workflows:
   build:
     jobs:
       - build:
-          gemfile: "gemfiles/activerecord_7_0.gemfile"
-          ruby: 3.2.0
-          name: "Ruby3-2_rails7-0"
+          gemfile: "gemfiles/activerecord_7_2.gemfile"
+          ruby: 3.3.5
+          name: "Ruby3-3_rails7-2"
       - build:
-          gemfile: "gemfiles/activerecord_6_0.gemfile"
-          ruby: 3.2.0
-          name: "Ruby3-2_Rails6-0"
+          gemfile: "gemfiles/activerecord_7_1.gemfile"
+          ruby: 3.3.5
+          name: "Ruby3-3_rails7-1"
       - build:
           gemfile: "gemfiles/activerecord_7_0.gemfile"
-          ruby: 3.1.3
-          name: "Ruby3-1_rails7-0"
+          ruby: 3.3.5
+          name: "Ruby3-3_rails7-0"
       - build:
-          gemfile: "gemfiles/activerecord_6_0.gemfile"
-          ruby: 3.1.3
-          name: "Ruby3-1_Rails6-0"
+          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.0.5
-          name: "Ruby3-0_rails7-0"
+          ruby: 3.2.5
+          name: "Ruby3-2_rails7-0"
       - build:
-          gemfile: "gemfiles/activerecord_6_0.gemfile"
-          ruby: 3.0.5
-          name: "Ruby3-0_Rails6-0"
+          gemfile: "gemfiles/activerecord_7_2.gemfile"
+          ruby: 3.1.6
+          name: "Ruby3-1_rails7-2"
       - build:
-          gemfile: "gemfiles/activerecord_7_0.gemfile"
-          ruby: 2.7.7
-          name: "Ruby2-7_rails7-0"
+          gemfile: "gemfiles/activerecord_7_1.gemfile"
+          ruby: 3.1.6
+          name: "Ruby3-1_rails7-1"
       - build:
-          gemfile: "gemfiles/activerecord_6_0.gemfile"
-          ruby: 2.7.7
-          name: "Ruby2-7_Rails6-0"
+          gemfile: "gemfiles/activerecord_7_0.gemfile"
+          ruby: 3.1.6
+          name: "Ruby3-1_rails7-0"
       - build:
           gemfile: "gemfiles/faraday_1.gemfile"
-          ruby: 2.7.7
+          ruby: 3.1.6
           name: "Faraday1"
-      - build:
-          gemfile: "gemfiles/faraday_0.gemfile"
-          ruby: 2.7.7
-          name: "Faraday0"
-      - build:
-          gemfile: "gemfiles/activerecord_6_0.gemfile"
-          ruby: 2.6.10
-          name: "Ruby2-6_Rails6-0"
-      - build:
-          gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.7.7
-          name: "Ruby2-7_Rails5-2"
-      - build:
-          gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.6.10
-          name: "Ruby2-6_Rails5-2"
 
   nightly:
     triggers:
@@ -158,54 +146,42 @@ workflows:
                 - master
     jobs:
       - build:
-          gemfile: "gemfiles/activerecord_7_0.gemfile"
-          ruby: 3.2.0
-          name: "Ruby3-2_rails7-0"
+          gemfile: "gemfiles/activerecord_7_2.gemfile"
+          ruby: 3.3.5
+          name: "Ruby3-3_rails7-2"
       - build:
-          gemfile: "gemfiles/activerecord_6_0.gemfile"
-          ruby: 3.2.0
-          name: "Ruby3-2_Rails6-0"
+          gemfile: "gemfiles/activerecord_7_1.gemfile"
+          ruby: 3.3.5
+          name: "Ruby3-3_rails7-1"
       - build:
           gemfile: "gemfiles/activerecord_7_0.gemfile"
-          ruby: 3.1.3
-          name: "Ruby3-1_rails7-0"
+          ruby: 3.3.5
+          name: "Ruby3-3_rails7-0"
       - build:
-          gemfile: "gemfiles/activerecord_6_0.gemfile"
-          ruby: 3.1.3
-          name: "Ruby3-1_Rails6-0"
+          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.0.5
-          name: "Ruby3-0_rails7-0"
+          ruby: 3.2.5
+          name: "Ruby3-2_rails7-0"
       - build:
-          gemfile: "gemfiles/activerecord_6_0.gemfile"
-          ruby: 3.0.5
-          name: "Ruby3-0_Rails6-0"
+          gemfile: "gemfiles/activerecord_7_2.gemfile"
+          ruby: 3.1.6
+          name: "Ruby3-1_rails7-2"
       - build:
-          gemfile: "gemfiles/activerecord_7_0.gemfile"
-          ruby: 2.7.7
-          name: "Ruby2-7_rails7-0"
+          gemfile: "gemfiles/activerecord_7_1.gemfile"
+          ruby: 3.1.6
+          name: "Ruby3-1_rails7-1"
       - build:
-          gemfile: "gemfiles/activerecord_6_0.gemfile"
-          ruby: 2.7.7
-          name: "Ruby2-7_Rails6-0"
+          gemfile: "gemfiles/activerecord_7_0.gemfile"
+          ruby: 3.1.6
+          name: "Ruby3-1_rails7-0"
       - build:
           gemfile: "gemfiles/faraday_1.gemfile"
-          ruby: 2.7.7
+          ruby: 3.1.6
           name: "Faraday1"
-      - build:
-          gemfile: "gemfiles/faraday_0.gemfile"
-          ruby: 2.7.7
-          name: "Faraday0"
-      - build:
-          gemfile: "gemfiles/activerecord_6_0.gemfile"
-          ruby: 2.6.10
-          name: "Ruby2-6_Rails6-0"
-      - build:
-          gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.7.7
-          name: "Ruby2-7_Rails5-2"
-      - build:
-          gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.6.10
-          name: "Ruby2-6_Rails5-2"

data/.tool-versions

@@ -1 +1 @@
-ruby 2.7.5
+ruby 3.3.5

data/Appraisals

@@ -1,23 +1,18 @@
 # frozen_string_literal: true
 
-appraise "activerecord-7-0" do
-  gem "activerecord", "~> 7.0.0"
-end
-
-appraise "activerecord-6-0" do
-  gem "activerecord", "~> 6.0.0"
+appraise "activerecord-7-2" do
+  gem "activerecord", "~> 7.2.0"
 end
 
-appraise "activerecord-5-2" do
-  gem "activerecord", "~> 5.2.0"
+appraise "activerecord-7-1" do
+  gem "activerecord", "~> 7.1.0"
 end
 
-appraise "faraday-0" do
-  gem "faraday", "< 1"
-  gem "activerecord", "~> 6.0.0"
+appraise "activerecord-7-0" do
+  gem "activerecord", "~> 7.0.0"
 end
 
 appraise "faraday-1" do
   gem "faraday", "~> 1.0"
-  gem "activerecord", "~> 6.0.0"
+  gem "activerecord", "~> 7.0.0"
 end

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# v3.4.0 2024-10-11
+
+## Changes since last release
+
+* Adds config setting index_tsim_only_threshold ([dchandekstark](https://github.com/dchandekstark))
+* Fix related URIs for pairtree paths in Fedora. ([randalldfloyd](https://github.com/randalldfloyd))
+* Return nil when #id_to_uri is passed empty strings. ([bwatson78](https://github.com/bwatson78))
+* Add support for Ruby 3.3 and Rails 7.2 ([cjcolvar](https://github.com/cjcolvar))
+
 # v3.3.0 2024-07-03
 
 ## Changes since last release

data/Rakefile

@@ -68,10 +68,14 @@ namespace :db do
       ActiveRecord::Migrator.migrate(MIGRATIONS_DIR, version) do |migration|
         scope.blank? || scope == migration.scope
       end
-    else
+    elsif ActiveRecord.version < Gem::Version.new("7.2.0")
       ActiveRecord::Base.connection.migration_context.migrate(version) do |migration|
         scope.blank? || scope == migration.scope
       end
+    else
+      ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths).migrate(version) do |migration|
+        scope.blank? || scope == migration.scope
+      end
     end
     ActiveRecord::Base.clear_cache!
   ensure

data/gemfiles/{activerecord_5_2.gemfile → activerecord_7_1.gemfile}

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

data/gemfiles/{activerecord_6_0.gemfile → activerecord_7_2.gemfile}

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

data/gemfiles/faraday_1.gemfile

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

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

@@ -64,6 +64,7 @@ module Valkyrie::Persistence::Fedora
     # @param [RDF::URI] id the Valkyrie ID
     # @return [RDF::URI]
     def id_to_uri(id)
+      return if id.to_s.empty?
       prefix = ""
       prefix = "#{pair_path(id)}/" if fedora_version == 4 || (fedora_version >= 6.5 && (pairtree_count * pairtree_length).positive?)
       RDF::URI("#{connection_prefix}/#{prefix}#{CGI.escape(id.to_s)}")

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

@@ -52,7 +52,7 @@ module Valkyrie::Persistence::Fedora
     # @return [Array<RDF::URI>]
     def include_uris
       [
-        [5, 6].include?(adapter.fedora_version) ? "http://fedora.info/definitions/fcrepo#PreferInboundReferences" : ::RDF::Vocab::Fcrepo4.InboundReferences
+        adapter.fedora_version >= 5 ? "http://fedora.info/definitions/fcrepo#PreferInboundReferences" : ::RDF::Vocab::Fcrepo4.InboundReferences
       ]
     end
 

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

@@ -422,7 +422,7 @@ module Valkyrie::Persistence::Solr
       # @see https://github.com/samvera-labs/valkyrie/blob/main/solr/config/schema.xml
       # @return [Array<Symbol>]
       def fields
-        if value.value.length > 1000
+        if value.value.length > Valkyrie.config.index_tsim_only_threshold
           [:tsim]
         else
           [:tsim, :ssim, :tesim, :tsi, :ssi, :tesi]

data/lib/valkyrie/version.rb

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

data/lib/valkyrie.rb

@@ -97,6 +97,10 @@ module Valkyrie
       Valkyrie::StorageAdapter.find(self[:storage_adapter].to_sym)
     end
 
+    def index_tsim_only_threshold
+      self[:index_tsim_only_threshold].to_i
+    end
+
     # @api public
     #
     # The returned anonymous method (e.g. responds to #call) has a signature of
@@ -118,7 +122,8 @@ module Valkyrie
 
     def defaults
       {
-        resource_class_resolver: method(:default_resource_class_resolver)
+        resource_class_resolver: method(:default_resource_class_resolver),
+        index_tsim_only_threshold: 1000
       }
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Trey Pendragon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-08 00:00:00.000000000 Z
+date: 2024-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -452,10 +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_5_2.gemfile
-- gemfiles/activerecord_6_0.gemfile
 - gemfiles/activerecord_7_0.gemfile
-- gemfiles/faraday_0.gemfile
+- gemfiles/activerecord_7_1.gemfile
+- gemfiles/activerecord_7_2.gemfile
 - gemfiles/faraday_1.gemfile
 - lib/valkyrie.rb
 - lib/valkyrie/adapter_container.rb
@@ -582,7 +581,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: An ORM using the Data Mapper pattern, specifically built to solve Digital

data/gemfiles/faraday_0.gemfile

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