hyrax 4.0.0.rc1 → 4.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a40b509766f1add062da64ebfa925e2f005b37f3b8ba98cf47869b126e5c5edb
-  data.tar.gz: f8d8d154e6c12ba940ea317042ded3bddbbc8c5b3b4ba70df2edcb35715c3aca
+  metadata.gz: 24e7e9d00de4eebd2f2dfaf96bcd1a09ac9589b17e94ddcc0bf5681d3c93b0c4
+  data.tar.gz: 92753b2fbb1271cfec93e2eddd07d11da1091eaf8b36494e754ac3400a83a6a1
 SHA512:
-  metadata.gz: b07a5c4beb95e72e33ebcdb6cd7c68837077760de21f73ff8a216c9a51eef7b32ca8c2331a3cfc54e17aae8964fa2c5cbd5981de052c822502141bc7ad3ee513
-  data.tar.gz: cae0fc1b05c720927879e2c076e3ce9eac3fa623e44012f227ef43814028b95cfd7605c14f87e459d26259f9d3996c15848c25130ad128ca82c3a13a9298f237
+  metadata.gz: 16a328b5b11d826f8149f0b260675ffe913d7e41a4b5c37035696cb32741b650a9f4bf9fa0d70ed08a1be712ddc8b452824bfb5be60a99b1a9d52ead57d8b7f3
+  data.tar.gz: bff8a0b37d073e1014f9566472030bb2b22e16a19fc1413dec6405cf21d6c3f178b0644ecbb48ee8ed0d259fe4f1b0422e747a5f3192c63753dc76d89ba8cb33

data/.circleci/config.yml

@@ -187,6 +187,67 @@ jobs:
 
 workflows:
   version: 2
+  ruby3-2:
+    jobs:
+      - bundle:
+          ruby_version: "3.2.2"
+          rails_version: "6.1.7.2"
+          bundler_version: "2.4.8"
+      - build:
+          ruby_version: "3.2.2"
+          rails_version: "6.1.7.2"
+          bundler_version: "2.4.8"
+          requires:
+            - bundle
+      - test:
+          name: "ruby3-2"
+          ruby_version: "3.2.2"
+          bundler_version: "2.4.8"
+          requires:
+            - build
+      - test:
+          name: "ruby3-2-valkyrie"
+          ruby_version: "3.2.2"
+          bundler_version: "2.4.8"
+          hyrax_valkyrie: "true"
+          requires:
+            - build
+  ruby3-1:
+    jobs:
+      - bundle:
+          ruby_version: "3.1.4"
+          rails_version: "6.1.7.2"
+          bundler_version: "2.4.8"
+      - build:
+          ruby_version: "3.1.4"
+          rails_version: "6.1.7.2"
+          bundler_version: "2.4.8"
+          requires:
+            - bundle
+      - test:
+          name: "ruby3-1"
+          ruby_version: "3.1.4"
+          bundler_version: "2.4.8"
+          requires:
+            - build
+  ruby3-0:
+    jobs:
+      - bundle:
+          ruby_version: "3.0.6"
+          rails_version: "6.1.7.2"
+          bundler_version: "2.4.8"
+      - build:
+          ruby_version: "3.0.6"
+          rails_version: "6.1.7.2"
+          bundler_version: "2.4.8"
+          requires:
+            - bundle
+      - test:
+          name: "ruby3-0"
+          ruby_version: "3.0.6"
+          bundler_version: "2.4.8"
+          requires:
+            - build
   ruby2-7:
     jobs:
       - bundle:

data/.dassie/Gemfile

@@ -8,7 +8,7 @@ else
 end
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.7.7'
+ruby '3.2.1'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 6.0'

data/.github/CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # How to Contribute
 
-We want your help to make Samvera great. There are a few guidelines
+We want your help to make the Samvera community great. There are a few guidelines
 that we need contributors to follow so that we can have a chance of
 keeping on top of things.
 
@@ -11,16 +11,27 @@ experience for all its members, whether they are at a formal gathering, in
 a social setting, or taking part in activities online. Please see our
 [Code of Conduct](CODE_OF_CONDUCT.md) for more information.
 
-## Samvera Community Intellectual Property Licensing and Ownership
+## Language
 
-All code contributors must have an Individual Contributor License Agreement
-(iCLA) on file with the Samvera Steering Group. If the contributor works for
-an institution, the institution must have a Corporate Contributor License
-Agreement (cCLA) on file.
+The language we use matters.  Today, tomorrow, and for years to come
+people will read the code we write.  They will judge us for our
+design, logic, and the words we use to describe the system.
 
-https://wiki.lyrasis.org/display/samvera/Samvera+Community+Intellectual+Property+Licensing+and+Ownership
+Our words should be accessible.  Favor descriptive words that give
+meaning while avoiding reinforcing systemic inequities.  For example,
+in the Samvera community, we should favor using allowed\_list instead
+of whitelist, denied\_list instead of blacklist, or source/copy
+instead of master/slave.
 
-You should also add yourself to the `CONTRIBUTORS.md` file in the root of the project.
+We're going to get it wrong, but this is a call to keep working to
+make it right.  View our code and the words we choose as a chance to
+have a conversation. A chance to grow an understanding of the systems
+we develop as well as the systems in which we live.
+
+See [“Blacklists” and “whitelists”: a salutary warning concerning the
+prevalence of racist language in discussions of predatory
+publishing](https://www.ncbi.nlm.nih.gov/pmc/articles/PMC6148600/) for
+further details.
 
 ## Contribution Tasks
 
@@ -34,7 +45,7 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
 ### Reporting Issues
 
 * Make sure you have a [GitHub account](https://github.com/signup/free)
-* Submit a [Github issue](./issues) by:
+* Submit a [Github issue](https://github.com/samvera/hyrax/issues/) by:
   * Clearly describing the issue
     * Provide a descriptive summary
     * Explain the expected behavior
@@ -45,15 +56,22 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
 
 * Fork the repository on GitHub
 * Create a topic branch from where you want to base your work.
-  * This is usually the master branch.
-  * To quickly create a topic branch based on master; `git branch fix/master/my_contribution master`
-  * Then checkout the new branch with `git checkout fix/master/my_contribution`.
-  * Please avoid working directly on the `master` branch.
+  * This is usually the `main` branch.
+  * To quickly create a topic branch based on `main`; `git branch fix/main/my_contribution main`
+  * Then checkout the new branch with `git checkout fix/main/my_contribution`.
+  * Please avoid working directly on the `main` branch.
+  * Please do not create a branch called `master`. (See note below.)
   * You may find the [hub suite of commands](https://github.com/defunkt/hub) helpful
 * Make sure you have added sufficient tests and documentation for your changes.
   * Test functionality with RSpec; Test features / UI with Capybara.
 * Run _all_ the tests to assure nothing else was accidentally broken.
 
+NOTE: This repository follows the [Samvera Community Code of Conduct](https://samvera.atlassian.net/wiki/spaces/samvera/pages/405212316/Code+of+Conduct) 
+and [language recommendations](#language).  
+Please ***do not*** create a branch called `master` for this repository or as part of 
+your pull request; the branch will either need to be removed or renamed before it can 
+be considered for inclusion in the code base and history of this repository.
+
 ### Documenting Code
 
 * All new public methods, modules, and classes should include inline documentation in [YARD](http://yardoc.org/).
@@ -63,15 +81,11 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
   * If you don't know exactly what a bit of code does, it is extra likely that it needs to be documented. Take a stab at it and ask for feedback in your pull request. You can use the 'blame' button on GitHub to identify the original developer of the code and @mention them in your comment.
   * This work greatly increases the usability of the code base and supports the on-ramping of new committers.
   * We will all be understanding of one another's time constraints in this area.
-* YARD examples:
-  * [Hyrax::AdminSet](https://github.com/samvera/hyrax/blob/master/app/models/admin_set.rb)
-  * [ActiveTriples::LocalName::Minter](https://github.com/ActiveTriples/active_triples-local_name/blob/master/lib/active_triples/local_name/minter.rb)
 * [Getting started with YARD](http://www.rubydoc.info/gems/yard/file/docs/GettingStarted.md)
 
 ### Committing changes
 
 * Make commits of logical units.
-  * Your commit should include a high level description of your work in HISTORY.textile
 * Check for unnecessary whitespace with `git diff --check` before committing.
 * Make sure your commit messages are [well formed](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
 * If you created an issue, you can close it by including "Closes #issue" in your commit message. See [Github's blog post for more details](https://github.com/blog/1386-closing-issues-via-commit-messages)
@@ -112,18 +126,16 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
 
 ### Submitting Changes
 
-[Detailed Walkthrough of One Pull Request per Commit](http://ndlib.github.io/practices/one-commit-per-pull-request/)
-
 * Read the article ["Using Pull Requests"](https://help.github.com/articles/using-pull-requests) on GitHub.
-* Make sure your branch is up to date with its parent branch (i.e. master)
-  * `git checkout master`
+* Make sure your branch is up to date with its parent branch (i.e. main)
+  * `git checkout main`
   * `git pull --rebase`
   * `git checkout <your-branch>`
-  * `git rebase master`
+  * `git rebase main`
   * It is a good idea to run your tests again.
 * If you've made more than one commit take a moment to consider whether squashing commits together would help improve their logical grouping.
   * [Detailed Walkthrough of One Pull Request per Commit](http://ndlib.github.io/practices/one-commit-per-pull-request/)
-  * `git rebase --interactive master` ([See Github help](https://help.github.com/articles/interactive-rebase))
+  * `git rebase --interactive main` ([See Github help](https://help.github.com/articles/interactive-rebase))
   * Squashing your branch's changes into one commit is "good form" and helps the person merging your request to see everything that is going on.
 * Push your changes to a topic branch in your fork of the repository.
 * Submit a pull request from your fork to the project.
@@ -133,14 +145,14 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
 We adopted [Github's Pull Request Review](https://help.github.com/articles/about-pull-request-reviews/) for our repositories.
 Common checks that may occur in our repositories:
 
-1. Travis CI - where our automated tests are running
-2. Hound CI - where we check for style violations
+1. [CircleCI](https://circleci.com/gh/samvera) - where our automated tests are running
+2. RuboCop/Bixby - where we check for style violations
 3. Approval Required - Github enforces at least one person approve a pull request. Also, all reviewers that have chimed in must approve.
 4. CodeClimate - is our code remaining healthy (at least according to static code analysis)
 
 If one or more of the required checks failed (or are incomplete), the code should not be merged (and the UI will not allow it). If all of the checks have passed, then anyone on the project (including the pull request submitter) may merge the code.
 
-*Example: Carolyn submits a pull request, Justin reviews the pull request and approves. However, Justin is still waiting on other checks (Travis CI is usually the culprit), so he does not merge the pull request. Eventually, all of the checks pass. At this point, Carolyn or anyone else may merge the pull request.*
+*Example: Carolyn submits a pull request, Justin reviews the pull request and approves. However, Justin is still waiting on other checks (CI tests are usually the culprit), so he does not merge the pull request. Eventually, all of the checks pass. At this point, Carolyn or anyone else may merge the pull request.*
 
 #### Things to Consider When Reviewing
 
@@ -157,7 +169,7 @@ This is your chance for a mentoring moment of another developer. Take time to gi
   * Do new or changed methods, modules, and classes have documentation?
   * Does the commit contain more than it should? Are two separate concerns being addressed in one commit?
   * Does the description of the new/changed specs match your understanding of what the spec is doing?
-  * Did the Travis tests complete successfully?
+  * Did the Continuous Integration tests complete successfully?
 
 If you are uncertain, bring other contributors into the conversation by assigning them as a reviewer.
 

data/.regen

@@ -1,2 +1,2 @@
 # When updating CI regen seed, set to current date.
-2022-07-01T00
+2023-04-11T16:25:55

data/CONTAINERS.md

@@ -5,13 +5,13 @@ Our goal is to provide a practical, reusable reference environment for applicati
 
 The [Hyrax Engine Development](#hyrax-engine-development) is further along than the [Docker Image for Hyrax-based Applications](#docker-image-for-hyrax-based-applications) which is further along than [Deploying to Production](#deploying-to-production).
 
-There are two options for development environments to run: 
+There are two options for development environments to run:
 
 - [Dassie](#dassie-internal-test-app-with-activefedora) is the default internal test app that will run an ActiveFedora-based Hyrax web application using Fedora 4 as the backend storage. See [Troubleshooting Dassie](#troubleshooting-dassie) if you encounter any issues.
 - [Koppie](#koppie-internal-test-app-with-valkyrie-connector-to-postgres) is a newer internal test app that is a Valkyrie-based Hyrax web application that runs with PostGres as backend storage. It does not run ActiveFedora or use Fedora 4. See [Troubleshooting Koppie](#troubleshooting-koppie) if you encounter any issues.
 
 <!-- NOTE: This title is referenced in the top-level README.md. Keep that in mind if you change it. -->
-## Hyrax Engine Development 
+## Hyrax Engine Development
 
 We support a `docker-compose`-based development environment for folks working on
 the Hyrax engine. This environment is substantially more like a Hyrax production
@@ -191,7 +191,7 @@ We publish several Hyrax images to the [GitHub container registry][ghcr] under
 the [Samvera organization][samvera-packages].  To build them:
 
 ```sh
-export HYRAX_VERSION=v4.0.0.rc1 # or desired version
+export HYRAX_VERSION=v4.0.0.rc2 # or desired version
 git checkout hyrax-$HYRAX_VERSION
 
 docker build --target hyrax-base --tag ghcr.io/samvera/hyrax/hyrax-base:$(git rev-parse HEAD) .
@@ -229,4 +229,4 @@ helm install -n hyrax --set image.tag=(git rev-parse HEAD) dassie chart/hyrax
 ```
 
 [ghcr]: https://docs.github.com/en/enterprise-cloud@latest/packages/working-with-a-github-packages-registry/working-with-the-container-registry
-[samvera-packages]: https://github.com/orgs/samvera/packages
+[samvera-packages]: https://github.com/orgs/samvera/packages

data/Dockerfile

@@ -1,4 +1,4 @@
-ARG RUBY_VERSION=2.7.7
+ARG RUBY_VERSION=3.2.1
 
 # Replace with official jemalloc package in alpine 3.17
 FROM ruby:$RUBY_VERSION-alpine3.16 as builder

data/app/actors/hyrax/actors/create_with_files_actor.rb

@@ -50,7 +50,7 @@ module Hyrax
       # @return [TrueClass]
       def attach_files(files, curation_concern, attributes)
         return true if files.blank?
-        AttachFilesToWorkJob.perform_later(curation_concern, files, attributes.to_h.symbolize_keys)
+        AttachFilesToWorkJob.perform_later(curation_concern, files, **attributes.to_h.symbolize_keys)
         true
       end
 

data/app/controllers/concerns/hyrax/controller.rb

@@ -41,7 +41,8 @@ module Hyrax::Controller
 
   ##
   # @note for Blacklight 6/7 compatibility
-  def search_service(**search_params)
+  def search_service(*args, **search_params)
+    search_params.merge!(args.last) if args.last.is_a?(Hash)
     return super if defined?(super) && search_params.empty?
 
     search_service_class.new(config: blacklight_config,

data/app/controllers/hyrax/admin/strategies_controller.rb

@@ -7,8 +7,8 @@ module Hyrax
       end
 
       # TODO: we could remove this if we used an isolated engine
-      def features_url
-        hyrax.admin_features_path
+      def features_url(*args)
+        hyrax.admin_features_path(*args)
       end
     end
   end

data/app/forms/hyrax/forms/administrative_set_form.rb

@@ -8,7 +8,7 @@ module Hyrax
     class AdministrativeSetForm < Valkyrie::ChangeSet
       ##
       # @api private
-      AdminSetMembersPopulator = lambda do |_options|
+      AdminSetMembersPopulator = lambda do |**_options|
         self.member_ids =
           if model.new_record
             []

data/app/forms/hyrax/forms/pcdm_collection_form.rb

@@ -8,7 +8,7 @@ module Hyrax
     class PcdmCollectionForm < Valkyrie::ChangeSet # rubocop:disable Metrics/ClassLength
       include Hyrax::FormFields(:core_metadata)
 
-      BannerInfoPrepopulator = lambda do |_options|
+      BannerInfoPrepopulator = lambda do |**_options|
         self.banner_info ||= begin
           banner_info = CollectionBrandingInfo.where(collection_id: id.to_s, role: "banner")
           banner_file = File.split(banner_info.first.local_path).last unless banner_info.empty?
@@ -19,7 +19,7 @@ module Hyrax
         end
       end
 
-      LogoInfoPrepopulator = lambda do |_options|
+      LogoInfoPrepopulator = lambda do |**_options|
         self.logo_info ||= begin
           logos_info = CollectionBrandingInfo.where(collection_id: id.to_s, role: "logo")
 

data/app/forms/hyrax/forms/pcdm_object_form.rb

@@ -12,7 +12,7 @@ module Hyrax
       property :proxy_depositor
 
       # pcdm relationships
-      property :admin_set_id, prepopulator: ->(_opts) { self.admin_set_id = Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id.to_s }
+      property :admin_set_id, prepopulator: proc { |_opts| self.admin_set_id = Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id.to_s }
       property :member_ids, default: [], type: Valkyrie::Types::Array
       property :member_of_collection_ids, default: [], type: Valkyrie::Types::Array
       property :member_of_collections_attributes, virtual: true, populator: :in_collections_populator

data/app/forms/hyrax/forms/permission.rb

@@ -9,8 +9,8 @@ module Hyrax
     #   names. we provide these as virtual fields and prepopulate these from
     #   `Hyrax::Permission`.
     class Permission < Hyrax::ChangeSet
-      property :agent_name, virtual: true, prepopulator: ->(_opts) { self.agent_name = model.agent }
-      property :access, virtual: true, prepopulator: ->(_opts) { self.access = model.mode }
+      property :agent_name, virtual: true, prepopulator: proc { |_opts| self.agent_name = model.agent }
+      property :access, virtual: true, prepopulator: proc { |_opts| self.access = model.mode }
 
       ##
       # @note support a {#to_hash} method for compatibility with

data/app/forms/hyrax/forms/resource_form.rb

@@ -37,7 +37,7 @@ module Hyrax
     class ResourceForm < Hyrax::ChangeSet # rubocop:disable Metrics/ClassLength
       ##
       # @api private
-      InWorksPrepopulator = lambda do |_options|
+      InWorksPrepopulator = proc do |_options|
         self.in_works_ids =
           if persisted?
             Hyrax.query_service
@@ -56,7 +56,7 @@ module Hyrax
       #   with `etag`-driven, application-side lock checks. for non-wings adapters
       #   we want to move away from application side lock validation and rely
       #   on the adapter/database features instead.
-      LockKeyPrepopulator = lambda do |_options|
+      LockKeyPrepopulator = proc do |_options|
         if Hyrax.config.disable_wings || !Hyrax.metadata_adapter.is_a?(Wings::Valkyrie::MetadataAdapter)
           Hyrax.logger.info "trying to prepopulate a lock token for " \
                             "#{self.class.inspect}, but optimistic locking isn't " \
@@ -78,26 +78,26 @@ module Hyrax
 
       property :date_modified, readable: false
       property :date_uploaded, readable: false
-      property :agreement_accepted, virtual: true, default: false, prepopulator: ->(_opts) { self.agreement_accepted = !model.new_record }
+      property :agreement_accepted, virtual: true, default: false, prepopulator: proc { |_opts| self.agreement_accepted = !model.new_record }
 
       collection(:permissions,
                  virtual: true,
                  default: [],
                  form: Hyrax::Forms::Permission,
                  populator: :permission_populator,
-                 prepopulator: ->(_opts) { self.permissions = Hyrax::AccessControl.for(resource: model).permissions })
+                 prepopulator: proc { |_opts| self.permissions = Hyrax::AccessControl.for(resource: model).permissions })
 
       property :embargo, form: Hyrax::Forms::Embargo, populator: :embargo_populator
       property :lease, form: Hyrax::Forms::Lease, populator: :lease_populator
 
       # virtual properties for embargo/lease;
-      property :embargo_release_date, virtual: true, prepopulator: ->(_opts) { self.embargo_release_date = model.embargo&.embargo_release_date }
-      property :visibility_after_embargo, virtual: true, prepopulator: ->(_opts) { self.visibility_after_embargo = model.embargo&.visibility_after_embargo }
-      property :visibility_during_embargo, virtual: true, prepopulator: ->(_opts) { self.visibility_during_embargo = model.embargo&.visibility_during_embargo }
+      property :embargo_release_date, virtual: true, prepopulator: proc { |_opts| self.embargo_release_date = model.embargo&.embargo_release_date }
+      property :visibility_after_embargo, virtual: true, prepopulator: proc { |_opts| self.visibility_after_embargo = model.embargo&.visibility_after_embargo }
+      property :visibility_during_embargo, virtual: true, prepopulator: proc { |_opts| self.visibility_during_embargo = model.embargo&.visibility_during_embargo }
 
-      property :lease_expiration_date, virtual: true,  prepopulator: ->(_opts) { self.lease_expiration_date = model.lease&.lease_expiration_date }
-      property :visibility_after_lease, virtual: true, prepopulator: ->(_opts) { self.visibility_after_lease = model.lease&.visibility_after_lease }
-      property :visibility_during_lease, virtual: true, prepopulator: ->(_opts) { self.visibility_during_lease = model.lease&.visibility_during_lease }
+      property :lease_expiration_date, virtual: true,  prepopulator: proc { |_opts| self.lease_expiration_date = model.lease&.lease_expiration_date }
+      property :visibility_after_lease, virtual: true, prepopulator: proc { |_opts| self.visibility_after_lease = model.lease&.visibility_after_lease }
+      property :visibility_during_lease, virtual: true, prepopulator: proc { |_opts| self.visibility_during_lease = model.lease&.visibility_during_lease }
 
       property :in_works_ids, virtual: true, prepopulator: InWorksPrepopulator
 

data/app/forms/hyrax/forms/work_embargo_form.rb

@@ -11,9 +11,9 @@ module Hyrax
     #   +EmbargoesControllerBehavior+.
     class WorkEmbargoForm < Hyrax::ChangeSet
       property :embargo, form: Hyrax::Forms::Embargo, populator: :embargo_populator, prepopulator: :embargo_populator
-      property :embargo_release_date, virtual: true, prepopulator: ->(_opts) { self.embargo_release_date = model.embargo&.embargo_release_date }
-      property :visibility_after_embargo, virtual: true, prepopulator: ->(_opts) { self.visibility_after_embargo = model.embargo&.visibility_after_embargo }
-      property :visibility_during_embargo, virtual: true, prepopulator: ->(_opts) { self.visibility_during_embargo = model.embargo&.visibility_during_embargo }
+      property :embargo_release_date, virtual: true, prepopulator: proc { |_opts| self.embargo_release_date = model.embargo&.embargo_release_date }
+      property :visibility_after_embargo, virtual: true, prepopulator: proc { |_opts| self.visibility_after_embargo = model.embargo&.visibility_after_embargo }
+      property :visibility_during_embargo, virtual: true, prepopulator: proc { |_opts| self.visibility_during_embargo = model.embargo&.visibility_during_embargo }
 
       def embargo_populator(**)
         self.embargo = Hyrax::EmbargoManager.embargo_for(resource: model)

data/app/forms/hyrax/forms/work_lease_form.rb

@@ -11,9 +11,9 @@ module Hyrax
     #   +LeasesControllerBehavior+.
     class WorkLeaseForm < Hyrax::ChangeSet
       property :lease, form: Hyrax::Forms::Lease, populator: :lease_populator, prepopulator: :lease_populator
-      property :lease_expiration_date, virtual: true, prepopulator: ->(_opts) { self.lease_expiration_date = model.lease&.lease_expiration_date }
-      property :visibility_after_lease, virtual: true, prepopulator: ->(_opts) { self.visibility_after_lease = model.lease&.visibility_after_lease }
-      property :visibility_during_lease, virtual: true, prepopulator: ->(_opts) { self.visibility_during_lease = model.lease&.visibility_during_lease }
+      property :lease_expiration_date, virtual: true, prepopulator: proc { |_opts| self.lease_expiration_date = model.lease&.lease_expiration_date }
+      property :visibility_after_lease, virtual: true, prepopulator: proc { |_opts| self.visibility_after_lease = model.lease&.visibility_after_lease }
+      property :visibility_during_lease, virtual: true, prepopulator: proc { |_opts| self.visibility_during_lease = model.lease&.visibility_during_lease }
 
       def lease_populator(**)
         self.lease = Hyrax::LeaseManager.lease_for(resource: model)

data/app/helpers/hyrax/content_block_helper_behavior.rb

@@ -3,7 +3,7 @@ module Hyrax
   module ContentBlockHelperBehavior
     def displayable_content_block(content_block, **options)
       return unless display_content_block? content_block
-      tag.div raw(content_block.value), options
+      tag.div(raw(content_block.value), **options)
     end
 
     def display_content_block?(content_block)

data/app/helpers/hyrax/iiif_helper.rb

@@ -3,7 +3,7 @@ module Hyrax
   module IiifHelper
     def iiif_viewer_display(work_presenter, locals = {})
       render iiif_viewer_display_partial(work_presenter),
-             locals.merge(presenter: work_presenter)
+             **locals.merge(presenter: work_presenter)
     end
 
     def iiif_viewer_display_partial(work_presenter)

data/app/models/collection_branding_info.rb

@@ -1,18 +1,7 @@
 # frozen_string_literal: true
 class CollectionBrandingInfo < ApplicationRecord
-  def initialize(collection_id:,
-                 filename:,
-                 role:,
-                 alt_txt: "",
-                 target_url: "")
-
-    super()
-    self.collection_id = collection_id
-    self.role = role
-    self.alt_text = alt_txt
-    self.target_url = target_url
-    self.local_path = File.join(role, filename)
-  end
+  attr_accessor :filename, :alt_txt
+  after_initialize :set_collection_attributes
 
   def save(file_location, upload_file = true)
     filename = File.split(local_path).last
@@ -52,6 +41,11 @@ class CollectionBrandingInfo < ApplicationRecord
 
   private
 
+  def set_collection_attributes
+    self.alt_text ||= alt_txt || ''
+    self.local_path ||= File.join(role, filename)
+  end
+
   def storage
     Hyrax.config.branding_storage_adapter
   end

data/app/models/hyrax/permission_template.rb

@@ -204,7 +204,7 @@ module Hyrax
       interpreted_read_groups = read_groups
 
       if interpret_visibility
-        visibilities = Hyrax::VisibilityMap.instance
+        visibilities = Hyrax.config.visibility_map
         interpreted_read_groups -= visibilities.deletions_for(visibility: collection.visibility)
         interpreted_read_groups += visibilities.additions_for(visibility: collection.visibility)
       end

data/app/presenters/hyrax/iiif_manifest_presenter.rb

@@ -77,7 +77,7 @@ module Hyrax
       metadata_fields.map do |field_name|
         {
           'label' => I18n.t("simple_form.labels.defaults.#{field_name}"),
-          'value' => Array(self[field_name]).map { |value| scrub(value.to_s) }
+          'value' => Array(send(field_name)).map { |value| scrub(value.to_s) }
         }
       end
     end

data/app/presenters/hyrax/presenter_factory.rb

@@ -44,8 +44,8 @@ module Hyrax
     end
 
     # Query solr using POST so that the query doesn't get too large for a URI
-    def query(query, args = {})
-      result = Hyrax::SolrService.post(query, args)
+    def query(query, **opts)
+      result = Hyrax::SolrService.post(query, **opts)
       result.fetch('response').fetch('docs')
     end
   end

data/app/services/hyrax/solr_service.rb

@@ -128,8 +128,8 @@ module Hyrax
 
     # Wraps ActiveFedora::Base#search_by_id(id, opts)
     # @return [Array<SolrHit>] the response docs wrapped in SolrHit objects
-    def search_by_id(id, opts = {})
-      result = Hyrax::SolrService.query("id:#{id}", opts.merge(rows: 1))
+    def search_by_id(id, **opts)
+      result = Hyrax::SolrService.query("id:#{id}", **opts.merge(rows: 1))
 
       raise Hyrax::ObjectNotFoundError, "Object '#{id}' not found in solr" if result.empty?
       result.first

data/app/services/hyrax/visibility_reader.rb

@@ -41,7 +41,7 @@ module Hyrax
     end
 
     def visibility_map
-      Hyrax::VisibilityMap.instance
+      Hyrax.config.visibility_map
     end
   end
 end

data/app/services/hyrax/visibility_writer.rb

@@ -44,7 +44,7 @@ module Hyrax
     end
 
     def visibility_map
-      Hyrax::VisibilityMap.instance
+      Hyrax.config.visibility_map
     end
   end
 end

data/app/services/hyrax/workflow/permission_query.rb

@@ -55,7 +55,7 @@ module Hyrax
           workflow_actions_scope.arel_table[:id].in(
             workflow_state_actions_scope.arel_table.project(
               workflow_state_actions_scope.arel_table[:workflow_action_id]
-            ).where(workflow_state_actions_scope.arel.constraints.reduce)
+            ).where(workflow_state_actions_scope.arel.constraints.reduce(:+))
           )
         )
       end
@@ -307,7 +307,7 @@ module Hyrax
 
         entity_specific_scope = scope_processing_workflow_roles_for_user_and_entity_specific(user: user, entity: entity)
         Sipity::WorkflowRole.where(
-          workflow_scope.arel.constraints.reduce.or(entity_specific_scope.arel.constraints.reduce)
+          workflow_scope.arel.constraints.reduce(:+).or(entity_specific_scope.arel.constraints.reduce(:+))
         )
       end
 
@@ -358,7 +358,7 @@ module Hyrax
                 agent_scope.arel_table.project(
                   agent_scope.arel_table[:id]
                 ).where(
-                  agent_scope.arel.constraints.reduce.and(entity_responsibilities[:entity_id].eq(entity.id))
+                  agent_scope.arel.constraints.reduce(:+).and(entity_responsibilities[:entity_id].eq(entity.id))
                 )
               )
             )
@@ -399,7 +399,7 @@ module Hyrax
               ).where(
                 permissions.arel_table[:workflow_role_id].in(
                   role_scope.arel_table.project(role_scope.arel_table[:id]).where(
-                    role_scope.arel.constraints.reduce
+                    role_scope.arel.constraints.reduce(:+)
                   )
                 )
               )
@@ -441,7 +441,7 @@ module Hyrax
       # @return [ActiveRecord::Relation<Sipity::WorkflowAction>]
       def scope_workflow_actions_available_for_current_state(entity:)
         workflow_actions_for_current_state = scope_workflow_actions_for_current_state(entity: entity)
-        Sipity::WorkflowAction.where(workflow_actions_for_current_state.arel.constraints.reduce)
+        Sipity::WorkflowAction.where(workflow_actions_for_current_state.arel.constraints.reduce(:+))
       end
     end
   end

data/app/validators/hyrax/collection_membership_validator.rb

@@ -5,8 +5,8 @@ module Hyrax
   class CollectionMembershipValidator < ActiveModel::Validator
     ##
     # @param multiple_membership_checker
-    def initialize(multiple_membership_checker: Hyrax::MultipleMembershipChecker, **options)
-      @multiple_membership_checker = multiple_membership_checker
+    def initialize(options = {})
+      @multiple_membership_checker = options[:multiple_membership_checker] || Hyrax::MultipleMembershipChecker
       super(options)
     end
 

data/config/initializers/kaminari_engine_patch.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# Add support for engine routes to kaminari
+Rails.application.config.to_prepare do
+  Kaminari::Helpers::Tag.class_eval do
+    def page_url_for(page)
+      params = params_for(page)
+      params[:only_path] = true
+      if @options[:route_set]
+        @options[:route_set].url_for params
+      else
+        @template.url_for params
+      end
+    end
+  end
+end

data/documentation/legacyREADME.md

@@ -50,7 +50,7 @@ The Samvera community is here to help. Please see our [support guide](../.github
 # Getting started
 
 This document contains instructions specific to setting up an app with __Hyrax
-v4.0.0.rc1__. If you are looking for instructions on installing a different
+v4.0.0.rc2__. If you are looking for instructions on installing a different
 version, be sure to select the appropriate branch or tag from the drop-down
 menu above.
 
@@ -129,7 +129,7 @@ Note here that the following commands assume you're setting up Hyrax in a develo
 
 First, you'll need a working Ruby installation. You can install this via your operating system's package manager -- you are likely to get farther with OSX, Linux, or UNIX than Windows but your mileage may vary -- but we recommend using a Ruby version manager such as [RVM](https://rvm.io/) or [rbenv](https://github.com/sstephenson/rbenv).
 
-Hyrax supports Ruby 2.5, 2.6, and 2.7. When starting a new project, we recommend using the latest Ruby 2.7 version.
+Hyrax supports Ruby 2.7, 3.0, 3.1 and 3.2. When starting a new project, we recommend using the latest Ruby 3.2 version.
 
 ## Redis
 
@@ -159,7 +159,7 @@ NOTE: The steps need to be done in order to create a new Hyrax based app.
 Generate a new Rails application using the template.
 
 ```
-rails _6.1.7.3_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v4.0.0.rc1/template.rb
+rails _6.1.7.3_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v4.0.0.rc2/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:

data/hyrax.gemspec

@@ -32,7 +32,7 @@ SUMMARY
   # http://guides.rubyonrails.org/maintenance_policy.html
   spec.add_dependency 'rails', '~> 6.0'
 
-  spec.add_dependency 'active-fedora', '~> 13.1', '>= 13.1.2'
+  spec.add_dependency 'active-fedora', '~> 14.0'
   spec.add_dependency 'almond-rails', '~> 0.1'
   spec.add_dependency 'awesome_nested_set', '~> 3.1'
   spec.add_dependency 'blacklight', '~> 7.29'
@@ -53,18 +53,16 @@ SUMMARY
   spec.add_dependency 'font-awesome-rails', '~> 4.2'
   spec.add_dependency 'hydra-derivatives', '~> 3.3'
   spec.add_dependency 'hydra-editor', '~> 6.0'
-  spec.add_dependency 'hydra-file_characterization', '~> 1.1.2'
+  spec.add_dependency 'hydra-file_characterization', '~> 1.1'
   spec.add_dependency 'hydra-head', '~> 12.0'
   spec.add_dependency 'hydra-works', '>= 0.16'
   spec.add_dependency 'iiif_manifest', '>= 0.3', '< 2.0'
   spec.add_dependency 'json-schema' # for Arkivo
-  # Pin more tightly because 0.x gems are potentially unstable
-  spec.add_dependency 'kaminari_route_prefix', '~> 0.1.1'
   spec.add_dependency 'legato', '~> 0.3'
   spec.add_dependency 'linkeddata' # Required for getting values from geonames
   spec.add_dependency 'mailboxer', '~> 0.12'
   spec.add_dependency 'nest', '~> 3.1'
-  spec.add_dependency 'noid-rails', '~> 3.0.0'
+  spec.add_dependency 'noid-rails', '~> 3.0'
   spec.add_dependency 'oauth'
   spec.add_dependency 'oauth2', '~> 1.2'
   spec.add_dependency 'openseadragon'
@@ -79,7 +77,6 @@ SUMMARY
   spec.add_dependency 'reform', '~> 2.3'
   spec.add_dependency 'reform-rails', '~> 0.2.0'
   spec.add_dependency 'retriable', '>= 2.9', '< 4.0'
-  spec.add_dependency 'samvera-nesting_indexer', '~> 2.0'
   spec.add_dependency 'signet'
   spec.add_dependency 'tinymce-rails', '~> 5.10'
   spec.add_dependency 'valkyrie', '~> 3.0.1'

data/lib/hyrax/configuration.rb

@@ -880,6 +880,17 @@ module Hyrax
       @derivative_services ||= [Hyrax::FileSetDerivativesService]
     end
 
+    attr_writer :visibility_map
+    # A mapping from visibility string values to permissions; the default and
+    # reference implementation is provided by {Hyrax::VisibilityMap}.
+    #
+    # @return [Hyrax::VisibilityMap]
+    # @see Hyrax::VisibilityReader
+    # @see Hyrax::VisibilityWriter
+    def visibility_map
+      @visibility_map ||= Hyrax::VisibilityMap.instance
+    end
+
     private
 
     # @param [Symbol, #to_s] model_name - symbol representing the model

data/lib/hyrax/controlled_vocabularies/resource_label_caching.rb

@@ -27,7 +27,7 @@ module Hyrax
       # @note adds behavior to clear the cache whenever a manual fetch of data
       #   is performed.
       # @see ActiveTriples::Resource#fetch
-      def fetch(*)
+      def fetch(*, **)
         Rails.cache.delete(cache_key)
         super
       end

data/lib/hyrax/engine.rb

@@ -107,6 +107,8 @@ module Hyrax
 
         ActiveFedora::Base.translate_uri_to_id = c.translate_uri_to_id
         ActiveFedora::Base.translate_id_to_uri = c.translate_id_to_uri
+        ActiveFedora::File.translate_uri_to_id = c.translate_uri_to_id
+        ActiveFedora::File.translate_id_to_uri = c.translate_id_to_uri
 
         ::Noid::Rails.config.template = c.noid_template
         ::Noid::Rails.config.minter_class = c.noid_minter_class

data/lib/hyrax/transactions/transaction.rb

@@ -95,7 +95,8 @@ module Hyrax
       def call(value)
         Success(
           steps.inject(value) do |val, step_name|
-            yield container[step_name].call(val, *step_arguments_for(step_name))
+            args = step_arguments_for(step_name)
+            yield container[step_name].call(val, *args[0..-2], **Hash(args[-1]))
           end
         )
       end
@@ -119,7 +120,7 @@ module Hyrax
       #   tx = Hyrax::Transactions::Transaction.new(steps: [:first_step, :second_step])
       #   result = tx.with_step_args(second_step: {named_parameter: :param_value}).call(:value)
       #
-      def with_step_args(args)
+      def with_step_args(**args)
         raise(ArgumentError, key_err_msg(args.keys)) if
           args.keys.any? { |key| !step?(key) }
 

data/lib/hyrax/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hyrax
-  VERSION = '4.0.0.rc1'
+  VERSION = '4.0.0.rc2'
 end

data/lib/hyrax.rb

@@ -20,7 +20,6 @@ require 'hyrax/version'
 require 'hyrax/inflections'
 require 'hyrax/name'
 require 'hyrax/valkyrie_can_can_adapter'
-require 'kaminari_route_prefix'
 require 'valkyrie/indexing_adapter'
 require 'valkyrie/indexing/solr/indexing_adapter'
 require 'valkyrie/indexing/null_indexing_adapter'

data/lib/wings/valkyrie/storage.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'faraday/multipart'
+
 module Wings
   module Valkyrie
     ##
@@ -67,8 +69,9 @@ module Wings
 
         reader = RDF::Reader.for(content_type: response.headers['content-type'])
         version_graph = RDF::Graph.new << reader.new(response.body)
+        query = { predicate: RDF::Vocab::Fcrepo4.hasVersion }
 
-        version_graph.query(predicate: RDF::Vocab::Fcrepo4.hasVersion).objects.map do |uri|
+        version_graph.query(query).objects.map do |uri|
           timestamp =
             version_graph.query([uri, RDF::Vocab::Fcrepo4.created, :created])
                          .first_object

data/template.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 # Hack for https://github.com/rails/rails/issues/35153
 gsub_file 'Gemfile', /^gem ["']sqlite3["']$/, 'gem "sqlite3", "~> 1.3.0"'
-gem 'hyrax', '4.0.0.rc1'
+gem 'hyrax', '4.0.0.rc2'
 run 'bundle install'
 generate 'hyrax:install', '-f'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc1
+  version: 4.0.0.rc2
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-31 00:00:00.000000000 Z
+date: 2023-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -36,20 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 13.1.2
+        version: '14.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 13.1.2
+        version: '14.0'
 - !ruby/object:Gem::Dependency
   name: almond-rails
   requirement: !ruby/object:Gem::Requirement
@@ -328,14 +322,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: hydra-head
   requirement: !ruby/object:Gem::Requirement
@@ -398,20 +392,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: kaminari_route_prefix
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: legato
   requirement: !ruby/object:Gem::Requirement
@@ -474,14 +454,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
@@ -696,20 +676,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: samvera-nesting_indexer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: signet
   requirement: !ruby/object:Gem::Requirement
@@ -2962,6 +2928,7 @@ files:
 - config/i18n-tasks.yml
 - config/initializers/1_healthz.rb
 - config/initializers/indexing_adapter_initializer.rb
+- config/initializers/kaminari_engine_patch.rb
 - config/initializers/listeners.rb
 - config/initializers/reform_rails_6_1_monkey_patch.rb
 - config/initializers/simple_form.rb
@@ -3329,7 +3296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: Hyrax is a front-end based on the robust Samvera framework, providing a user