hyrax 5.0.0.rc2 → 5.0.0.rc3

data/app/views/hyrax/collections/show.html.erb

@@ -4,9 +4,9 @@
     <div class="col-md-12">
 
       <% if @presenter.banner_file.present? %>
-          <div class="hyc-banner" style="background-image:url(<%= @presenter.banner_file %>)">
+        <div class="hyc-banner" style="background-image:url(<%= @presenter.banner_file %>)">
       <% else %>
-          <div class="hyc-generic">
+        <div class="hyc-generic">
       <% end %>
 
       <div class="hyc-title">
@@ -80,11 +80,11 @@
   <!-- Search results label -->
   <% if @members_count > 0 || @presenter.subcollection_count > 0 %>
     <div class="hyc-blacklight hyc-bl-title">
-    <% if collection_search_parameters? %>
-      <h2>
-        <%= t('hyrax.dashboard.collections.show.search_results') %>
-      </h2>
-    <% end %>
+      <% if collection_search_parameters? %>
+        <h2>
+          <%= t('hyrax.dashboard.collections.show.search_results') %>
+        </h2>
+      <% end %>
     </div>
   <% end %>
 
@@ -125,6 +125,4 @@
   <% end # if @members_count > 0 %>
 </div>
 
-
 <span class='hide analytics-event' data-category="collection" data-action="collection-page-view" data-name="<%= @presenter.id %>" >
-

data/app/views/hyrax/dashboard/_sidebar.html.erb

@@ -12,9 +12,10 @@
         </div>
       </div>
     </li>
-    <li class="nav-item"><%= link_to hyrax.dashboard_path, class: "nav-link" do %>
-          <span class="fa fa-home" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.dashboard') %></span>
-        <% end %>
+    <li class="nav-item">
+      <%= link_to hyrax.dashboard_path, class: "nav-link", title: t('hyrax.admin.sidebar.dashboard') do %>
+        <span class="fa fa-home" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.dashboard') %></span>
+      <% end %>
     </li>
     <%= render 'hyrax/dashboard/sidebar/activity', menu: menu %>
     <%= render 'hyrax/dashboard/sidebar/repository_content', menu: menu %>

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

@@ -2,7 +2,7 @@
                   
   <h3 class="h4"><%= t(".#{access}.title") %></h3>
   <p><%= t(".#{access}.help") %></p>
-  <p><%= t(".#{access}.help_with_works", type_title: @collection_type.title) if @collection_type.share_applies_to_new_works? && access != 'depositors' %></p>
+  <p><%= t(".#{access}.help_with_works", type_title: collection_type.title) if collection_type.share_applies_to_new_works? && access != 'depositors' %></p>
   <% if collection_permission_template_form_for(form: @form).access_grants.select(&filter).any? %>
     <table class="table table-striped share-status">
       <thead>
@@ -31,4 +31,4 @@
   <% else %>
     <p><em><%= t(".#{access}.empty") %></em></p>
   <% end %>
-</div>
+</div>

data/app/views/hyrax/file_sets/media_display/_audio.html.erb

@@ -8,7 +8,7 @@
       </audio>
       <%= link_to t('hyrax.file_set.show.downloadable_content.audio_link'),
                   hyrax.download_path(file_set),
-                  data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
+                  data: { label: file_set.id.to_s, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
                   target: :_blank,
                   id: "file_download" %>
     </div>

data/app/views/hyrax/file_sets/media_display/_video.html.erb

@@ -8,7 +8,7 @@
       </video>
       <%= link_to t('hyrax.file_set.show.downloadable_content.video_link'),
                   hyrax.download_path(file_set),
-                  data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
+                  data: { label: file_set.id.to_s, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
                   target: :_blank,
                   id: "file_download" %>
     </div>

data/app/views/hyrax/my/facet.html.erb

@@ -9,7 +9,7 @@
   <%= render partial: 'facet_index_navigation' if @facet.index_range && @display_facet.index? %>
 
   <div class="facet-extended-list">
-    <%= render_facet_limit(@display_facet, layout: false) %>
+    <%= render_facet_limit(@display_facet, layout: false, partial: 'catalog/facet_limit') %>
   </div>
 
   <%# Removed component footer and placed the facet pagination partial within a `container` div %>

data/app/views/layouts/_head_tag_content.html.erb

@@ -9,6 +9,7 @@ signed in %>
 <!-- added for use on small devices like phones -->
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <link rel="resourcesync" href="<%= hyrax.capability_list_url %>" />
+<meta name="generator" content="Samvera Hyrax <%= ::Hyrax::VERSION %>" />
 
 <!-- Twitter card metadata -->
 <%= yield :twitter_meta %>

data/app/views/shared/_footer.html.erb

@@ -6,7 +6,7 @@
     </div>
     <div class="navbar-right">
       <div class="navbar-text text-right">
-        <p><%= t('hyrax.footer.copyright_html') %></p>
+        <p><%= t('hyrax.footer.copyright_html', current_year: Time.current.year) %></p>
         <p><%= t('hyrax.background_attribution_html') %></p>
       </div>
     </div>

data/chart/hyrax/Chart.yaml

@@ -2,11 +2,11 @@ apiVersion: v2
 name: hyrax
 description: An open-source, Samvera-powered digital repository system
 type: application
-version: 3.5.0
-appVersion: 3.3.0
+version: 3.6.0
+appVersion: 5.0.0
 dependencies:
   - name: fcrepo
-    version: 1.0.0
+    version: 2.0.0
     repository: oci://ghcr.io/samvera
     condition: fcrepo.enabled
   - name: memcached

data/chart/hyrax/values.yaml

@@ -226,7 +226,7 @@ fcrepo:
     enabled: false
     image:
       repository: bitnami/postgresql
-      tag: 12.11.0-debian-11-r12
+      tag: 12.17.0-debian-11-r28
 
 # configuration for an external/existing fits service;
 #   ignored if `fits.enabled` is true
@@ -284,6 +284,14 @@ nginx:
   image:
     repository: bitnami/nginx
     tag: 1.23.0-debian-11-r1
+  # this needs to be set since templates/ingress.yaml tries to
+  # evaluate .Values.nginx.service.port, and it needs to at least evaluate to
+  # nil, rather than throw an error (which it does if `service` itself is nil).
+  # you can change to NodePort or LoadBalancer if direct access is needed.
+  # ClusterIP is used as we assume an ingress is in place.
+  service:
+    type: ClusterIP
+    port: 80
   # The set up below does malicious bot / ip blocking and mounts
   # volumes to allow nginx to server assets and other public directory items
   # extraVolumes:

data/config/initializers/listeners.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-Hyrax.publisher.subscribe(Hyrax::Listeners::ActiveFedoraAclIndexListener.new) unless Hyrax.config.disable_wings
+Hyrax.publisher.subscribe(Hyrax::Listeners::ActiveFedoraACLIndexListener.new) unless Hyrax.config.disable_wings
 
 Hyrax.publisher.default_listeners.each do |listener|
   Hyrax.publisher.subscribe(listener)

data/config/locales/hyrax.de.yml

@@ -905,6 +905,11 @@ de:
             collection_title: Sammlungstitel
           this_collection_in_other_collections_description: Sie können diese Sammlung anderen Sammlungen als Untersammlung hinzufügen.
         form_share:
+          access_options:
+            creator: Schöpfer
+            depositor: Einleger
+            manager: Manager
+            viewer: Zuschauer
           add_group: Gruppe hinzufügen
           add_sharing: Freigaben hinzufügen
           add_user: Benutzer hinzufügen

data/config/locales/hyrax.en.yml

@@ -584,6 +584,11 @@ en:
         help_html: Select the file with media that represents this work.
         legend_html: Representative Media
       form_share:
+        access_options:
+          creator: Creator
+          depositor: Depositor
+          manager: Manager
+          viewer: Viewer
         access_type_to_grant: Access type to grant
         account_label_without_suffix: "%{account_label} (without the %{suffix} part)"
         add_sharing: Add Sharing
@@ -903,6 +908,11 @@ en:
             collection_title: Collection Title
           this_collection_in_other_collections_description: You can add this collection to other collections as a sub-collection.
         form_share:
+          access_options:
+            creator: Creator
+            depositor: Depositor
+            manager: Manager
+            viewer: Viewer
           add_group: Add group
           add_sharing: Add Sharing
           add_user: Add user

data/config/locales/hyrax.es.yml

@@ -905,6 +905,11 @@ es:
             collection_title: Título de la colección
           this_collection_in_other_collections_description: Puede agregar esta colección a otras colecciones como una subcolección.
         form_share:
+          access_options:
+            creator: Creador
+            depositor: Depositor
+            manager: Gerente
+            viewer: Espectador        
           add_group: Añadir grupo
           add_sharing: Agregar Compartir
           add_user: Agregar usuario

data/config/locales/hyrax.fr.yml

@@ -906,6 +906,11 @@ fr:
             collection_title: Titre de la collection
           this_collection_in_other_collections_description: Vous pouvez ajouter cette collection à d'autres collections en tant que sous-collection.
         form_share:
+          access_options:
+            creator: Créateur
+            depositor: Déposant
+            manager: Gestionnaire
+            viewer: Téléspectateur
           add_group: Ajouter un groupe
           add_sharing: Ajouter un partage
           add_user: Ajouter un utilisateur

data/config/locales/hyrax.it.yml

@@ -905,6 +905,11 @@ it:
             collection_title: Titolo della collezione
           this_collection_in_other_collections_description: È possibile aggiungere questa raccolta ad altre raccolte come sotto-raccolta.
         form_share:
+          access_options:
+            creator: Creatore
+            depositor: Depositante
+            manager: Gestore
+            viewer: Spettatore        
           add_group: Aggiungere gruppo
           add_sharing: Aggiungi condivisione
           add_user: Aggiungi utente

data/config/locales/hyrax.pt-BR.yml

@@ -904,6 +904,11 @@ pt-BR:
             collection_title: Título da Coleção
           this_collection_in_other_collections_description: Você pode embutir esta coleção em outras coleções como uma sub-coleção.
         form_share:
+          access_options:
+            creator: O Criador
+            depositor: Depositante
+            manager: Gerente
+            viewer: Visualizador        
           add_group: Acrescentar Grupo
           add_sharing: Acrescentar Compartilhamento
           add_user: Acrescentar Usuário

data/config/locales/hyrax.zh.yml

@@ -903,6 +903,11 @@ zh:
             collection_title: 收藏标题
           this_collection_in_other_collections_description: 您可以将此集合作为子集合添加到其他集合。
         form_share:
+          access_options:
+            creator: 造物主
+            depositor: 储户
+            manager: 经理
+            viewer: 查看器
           add_group: 添加组
           add_sharing: 添加共享
           add_user: 添加用户

data/config/metadata/basic_metadata.yaml

@@ -50,6 +50,7 @@ attributes:
       primary: false
     index_keys:
       - "contributor_tesim"
+      - "contributor_sim"
     predicate: http://purl.org/dc/elements/1.1/contributor
   creator:
     type: string

data/config/metadata/core_metadata.yaml

@@ -19,3 +19,5 @@ attributes:
   depositor:
     type: string
     predicate: http://id.loc.gov/vocabulary/relators/dpt
+    index_keys:
+      - "depositor_tesim"

data/config/metadata/file_set_metadata.yaml

@@ -20,6 +20,8 @@ attributes:
       required: false
       primary: true
     predicate: http://purl.org/dc/terms/license
+    index_keys:
+      - "license_tesim"
 
   # Other attributes:
   abstract:

data/docker-compose-koppie.yml

@@ -99,8 +99,8 @@ services:
       - /dev/shm:/dev/shm
     shm_size: 2G
     ports:
-      - "4445:4444"
-      - "5960:5900"
+      - "4446:4444"
+      - "5961:5900"
     networks:
       - koppie
 
@@ -145,7 +145,7 @@ services:
     command:
       - sh
       - "-c"
-      - "precreate-core koppie_test /opt/solr/server/configsets/hyraxconf; solr-precreate koppie /opt/solr/server/configsets/hyraxconf"
+      - "precreate-core hydra-test /opt/solr/server/configsets/hyraxconf; solr-precreate koppie /opt/solr/server/configsets/hyraxconf"
     volumes:
       - solr_home:/var/solr/data:cached
       - .koppie/solr/conf:/opt/solr/server/configsets/hyraxconf

data/docker-compose-sirenia.yml

@@ -129,8 +129,8 @@ services:
     image: fcrepo/fcrepo:6.4.0
     environment:
       - >-
-        CATALINA_OPTS=-Dfcrepo.home=/fcrepo-home -Djava.awt.headless=true -Dfile.encoding=UTF-8 
-        -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m 
+        CATALINA_OPTS=-Dfcrepo.home=/fcrepo-home -Djava.awt.headless=true -Dfile.encoding=UTF-8
+        -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m
         -XX:MaxPermSize=256m -XX:+DisableExplicitGC -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true
       - JAVA_OPTS=-Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true
     volumes:
@@ -170,7 +170,7 @@ services:
     command:
       - sh
       - "-c"
-      - "precreate-core koppie_test /opt/solr/server/configsets/hyraxconf; solr-precreate koppie /opt/solr/server/configsets/hyraxconf"
+      - "precreate-core hydra-test /opt/solr/server/configsets/hyraxconf; solr-precreate koppie /opt/solr/server/configsets/hyraxconf"
     volumes:
       - solr_home:/var/solr/data:cached
       - .koppie/solr/conf:/opt/solr/server/configsets/hyraxconf

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

@@ -29,8 +29,10 @@ A Hyrax-based application includes lots of dependencies. We provide a [Docker im
 
 You can also try [Running Hyrax-based application in local VM](https://github.com/samvera/hyrax/wiki/Hyrax-Development-Guide#running-hyrax-based-application-in-local-vm) which uses Ubuntu.
 
+During development, running only the dependent services in a container environment may be beneficial. This avoids potential headaches concerning file permissions and eases the use of debugging tools. The application generation instructions below use [Lando](https://lando.dev) to achieve this setup.
+
 This document contains instructions specific to setting up an app with __Hyrax
-v5.0.0.rc2__. If you are looking for instructions on installing a different
+v5.0.0.rc3__. 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.
 
@@ -44,8 +46,8 @@ Prerequisites are required for both creating a Hyrax\-based app and contributing
 Hyrax requires the following software to work:
 
 1. [Solr](http://lucene.apache.org/solr/) version >= 5.x (tested up to 8.11.1, which includes the log4j library update)
-1. [Fedora Commons](http://www.fedora-commons.org/) digital repository version >= 4.5.1 (tested up to 4.7.5)
-1. A SQL RDBMS (MySQL, PostgreSQL), though **note** that SQLite will be used by default if you're looking to get up and running quickly
+1. [Fedora Commons](http://www.fedora-commons.org/) digital repository version >= 4.7.6 (if not using the Valkyrie Postgres adapter)
+1. A SQL RDBMS ([PostgreSQL](https://www.postgresql.org) recommended)
 1. [Redis](http://redis.io/), a key-value store
 1. [ImageMagick](http://www.imagemagick.org/) with JPEG-2000 support
 1. [FITS](#characterization) (tested up to version 1.5.0 -- avoid version 1.1.0)
@@ -55,7 +57,12 @@ Hyrax requires the following software to work:
 **NOTE: The [Hyrax Development Guide](https://github.com/samvera/hyrax/wiki/Hyrax-Development-Guide) has instructions for installing Solr and Fedora in a development environment.**
 
 ### Characterization
+#### Servlet FITS
+FITS can be run as a web service. This has the benefit of improved performance by avoiding the slow startup time inherent to the local option below.
+
+A container image is available for this purpose: [ghcr.io/samvera/fitsservlet](https://ghcr.io/samvera/fitsservlet)
 
+#### Local FITS
 FITS can be installed on OSX using Homebrew by running the command: `brew install fits`
 
 **OR**
@@ -122,10 +129,21 @@ NOTE: [nodejs](https://nodejs.org/en/) is preinstalled on most Mac computers and
 
 NOTE: The steps need to be done in order to create a new Hyrax based app.
 
+### Development Prerequisites
+
+These instructions assume the use of [Lando](https://lando.dev) and [Docker](https://docker.io) to manage the backend services needed by your Hyrax application. Follow the Lando installation instructions before proceeding, or have alternate providers for the services listed in the generated `.lando.yml`:
+- Solr
+- Postgres
+- Redis
+- FITS servlet
+- Fedora (if not using Postgres)
+
+### Generate the application
+
 Generate a new Rails application using the template.
 
-```
-rails _6.1.7.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v5.0.0.rc2/template.rb
+```shell
+rails _6.1.7.6_ new my_app --database=postgresql -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v5.0.0.rc3/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:
@@ -133,23 +151,65 @@ Generating a new Rails application using Hyrax's template above takes cares of a
 * Adding Hyrax (and any of its dependencies) to your application `Gemfile`, to declare that Hyrax is a dependency of your application
 * Running `bundle install`, to install Hyrax and its dependencies
 * Running Hyrax's install generator, to add a number of files that Hyrax requires within your Rails app, including e.g. database migrations
+
+### Start Services
+
+Start the background services managed by Lando. The
+
+```shell
+cd my_app
+lando start
+```
+
+### Run Migrations/Seeds
+
+This performs the following actions:
+
 * Loading all of Hyrax's database migrations into your application's database
-* Loading Hyrax's default workflows into your application's database
 * Create default collection types (e.g. Admin Set, User Collection)
+* Loading Hyrax's default workflows into your application's database
+
+```shell
+rails db:migrate
+rails db:seed
+```
 
-### Start servers
+**NOTE**: You will want to run these commands the first time this code is deployed to a new environment as well.
 
-To test-drive your new Hyrax application in development mode, spin up the servers that Hyrax needs (Solr, Fedora, and Rails):
+This creates the default administrative set -- into which all works will be deposited unless assigned to other administrative sets.
+This command also makes sure that Hyrax's built-in workflows are loaded for your application and available for the default administrative set.
+
+### Generate a work type
+
+Using Hyrax requires generating at least one type of repository object, or "work type." Hyrax allows you to generate the work types required in your application by using a Rails generator-based tool. You may generate one or more of these work types.
+
+Pass a (CamelCased) model name to Hyrax's work generator to get started, e.g.:
 
 ```
-bin/rails hydra:server
+rails generate hyrax:work_resource MovingImage
+```
+
+If your applications requires your work type to be namespaced, namespaces can be included by adding a slash to the model name which creates a new class called `MovingImage` within the `My` namespace:
+
+```shell
+rails generate hyrax:work_resource My/MovingImage
+```
+
+You may wish to [customize your work type](https://github.com/samvera/hyrax/wiki/Customizing-your-work-types) now that it's been generated.
+
+### Start Hyrax web server
+
+Test-drive your new Hyrax application in development mode:
+
+```shell
+rails s
 ```
 
 And now you should be able to browse to [localhost:3000](http://localhost:3000/) and see the application.
 
 Notes:
 * This web server is purely for development purposes. You will want to use a more fully featured [web server](https://github.com/samvera/hyrax/wiki/Hyrax-Management-Guide#web-server) for production-like environments.
-* You have the option to start each of these services individually.  More information on [solr_wrapper](https://github.com/cbeer/solr_wrapper) and [fcrepo_wrapper](https://github.com/cbeer/fcrepo_wrapper) will help you set this up.  Start rails with `rails s`.
+* For a fresh start, the data persisted in Lando can be wiped using `lando destroy`.
 
 ### Start background workers
 
@@ -163,14 +223,10 @@ Many of the services performed by Hyrax are resource intensive, and therefore ar
 
 Hyrax implements these jobs using the Rails [ActiveJob](http://edgeguides.rubyonrails.org/active_job_basics.html) framework, allowing you to choose the message queue system of your choice.
 
-For initial development, it is recommended that you change the default ActiveJob adapter from `:async` to `:inline`. This adapter will execute jobs immediately (in the foreground) as they are received. This can be accomplished by adding the following to your `config/environments/development.rb`
+For initial development, it is recommended that you change the default ActiveJob adapter from `:async` to `:inline`. This adapter will execute jobs immediately (in the foreground) as they are received. This can be accomplished by modifying the `.env` file:
 
-```
-class Application < Rails::Application
-  # ...
-  config.active_job.queue_adapter = :inline
-  # ...
-end
+```dotenv
+HYRAX_ACTIVE_JOB_QUEUE=inline
 ```
 
 For testing, it is recommended that you use the [built-in `:test` adapter](http://api.rubyonrails.org/classes/ActiveJob/QueueAdapters/TestAdapter.html) which stores enqueued and performed jobs, running only those configured to run during test setup. To do this, add the following to `config/environments/test.rb`:
@@ -185,54 +241,15 @@ end
 
 **For production applications** you will want to use a more robust message queue system such as [Sidekiq](http://sidekiq.org/). The Hyrax Development Guide has a detailed walkthrough of [installing and configuring Sidekiq](https://github.com/samvera/hyrax/wiki/Using-Sidekiq-with-Hyrax).
 
-### Create default administrative set
-
-**After** Fedora and Solr are running, create the default administrative set -- into which all works will be deposited unless assigned to other administrative sets -- by running the following command:
-
-```
-rails hyrax:default_admin_set:create
-```
-
-This command also makes sure that Hyrax's built-in workflows are loaded for your application and available for the default administrative set.
-
-**NOTE**: You will want to run this command the first time this code is deployed to a new environment as well.
-
-### Generate a work type
-
-Using Hyrax requires generating at least one type of repository object, or "work type." Hyrax allows you to generate the work types required in your application by using a Rails generator-based tool. You may generate one or more of these work types.
-
-Pass a (CamelCased) model name to Hyrax's work generator to get started, e.g.:
-
-```
-rails generate hyrax:work Work
-```
-
-or
-
-```
-rails generate hyrax:work MovingImage
-```
-
-If your applications requires your work type to be namespaced, namespaces can be included by adding a slash to the model name which creates a new class called `MovingImage` within the `My` namespace:
-
-```
-rails generate hyrax:work My/MovingImage
-```
-
-You may wish to [customize your work type](https://github.com/samvera/hyrax/wiki/Customizing-your-work-types) now that it's been generated.
-
-### Enable notifications
-
-Hyrax 2+ uses a WebSocket-based user notifications system, which requires Redis. To enable user notifications, make sure that you have configured ActionCable to use Redis as the adapter in your application's `config/cable.yml`. E.g., for the `development` Rails environment:
+### Create an Admin User
 
+To access all of Hyrax's features you must be signed in as a user in the `admin` role. The default role management system uses the `config/role_map.yml` file to assign users to roles. For example:
 ```yaml
 development:
-  adapter: redis
-  url: redis://localhost:6379
+  admin:
+    - dev@test.internal
 ```
 
-Note that the Hyrax Management Guide contains additional information on [how to configure ActionCable in production environments](https://github.com/samvera/hyrax/wiki/Hyrax-Management-Guide#notifications).
-
 ## Managing a Hyrax-based app
 
 The [Hyrax Management Guide](https://github.com/samvera/hyrax/wiki/Hyrax-Management-Guide) provides tips for how to manage, customize, and enhance your Hyrax application, including guidance specific to:

data/hyrax.gemspec

@@ -17,7 +17,15 @@ SUMMARY
 
   spec.homepage      = "http://github.com/samvera/hyrax"
 
-  spec.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR).select { |f| File.dirname(f) !~ %r{\A"?spec\/?} && f != 'bin/rails' }
+  spec.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR).reject do |f|
+    f == 'bin/rails' ||
+      # We want for downstream implementations to be able to leverage the various Hyrax factories.
+      # As such we need them to be available in the .gem file.  See `./lib/hyrax/spec/factories.rb`
+      # for more details.
+      (File.dirname(f) =~ %r{\A"?spec\/?} &&
+        File.dirname(f) !~ %r{\A"?spec\/(factories|assets|support)\/?}
+      )
+  end
   spec.executables   = spec.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   spec.name          = "hyrax"
   spec.require_paths = ["lib"]
@@ -48,7 +56,6 @@ SUMMARY
   spec.add_dependency 'dry-container', '~> 0.11'
   spec.add_dependency 'dry-events', '~> 1.0', '>= 1.0.1'
   spec.add_dependency 'dry-monads', '~> 1.6'
-  spec.add_dependency 'dry-struct', '~> 1.6'
   spec.add_dependency 'dry-validation', '~> 1.10'
   spec.add_dependency 'flipflop', '~> 2.3'
   # Pin more tightly because 0.x gems are potentially unstable

data/lib/generators/hyrax/collection_resource/templates/collection_indexer.rb.erb

@@ -2,6 +2,6 @@
 
 # Generated via
 #  `rails generate hyrax:collection_resource <%= class_name %>`
-class <%= class_name %>Indexer < Hyrax::PcdmCollectionIndexer
+class <%= class_name %>Indexer < Hyrax::Indexers::PcdmCollectionIndexer
   include Hyrax::Indexer(:<%= file_name %>)
 end

data/lib/generators/hyrax/config_generator.rb

@@ -38,11 +38,23 @@ class Hyrax::ConfigGenerator < Rails::Generators::Base
     copy_file 'config/initializers/redis_config.rb'
   end
 
+  def configure_valkyrie
+    copy_file 'config/initializers/1_valkyrie.rb'
+  end
+
   def configure_valkyrie_index
     copy_file 'config/valkyrie_index.yml'
     copy_file 'config/solr_wrapper_valkyrie_test.yml'
   end
 
+  def metadata_dir
+    empty_directory 'config/metadata'
+  end
+
+  def derivatives_file_services
+    copy_file 'config/initializers/file_services.rb'
+  end
+
   def create_initializer_config_file
     copy_file 'config/initializers/hyrax.rb'
   end