hyrax 5.0.0.rc1 → 5.0.0.rc3

data/docker-compose-sirenia.yml

@@ -0,0 +1,202 @@
+# Requires Docker Compose v2
+name: sirenia
+services:
+  app: &app
+    build:
+      context: .
+      target: hyrax-engine-dev
+      args:
+        - EXTRA_APK_PACKAGES=git less
+        - APP_PATH=.koppie
+    image: samvera/koppie
+    entrypoint: dev-entrypoint.sh
+    command: sh -c 'bundle exec puma -v -b tcp://0.0.0.0:3000'
+    stdin_open: true
+    tty: true
+    user: root
+    env_file:
+      - .koppie/.env
+    environment:
+      - APP_NAME=sirenia
+      - RAILS_ROOT=/app/samvera/hyrax-webapp
+      - VALKYRIE_METADATA_ADAPTER=fedora_metadata
+      - VALKYRIE_STORAGE_ADAPTER=fedora_storage
+    depends_on:
+      - chrome
+      - db_migrate
+      - memcached
+      - postgres
+      - redis
+      - solr
+    ports:
+      - 3002:3000
+      - 9878:9876
+      - 1050:1048
+    volumes:
+      - ./bin:/app/samvera
+      - .koppie:/app/samvera/hyrax-webapp
+      - .:/app/samvera/hyrax-engine
+      - bundle:/app/bundle
+      - hyrax-storage:/app/samvera/hyrax-webapp/storage
+      - hyrax-derivatives:/app/samvera/hyrax-webapp/derivatives
+      - hyrax-uploads:/app/samvera/hyrax-webapp/uploads
+      - rails-public:/app/samvera/hyrax-webapp/public
+      - rails-tmp:/app/samvera/hyrax-webapp/tmp
+    networks:
+      - sirenia
+
+  sidekiq:
+    image: samvera/koppie
+    entrypoint: dev-entrypoint.sh
+    command: sh -c 'bundle exec sidekiq'
+    user: root
+    env_file:
+      - .koppie/.env
+    environment:
+      - APP_NAME=sirenia
+      - VALKYRIE_METADATA_ADAPTER=fedora_metadata
+      - VALKYRIE_STORAGE_ADAPTER=fedora_storage
+    depends_on:
+      - db_migrate
+      - memcached
+      - postgres
+      - redis
+      - solr
+    volumes:
+      - ./bin:/app/samvera
+      - .koppie:/app/samvera/hyrax-webapp
+      - .:/app/samvera/hyrax-engine
+      - bundle:/app/bundle
+      - hyrax-storage:/app/samvera/hyrax-webapp/storage
+      - hyrax-derivatives:/app/samvera/hyrax-webapp/derivatives
+      - hyrax-uploads:/app/samvera/hyrax-webapp/uploads
+      - rails-public:/app/samvera/hyrax-webapp/public
+      - rails-tmp:/app/samvera/hyrax-webapp/tmp
+    networks:
+      - sirenia
+
+  db_migrate:
+    image: samvera/koppie
+    user: root
+    env_file:
+      - .koppie/.env
+    environment:
+      - APP_NAME=sirenia
+      - VALKYRIE_METADATA_ADAPTER=fedora_metadata
+      - VALKYRIE_STORAGE_ADAPTER=fedora_storage
+    entrypoint: dev-entrypoint.sh
+    command: db-migrate-seed.sh
+    depends_on:
+      - postgres
+      - solr
+    volumes:
+      - ./bin:/app/samvera
+      - .koppie:/app/samvera/hyrax-webapp
+      - .:/app/samvera/hyrax-engine
+      - bundle:/app/bundle
+      - rails-public:/app/samvera/hyrax-webapp/public
+      - rails-tmp:/app/samvera/hyrax-webapp/tmp
+    networks:
+      - sirenia
+
+  chrome:
+    image: seleniarm/standalone-chromium:114.0
+    environment:
+      - START_XVFB=false
+    logging:
+      driver: none
+    volumes:
+      - /dev/shm:/dev/shm
+    shm_size: 2G
+    ports:
+      - "4447:4444"
+      - "5962:5900"
+    networks:
+      - sirenia
+
+  postgres:
+    image: postgres:15
+    env_file:
+      - .koppie/.env
+    ports:
+      - "5434:5432"
+    volumes:
+      - db:/var/lib/postgresql/data
+    networks:
+      - sirenia
+
+  fcrepo:
+    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
+        -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:
+      - fcrepo:/fcrepo-home
+    ports:
+      - 8081:8080
+    networks:
+      - sirenia
+
+  fits:
+    image: ghcr.io/samvera/fitsservlet:1.6.0
+    ports:
+      - 9082:8080
+    networks:
+      - sirenia
+
+  memcached:
+    image: bitnami/memcached
+    ports:
+      - '11213:11211'
+    networks:
+      - sirenia
+
+  redis:
+    image: bitnami/redis:6.2
+    env_file:
+      - .koppie/.env
+    volumes:
+      - redis:/bitnami/redis/data
+    networks:
+      - sirenia
+
+  solr:
+    image: solr:8.11
+    ports:
+      - 8985:8983
+    command:
+      - sh
+      - "-c"
+      - "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
+    ulimits:
+      nofile:
+        soft: 65536
+        hard: 524288
+    networks:
+      - sirenia
+
+volumes:
+  bundle:
+  db:
+  fcrepo:
+  hyrax-storage:
+  hyrax-derivatives:
+  hyrax-uploads:
+  rails-public:
+  rails-tmp:
+  redis:
+  sidekiq-public:
+  sidekiq-tmp:
+  solr_home:
+
+networks:
+  sirenia:
+    driver: bridge
+    driver_opts:
+      com.docker.network.bridge.name: br-sirenia

data/docker-compose.yml

@@ -6,9 +6,11 @@ services:
       context: .
       target: hyrax-engine-dev
       args:
-        - EXTRA_APK_PACKAGES=git less chromium
-    image: ghcr.io/samvera/dassie
-    command: sh -c 'bundle && bundle exec puma -v -b tcp://0.0.0.0:3000'
+        - EXTRA_APK_PACKAGES=git less
+        - BUNDLE_GEMFILE=Gemfile.dassie
+    image: samvera/dassie
+    entrypoint: dev-entrypoint.sh
+    command: sh -c 'bundle exec puma -v -b tcp://0.0.0.0:3000'
     stdin_open: true
     tty: true
     user: root
@@ -28,8 +30,10 @@ services:
       - 3000:3000
       - 9876:9876
     volumes:
+      - ./bin:/app/samvera
       - .dassie:/app/samvera/hyrax-webapp
       - .:/app/samvera/hyrax-engine
+      - bundle:/app/bundle
       - hyrax-derivatives:/app/samvera/hyrax-webapp/derivatives
       - hyrax-uploads:/app/samvera/hyrax-webapp/uploads
       - rails-public:/app/samvera/hyrax-webapp/public
@@ -38,11 +42,9 @@ services:
       - hyrax
 
   sidekiq:
-    build:
-      context: .
-      target: hyrax-engine-dev-worker
-    image: ghcr.io/samvera/dassie-worker
-    command: sh -c 'bundle && bundle exec sidekiq'
+    image: samvera/dassie
+    entrypoint: dev-entrypoint.sh
+    command: sh -c 'bundle exec sidekiq'
     user: root
     env_file:
       - .dassie/.env
@@ -54,31 +56,31 @@ services:
       - redis
       - solr
     volumes:
+      - ./bin:/app/samvera
       - .dassie:/app/samvera/hyrax-webapp
       - .:/app/samvera/hyrax-engine
+      - bundle:/app/bundle
       - hyrax-derivatives:/app/samvera/hyrax-webapp/derivatives
       - hyrax-uploads:/app/samvera/hyrax-webapp/uploads
-      - sidekiq-public:/app/samvera/hyrax-webapp/public
-      - sidekiq-tmp:/app/samvera/hyrax-webapp/tmp
+      - rails-public:/app/samvera/hyrax-webapp/public
+      - rails-tmp:/app/samvera/hyrax-webapp/tmp
     networks:
       - hyrax
 
   db_migrate:
-    build:
-      context: .
-      target: hyrax-engine-dev
-      args:
-        - EXTRA_APK_PACKAGES=git less
-    image: ghcr.io/samvera/dassie
+    image: samvera/dassie
     user: root
     env_file:
       - .dassie/.env
-    command: sh -c 'bundle && db-migrate-seed.sh'
+    entrypoint: dev-entrypoint.sh
+    command: db-migrate-seed.sh
     depends_on:
       - postgres
     volumes:
+      - ./bin:/app/samvera
       - .dassie:/app/samvera/hyrax-webapp
       - .:/app/samvera/hyrax-engine
+      - bundle:/app/bundle
       - rails-public:/app/samvera/hyrax-webapp/public
       - rails-tmp:/app/samvera/hyrax-webapp/tmp
     networks:
@@ -100,7 +102,7 @@ services:
       - hyrax
 
   postgres:
-    image: postgres:latest
+    image: postgres:15
     environment:
       - POSTGRES_USER=hyrax_user
       - POSTGRES_PASSWORD=hyrax_password
@@ -123,7 +125,7 @@ services:
       - hyrax
 
   fits:
-    image: harvardlts/fitsservlet_container:1.5.0
+    image: ghcr.io/samvera/fitsservlet:1.6.0
     ports:
       - 8080
     networks:
@@ -137,14 +139,16 @@ services:
       - hyrax
 
   redis:
-    image: redis:5-alpine
+    image: bitnami/redis:6.2
+    env_file:
+      - .dassie/.env
     volumes:
-      - redis:/data
+      - redis:/bitnami/redis/data
     networks:
       - hyrax
 
   solr:
-    image: solr:8.11.1
+    image: solr:8.11
     ports:
       - 8983:8983
     command:
@@ -162,6 +166,7 @@ services:
       - hyrax
 
 volumes:
+  bundle:
   db:
   fcrepo:
   hyrax-derivatives:
@@ -169,8 +174,6 @@ volumes:
   rails-public:
   rails-tmp:
   redis:
-  sidekiq-public:
-  sidekiq-tmp:
   solr_home:
 
 networks:

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.rc1__. 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.rc1/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"]
@@ -30,7 +38,7 @@ SUMMARY
   # 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', '~> 6.0'
+  spec.add_dependency 'rails', '~> 6.1'
 
   spec.add_dependency 'active-fedora', '~> 14.0'
   spec.add_dependency 'almond-rails', '~> 0.1'
@@ -41,13 +49,14 @@ SUMMARY
   spec.add_dependency 'browse-everything', '>= 0.16', '< 2.0'
   spec.add_dependency 'carrierwave', '~> 1.0'
   spec.add_dependency 'clipboard-rails', '~> 1.5'
+  spec.add_dependency 'concurrent-ruby', '~> 1.0'
   spec.add_dependency 'connection_pool', '~> 2.4'
   spec.add_dependency 'draper', '~> 4.0'
-  spec.add_dependency 'dry-events', '~> 0.2.0'
-  spec.add_dependency 'dry-equalizer', '~> 0.2'
-  spec.add_dependency 'dry-monads', '~> 1.5'
-  spec.add_dependency 'dry-struct', '~> 1.0'
-  spec.add_dependency 'dry-validation', '~> 1.3'
+  spec.add_dependency 'dry-logic', '~> 1.5'
+  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-validation', '~> 1.10'
   spec.add_dependency 'flipflop', '~> 2.3'
   # Pin more tightly because 0.x gems are potentially unstable
   spec.add_dependency 'flot-rails', '~> 0.0.6'
@@ -80,7 +89,7 @@ SUMMARY
   spec.add_dependency 'retriable', '>= 2.9', '< 4.0'
   spec.add_dependency 'signet'
   spec.add_dependency 'tinymce-rails', '~> 5.10'
-  spec.add_dependency 'valkyrie', '~> 3.0.1'
+  spec.add_dependency 'valkyrie', '~> 3.1.1'
   spec.add_dependency 'view_component', '~> 2.74.1' # Pin until blacklight is updated with workaround for https://github.com/ViewComponent/view_component/issues/1565
   spec.add_dependency 'sprockets', '~> 3.7'
   spec.add_dependency 'sass-rails', '~> 6.0'
@@ -89,16 +98,14 @@ SUMMARY
   spec.add_development_dependency "capybara", '~> 3.29'
   spec.add_development_dependency 'capybara-screenshot', '~> 1.0'
   spec.add_development_dependency 'database_cleaner', '~> 1.3'
-  spec.add_development_dependency 'engine_cart', '~> 2.5'
   spec.add_development_dependency "equivalent-xml", '~> 0.5'
   spec.add_development_dependency "factory_bot", '~> 4.4'
-  spec.add_development_dependency 'fcrepo_wrapper', '~> 0.5', '>= 0.5.1'
   spec.add_development_dependency 'mida', '~> 0.3'
   spec.add_development_dependency 'okcomputer'
   spec.add_development_dependency 'pg', '~> 1.2'
   spec.add_development_dependency 'rspec-activemodel-mocks', '~> 1.0'
   spec.add_development_dependency 'rspec-its', '~> 1.1'
-  spec.add_development_dependency 'rspec-rails', '~> 5.0'
+  spec.add_development_dependency 'rspec-rails', '~> 6.0'
   spec.add_development_dependency 'rspec_junit_formatter'
   spec.add_development_dependency "selenium-webdriver", '~> 4.4'
   spec.add_development_dependency 'i18n-debug'
@@ -108,6 +115,5 @@ SUMMARY
   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'
   spec.add_development_dependency 'webmock'
 end

data/karma.conf.js

@@ -23,7 +23,7 @@ module.exports = function(config) {
     },
 
     // list of files / patterns to load in the browser
-    // uses dotenv to allow for .internal_test_app or .dassie as the Rails root
+    // uses dotenv to allow for .dassie as the Rails root
 
     files: [
       {pattern: 'spec/javascripts/fixtures/*.html', watched: true, included: false, served: true},

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/collection_resource/templates/collection_metadata.yaml

@@ -2,6 +2,8 @@
 # index key names, and form properties.
 #
 # Attributes must have a type but all other configuration options are optional.
+# Please note: If using Valkyrie's Fedora Metadata Adapter, predicates for attributes
+# must be placed here.
 #
 # attributes:
 #   attribute_name:

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