hyrax 3.4.1 → 3.4.2

data/app/views/hyrax/dashboard/collections/_form.html.erb

@@ -23,7 +23,7 @@
     <% end %>
   </ul>
 
-  <%= simple_form_for @form, url: [hyrax, :dashboard, @form], html: { class: 'editor nav-safety' } do |f| %>
+  <%= simple_form_for @form, url: [hyrax, :dashboard, @form], html: { class: 'editor nav-safety', data: { behavior: 'collection-form', 'param-key' => @form.model_name.param_key } } do |f| %>
     <div class="tab-content">
       <div id="description" class="tab-pane active">
         <div class="panel panel-default labels">
@@ -35,7 +35,7 @@
               <% end %>
 
               <% # TODO: Remove check for PcdmCollection when Issue #5286 is resolved. %>
-              <% if f.object.persisted? && Hyrax.config.collection_class != Hyrax::PcdmCollection %>
+              <% if f.object.persisted? && !(Hyrax.config.collection_class < Valkyrie::Resource) %>
                 <%# we're loading these values dynamically to speed page load %>
                 <%= f.input :thumbnail_id,
                     input_html: { data: { text: thumbnail_label_for(object: f.object) } } %>
@@ -116,3 +116,4 @@
   <% end # simple_form_for %>
 
 </div> <!-- end collection-controls -->
+

data/app/views/hyrax/dashboard/collections/_form_branding.html.erb

@@ -34,6 +34,7 @@
     <div class="row branding-banner-list">
       <div class="col-xs-12">
         <div class="container">
+        <%# Where the request to display the branding comes from. %>
         <% if f.object.banner_info[:file] %>
           <div id="banner">
             <div class="row branding-banner-row">

data/app/views/hyrax/dashboard/sidebar/_activity.html.erb

@@ -32,7 +32,7 @@
     <% end %>
   <% end %>
 
-  <% if current_ability.can_create_any_work? %>
+  <% if current_ability.can_create_any_work? && Hyrax.config.analytics? %>
     <li>
       <%= menu.collapsable_section t('hyrax.admin.sidebar.analytics'),
                                         icon_class: "fa fa-pie-chart",

data/app/views/hyrax/my/works/_tabs.html.erb

@@ -1,6 +1,11 @@
 <ul class="nav nav-tabs" id="my_nav" role="list">
   <li<%= ' class="active"'.html_safe if current_page?(hyrax.dashboard_works_path(locale: nil)) %>>
-    <%= link_to t("hyrax.dashboard.#{current_ability.admin? ? 'all' : 'managed'}.works"), hyrax.dashboard_works_path %>
+    <% if params[:add_works_to_collection].present? && params[:add_works_to_collection_label].present? %>
+      <%= link_to t("hyrax.dashboard.#{current_ability.admin? ? 'all' : 'managed'}.works"), hyrax.dashboard_works_path(add_works_to_collection: params[:add_works_to_collection], add_works_to_collection_label: params[:add_works_to_collection_label]) %>
+    <% else %>
+      <%= link_to t("hyrax.dashboard.#{current_ability.admin? ? 'all' : 'managed'}.works"), hyrax.dashboard_works_path %>
+    <% end %>
+    
   </li>
   <li<%= ' class="active"'.html_safe if current_page?(hyrax.my_works_path(locale: nil)) %>>
     <%= link_to t('hyrax.dashboard.my.your_works'), hyrax.my_works_path %>

data/chart/hyrax/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: hyrax
 description: An open-source, Samvera-powered digital repository system
 type: application
-version: 1.1.0
+version: 1.5.1
 appVersion: 3.3.0
 dependencies:
   - name: fcrepo
@@ -11,21 +11,25 @@ dependencies:
     condition: fcrepo.enabled
   - name: memcached
     version: 4.2.21
-    repository: https://charts.bitnami.com/bitnami
+    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
     condition: memcached.enabled
   - name: minio
     version: 6.7.2
-    repository: https://charts.bitnami.com/bitnami
+    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
     condition: minio.enabled
   - name: postgresql
     version: 10.3.13
-    repository: https://charts.bitnami.com/bitnami
+    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
     condition: postgresql.enabled
   - name: redis
     version: 10.7.16
-    repository: https://charts.bitnami.com/bitnami
+    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
     condition: redis.enabled
   - name: solr
     version: 1.0.1
-    repository: https://charts.bitnami.com/bitnami
+    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
     condition: solr.enabled
+  - name: nginx
+    version: 9.8.0
+    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
+    condition: nginx.enabled

data/chart/hyrax/templates/_helpers.tpl

@@ -179,6 +179,10 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- printf "redis://:%s@%s:%s" .Values.redis.password (include "hyrax.redis.host" .) "6379/0" -}}
 {{- end -}}
 
+{{- define "hyrax.nginx.host" -}}
+{{- printf "%s-%s" .Release.Name "nginx" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
 {{- define "hyrax.sharedPvcAccessModes" -}}
 {{- if .Values.worker.enabled }}
 accessModes:

data/chart/hyrax/templates/cron-embargo.yaml

@@ -11,6 +11,11 @@ spec:
   jobTemplate:
     spec:
       template:
+        metadata:
+        {{- with .Values.podAnnotations }}
+          annotations:
+            {{- toYaml . | nindent 12 }}
+        {{- end }}
         spec:
           containers:
           - name: embargo-release

data/chart/hyrax/templates/cron-lease.yaml

@@ -11,6 +11,11 @@ spec:
   jobTemplate:
     spec:
       template:
+        metadata:
+        {{- with .Values.podAnnotations }}
+          annotations:
+            {{- toYaml . | nindent 12 }}
+        {{- end }}
         spec:
           containers:
           - name: lease-release

data/chart/hyrax/templates/deployment-worker.yaml

@@ -64,6 +64,17 @@ spec:
             {{- end }}
           env:
             {{- toYaml .Values.worker.extraEnvVars | nindent 12 }}
+          {{- if .Values.worker.readinessProbe.enabled }}
+          readinessProbe:
+            exec:
+              command:
+                {{- toYaml .Values.worker.readinessProbe.command | nindent 16 }}
+            failureThreshold: {{ .Values.worker.readinessProbe.failureThreshold }}
+            initialDelaySeconds: {{ .Values.worker.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.worker.readinessProbe.periodSeconds }}
+            successThreshold: {{ .Values.worker.readinessProbe.successThreshold }}
+            timeoutSeconds: {{ .Values.worker.readinessProbe.timeoutSeconds }}
+          {{- end }}
           volumeMounts:
             - name: derivatives
               mountPath: /app/samvera/derivatives

data/chart/hyrax/templates/ingress.yaml

@@ -1,6 +1,7 @@
 {{- if .Values.ingress.enabled -}}
-{{- $fullName := include "hyrax.fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
+{{- $svcFullName := ternary (include "hyrax.nginx.host" .) (include "hyrax.fullname" .) .Values.nginx.enabled -}}
+{{- $svcPort := ternary .Values.nginx.service.port .Values.service.port .Values.nginx.enabled -}}
+
 {{- $beta := semverCompare "<1.19-0" (default .Capabilities.KubeVersion.Version .Values.kubeVersion) -}}
 {{- if $beta }}
 apiVersion: networking.k8s.io/v1beta1
@@ -9,7 +10,7 @@ apiVersion: networking.k8s.io/v1
 {{- end }}
 kind: Ingress
 metadata:
-  name: {{ $fullName }}
+  name: {{ include "hyrax.fullname" . }}
   labels:
     {{- include "hyrax.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
@@ -37,14 +38,14 @@ spec:
             pathType: {{ .pathType | default "ImplementationSpecific" }}
             backend:
               {{- if $beta }}
-              serviceName: {{ $fullName }}
+              serviceName: {{ $svcFullName }}
               servicePort: {{ $svcPort }}
               {{- else }}
               service:
-                name: {{ $fullName }}
+                name: {{ $svcFullName }}
                 port:
                   number: {{ $svcPort }}
               {{- end }}
           {{- end }}
     {{- end }}
-  {{- end }}
+{{- end }}

data/chart/hyrax/values.yaml

@@ -201,6 +201,18 @@ worker:
   affinity: {}
   resources: {}
 
+  # see: https://github.com/mperham/sidekiq/wiki/Kubernetes#health-checks
+  readinessProbe:
+    enabled: false
+    # command:
+    #  - cat
+    #  - /app/samvera/hyrax-webapp/tmp/sidekiq_process_has_started_and_will_begin_processing_jobs
+    # initialDelaySeconds: 10
+    # periodSeconds: 2
+    # timeoutSeconds: 1
+    # failureThreshold: 10
+    # successThreshold: 2
+
 fcrepo:
   enabled: true
   externalDatabaseUsername: "hyrax"
@@ -238,6 +250,144 @@ postgresql:
   # persistence:
   #   size: 10Gi
 
+
+## Nginx proxy is used to keep puma from having to serve static assets
+## and to act as an auth proxy for Cantelope
+nginx:
+  enabled: false
+  # The set up below does malicious bot / ip blocking and mounts
+  # vaolumes to allow nginx to server assets and other public directory items
+  # image:
+  #   registry: registry.gitlab.com
+  #   repository: notch8/scripts/bitnami-nginx
+  #   tag: 1.21.5-debian-10-r4
+  # extraVolumes:
+  #   - name: "uploads"
+  #     persistentVolumeClaim:
+  #       claimName: {{ .Values.global.hyraxHostName }}-uploads
+  # extraVolumeMounts:
+  #   - name: uploads
+  #     mountPath: /app/samvera/hyrax-webapp/public/system
+  #     subPath: public-system
+  #   - name: uploads
+  #     mountPath: /app/samvera/hyrax-webapp/public/uploads
+  #     subPath: public-uploads
+  #   - name: uploads
+  #     mountPath: /app/samvera/hyrax-webapp/public/uv
+  #     subPath: public-uv
+  #   - name: uploads
+  #     mountPath: /app/samvera/hyrax-webapp/public/assets
+  #     subPath: public-assets
+  # serverBlock: |-
+  #   upstream rails_app {
+  #     server {{ .Values.global.hyraxHostName }};
+  #   }
+
+  #   map $status $loggable {
+  #       ~^444  0;
+  #       default 1;
+  #   }
+
+  #   log_format loki 'host=$host ip=$http_x_forwarded_for remote_user=$remote_user [$time_local] '
+  #                     'request="$request" status=$status bytes=$body_bytes_sent '
+  #                     'referer="$http_referer" agent="$http_user_agent" request_time=$request_time upstream_response_time=$upstream_response_time upstream_response_length=$upstream_response_length';
+
+  #   error_log  /opt/bitnami/nginx/logs/error.log warn;
+  #   #tcp_nopush     on;
+
+  #   # Cloudflare ips see for refresh
+  #   # https://support.cloudflare.com/hc/en-us/articles/200170786-Restoring-original-visitor-IPs-logging-visitor-IP-addresses
+  #   # update list https://www.cloudflare.com/ips/
+  #   set_real_ip_from 103.21.244.0/22;
+  #   set_real_ip_from 103.22.200.0/22;
+  #   set_real_ip_from 103.31.4.0/22;
+  #   set_real_ip_from 104.16.0.0/13;
+  #   set_real_ip_from 104.24.0.0/14;
+  #   set_real_ip_from 108.162.192.0/18;
+  #   set_real_ip_from 131.0.72.0/22;
+  #   set_real_ip_from 141.101.64.0/18;
+  #   set_real_ip_from 162.158.0.0/15;
+  #   set_real_ip_from 172.64.0.0/13;
+  #   set_real_ip_from 173.245.48.0/20;
+  #   set_real_ip_from 188.114.96.0/20;
+  #   set_real_ip_from 190.93.240.0/20;
+  #   set_real_ip_from 197.234.240.0/22;
+  #   set_real_ip_from 198.41.128.0/17;
+  #   set_real_ip_from 2400:cb00::/32;
+  #   set_real_ip_from 2606:4700::/32;
+  #   set_real_ip_from 2803:f800::/32;
+  #   set_real_ip_from 2405:b500::/32;
+  #   set_real_ip_from 2405:8100::/32;
+  #   set_real_ip_from 2a06:98c0::/29;
+  #   set_real_ip_from 2c0f:f248::/32;
+
+  #   real_ip_header X-Forwarded-For;
+  #   real_ip_recursive on;
+  #   include /opt/bitnami/nginx/conf/conf.d/*.conf;
+  #   server {
+  #       listen 8080;
+  #       server_name _;
+  #       root /app/samvera/hyrax-webapp/public;
+  #       index index.html;
+
+  #       client_body_in_file_only clean;
+  #       client_body_buffer_size 32K;
+  #       client_max_body_size 0;
+  #       access_log /opt/bitnami/nginx/logs/access.log loki;
+  #       # if=$loggable;
+
+  #       sendfile on;
+  #       send_timeout 300s;
+
+  #       include /opt/bitnami/nginx/conf/bots.d/ddos.conf;
+  #       include /opt/bitnami/nginx/conf/bots.d/blockbots.conf;
+
+  #       location ~ (\.php|\.aspx|\.asp) {
+  #       	return 404;
+  #       }
+
+  #       # deny requests for files that should never be accessed
+  #       location ~ /\. {
+  #         deny all;
+  #       }
+
+  #       location ~* ^.+\.(rb|log)$ {
+  #         deny all;
+  #       }
+
+  #       # serve static (compiled) assets directly if they exist (for rails production)
+  #       location ~ ^/(assets|packs|fonts|images|javascripts|stylesheets|swfs|system)/ {
+  #         try_files $uri @rails;
+
+  #         # access_log off;
+  #         gzip_static on; # to serve pre-gzipped version
+
+  #         expires max;
+  #         add_header Cache-Control public;
+
+  #         # Some browsers still send conditional-GET requests if there's a
+  #         # Last-Modified header or an ETag header even if they haven't
+  #         # reached the expiry date sent in the Expires header.
+  #         add_header Last-Modified "";
+  #         add_header ETag "";
+  #         break;
+  #       }
+
+  #       # send non-static file requests to the app server
+  #       location / {
+  #         try_files $uri @rails;
+  #       }
+
+  #       location @rails {
+  #         proxy_set_header  X-Real-IP  $remote_addr;
+  #         proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
+  #         proxy_set_header Host $http_host;
+  #         proxy_redirect off;
+  #         proxy_pass http://rails_app;
+  #       }
+  #   }
+
+
 redis:
   enabled: true
   password: mysecret
@@ -273,6 +423,8 @@ global:
   postgresql:
     postgresqlUsername: hyrax
     postgresqlPassword: hyrax_pass
+  # This is th name of the running rails server pod
+  hyraxHostName: hyrax
 
 nodeSelector: {}
 

data/config/features.rb

@@ -1,53 +1,51 @@
 # frozen_string_literal: true
 Flipflop.configure do
-  begin
-    # Strategies will be used in the order listed here.
-    strategy :cookie
-    strategy :active_record, class: Hyrax::Feature
-    strategy Hyrax::Strategies::YamlStrategy, config: Hyrax.config.feature_config_path
-    strategy :default
-
-    feature :proxy_deposit,
-            default: true,
-            description: "Depositors may designate proxies to deposit works on their behalf"
-
-    feature :transfer_works,
-            default: true,
-            description: "Depositors may transfer their works to another user"
-
-    # Note, if this is deactivated, a default admin set will be created and all
-    # works will be assigned to it when they are created.
-    feature :assign_admin_set,
-            default: true,
-            description: "Ability to assign uploaded items to an admin set"
-
-    feature :show_deposit_agreement,
-            default: true,
-            description: "Show a deposit agreement to users creating works"
-
-    feature :active_deposit_agreement_acceptance,
-            default: Hyrax.config.active_deposit_agreement_acceptance?,
-            description: "Require an active acceptance of the deposit agreement by checking a checkbox"
-
-    feature :batch_upload,
-            default: false,
-            description: "Enable uploading batches of works"
-
-    feature :hide_private_items,
-            default: false,
-            description: "Do not show the private items."
-
-    feature :hide_users_list,
-            default: true,
-            description: "Do not show users list unless user has authenticated."
-
-    feature :cache_work_iiif_manifest,
-            default: false,
-            description: "Use Rails.cache to cache the JSON document for IIIF manifests"
-    feature :read_only,
-            default: false,
-            description: "Put the system into read-only mode. Deposits, edits, approvals and anything that makes a change to the data will be disabled."
-  rescue Flipflop::StrategyError, Flipflop::FeatureError => err
-    Rails.logger.warn "Ignoring #{err}: #{err.message}"
-  end
+  # Strategies will be used in the order listed here.
+  strategy :cookie
+  strategy :active_record, class: Hyrax::Feature
+  strategy Hyrax::Strategies::YamlStrategy, config: Hyrax.config.feature_config_path
+  strategy :default
+
+  feature :proxy_deposit,
+          default: true,
+          description: "Depositors may designate proxies to deposit works on their behalf"
+
+  feature :transfer_works,
+          default: true,
+          description: "Depositors may transfer their works to another user"
+
+  # Note, if this is deactivated, a default admin set will be created and all
+  # works will be assigned to it when they are created.
+  feature :assign_admin_set,
+          default: true,
+          description: "Ability to assign uploaded items to an admin set"
+
+  feature :show_deposit_agreement,
+          default: true,
+          description: "Show a deposit agreement to users creating works"
+
+  feature :active_deposit_agreement_acceptance,
+          default: Hyrax.config.active_deposit_agreement_acceptance?,
+          description: "Require an active acceptance of the deposit agreement by checking a checkbox"
+
+  feature :batch_upload,
+          default: false,
+          description: "Enable uploading batches of works"
+
+  feature :hide_private_items,
+          default: false,
+          description: "Do not show the private items."
+
+  feature :hide_users_list,
+          default: true,
+          description: "Do not show users list unless user has authenticated."
+
+  feature :cache_work_iiif_manifest,
+          default: false,
+          description: "Use Rails.cache to cache the JSON document for IIIF manifests"
+  feature :read_only,
+          default: false,
+          description: "Put the system into read-only mode. Deposits, edits, approvals and anything that makes a change to the data will be disabled."
+rescue Flipflop::StrategyError, Flipflop::FeatureError => err
+  Rails.logger.warn "Ignoring #{err}: #{err.message}"
 end

data/config/initializers/{valkryrie_storage.rb → storage_adapter_initializer.rb}

@@ -5,3 +5,8 @@ Valkyrie::StorageAdapter.register(
                               path_generator: Hyrax::ValkyrieSimplePathGenerator),
   :branding_disk
 )
+
+Valkyrie::StorageAdapter.register(
+  Valkyrie::Storage::Disk.new(base_path: Hyrax.config.derivatives_path),
+  :derivatives_disk
+)

data/config/locales/hyrax.de.yml

@@ -220,7 +220,7 @@ de:
             summary: Zusammenfassung
             title: Sammlungsbericht
             view_collection_btn: Kollektion ansehen
-            visibility: Sichtweite
+            visibility: Sichtbarkeit
           summary:
             all_time: Alle Zeit
             collection_home_page_views: Aufrufe der Sammlungs-Startseite
@@ -239,7 +239,7 @@ de:
             export: Export
             file_downloads_in_collection: Dateiset-Downloads in dieser Sammlung
             top_collections: Top-Kollektionen
-            works_in_collection_views: Funktioniert in dieser Sammlungsansichten
+            works_in_collection_views: Arbeiten in dieser Sammlungsansichten
         date_range_form:
           date_range_heading: Datumsbereich anpassen
           end_date: Endtermin
@@ -270,7 +270,7 @@ de:
             summary: Zusammenfassung
             title: Werksbericht
             views: Ansichten
-            works: funktioniert
+            works: Arbeiten
           monthly_summary:
             file_downloads: Datei-Downloads
             monthly_subtitle: Monat für Monat Status für die letzten 12 Monate bis
@@ -285,7 +285,7 @@ de:
             summary: Zusammenfassung
             title: Arbeitsbericht
             view_work_btn: Arbeit ansehen
-            visibility: Sichtweite
+            visibility: Sichtbarkeit
             work_type: Arbeitstyp
           summary:
             all_time: Alle Zeit
@@ -310,7 +310,7 @@ de:
             work_title: Arbeitstitel
             work_views: Arbeitsseitenaufrufe
           work_counts:
-            child_works: Kind arbeitet
+            child_works: untergeordnete Arbeiten
             files: Dateien
             total_size: Gesamtgröße
           work_files:
@@ -408,7 +408,7 @@ de:
         collections_report: Sammlungsbericht
         configuration: Konfiguration
         content_blocks: Inhaltsblöcke
-        dashboard: Armaturenbrett
+        dashboard: Dashboard
         delete_all: Alles löschen
         notifications: Benachrichtigungen
         pages: Seiten
@@ -976,7 +976,7 @@ de:
           remove_from_collection: Aus der Sammlung entfernen
           select_an_action: Wählen Sie eine Aktion aus
           transfer_ownership_of_work: Übertragen Sie das Eigentum an der Arbeit
-        works: Funktioniert
+        works: Arbeiten
       create_work: Arbeiten erstellen
       current_proxies: Aktuelle Vertreter
       delete_notification: Benachrichtigung löschen
@@ -1106,7 +1106,7 @@ de:
         objects: Objekte
         subtitle: Die letzten 90 Tage
         title: Repository-Wachstum
-        works: Funktioniert
+        works: Arbeiten
       repository_objects:
         status: Aktueller Status
         subtitle: Aktueller Status
@@ -1157,7 +1157,7 @@ de:
       user_notifications: Benutzerbenachrichtigungen
       view_files: Dateien ansehen
       visibility_graph:
-        visibility: Sichtweite
+        visibility: Sichtbarkeit
       work_type_graph:
         count: Zählen
         title: Arbeitstypen
@@ -1408,10 +1408,10 @@ de:
           you_manage: "<strong> %{total_count} Sammlungen </ strong>, die Sie im Repository verwalten können"
           you_own: "<strong> %{total_count} Sammlungen </ strong>, die Sie im Repository besitzen"
         works:
-          in_repo: "<strong> %{total_count} funktioniert </ strong> im Repository"
+          in_repo: "<strong> %{total_count} Arbeiten </ strong> im Repository"
           works_listing: Auflistung der Arbeiten
-          you_manage: "<strong> %{total_count} funktioniert </ strong>, das Sie im Repository verwalten können"
-          you_own: "<strong> %{total_count} funktioniert </ strong>, das Sie im Repository besitzen"
+          you_manage: "<strong> %{total_count} Arbeiten </ strong>, das Sie im Repository verwalten können"
+          you_own: "<strong> %{total_count} Arbeiten </ strong>, das Sie im Repository besitzen"
       sort_and_per_page:
         number_of_results_to_display_per_page: Anzahl der anzuzeigenden Ergebnisse pro Seite
     nav_safety:

data/docker-compose.yml

@@ -74,6 +74,7 @@ services:
     user: root
     env_file:
       - .env
+      - .dassie/.env
     command: sh -l -c 'bundle && db-migrate-seed.sh'
     depends_on:
       - postgres

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

@@ -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.1/template.rb
+rails _5.2.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v3.4.2/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.1__. If you are looking for instructions on installing a different
+v3.4.2__. 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.
 

data/hyrax.gemspec

@@ -26,7 +26,7 @@ SUMMARY
 
   spec.required_ruby_version = '>= 2.5'
 
-  # Note: rails does not follow sem-ver conventions, it's
+  # NOTE: rails does not follow sem-ver conventions, it's
   # minor version releases can include breaking changes; see
   # http://guides.rubyonrails.org/maintenance_policy.html
   spec.add_dependency 'rails', '~> 5.0'
@@ -58,6 +58,7 @@ SUMMARY
   spec.add_dependency 'iiif_manifest', '>= 0.3', '< 2.0'
   spec.add_dependency 'jquery-datatables-rails', '~> 3.4'
   spec.add_dependency 'jquery-ui-rails', '~> 6.0'
+  spec.add_dependency 'json-ld', '< 3.2'
   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'
@@ -70,6 +71,7 @@ SUMMARY
   spec.add_dependency 'oauth2', '~> 1.2'
   spec.add_dependency 'posix-spawn'
   spec.add_dependency 'power_converter', '~> 0.1', '>= 0.1.2'
+  spec.add_dependency 'psych', '~> 3.3'
   spec.add_dependency 'qa', '~> 5.5', '>= 5.5.1' # questioning_authority
   spec.add_dependency 'rails_autolink', '~> 1.1'
   spec.add_dependency 'rdf-rdfxml' # controlled vocabulary importer
@@ -82,7 +84,7 @@ SUMMARY
   spec.add_dependency 'samvera-nesting_indexer', '~> 2.0'
   spec.add_dependency 'select2-rails', '~> 3.5'
   spec.add_dependency 'signet'
-  spec.add_dependency 'tinymce-rails'
+  spec.add_dependency 'tinymce-rails', '~> 5.10'
   spec.add_dependency 'valkyrie', '~> 2', '>= 2.1.1'
 
   spec.add_development_dependency "capybara", '~> 3.29'
@@ -106,7 +108,7 @@ SUMMARY
   spec.add_development_dependency 'i18n_yaml_sorter'
   spec.add_development_dependency 'rails-controller-testing', '~> 1'
   # the hyrax style guide is based on `bixby`. see `.rubocop.yml`
-  spec.add_development_dependency 'bixby', '~> 3.0', ">= 3.0.2"
+  spec.add_development_dependency 'bixby', '~> 5.0', '>= 5.0.2' # bixby 5 briefly dropped Ruby 2.5
   spec.add_development_dependency 'shoulda-callback-matchers', '~> 1.1.1'
   spec.add_development_dependency 'shoulda-matchers', '~> 3.1'
   spec.add_development_dependency 'webdrivers', '~> 4.4'

data/lib/generators/hyrax/collection_resource/USAGE

@@ -0,0 +1,20 @@
+Description:
+  This generator creates the necessary files for a Hyrax::PcdmCollection.
+
+Example:
+  Usage: rails generate hyrax:collection_resource MyCollection [with_basic_metadata]
+
+  Argument:
+    with_basic_metadata (optional) - if present, the collection resource will include basic metadata
+
+  This will create:
+    app/models/my_collection.rb
+    app/forms/my_collection_form.rb
+    app/indexers/my_collection_indexer.rb
+    config/metadata/my_collection.yaml
+    spec/models/my_collection_spec.rb
+    spec/forms/my_collection_form_spec.rb
+    spec/indexers/my_collection_indexer_spec.rb
+
+  This will also:
+    set Hyrax.config.collection_model = "MyCollection"