hyrax 3.4.2 → 3.6.0

data/config/metadata/file_set_metadata.yaml

@@ -0,0 +1,130 @@
+# This is the metadata used for `Hyrax::FileSet`s.` It is similar to
+# `basic_metadata.yaml`, but not exactly the same.
+#
+# Terms which are already present in `core_metadata.yaml` are not repeated here.
+attributes:
+  # Required attributes:
+  creator:
+    type: string
+    multiple: true
+    form:
+      required: true
+      primary: true
+    index_keys:
+      - "creator_tesim"
+  license:
+    type: string
+    multiple: true
+    form:
+      required: true
+      primary: true
+
+  # Other attributes:
+  abstract:
+    type: string
+    multiple: true
+  # form:
+  #   primary: false
+  # missing: access_right
+  # missing: alternative_title
+  based_near:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "based_near_sim"
+      - "based_near_tesim"
+  # missing: bibliograpic_citation
+  contributor:
+    type: string
+    multiple: true
+    form:
+      primary: false
+  # required: creator
+  date_created:
+    type: date_time
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "date_created_tesim"
+  description:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "description_tesim"
+  identifier:
+    type: string
+    multiple: true
+    form:
+      primary: false
+  # missing: import_url
+  keyword:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "keyword_sim"
+      - "keyword_tesim"
+  # missing: publisher
+  label:
+    type: string
+  # form:
+  #   primary: false
+  language:
+    type: string
+    multiple: true
+    form:
+      primary: false
+  # required: license
+  publisher:
+    type: string
+    multiple: true
+    form:
+      primary: false
+  related_url:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "related_url_tesim"
+  relative_path:
+    type: string
+  resource_type:
+    type: string
+    multiple: true
+  # form:
+  #   primary: false
+    index_keys:
+      - "resource_type_sim"
+      - "resource_type_tesim"
+  rights_notes:
+    type: string
+    multiple: true
+  # form:
+  #   primary: false
+  rights_statement:
+    type: string
+    multiple: true
+  # form:
+  #   primary: true
+    index_keys:
+      - "rights_statement_tesim"
+  source:
+    type: string
+    multiple: true
+  # form:
+  #   primary: false
+  subject:
+    type: string
+    multiple: true
+    form:
+      primary: false
+    index_keys:
+      - "subject_sim"
+      - "subject_tesim"

data/documentation/developing-your-hyrax-based-app.md

@@ -109,7 +109,7 @@ Hyrax requires Rails 5. We recommend the latest Rails 5.2 release.
 
 ```
 # If you don't already have Rails at your disposal...
-gem install rails -v 5.2.6
+gem install rails -v 5.2.8.1
 ```
 
 ### JavaScript runtime
@@ -125,7 +125,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 _5.2.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v3.4.2/template.rb
+rails _5.2.8.1_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v3.6.0/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:

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
-v3.4.2__. If you are looking for instructions on installing a different
+v3.6.0__. 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.
 
@@ -143,7 +143,7 @@ Hyrax requires Rails 5. We recommend the latest Rails 5.2 release.
 
 ```
 # If you don't already have Rails at your disposal...
-gem install rails -v 5.2.6
+gem install rails -v 5.2.8.1
 ```
 
 ### JavaScript runtime
@@ -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 _5.2.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v3.0.2/template.rb
+rails _5.2.8.1_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v3.6.0/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

@@ -44,6 +44,7 @@ SUMMARY
   spec.add_dependency 'dry-events', '~> 0.2.0'
   spec.add_dependency 'dry-equalizer', '~> 0.2'
   spec.add_dependency 'dry-struct', '~> 1.0'
+  spec.add_dependency 'dry-monads', '< 1.5'
   spec.add_dependency 'dry-transaction', '~> 0.11'
   spec.add_dependency 'dry-validation', '~> 1.3'
   spec.add_dependency 'flipflop', '~> 2.3'
@@ -76,8 +77,9 @@ SUMMARY
   spec.add_dependency 'rails_autolink', '~> 1.1'
   spec.add_dependency 'rdf-rdfxml' # controlled vocabulary importer
   spec.add_dependency 'rdf-vocab', '~> 3.0'
+  spec.add_dependency 'redis', '~> 4.0'
   spec.add_dependency 'redis-namespace', '~> 1.5'
-  spec.add_dependency 'redlock', '>= 0.1.2'
+  spec.add_dependency 'redlock', '>= 0.1.2', '< 2.0'
   spec.add_dependency 'reform', '~> 2.3'
   spec.add_dependency 'reform-rails', '~> 0.2.0'
   spec.add_dependency 'retriable', '>= 2.9', '< 4.0'

data/lib/generators/hyrax/templates/config/analytics.yml

@@ -2,10 +2,13 @@
 # You can manually fill in these values or use the ENV variables.
 #
 analytics:
+  ga4:
+    analytics_id: <%= ENV['GOOGLE_ANALYTICS_ID'] %>
   google:
     analytics_id: <%= ENV['GOOGLE_ANALYTICS_ID'] %>
     app_name: <%= ENV['GOOGLE_OAUTH_APP_NAME'] %>
     app_version: <%= ENV['GOOGLE_OAUTH_APP_VERSION'] %>
+    privkey_value: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'] %>
     privkey_path: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_PATH'] %>
     privkey_secret: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_SECRET'] %>
     client_email: <%= ENV['GOOGLE_OAUTH_CLIENT_EMAIL'] %>

data/lib/generators/hyrax/templates/config/locales/hyrax.de.yml

@@ -50,7 +50,7 @@ de:
     directory:
       suffix: "@ Example.org"
     footer:
-      copyright_html: "<strong>Copyright © 2018 Samvera lizenziert</strong> unter der Apache Lizenz, Version 2.0"
+      copyright_html: "<strong>Copyright © 2022 Samvera lizenziert</strong> unter der Apache Lizenz, Version 2.0"
       service_html: Ein Dienst von <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a> .
     institution_name: Institution
     institution_name_full: Name des Instituts

data/lib/generators/hyrax/templates/config/locales/hyrax.en.yml

@@ -50,7 +50,7 @@ en:
     directory:
       suffix: "@example.org"
     footer:
-      copyright_html: "<strong>Copyright &copy; 2018 Samvera</strong> Licensed under the Apache License, Version 2.0"
+      copyright_html: "<strong>Copyright &copy; 2022 Samvera</strong> Licensed under the Apache License, Version 2.0"
       service_html: A service of <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a>.
     institution_name: Institution
     institution_name_full: The Institution Name

data/lib/generators/hyrax/templates/config/locales/hyrax.es.yml

@@ -50,7 +50,7 @@ es:
     directory:
       suffix: "@example.org"
     footer:
-      copyright_html: "<strong>Copyright &copy; 2018 Samvera</strong> bajo licencia de Apache, Version 2.0"
+      copyright_html: "<strong>Copyright &copy; 2022 Samvera</strong> bajo licencia de Apache, Version 2.0"
       service_html: Un servicio de <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a>.
     institution_name: institución
     institution_name_full: El nombre de la institución

data/lib/generators/hyrax/templates/config/locales/hyrax.fr.yml

@@ -50,7 +50,7 @@ fr:
     directory:
       suffix: "@ Example.org"
     footer:
-      copyright_html: "<strong>Copyright © 2018 Samvera</strong> Licence sous Licence Apache, Version 2.0"
+      copyright_html: "<strong>Copyright © 2022 Samvera</strong> Licence sous Licence Apache, Version 2.0"
       service_html: Un service de <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a> .
     institution_name: Institution
     institution_name_full: Nom de l'établissement

data/lib/generators/hyrax/templates/config/locales/hyrax.it.yml

@@ -50,7 +50,7 @@ it:
     directory:
       suffix: "@ example.org"
     footer:
-      copyright_html: "<strong>Copyright © 2018 Samvera</strong> Licenza sotto la licenza Apache, versione 2.0"
+      copyright_html: "<strong>Copyright © 2022 Samvera</strong> Licenza sotto la licenza Apache, versione 2.0"
       service_html: Un servizio di <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a> .
     institution_name: Istituzione
     institution_name_full: Nome dell'Istituzione

data/lib/generators/hyrax/templates/config/locales/hyrax.zh.yml

@@ -50,7 +50,7 @@ zh:
     directory:
       suffix: "@example.org"
     footer:
-      copyright_html: "<strong>版权所有 &copy; 2018 Samvera</strong> 根据Apache许可证2.0版许可"
+      copyright_html: "<strong>版权所有 &copy; 2022 Samvera</strong> 根据Apache许可证2.0版许可"
       service_html: 的服务<a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a>.
     institution_name: 机构
     institution_name_full: 机构名称

data/lib/hyrax/active_fedora_dummy_model.rb

@@ -35,12 +35,25 @@ module Hyrax
       @id
     end
 
+    ##
+    # @api public
+    def to_key
+      [@id]
+    end
+
     ##
     # @api public
     def model_name
       @model.model_name
     end
 
+    ##
+    # @api public
+    # @return [String]
+    def human_readable_type
+      @model.human_readable_type
+    end
+
     ##
     # @api public
     #

data/lib/hyrax/configuration.rb

@@ -875,10 +875,17 @@ module Hyrax
                     end
     end
 
-    attr_accessor :nested_relationship_reindexer
+    def use_solr_graph_for_collection_nesting
+      ActiveModel::Type::Boolean.new.cast(ENV.fetch('HYRAX_USE_SOLR_GRAPH_NESTING', false))
+    end
 
+    attr_accessor :nested_relationship_reindexer
     def default_nested_relationship_reindexer
-      ->(id:, extent:) { Samvera::NestingIndexer.reindex_relationships(id: id, extent: extent) }
+      if use_solr_graph_for_collection_nesting
+        ->(id:, extent:) {}
+      else
+        ->(id:, extent:) { Samvera::NestingIndexer.reindex_relationships(id: id, extent: extent) }
+      end
     end
 
     attr_writer :solr_select_path

data/lib/hyrax/errors.rb

@@ -15,4 +15,6 @@ module Hyrax
   class SingleMembershipError < HyraxError; end
 
   class ObjectNotFoundError < ActiveFedora::ObjectNotFoundError; end
+
+  class ModelMismatchError < HyraxError; end
 end

data/lib/hyrax/specs/shared_specs/factories/strategies/valkyrie_resource.rb

@@ -3,6 +3,12 @@
 # @example
 #   let(:resource) { FactoryBot.valkyrie_create(:hyrax_work) }
 class ValkyrieCreateStrategy
+  def initialize
+    @strategy = FactoryBot.strategy_by_name(:create).new
+  end
+
+  delegate :association, to: :@strategy
+
   def result(evaluation)
     evaluation.notify(:after_build, evaluation.object)
     evaluation.notify(:before_create, evaluation.object)

data/lib/hyrax/specs/shared_specs/indexers.rb

@@ -266,6 +266,11 @@ RSpec.shared_examples 'a Collection indexer' do
         .to include(generic_type_sim: a_collection_containing_exactly('Collection'))
     end
 
+    it 'indexes member_of_collection_ids' do
+      expect(indexer.to_solr)
+        .to include(member_of_collection_ids_ssim: resource.member_of_collection_ids)
+    end
+
     it 'indexes depositor' do
       expect(indexer.to_solr)
         .to include(depositor_ssim: [resource.depositor],

data/lib/hyrax/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hyrax
-  VERSION = '3.4.2'
+  VERSION = '3.6.0'
 end

data/lib/wings/valkyrie/storage.rb

@@ -73,7 +73,7 @@ module Wings
             version_graph.query([uri, RDF::Vocab::Fcrepo4.created, :created])
                          .first_object
                          .object
-          Version.new(cast_to_valkyrie_id(uri.to_s), timestamp, self)
+          Version.new(id: cast_to_valkyrie_id(uri.to_s), created: timestamp, adapter: self)
         end.sort
       end
 
@@ -86,7 +86,7 @@ module Wings
       # this implementation uses an orderable {#version_token}. in practice
       # the token is the fcrepo created date for the version, as extracted from
       # the versions graph.
-      Version = Struct.new(:id, :version_token, :adapter) do
+      Version = Struct.new("Version", :id, :created, :adapter, keyword_init: true) do
         include Comparable
 
         ##
@@ -95,6 +95,10 @@ module Wings
           adapter.find_by(id: id)
         end
 
+        def version_token
+          created
+        end
+
         def <=>(other)
           raise ArgumentError unless other.respond_to?(:version_token)
           version_token <=> other.version_token

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', '3.4.2'
+gem 'hyrax', '3.6.0'
 run 'bundle install'
 generate 'hyrax:install', '-f'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.6.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2023-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -224,6 +224,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: dry-monads
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: dry-transaction
   requirement: !ruby/object:Gem::Requirement
@@ -674,6 +688,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
@@ -695,6 +723,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -702,6 +733,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: reform
   requirement: !ruby/object:Gem::Requirement
@@ -1499,8 +1533,6 @@ files:
 - ".github/SUPPORT.md"
 - ".github/release.yml"
 - ".github/stale.yml"
-- ".github/workflows/main.yml"
-- ".github/workflows/release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".regen"
@@ -1797,17 +1829,22 @@ files:
 - app/forms/hyrax/forms/batch_upload_form.rb
 - app/forms/hyrax/forms/collection_form.rb
 - app/forms/hyrax/forms/dashboard/nest_collection_form.rb
+- app/forms/hyrax/forms/embargo.rb
 - app/forms/hyrax/forms/failed_submission_form_wrapper.rb
 - app/forms/hyrax/forms/file_manager_form.rb
 - app/forms/hyrax/forms/file_set_edit_form.rb
 - app/forms/hyrax/forms/file_set_form.rb
+- app/forms/hyrax/forms/lease.rb
 - app/forms/hyrax/forms/pcdm_collection_form.rb
+- app/forms/hyrax/forms/pcdm_object_form.rb
 - app/forms/hyrax/forms/permission.rb
 - app/forms/hyrax/forms/permission_template_form.rb
 - app/forms/hyrax/forms/resource_form.rb
 - app/forms/hyrax/forms/widgets/admin_set_embargo_period.rb
 - app/forms/hyrax/forms/widgets/admin_set_visibility.rb
+- app/forms/hyrax/forms/work_embargo_form.rb
 - app/forms/hyrax/forms/work_form.rb
+- app/forms/hyrax/forms/work_lease_form.rb
 - app/forms/hyrax/forms/workflow_action_form.rb
 - app/forms/hyrax/forms/workflow_responsibility_form.rb
 - app/helpers/hyrax/ability_helper.rb
@@ -2129,6 +2166,7 @@ files:
 - app/services/hyrax/admin_set_member_service.rb
 - app/services/hyrax/admin_set_service.rb
 - app/services/hyrax/analytics.rb
+- app/services/hyrax/analytics/ga4.rb
 - app/services/hyrax/analytics/google.rb
 - app/services/hyrax/analytics/google/events.rb
 - app/services/hyrax/analytics/google/events_daily.rb
@@ -2186,6 +2224,7 @@ files:
 - app/services/hyrax/ensure_well_formed_admin_set_service.rb
 - app/services/hyrax/file_set_csv_service.rb
 - app/services/hyrax/file_set_derivatives_service.rb
+- app/services/hyrax/file_set_file_service.rb
 - app/services/hyrax/file_set_fixity_check_service.rb
 - app/services/hyrax/file_set_type_service.rb
 - app/services/hyrax/file_set_visibility_propagator.rb
@@ -2275,6 +2314,7 @@ files:
 - app/services/hyrax/visibility_writer.rb
 - app/services/hyrax/work_form_service.rb
 - app/services/hyrax/work_query_service.rb
+- app/services/hyrax/work_resource_query_service.rb
 - app/services/hyrax/work_thumbnail_path_service.rb
 - app/services/hyrax/work_uploads_handler.rb
 - app/services/hyrax/workflow/abstract_notification.rb
@@ -2400,6 +2440,7 @@ files:
 - app/views/hyrax/admin/stats/show.html.erb
 - app/views/hyrax/admin/users/index.html.erb
 - app/views/hyrax/admin/workflow_roles/index.html.erb
+- app/views/hyrax/admin/workflows/_tabs.html.erb
 - app/views/hyrax/admin/workflows/index.html.erb
 - app/views/hyrax/base/_actions.html.erb
 - app/views/hyrax/base/_attribute_rows.html.erb
@@ -2744,6 +2785,7 @@ files:
 - app/views/shared/_citations.html.erb
 - app/views/shared/_footer.html.erb
 - app/views/shared/_ga.html.erb
+- app/views/shared/_ga4.html.erb
 - app/views/shared/_locale_picker.html.erb
 - app/views/shared/_matomo.html.erb
 - app/views/shared/_nav_safety_modal.html.erb
@@ -2803,6 +2845,7 @@ files:
 - config/locales/simple_form.zh.yml
 - config/metadata/basic_metadata.yaml
 - config/metadata/core_metadata.yaml
+- config/metadata/file_set_metadata.yaml
 - config/routes.rb
 - config/schema_org.yml
 - db/seeds.rb
@@ -3148,7 +3191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.17
+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

data/.github/workflows/main.yml

@@ -1,17 +0,0 @@
-name: Trigger Nurax build
-on:
-  workflow_dispatch:
-  push:
-
-jobs:
-  trigger:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: peter-evans/repository-dispatch@v1
-      with:
-         token: ${{ secrets.NURAX_ACCESS_TOKEN }}
-         event-type: push
-         repository: curationexperts/nurax
-         client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
-
-

data/.github/workflows/release.yml

@@ -1,17 +0,0 @@
-name: Trigger Nurax build
-on:
-  workflow_dispatch:
-  release:
-
-jobs:
-  trigger:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: peter-evans/repository-dispatch@v1
-      with:
-         token: ${{ secrets.NURAX_ACCESS_TOKEN }}
-         event-type: release
-         repository: curationexperts/nurax
-         client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
-
-