hyrax 3.4.1 → 4.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 865d623446e36dc64e73cf82ef855955e83d8d8f730a65f439b9b89664641c3f
-  data.tar.gz: 87aec067e009093bbd119d6d39639c5c6927b2b26173088ca7000b1241f71caa
+  metadata.gz: 0217d84335b2d3a3a1ed7729493eec75e67e5a2563034c9b1b4b3e025eb30520
+  data.tar.gz: 509e3aaf3d67a086d2361baa09de56a75d063f3df63c7b2b955027d6fd1fcbd7
 SHA512:
-  metadata.gz: d75dbf03372ee072f394a88af8449ff947ff42b21de9b10a83428ac98af5d01783f21e7f123ee00e3c0dd7b6d3808d4e7d59f0238e1fda703da8358d2b567447
-  data.tar.gz: 6dae952fde3a2f2fdc329775d8efe14929e23c0f92284d1848abfa8a7a8a041e4b5a197a4fa0581d3934ddc9267d0e3ca64c455a5f65b81f5287bde8110fb19e
+  metadata.gz: 95237e304352c8a36f8fc16994e192f8b305c12d4df7dc12c20de05072932a5516d4598a4facd58f42262d1e1a85aae9a50a21e174e32f9dbc613ac2c90c7177
+  data.tar.gz: 42f9ff962f2920a60f78e342cc01114ab9dfe653d5f5ec8cf743816edb5da3d71bad71e553239a67e8e017c0faf4317c004564b6f60653f40697275ba4fc1994

data/.circleci/config.yml

@@ -1,18 +1,19 @@
 version: 2.1
 orbs:
-  samvera: samvera/circleci-orb@0
+  samvera: samvera/circleci-orb@1
+  browser-tools: circleci/browser-tools@1.3
 jobs:
   bundle:
     parameters:
       ruby_version:
         type: string
-        default: 2.5.8
+        default: 2.7.6
       bundler_version:
         type: string
-        default: 1.17.3
+        default: 2.3.13
       rails_version:
         type: string
-        default: '5.2.6'
+        default: 6.0.5
     executor:
       name: 'samvera/ruby'
       ruby_version: << parameters.ruby_version >>
@@ -67,13 +68,13 @@ jobs:
     parameters:
       ruby_version:
         type: string
-        default: 2.5.8
+        default: 2.7.6
       bundler_version:
         type: string
-        default: 1.17.3
+        default: 2.3.13
       rails_version:
         type: string
-        default: '5.2.6'
+        default: 6.0.5
     executor:
       name: 'samvera/ruby_fcrepo_solr_redis_postgres'
       ruby_version: << parameters.ruby_version >>
@@ -81,7 +82,7 @@ jobs:
     environment:
       RAILS_VERSION: << parameters.rails_version >>
       NOKOGIRI_USE_SYSTEM_LIBRARIES: true
-      ENGINE_CART_RAILS_OPTIONS: --database=postgresql --skip-git --skip-bundle --skip-listen --skip-spring --skip-keeps --skip-test --skip-bootsnap
+      ENGINE_CART_RAILS_OPTIONS: --database=postgresql --skip-git --skip-bundle --skip-listen --skip-spring --skip-keeps --skip-test --skip-bootsnap --skip-javascript
       DATABASE_URL: postgresql://postgres@127.0.0.1/circle_test # Hard-coded with data from CircleCI orb, related to https://github.com/samvera-labs/samvera-circleci-orb/issues/42
     steps:
       - attach_workspace:
@@ -101,10 +102,10 @@ jobs:
     parameters:
       ruby_version:
         type: string
-        default: 2.5.8
+        default: 2.7.6
       bundler_version:
         type: string
-        default: 1.17.3
+        default: 2.3.13
       hyrax_valkyrie:
         type: string
         default: "false"
@@ -117,9 +118,26 @@ jobs:
       HYRAX_VALKYRIE: << parameters.hyrax_valkyrie >>
       VALKYRIE_SOLR_PORT: 8985
       DATABASE_URL: postgresql://postgres@127.0.0.1/circle_test # Hard-coded with data from CircleCI orb, related to https://github.com/samvera-labs/samvera-circleci-orb/issues/42
+      KARMA_BROWSER: ChromeHeadlessCustom
+      RAILS_ROOT: .internal_test_app
     steps:
       - attach_workspace:
           at: ~/
+      - run:
+          name: Install system dependencies
+          command: |
+            sudo apt-get update
+            sudo apt-get install imagemagick librsvg2-bin
+      - browser-tools/install-chrome
+      - browser-tools/install-chromedriver
+      - run:
+          command: |
+            google-chrome --version
+            chromedriver --version
+          name: Check Chrome install
+      - run:
+          name: Yarn install
+          command: yarn install
       - samvera/install_solr_core:
           solr_config_path: .internal_test_app/solr/conf
       - samvera/install_solr_core:
@@ -150,60 +168,31 @@ jobs:
             --header 'Content-Type: application/json'
 workflows:
   version: 2
-  ruby2-5-8:
+  ruby2-7-6:
     jobs:
       - bundle:
-          ruby_version: "2.5.8"
-          rails_version: "5.2.6"
+          ruby_version: "2.7.6"
+          rails_version: "6.0.5"
+          bundler_version: "2.3.13"
       - build:
-          ruby_version: "2.5.8"
-          rails_version: "5.2.6"
+          ruby_version: "2.7.6"
+          rails_version: "6.0.5"
+          bundler_version: "2.3.13"
           requires:
             - bundle
       - test:
-          name: "ruby2-5-8"
-          ruby_version: "2.5.8"
+          name: "ruby2-7-6"
+          ruby_version: "2.7.6"
+          bundler_version: "2.3.13"
           requires:
             - build
-  ruby2-6-6:
-    jobs:
-      - bundle:
-          ruby_version: "2.6.6"
-          rails_version: "5.2.6"
-      - build:
-          ruby_version: "2.6.6"
-          rails_version: "5.2.6"
-          requires:
-            - bundle
       - test:
-          name: "ruby2-6-6"
-          ruby_version: "2.6.6"
-          requires:
-            - build
-      - test:
-          name: "ruby2-6-6-valkyrie"
-          ruby_version: "2.6.6"
+          name: "ruby2-7-6-valkyrie"
+          ruby_version: "2.7.6"
+          bundler_version: "2.3.13"
           hyrax_valkyrie: "true"
           requires:
             - build
-  ruby2-7-4:
-    jobs:
-      - bundle:
-          ruby_version: "2.7.4"
-          rails_version: "5.2.6"
-          bundler_version: "2.1.4"
-      - build:
-          ruby_version: "2.7.4"
-          rails_version: "5.2.6"
-          bundler_version: "2.1.4"
-          requires:
-            - bundle
-      - test:
-          name: "ruby2-7-4"
-          ruby_version: "2.7.4"
-          bundler_version: "2.1.4"
-          requires:
-            - build
   nurax-dev_deploy:
     jobs:
       - deploy:

data/.dassie/.env

@@ -1,4 +1,4 @@
 MEMCACHED_HOST=memcached
 REDIS_PROVIDER=SIDEKIQ_REDIS_URL
-SIDEKIQ_REDIS_URL=redis://redis:6379/0
 SEED_DASSIE=true
+SIDEKIQ_REDIS_URL=redis://redis:6379/0

data/.dassie/Gemfile

@@ -8,16 +8,16 @@ else
 end
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.7.4'
+ruby '2.7.6'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.2.4', '>= 5.2.4.4'
+gem 'rails', '~> 6.0'
 # Use postgresql as the database for Active Record
 gem 'pg', '>= 0.18', '< 2.0'
 # Use Puma as the app server
 gem 'puma', '~> 4.3.8'
 # Use SCSS for stylesheets
-gem 'sass-rails', '~> 5.0'
+gem 'sass-rails', '~> 6.0'
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 
@@ -52,7 +52,7 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 gemspec name: 'hyrax', path: ENV.fetch('HYRAX_ENGINE_PATH', '..')
 
-gem 'bootstrap-sass', '~> 3.0'
+gem 'bootstrap', '~> 4.0'
 gem 'devise'
 gem 'devise-guests', '~> 0.6'
 gem 'jquery-rails'

data/.dassie/app/assets/javascripts/application.js

@@ -15,11 +15,15 @@
 //= require turbolinks
 //
 // Required by Blacklight
-//= require jquery
-//= require jquery_ujs
-//= require dataTables/jquery.dataTables
-//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
+//= require jquery3
+//= require rails-ujs
+//= require popper
+//= require twitter/typeahead
+//= require bootstrap
+//= require jquery.dataTables
+//= require dataTables.bootstrap4
 //= require blacklight/blacklight
+//= require blacklight_gallery
 
 //= require_tree .
 //= require hyrax

data/.dassie/app/assets/stylesheets/application.css

@@ -11,6 +11,6 @@
  * It is generally better to create a new file per style scope.
  *
  *= require_tree .
- *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
+ *= require dataTables.bootstrap4
  *= require_self
  */

data/.dassie/app/assets/stylesheets/hyrax.scss

@@ -4,14 +4,13 @@
  *= require_self
 */
 
-@import "bootstrap-sprockets";
 @import "bootstrap-default-overrides";
 @import 'bootstrap';
-@import 'blacklight/blacklight';
 @import "font-awesome";
 @import "blacklight_gallery/gallery";
 @import "blacklight_gallery/masonry";
 @import "blacklight_gallery/slideshow";
 @import "blacklight_gallery/osd_viewer";
+@import "hyrax/blacklight_gallery";
 @import 'hyrax/hyrax';
 @import 'hyrax/login_signup';

data/.dassie/app/controllers/application_controller.rb

@@ -2,13 +2,11 @@ class ApplicationController < ActionController::Base
   helper Openseadragon::OpenseadragonHelper
   # Adds a few additional behaviors into the application controller
   include Blacklight::Controller
-  skip_after_action :discard_flash_if_xhr
   include Hydra::Controller::ControllerBehavior
 
   # Adds Hyrax behaviors into the application controller
   include Hyrax::Controller
   include Hyrax::ThemedLayoutController
-  with_themed_layout '1_column'
-
 
+  with_themed_layout '1_column'
 end

data/.dassie/app/controllers/catalog_controller.rb

@@ -5,8 +5,6 @@ class CatalogController < ApplicationController
 
   # This filter applies the hydra access controls
   before_action :enforce_show_permissions, only: :show
-  # Allow all search options when in read-only mode
-  skip_before_action :check_read_only
 
   def self.uploaded_field
     "system_create_dtsi"
@@ -17,19 +15,14 @@ class CatalogController < ApplicationController
   end
 
   configure_blacklight do |config|
-    config.view.gallery.partials = [:index_header, :index]
-    config.view.masonry.partials = [:index]
-    config.view.slideshow.partials = [:index]
-
+    config.view.gallery(document_component: Blacklight::Gallery::DocumentComponent)
+    config.view.masonry(document_component: Blacklight::Gallery::DocumentComponent)
+    config.view.slideshow(document_component: Blacklight::Gallery::SlideshowComponent)
 
     config.show.tile_source_field = :content_metadata_image_iiif_info_ssm
     config.show.partials.insert(1, :openseadragon)
     config.search_builder_class = Hyrax::CatalogSearchBuilder
 
-    # Show gallery view
-    config.view.gallery.partials = [:index_header, :index]
-    config.view.slideshow.partials = [:index]
-
     # Because too many times on Samvera tech people raise a problem regarding a failed query to SOLR.
     # Often, it's because they inadvertently exceeded the character limit of a GET request.
     config.http_method = :post
@@ -46,6 +39,17 @@ class CatalogController < ApplicationController
     config.index.display_type_field = "has_model_ssim"
     config.index.thumbnail_field = 'thumbnail_path_ss'
 
+    config.add_results_document_tool(:bookmark, partial: 'bookmark_control', if: :render_bookmarks_control?)
+    config.add_results_collection_tool(:sort_widget)
+    config.add_results_collection_tool(:per_page_widget)
+    config.add_results_collection_tool(:view_type_group)
+    config.add_show_tools_partial(:bookmark, partial: 'bookmark_control', if: :render_bookmarks_control?)
+    config.add_show_tools_partial(:email, callback: :email_action, validator: :validate_email_params)
+    config.add_show_tools_partial(:sms, if: :render_sms_action?, callback: :sms_action, validator: :validate_sms_params)
+    config.add_show_tools_partial(:citation)
+    config.add_nav_action(:bookmark, partial: 'blacklight/nav/bookmark', if: :render_bookmarks_control?)
+    config.add_nav_action(:search_history, partial: 'blacklight/nav/search_history')
+
     # solr fields that will be treated as facets by the blacklight application
     #   The ordering of the field names is the order of the display
     config.add_facet_field "human_readable_type_sim", label: "Type", limit: 5
@@ -74,22 +78,22 @@ class CatalogController < ApplicationController
     #   The ordering of the field names is the order of the display
     config.add_index_field "title_tesim", label: "Title", itemprop: 'name', if: false
     config.add_index_field "description_tesim", itemprop: 'description', helper_method: :iconify_auto_link
-    config.add_index_field "keyword_tesim", itemprop: 'keywords', link_to_search: "keyword_sim"
-    config.add_index_field "subject_tesim", itemprop: 'about', link_to_search: "subject_sim"
-    config.add_index_field "creator_tesim", itemprop: 'creator', link_to_search: "creator_sim"
-    config.add_index_field "contributor_tesim", itemprop: 'contributor', link_to_search: "contributor_sim"
+    config.add_index_field "keyword_tesim", itemprop: 'keywords', link_to_facet: "keyword_sim"
+    config.add_index_field "subject_tesim", itemprop: 'about', link_to_facet: "subject_sim"
+    config.add_index_field "creator_tesim", itemprop: 'creator', link_to_facet: "creator_sim"
+    config.add_index_field "contributor_tesim", itemprop: 'contributor', link_to_facet: "contributor_sim"
     config.add_index_field "proxy_depositor_ssim", label: "Depositor", helper_method: :link_to_profile
     config.add_index_field "depositor_tesim", label: "Owner", helper_method: :link_to_profile
-    config.add_index_field "publisher_tesim", itemprop: 'publisher', link_to_search: "publisher_sim"
-    config.add_index_field "based_near_label_tesim", itemprop: 'contentLocation', link_to_search: "based_near_label_sim"
-    config.add_index_field "language_tesim", itemprop: 'inLanguage', link_to_search: "language_sim"
+    config.add_index_field "publisher_tesim", itemprop: 'publisher', link_to_facet: "publisher_sim"
+    config.add_index_field "based_near_label_tesim", itemprop: 'contentLocation', link_to_facet: "based_near_label_sim"
+    config.add_index_field "language_tesim", itemprop: 'inLanguage', link_to_facet: "language_sim"
     config.add_index_field "date_uploaded_dtsi", itemprop: 'datePublished', helper_method: :human_readable_date
     config.add_index_field "date_modified_dtsi", itemprop: 'dateModified', helper_method: :human_readable_date
     config.add_index_field "date_created_tesim", itemprop: 'dateCreated'
     config.add_index_field "rights_statement_tesim", helper_method: :rights_statement_links
     config.add_index_field "license_tesim", helper_method: :license_links
-    config.add_index_field "resource_type_tesim", label: "Resource Type", link_to_search: "resource_type_sim"
-    config.add_index_field "file_format_tesim", link_to_search: "file_format_sim"
+    config.add_index_field "resource_type_tesim", label: "Resource Type", link_to_facet: "resource_type_sim"
+    config.add_index_field "file_format_tesim", link_to_facet: "file_format_sim"
     config.add_index_field "identifier_tesim", helper_method: :index_field_link, field_name: 'identifier'
     config.add_index_field Hydra.config.permissions.embargo.release_date, label: "Embargo release date", helper_method: :human_readable_date
     config.add_index_field Hydra.config.permissions.lease.expiration_date, label: "Lease expiration date", helper_method: :human_readable_date

data/.dassie/app/forms/collection_resource_form.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:collection_resource CollectionResource`
+class CollectionResourceForm < Hyrax::Forms::PcdmCollectionForm
+  include Hyrax::FormFields(:basic_metadata)
+  include Hyrax::FormFields(:collection_resource)
+end

data/.dassie/app/indexers/collection_resource_indexer.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:collection_resource CollectionResource`
+class CollectionResourceIndexer < Hyrax::PcdmCollectionIndexer
+  include Hyrax::Indexer(:basic_metadata)
+  include Hyrax::Indexer(:collection_resource)
+end

data/.dassie/app/models/collection_resource.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:collection_resource CollectionResource`
+class CollectionResource < Hyrax::PcdmCollection
+  # @note Do not directly update `basic_metadata.yaml`.  It is also used by works.
+  #
+  # To change metadata for collections
+  # * extend by adding fields to `/config/metadata/collection_resource.yaml`
+  # * remove all basic metadata
+  #   * if you generated `with_basic_metadata` and now don't want any basic metadata,
+  #       comment out or delete the schema include statement for `:basic_metadata`
+  #   * update form and indexer classes to also remove the `:basic_metadata` schema include
+  # * remove some basic metadata
+  #   * comment out or delete the schema include statement for `:basic_metadata`
+  #   * update form and indexer classes to also remove the `:basic_metadata` schema include
+  #   * copy fields you want to keep from `/config/metadata/basic_metadata.yaml`
+  #       to `/config/metadata/collection_resource.yaml`
+  # * override some basic metadata
+  #   * fields are not allowed to repeat, so to override any basic metadata, you
+  #       must first comment out or delete the schema include statement for `:basic_metadata`
+  #   * update form and indexer classes to also remove the `:basic_metadata` schema include
+  #   * copy all fields you want to keep unchanged or to override from `/config/metadata/basic_metadata.yaml`
+  #       to `/config/metadata/collection_resource.yaml`
+  #   * update them in `config/metadata/collection_resource.yaml to have the desired
+  #       characteristics
+  #
+  # Alternative:
+  # * comment out or delete schema include statements
+  # * add Valkyrie attributes to this class
+  # * update form and indexer to process the attributes
+  #
+  include Hyrax::Schema(:basic_metadata)
+  include Hyrax::Schema(:collection_resource)
+end

data/.dassie/app/models/user.rb

@@ -5,9 +5,6 @@ class User < ApplicationRecord
   include Hyrax::User
   include Hyrax::UserUsageStats
 
-  if Blacklight::Utils.needs_attr_accessible?
-    attr_accessible :email, :password, :password_confirmation
-  end
   # Connects this user object to Blacklights Bookmarks.
   include Blacklight::User
   # Include default devise modules. Others available are:

data/.dassie/config/application.rb

@@ -9,7 +9,7 @@ Bundler.require(*Rails.groups)
 module Dassie
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.2
+    config.load_defaults 6.0
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers

data/.dassie/config/initializers/file_services.rb

@@ -0,0 +1,4 @@
+ActiveSupport::Reloader.to_prepare do
+  Hydra::Derivatives.config.output_file_service = Hyrax::ValkyriePersistDerivatives
+  Hydra::Derivatives.config.source_file_service = Hyrax::LocalFileService
+end

data/.dassie/config/initializers/hyrax.rb

@@ -54,7 +54,8 @@ Hyrax.config do |config|
   ##
   # NOTE: To Valkyrie works, use Monograph which is_a Hyrax::Work is_a Valkyrie::Resource
   # To use Valkyrie models, uncomment the following lines.
-  # config.collection_model = 'Hyrax::PcdmCollection'
+  # config.collection_model = 'Hyrax::PcdmCollection' # collection without basic metadata
+  # config.collection_model = 'CollectionResource'    # collection with basic metadata
   # config.admin_set_model = 'Hyrax::AdministrativeSet'
 end
 

data/.dassie/config/initializers/riiif.rb

@@ -20,7 +20,7 @@ ActiveSupport::Reloader.to_prepare do
     end
   end
 
-  Riiif::Image.authorization_service = Hyrax::IIIFAuthorizationService
+  Riiif::Image.authorization_service = Hyrax::IiifAuthorizationService
 
   Riiif.not_found_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg')
   Riiif.unauthorized_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg')

data/.dassie/config/metadata/collection_resource.yaml

@@ -0,0 +1,23 @@
+# Simple yaml config-driven schema which is used to define model attributes,
+# index key names, and form properties.
+#
+# Originally generated with no metadata via
+#  `rails generate hyrax:collection_resource CollectionResource`
+#
+# A few custom fields are added for testing purposes.
+
+---
+attributes:
+  target_audience:
+    type: string
+    form:
+      primary: true
+      multiple: true
+  department:
+    type: string
+    form:
+      primary: true
+  course:
+    type: string
+    form:
+      primary: false

data/.dassie/db/schema.rb

@@ -2,11 +2,11 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `rails
+# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 

data/.dassie/db/seeds.rb

@@ -68,6 +68,8 @@ if wipe_data
 end
 
 if seed_dassie
+  puts 'Seeding Dassie ...'
+
   Hyrax::RequiredDataSeeder.new.generate_seed_data
   Hyrax::TestDataSeeders::UserSeeder.generate_seeds
 end

data/.dassie/package.json

@@ -3,13 +3,13 @@
   "private": true,
   "repository": "git@github.com:samvera/hyrax.git",
   "dependencies": {
-  "universalviewer": "^3.0.16"
-},
-"scripts": {
-  "preinstall": "rm -rf ./public/uv",
-  "postinstall": "yarn run uv-install && yarn run uv-config",
-  "uv-install": "cp -r ./node_modules/universalviewer/dist ./public/uv",
-  "uv-config": "cp ./config/uv/uv.html ./public/uv/uv.html & cp ./config/uv/uv-config.json ./public/uv/"
+    "universalviewer": "^3.1.4"
+  },
+  "scripts": {
+    "preinstall": "rm -rf ./public/uv",
+    "postinstall": "yarn run uv-install && yarn run uv-config",
+    "uv-install": "cp -r ./node_modules/universalviewer/dist ./public/uv",
+    "uv-config": "cp ./config/uv/uv.html ./public/uv/uv.html & cp ./config/uv/uv-config.json ./public/uv/"
   },
   "devDependencies": {}
 }

data/.dassie/spec/forms/collection_resource_form_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:collection_resource CollectionResource`
+require 'rails_helper'
+require 'valkyrie/specs/shared_specs'
+
+RSpec.describe CollectionResourceForm do
+  let(:change_set) { described_class.new(resource) }
+  let(:resource)   { CollectionResource.new }
+
+  it_behaves_like 'a Valkyrie::ChangeSet'
+end

data/.dassie/spec/indexers/collection_resource_indexer_spec.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:collection_resource CollectionResource`
+require 'rails_helper'
+require 'hyrax/specs/shared_specs/indexers'
+
+RSpec.describe CollectionResourceIndexer do
+  let(:indexer_class) { described_class }
+  let(:resource)      { CollectionResource.new }
+
+  it_behaves_like 'a Hyrax::Resource indexer'
+  it_behaves_like 'a Basic metadata indexer'
+end

data/.dassie/spec/models/collection_resource_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:collection_resource CollectionResource`
+require 'rails_helper'
+require 'hyrax/specs/shared_specs/hydra_works'
+
+RSpec.describe CollectionResource do
+  subject(:collection) { described_class.new }
+
+  it_behaves_like 'a Hyrax::PcdmCollection'
+  it_behaves_like 'a model with basic metadata'
+end

data/.engine_cart.yml

@@ -1,40 +1,3 @@
-# Greetings Hyrax developer, you may be surprised to see this file.
-# Hyrax is moving to using Postgresql for testing in CircleCI and
-# hopefully by Hyrax developers during local development. Previously,
-# we used sqlite.
-#
-# And while installing Postgresql is beyond the scope of this
-# community, I (Jeremy) installed Postgresql via homebrew (brew.sh),
-# and have used the following for testing (note `hyrax-testup` is
-# defined later on):
-#
-# ```console
-# hyrax-testup
-# brew services start postgresql
-# export DATABASE_URL="postgresql://localhost:5432/internal_development"
-# bundle exec rspec
-# ```
-#
-# But, before running that, I have a shell alias (see
-# https://github.com/jeremyf/dotzshrc/blob/trunk/configs/aliases.zsh)
-# that I call.  The alias ensures that I have:
-#
-#   * clean set of solr indices
-#   * running solr indices
-#   * running fcrepo
-#   * running redis server
-#
-# ```console
-# alias hyrax-testup='cd $HOME/git/samvera/hyrax/.internal_test_app ; \
-#   rm -rf tmp/solr-valkyrie-test/server/solr/hyrax-valkyrie-test ; \
-#   rm -rf tmp/solr-test/server/solr/hydra-test ; \
-#   fcrepo_wrapper --config config/fcrepo_wrapper_test.yml & \
-#   solr_wrapper --config config/solr_wrapper_test.yml & \
-#   solr_wrapper --config config/solr_wrapper_valkyrie_test.yml & \
-#   redis-server &'
-# ```
-#
-# Best luck, and I (Jeremy) hope to add this to the Wiki at some point
-# once this current code is accepted into the main-line.
 rails_options:
-  - "--database=postgresql" # Caution, as you may only get "one option" until this is merged. https://github.com/cbeer/engine_cart/pull/102
+  - "--database=postgresql"
+  - "--skip-javascript"

data/.env

@@ -16,6 +16,7 @@ HYRAX_DERIVATIVES_PATH=/app/samvera/hyrax-webapp/derivatives/
 HYRAX_ENGINE_PATH=/app/samvera/hyrax-engine
 HYRAX_UPLOAD_PATH=/app/samvera/hyrax-webapp/uploads/
 IN_DOCKER=true
+KARMA_BROWSER=ChromiumHeadlessCustom
 RACK_ENV=development
 RAILS_ENV=development
 RAILS_ROOT=.dassie

data/.regen

@@ -1 +1,2 @@
-41
+# When updating CI regen seed, set to current date.
+2022-07-01T00

data/.rubocop.yml

@@ -5,7 +5,7 @@ inherit_gem:
   bixby: bixby_default.yml
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.6
   DisplayCopNames: true
   Exclude:
     - 'db/**/*'