hyrax 4.0.0 → 5.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c53f04239ef92492dd8a98a52c8f13cb446c18ba4ad04d22e5b78673e688aa8c
-  data.tar.gz: a804bc525628fbe33352617f8f8c0074d454def18a5e90c4d82e6c6a46aa25c2
+  metadata.gz: 951cca50f478f6a77b0b4dfd7f7127de250891ae5f26af3d0aad431e84987506
+  data.tar.gz: 4748c1f1c6a6a744e9ddbf364de06d028548f3699aa5a25c33104259672b412d
 SHA512:
-  metadata.gz: 968a88b13e65cc3f88d30c142d4a69d39e5e21930c04a03f86af4ec2625443741da5e73662db261dc5758e770e669b521b866a1274d5d0bdfba8fcd2ef1b05c0
-  data.tar.gz: aa1568f4a0b53f442682f87721dc4c7d458716af085df77ef3523eedae5e0e663bf708f04ef6a02f06ddf3aa143d4fd73fe513f6bbe23b1e43402438abc10ff1
+  metadata.gz: e24d5fd70134e1c27b39cd266a51b18838fc8b29d815b91d9df80e96c53f5348ba0b87647cf15894886de61ac4c7e49afbb4ecb9b9708b38f74959d74b339480
+  data.tar.gz: 745e7abf8b5f773864867f91b75f74a1768c97dddd7de35085b65d7dae48513bc2b06dd233365de9445940ebc3af9ad01bd53276e6b58bd4fcffc217e63aaa94

data/.circleci/config.yml

@@ -5,271 +5,163 @@ orbs:
   ruby: circleci/ruby@2
   node: circleci/node@5
 
-jobs:
-  bundle:
+executors:
+  hyrax:
     parameters:
+      fcrepo_version:
+        type: string
+        default: '4.7.5'
+      hyrax_app:
+        type: string
+        default: 'dassie'
+      postgres_version:
+        type: string
+        default: '14.9'
+      redis_version:
+        type: string
+        default: '6.2'
+      ruby_type:
+        type: string
+        default: 'ruby'
       ruby_version:
         type: string
-        default: 2.7.7
-      bundler_version:
+        default: '2.5.5'
+      solr_port:
         type: string
-        default: 2.4.8
-      rails_version:
+        default: '8985'
+      solr_version:
         type: string
-        default: 6.1.7.2
-    executor:
-      name: 'samvera/ruby'
-      ruby_version: << parameters.ruby_version >>
-    resource_class: medium
+        default: '8.11-slim'
     environment:
-      RAILS_VERSION: << parameters.rails_version >>
-      NOKOGIRI_USE_SYSTEM_LIBRARIES: true
-    steps:
-      - samvera/cached_checkout
-
-      - run:
-          name: Check for a branch named 'master'
-          command: |
-            git fetch --all --quiet --prune --prune-tags
-            if [[ -n "$(git branch --all --list master */master)" ]]; then
-              echo "A branch named 'master' was found. Please remove it."
-              echo "$(git branch --all --list master */master)"
-            fi
-            [[ -z "$(git branch --all --list master */master)" ]]
-
-      - samvera/bundle:
-          ruby_version: << parameters.ruby_version >>
-          bundler_version: << parameters.bundler_version >>
+      RAILS_ENV: test
+      RACK_ENV: test
+      FCREPO_PORT: 8080
+      POSTGRES_DB: circle_test
+      POSTGRES_HOST: 127.0.0.1
+      POSTGRES_USER: postgres
+    docker:
+      - image: "ghcr.io/samvera/hyrax/<< parameters.hyrax_app >>-dev:<< pipeline.git.revision >>"
+      - image: seleniarm/standalone-chromium:114.0
+        environment:
+          SE_NODE_SESSION_TIMEOUT: 1200
+          START_XVFB: "false"
 
-      # Run rubocop in parallel with caching
-      # This should get added to the orb once proven here
+      - image: samvera/fcrepo4:<< parameters.fcrepo_version >>
+        environment:
+          CATALINA_OPTS: "-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"
+      - image: zookeeper:3.4
+      - image: solr:<< parameters.solr_version >>
+        environment:
+          VERBOSE: yes
+          SECURITY_JSON: '{"authentication":{"blockUnknown": false, "class":"solr.BasicAuthPlugin", "credentials":{"solr":"IV0EHq1OnNrj6gvRCwvFwTrZ1+z1oBbnQdiVC3otuq0= Ndd7LKvVBAaZIF0QAVi1ekCfAJXr1GGfLtRUXhgrF8c="}, "realm":"My Solr users", "forwardCredentials": false}, "authorization":{ "class":"solr.RuleBasedAuthorizationPlugin", "permissions":[{"name":"security-edit", "role":"admin"}], "user-role":{"solr":"admin"}}}'
+        command: sh -c "server/scripts/cloud-scripts/zkcli.sh -zkhost localhost:2181 -cmd put /security.json \"${SECURITY_JSON}\" && solr-fg -cloud -noprompt  -p << parameters.solr_port >> -z localhost:2181"
+      - image: redis:<< parameters.redis_version >>
+      - image: cimg/postgres:<< parameters.postgres_version >>
 
-      - restore_cache:
-          name: Restore rubocop cache
-          keys:
-            - v1-rubocop-ruby<< parameters.ruby_version >>-bundle{{ checksum "Gemfile.lock" }}
-            - v1-rubocop-ruby<< parameters.ruby_version >>
-            - v1
-
-      - run:
-          name: Run rubocop in parallel
-          command: bundle exec rubocop --parallel
-
-      - save_cache:
-          name: Save rubocop cache
-          key: v1-rubocop-ruby<< parameters.ruby_version >>-bundle{{ checksum "Gemfile.lock" }}
-          paths:
-            - ~/.cache/rubocop_cache
-
-      - persist_to_workspace:
-          root: ~/
-          paths:
-          - project/*
-          - project/**/*
-
-  build:
+jobs:
+  kaniko-build:
     parameters:
-      ruby_version:
-        type: string
-        default: 2.7.7
-      bundler_version:
+      hyrax_app:
         type: string
-        default: 2.4.8
-      rails_version:
+        default: dassie
+      ruby_version:
         type: string
-        default: 6.1.7.2
-    executor:
-      name: 'samvera/ruby_fcrepo_solr_redis_postgres'
-      ruby_version: << parameters.ruby_version >>
-    resource_class: medium
-    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 --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
+        default: 3.2.2
+    docker:
+      - image: gcr.io/kaniko-project/executor:v1.14.0-debug
+        entrypoint: ""
     steps:
-      - attach_workspace:
-          at: ~/
-      - samvera/engine_cart_generate:
-          cache_key: v1-internal-test-app-{{ checksum "hyrax.gemspec" }}-{{ checksum ".regen" }}-{{ checksum ".circleci/config.yml" }}-<< parameters.rails_version >>-<< parameters.ruby_version >>
-      - samvera/bundle:
-          ruby_version: << parameters.ruby_version >>
-          bundler_version: << parameters.bundler_version >>
       - run:
-          name: Generate .internal_test_app/Gemfile.lock
-          command: bundle lock
-          working_directory: .internal_test_app
-      - ruby/install-deps:
-          app-dir: .internal_test_app
-      - node/install-packages:
-          pkg-manager: yarn
-          app-dir: .internal_test_app
-      - persist_to_workspace:
-          root: ~/
-          paths:
-          - project/*
-          - project/**/*
+          name: Configure GHCR credentials
+          command: |
+             cat > /kaniko/.docker/config.json \<<- JSON
+             {
+               "auths": {
+                 "ghcr.io": {
+                   "auth": "$(echo -n $GHCR_USER:$GHCR_TOKEN | base64)"
+                 }
+               }
+             }
+             JSON
+      - run:
+          name: Build and Push image
+          command: |
+            /kaniko/executor \
+                --cache=true \
+                --build-arg "EXTRA_APK_PACKAGES=git bash" \
+                --build-arg "APP_PATH=.<< parameters.hyrax_app >>" \
+                --build-arg "RUBY_VERSION=<< parameters.ruby_version >>" \
+                --context "git://github.com/$(echo $CIRCLE_REPOSITORY_URL | sed -E 's/.+:(.+)\.git/\1/')#refs/heads/${CIRCLE_BRANCH}#${CIRCLE_SHA1}" \
+                --target "hyrax-engine-dev" \
+                --destination "ghcr.io/samvera/hyrax/<< parameters.hyrax_app >>-dev:${CIRCLE_SHA1}"
 
-  test:
+  hyrax-test:
     parameters:
-      ruby_version:
+      hyrax_app:
         type: string
-        default: 2.7.7
-      bundler_version:
-        type: string
-        default: 2.4.8
+        default: dassie
       hyrax_valkyrie:
         type: string
         default: "false"
+      ruby_version:
+        type: string
+        default: 3.2.2
     executor:
-      name: 'samvera/ruby_fcrepo_solr_redis_postgres'
+      name: hyrax
+      hyrax_app: << parameters.hyrax_app >>
       ruby_version: << parameters.ruby_version >>
-    resource_class: medium+
-    parallelism: 10
+    resource_class: large
+    parallelism: 12
     environment:
+      CHROME_HEADLESS_MODE: true
+      DATABASE_URL: postgresql://postgres@127.0.0.1/circle_test
+      HUB_URL: http://localhost:4444/wd/hub
       HYRAX_VALKYRIE: << parameters.hyrax_valkyrie >>
+      IN_DOCKER: true
+      KARMA_BROWSER: remote-chromium
+      VALKYRIE_SOLR_CORE: valkyrie-test
       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
-      SPEC_OPTS: "" # Clear output conflicts between samvera orb executor and ruby orb rspec command
     steps:
-      - attach_workspace:
-          at: ~/
       - run:
-          name: Install system dependencies
+          name: Create solr core
           command: |
-            sudo apt-get update
-            sudo apt-get install imagemagick librsvg2-bin lsof
-      - browser-tools/install-chrome
-      - browser-tools/install-chromedriver
-      - run:
-          name: Check Chrome install
-          command: |
-            google-chrome --version
-            chromedriver --version
-      - restore_cache:
-          keys:
-            - engine-node-v1-{{ checksum "package.json" }}
-      # Call yarn directly for hyrax engine; node orb demands a lockfile to use caching
-      - run:
-          name: Yarn Install (engine)
-          command: yarn install
-      - save_cache:
-          key: engine-node-v1-{{ checksum "package.json" }}
-          paths:
-            - node_modules
-      - samvera/install_solr_core:
-          solr_config_path: .internal_test_app/solr/conf
-      - samvera/install_solr_core:
-          solr_config_path: .internal_test_app/solr/conf
-          core_name: hyrax-valkyrie-test
-      # Rerun bundler in case this is a different ruby version than bundle and build steps
-      - samvera/bundle:
-          ruby_version: << parameters.ruby_version >>
-          bundler_version: << parameters.bundler_version >>
-      # Ensure gems needed by the test app are installed
-      - ruby/install-deps:
-          app-dir: .internal_test_app
-      - node/install-packages:
-          pkg-manager: yarn
-          app-dir: .internal_test_app
-      - run:
-          command: bundle exec rake db:migrate
-          working_directory: .internal_test_app
-      - ruby/rspec-test
-      - store_artifacts:
-          path: Gemfile.lock
-          destination: engine-gemfile-lock
-      - store_artifacts:
-          path: .internal_test_app/Gemfile.lock
-          destination: webapp-gemfile-lock
+            cd /app/samvera/hyrax-webapp/solr/conf
+            zip -1 -r solr_conf.zip ./*
+            db-wait.sh localhost:8985 # wait for solr to be available before hitting the API
+            curl -H "Content-type:application/octet-stream" --data-binary @solr_conf.zip "http://solr:SolrRocks@127.0.0.1:8985/solr/admin/configs?action=UPLOAD&name=solrconfig"
+            curl -H 'Content-type: application/json' http://solr:SolrRocks@127.0.0.1:8985/api/collections/ -d '{create: {name: hydra-test, config: solrconfig, numShards: 1}}'
+            curl -H 'Content-type: application/json' http://solr:SolrRocks@127.0.0.1:8985/api/collections/ -d '{create: {name: valkyrie-test, config: solrconfig, numShards: 1}}'
+      - ruby/rspec-test:
+          app-dir: /app/samvera/hyrax-engine
+
+  rubocop:
+    working_directory: ~/hyrax
+    docker:
+      - image: cimg/ruby:3.2.2
+    steps:
+      - checkout
+      - run: bundle install
+      - ruby/rubocop-check
 
 workflows:
   version: 2
-  ruby3-2:
+  dassie:
     jobs:
-      - bundle:
+      - rubocop
+      - kaniko-build:
+          name: "dassie-build"
           ruby_version: "3.2.2"
-          rails_version: "6.1.7.2"
-          bundler_version: "2.4.8"
-      - build:
+          hyrax_app: "dassie"
+      - hyrax-test:
+          name: "dassie-test"
           ruby_version: "3.2.2"
-          rails_version: "6.1.7.2"
-          bundler_version: "2.4.8"
+          hyrax_app: "dassie"
           requires:
-            - bundle
-      - test:
-          name: "ruby3-2"
+            - dassie-build
+      - hyrax-test:
+          name: "dassie-valkyrie-test"
           ruby_version: "3.2.2"
-          bundler_version: "2.4.8"
-          requires:
-            - build
-      - test:
-          name: "ruby3-2-valkyrie"
-          ruby_version: "3.2.2"
-          bundler_version: "2.4.8"
-          hyrax_valkyrie: "true"
-          requires:
-            - build
-  ruby3-1:
-    jobs:
-      - bundle:
-          ruby_version: "3.1.4"
-          rails_version: "6.1.7.2"
-          bundler_version: "2.4.8"
-      - build:
-          ruby_version: "3.1.4"
-          rails_version: "6.1.7.2"
-          bundler_version: "2.4.8"
-          requires:
-            - bundle
-      - test:
-          name: "ruby3-1"
-          ruby_version: "3.1.4"
-          bundler_version: "2.4.8"
-          requires:
-            - build
-  ruby3-0:
-    jobs:
-      - bundle:
-          ruby_version: "3.0.6"
-          rails_version: "6.1.7.2"
-          bundler_version: "2.4.8"
-      - build:
-          ruby_version: "3.0.6"
-          rails_version: "6.1.7.2"
-          bundler_version: "2.4.8"
-          requires:
-            - bundle
-      - test:
-          name: "ruby3-0"
-          ruby_version: "3.0.6"
-          bundler_version: "2.4.8"
-          requires:
-            - build
-  ruby2-7:
-    jobs:
-      - bundle:
-          ruby_version: "2.7.7"
-          rails_version: "6.1.7.2"
-          bundler_version: "2.4.8"
-      - build:
-          ruby_version: "2.7.7"
-          rails_version: "6.1.7.2"
-          bundler_version: "2.4.8"
-          requires:
-            - bundle
-      - test:
-          name: "ruby2-7"
-          ruby_version: "2.7.7"
-          bundler_version: "2.4.8"
-          requires:
-            - build
-      - test:
-          name: "ruby2-7-valkyrie"
-          ruby_version: "2.7.7"
-          bundler_version: "2.4.8"
-          hyrax_valkyrie: "true"
+          hyrax_app: "dassie"
+          hyrax_valkyrie: "1"
           requires:
-            - build
+            - dassie-build

data/.dassie/.env

@@ -1,4 +1,7 @@
 ANALYTICS_START_DATE=2021-08-21
+BUNDLE_GEMFILE=Gemfile.dassie
+BUNDLE_PATH=/app/bundle
+CH12N_TOOL=fits_servlet
 CHROME_HEADLESS_MODE=false
 DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL=true
 DATABASE_TEST_URL=postgresql://hyrax_user:hyrax_password@postgres/hyrax_test?pool=5
@@ -9,6 +12,7 @@ FCREPO_HOST=fcrepo
 FCREPO_PORT=8080
 FCREPO_REST_PATH=rest
 FCREPO_TEST_BASE_PATH=/test
+FITS_SERVLET_URL=http://fits:8080/fits
 HUB_URL=http://chrome:4444/wd/hub
 HYRAX_ANALYTICS=false
 HYRAX_ANALYTICS_PROVIDER=google
@@ -16,15 +20,17 @@ 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
+KARMA_BROWSER=remote-chromium
+KARMA_HOSTNAME=app
 MEMCACHED_HOST=memcached
 RACK_ENV=development
 RAILS_ENV=development
 RAILS_ROOT=.dassie
 REDIS_HOST=redis
+REDIS_PASSWORD=sidekickin
 REDIS_PROVIDER=SIDEKIQ_REDIS_URL
 SEED_DASSIE=true
-SIDEKIQ_REDIS_URL=redis://redis:6379/0
+SIDEKIQ_REDIS_URL=redis://:sidekickin@redis:6379/0
 SOLR_HOST=solr
 SOLR_PORT=8983
 SOLR_TEST_URL=http://solr:8983/solr/hyrax_test

data/.dassie/Gemfile

@@ -8,35 +8,31 @@ else
 end
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-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', '~> 6.0'
-# Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
-
-gem 'dalli' # mem_cache_store support
-
-# Use CoffeeScript for .coffee assets and views
+gem 'bootsnap', '>= 1.1.0', require: false
+gem 'bootstrap', '~> 4.0'
 gem 'coffee-rails', '~> 4.2'
-# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
-gem 'turbolinks', '~> 5'
-# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem 'dalli'
+gem 'devise'
+gem 'devise-guests', '~> 0.8'
+gemspec name: 'hyrax', path: ENV.fetch('HYRAX_ENGINE_PATH', '..')
 gem 'jbuilder', '~> 2.5'
-
-# Reduces boot times through caching; required in config/boot.rb
-gem 'bootsnap', '>= 1.1.0', require: false
-
-group :development, :test do
-  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
-end
+gem 'jquery-rails'
+gem 'pg', '~> 1.3'
+gem 'puma'
+gem 'rails', '~> 6.1'
+gem 'riiif', '~> 2.1'
+gem 'rsolr', '>= 1.0', '< 3'
+gem 'sass-rails', '~> 6.0'
+gem 'sidekiq', '~> 6.4'
+gem 'turbolinks', '~> 5'
+gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+gem 'uglifier', '>= 1.3.0'
 
 group :development do
+  gem 'better_errors' # add command line in browser when errors
+  gem 'binding_of_caller' # deeper stack trace used by better errors
+
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
   gem 'web-console', '>= 3.3.0'
   gem 'listen', '>= 3.0.5', '< 3.2'
@@ -45,20 +41,9 @@ group :development do
   gem 'spring-watcher-listen', '~> 2.0.0'
 end
 
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-
-gemspec name: 'hyrax', path: ENV.fetch('HYRAX_ENGINE_PATH', '..')
-
-gem 'bootstrap', '~> 4.0'
-gem 'devise'
-gem 'devise-guests', '~> 0.6'
-gem 'jquery-rails'
-gem 'pry-byebug'
-gem 'pry-doc'
-gem 'pry-rails'
-gem 'pry-rescue'
-gem 'riiif', '~> 2.1'
-gem 'rsolr', '>= 1.0', '< 3'
-gem 'sidekiq', '~> 6.0'
-gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
+group :development, :test do
+  gem 'debug', '>= 1.0.0'
+  gem 'pry-doc'
+  gem 'pry-rails'
+  gem 'pry-rescue'
+end

data/.dassie/Gemfile.dassie

@@ -0,0 +1,2 @@
+# Use dedicated lock files for dassie/koppie to avoid gem mismatches
+eval_gemfile 'Gemfile'

data/.dassie/app/assets/config/manifest.js

@@ -1,3 +1,5 @@
 //= link_tree ../images
 //= link_directory ../javascripts .js
 //= link_directory ../stylesheets .css
+
+//= link openseadragon-assets

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

@@ -6,6 +6,7 @@
 
 @import "bootstrap-default-overrides";
 @import 'bootstrap';
+@import 'blacklight/blacklight';
 @import "font-awesome";
 @import "blacklight_gallery/gallery";
 @import "blacklight_gallery/masonry";

data/.dassie/config/environments/test.rb

@@ -2,6 +2,7 @@ require 'hyrax/specs/disable_animations_in_test_environment'
 
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
+  config.assets.debug = true
 
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that

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

@@ -18,6 +18,8 @@ Hyrax.config do |config|
   config.work_requires_files = false
   config.citations = true
 
+  config.characterization_options = { ch12n_tool: ENV.fetch('CH12N_TOOL', 'fits').to_sym }
+
   # Returns a URL that resolves to an image provided by a IIIF image server
   config.iiif_image_url_builder = lambda do |file_id, base_url, size, format|
     Riiif::Engine.routes.url_helpers.image_url(file_id, host: base_url, size: size)
@@ -40,7 +42,7 @@ Hyrax.config do |config|
     config.browse_everything = nil
   end
 
-  # config.geonames_username = ''
+  config.geonames_username = ENV['GEONAMES_USERNAME'] || ''
 
   ##
   # Set the system-wide virus scanner

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

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
-ActiveSupport::Reloader.to_prepare do
-  Riiif::Image.file_resolver = Riiif::HttpFileResolver.new
+Rails.application.reloader.to_prepare do
   Riiif::Image.info_service = lambda do |id, _file|
     # id will look like a path to a pcdm:file
     # (e.g. rv042t299%2Ffiles%2F6d71677a-4f80-42f1-ae58-ed1063fd79c7)
     # but we just want the id for the FileSet it's attached to.
 
-    # Capture everything before the first slash
     fs_id = id.sub(/\A([^\/]*)\/.*/, '\1')
     resp = Hyrax::SolrService.get("id:#{fs_id}")
     doc = resp['response']['docs'].first
@@ -14,9 +12,15 @@ ActiveSupport::Reloader.to_prepare do
     { height: doc['height_is'], width: doc['width_is'], format: doc['mime_type_ssi'], channels: doc['alpha_channels_ssi'] }
   end
 
-  Riiif::Image.file_resolver.id_to_uri = lambda do |id|
-    Hyrax::Base.id_to_uri(CGI.unescape(id)).tap do |url|
-      Rails.logger.info "Riiif resolved #{id} to #{url}"
+  if Hyrax.config.use_valkyrie?
+    Riiif::Image.file_resolver = Hyrax::RiiifFileResolver.new
+  else
+    Riiif::Image.file_resolver = Riiif::HttpFileResolver.new
+
+    Riiif::Image.file_resolver.id_to_uri = lambda do |id|
+      Hyrax::Base.id_to_uri(CGI.unescape(id)).tap do |url|
+        Rails.logger.info "Riiif resolved #{id} to #{url}"
+      end
     end
   end
 
@@ -25,5 +29,5 @@ ActiveSupport::Reloader.to_prepare do
   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')
 
-  Riiif::Engine.config.cache_duration = 365.days
+  Riiif::Engine.config.cache_duration = 1.day
 end

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

@@ -13,11 +13,14 @@ attributes:
     form:
       primary: true
       multiple: true
+    predicate: http://hyrax-example.com/target_audience
   department:
     type: string
     form:
       primary: true
+    predicate: http://hyrax-example.com/department
   course:
     type: string
     form:
       primary: false
+    predicate: http://hyrax-example.com/course