iiif_print 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 494bfcd0e3f6c84a7b6d81ae45aea07c5a6259a7d692e079bb24ea29f6908442
-  data.tar.gz: fb266b5b22d36bc3cd2e99697f82dab7093912e84957a71e28c84aaef657157b
+  metadata.gz: aa3dd970a2698e24cea1ee94cbc62540f86a817b9cfcc9befa4d2c5b918adc29
+  data.tar.gz: 860a39b300ec241df49da8cfd562b78e4b8e9d85556c732ffdb48b3bf63ff253
 SHA512:
-  metadata.gz: e48dff9d57b8043d804096e923afe4e21609e7f1ae067e84e1afc895bfd38781f532c036ac513316d517675c45d74f6e4c014e25b578aa3b0074371cdb7fffc8
-  data.tar.gz: 70d83ecf95e10f177c976c2e241be8f613084ac7e360a946edb1dd3919a19140f36ac2c6abe085f5a12bdc62d2ae565bacab3dfd1c64f1645213c5484f46bbe8
+  metadata.gz: '0940916e73b7d643c7db3d2f407c65efdda23d89b7710984fe2845d687b2899ea995faf945d5c8dc083755f53efca10bde06938927ae2c35e4652a981a963c0c'
+  data.tar.gz: ef6ff81415505569c2e546428492c686e31fb5a6ac0b1b85a21f7a82d355f6e772d92a57d7fc057f6ddb54c85f97f429981a1320410cdc1cd193ff6892ba295d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: /app/samvera/hyrax-webapp
+  remote: .
   specs:
-    iiif_print (1.0.0)
+    iiif_print (3.0.0)
       blacklight_iiif_search (>= 1.0, < 3.0)
       derivative-rodeo (~> 0.5)
       hyrax (>= 2.5, < 6)
@@ -65,7 +65,7 @@ GEM
       activemodel (= 5.2.8.1)
       activesupport (= 5.2.8.1)
       arel (>= 9.0)
-    activerecord-import (1.5.1)
+    activerecord-import (1.7.0)
       activerecord (>= 4.2)
     activestorage (5.2.8.1)
       actionpack (= 5.2.8.1)
@@ -76,8 +76,8 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.8.5)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     almond-rails (0.3.0)
       rails (>= 4.2)
     arel (9.0.0)
@@ -87,34 +87,34 @@ GEM
     awesome_nested_set (3.6.0)
       activerecord (>= 4.0.0, < 7.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.857.0)
-    aws-sdk-core (3.188.0)
-      aws-eventstream (~> 1, >= 1.0.2)
+    aws-partitions (1.951.0)
+    aws-sdk-core (3.201.0)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.73.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.140.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-kms (1.88.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.156.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.6)
-    aws-sdk-sqs (1.68.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.7.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-sqs (1.80.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
       execjs (~> 2.0)
     backport (1.2.0)
+    base64 (0.2.0)
     bcp47 (0.3.3)
       i18n
-    bcrypt (3.1.20)
     benchmark (0.3.0)
-    bindex (0.8.1)
+    bigdecimal (3.1.8)
     bixby (5.0.2)
       rubocop (= 1.28.2)
       rubocop-ast
@@ -158,8 +158,7 @@ GEM
       ruby-box
       signet (~> 0.8)
       typhoeus
-    builder (3.2.4)
-    byebug (11.1.3)
+    builder (3.3.0)
     cancancan (1.17.0)
     carrierwave (1.3.4)
       activemodel (>= 4.0.0)
@@ -167,14 +166,7 @@ GEM
       mime-types (>= 1.16)
       ssrf_filter (~> 1.0, < 1.1.0)
     clipboard-rails (1.7.1)
-    coffee-rails (4.2.2)
-      coffee-script (>= 2.2.0)
-      railties (>= 4.0.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.12.2)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
@@ -183,6 +175,7 @@ GEM
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
     crass (1.0.6)
+    csv (3.3.0)
     database_cleaner (1.99.0)
     date (3.3.4)
     declarative (0.0.20)
@@ -191,7 +184,7 @@ GEM
     declarative-option (0.1.0)
     deprecation (1.1.0)
       activesupport
-    derivative-rodeo (0.5.2)
+    derivative-rodeo (0.5.3)
       activesupport (>= 5)
       aws-sdk-s3
       aws-sdk-sqs
@@ -200,15 +193,7 @@ GEM
       mime-types
       mini_magick
       nokogiri
-    devise (4.9.3)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 4.1.0)
-      responders
-      warden (~> 1.2.3)
-    devise-guests (0.8.2)
-      devise
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     disposable (0.4.7)
       declarative (>= 0.0.9, < 1.0.0)
       declarative-builder (< 0.2.0)
@@ -289,11 +274,11 @@ GEM
       scanf (~> 1.0)
       sxp (~> 1.2)
       unicode-types (~> 1.8)
-    engine_cart (2.5.0)
+    engine_cart (2.6.0)
       rails (>= 5.0)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    erubi (1.12.0)
+    erubi (1.13.0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
     execjs (2.9.1)
@@ -305,7 +290,7 @@ GEM
       faraday
     fcrepo_wrapper (0.9.0)
       ruby-progressbar
-    ffi (1.16.3)
+    ffi (1.17.0)
     flipflop (2.7.1)
       activesupport (>= 4.0)
       terminal-table (>= 1.8)
@@ -313,10 +298,12 @@ GEM
       jquery-rails
     font-awesome-rails (4.7.0.8)
       railties (>= 3.2, < 8.0)
-    geocoder (1.8.2)
+    geocoder (1.8.3)
+      base64 (>= 0.1.0)
+      csv (>= 3.0.0)
     globalid (1.1.0)
       activesupport (>= 5.0)
-    google-apis-core (0.11.2)
+    google-apis-core (0.11.3)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -324,8 +311,7 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
       rexml
-      webrick
-    google-apis-drive_v3 (0.44.0)
+    google-apis-drive_v3 (0.46.0)
       google-apis-core (>= 0.11.0, < 2.a)
     googleauth (1.8.1)
       faraday (>= 0.17.3, < 3.a)
@@ -333,7 +319,7 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    haml (6.2.3)
+    haml (6.3.0)
       temple (>= 0.8.2)
       thor
       tilt
@@ -341,7 +327,8 @@ GEM
     hiredis (0.6.3)
     htmlentities (4.3.4)
     http_logger (0.7.0)
-    httparty (0.21.0)
+    httparty (0.22.0)
+      csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
@@ -445,17 +432,17 @@ GEM
       signet
       tinymce-rails (~> 5.10)
       valkyrie (~> 2, >= 2.1.1)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     iiif-presentation (1.1.0)
       activesupport (>= 3.2.18)
       faraday (>= 0.9)
       json
-    iiif_manifest (1.3.1)
+    iiif_manifest (1.5.0)
       activesupport (>= 4)
-    jaro_winkler (1.5.6)
-    jbuilder (2.11.5)
+    jaro_winkler (1.6.0)
+    jbuilder (2.12.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jmespath (1.6.2)
@@ -470,7 +457,7 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    json (2.6.3)
+    json (2.7.2)
     json-canonicalization (0.3.1)
     json-ld (3.1.10)
       htmlentities (~> 4.3)
@@ -482,9 +469,10 @@ GEM
     json-ld-preloaded (3.1.6)
       json-ld (~> 3.1)
       rdf (~> 3.1)
-    json-schema (4.1.1)
+    json-schema (4.3.0)
       addressable (>= 2.8)
-    jwt (2.7.1)
+    jwt (2.8.2)
+      base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -566,40 +554,42 @@ GEM
     mailboxer (0.15.1)
       carrierwave (>= 0.5.8)
       rails (>= 5.0.0)
-    marcel (1.0.2)
+    marcel (1.0.4)
     matrix (0.4.2)
-    method_source (1.0.0)
-    mime-types (3.5.1)
+    method_source (1.1.0)
+    mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.1003)
-    mini_magick (4.12.0)
+    mime-types-data (3.2024.0702)
+    mini_magick (4.13.1)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
-    minitest (5.20.0)
+    mini_portile2 (2.8.7)
+    minitest (5.24.1)
+    mize (0.4.1)
+      protocol (~> 2.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.3.0)
+    multipart-post (2.4.1)
     nest (3.2.0)
       redic
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.4.6)
+    net-imap (0.4.14)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0)
+    net-smtp (0.5.0)
       net-protocol
     newspaper_works_fixtures (0.3.1)
       rails (~> 5.0)
-    nio4r (2.6.1)
+    nio4r (2.7.3)
     noid (0.9.0)
     noid-rails (3.0.3)
       actionpack (>= 5.0.0, < 7)
       noid (~> 0.9)
-    nokogiri (1.15.5)
+    nokogiri (1.15.6)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth (1.1.0)
@@ -616,18 +606,18 @@ GEM
       rack (>= 1.2, < 4)
     openseadragon (0.6.0)
       rails (> 3.2.0)
-    orm_adapter (0.5.0)
     os (1.1.4)
-    parallel (1.23.0)
-    parser (3.2.2.4)
+    parallel (1.25.1)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
     posix-spawn (0.3.15)
     power_converter (0.1.2)
+    protocol (2.0.0)
+      ruby_parser (~> 3.0)
     psych (3.3.4)
-    public_suffix (5.0.4)
-    puma (3.12.6)
+    public_suffix (5.1.1)
     qa (5.11.0)
       activerecord-import
       deprecation
@@ -637,8 +627,8 @@ GEM
       nokogiri (~> 1.6)
       rails (>= 5.0, < 7.2)
       rdf
-    racc (1.7.3)
-    rack (2.2.8)
+    racc (1.8.0)
+    rack (2.2.9)
     rack-test (2.1.0)
       rack (>= 1.3)
     rails (5.2.8.1)
@@ -676,9 +666,9 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.1)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
     rdf (3.2.11)
       link_header (~> 0.0, >= 0.0.8)
@@ -754,35 +744,33 @@ GEM
     reform-rails (0.2.6)
       activemodel (>= 5.0)
       reform (>= 2.3.1, < 3.0.0)
-    regexp_parser (2.8.2)
+    regexp_parser (2.9.2)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
-    request_store (1.5.1)
+    request_store (1.7.0)
       rack (>= 1.4)
-    responders (3.1.1)
-      actionpack (>= 5.2)
-      railties (>= 5.2)
     retriable (3.1.2)
     reverse_markdown (2.1.1)
       nokogiri
-    rexml (3.2.6)
-    rsolr (2.5.0)
+    rexml (3.3.1)
+      strscan
+    rsolr (2.6.0)
       builder (>= 2.1.2)
       faraday (>= 0.9, < 3, != 2.0.0)
-    rspec-activemodel-mocks (1.1.0)
+    rspec-activemodel-mocks (1.2.0)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       rspec-mocks (>= 2.99, < 4.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.13.0)
     rspec-rails (5.1.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
@@ -791,7 +779,7 @@ GEM
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.12.1)
+    rspec-support (3.13.1)
     rubocop (1.28.2)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
@@ -801,8 +789,8 @@ GEM
       rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
     rubocop-performance (1.19.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
@@ -819,6 +807,9 @@ GEM
       oauth2
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
+    ruby_parser (3.21.0)
+      racc (~> 1.5)
+      sexp_processor (~> 4.16)
     rubyzip (2.3.2)
     samvera-nesting_indexer (2.0.0)
       dry-equalizer
@@ -837,6 +828,7 @@ GEM
       ffi (~> 1.9)
     scanf (1.0.0)
     select2-rails (3.5.11)
+    sexp_processor (4.17.1)
     shacl (0.1.1)
       json-ld (~> 3.1, >= 3.1.7)
       rdf (~> 3.1, >= 3.1.8)
@@ -853,12 +845,12 @@ GEM
       sxp (~> 1.1)
     shoulda-matchers (3.1.3)
       activesupport (>= 4.0.0)
-    signet (0.18.0)
+    signet (0.19.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simple_form (5.3.0)
+    simple_form (5.3.1)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
     simplecov (0.16.1)
@@ -902,7 +894,8 @@ GEM
     sparql-client (3.2.2)
       net-http-persistent (~> 4.0, >= 4.0.2)
       rdf (~> 3.2, >= 3.2.11)
-    sprockets (3.7.2)
+    sprockets (3.7.3)
+      base64
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-es6 (0.9.2)
@@ -913,29 +906,27 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.7.2)
-      mini_portile2 (~> 2.8.0)
     ssrf_filter (1.0.8)
+    strscan (3.1.0)
     sxp (1.2.4)
       matrix (~> 0.4)
       rdf (~> 3.2)
     sync (0.5.0)
     temple (0.10.3)
-    term-ansicolor (1.7.1)
+    term-ansicolor (1.10.2)
+      mize
       tins (~> 1.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    thor (1.3.0)
+    thor (1.3.1)
     thread_safe (0.3.6)
-    tilt (2.3.0)
+    tilt (2.4.0)
     timeout (0.4.1)
-    tins (1.32.1)
+    tins (1.33.0)
+      bigdecimal
       sync
     tinymce-rails (5.10.9)
       railties (>= 3.1.1)
-    turbolinks (5.2.1)
-      turbolinks-source (~> 5.2)
-    turbolinks-source (5.2.0)
     twitter-typeahead-rails (0.11.1.pre.corejavascript)
       actionpack (>= 3.1)
       jquery-rails
@@ -945,8 +936,6 @@ GEM
     tzinfo (1.2.11)
       thread_safe (~> 0.1)
     uber (0.1.0)
-    uglifier (4.2.0)
-      execjs (>= 0.3.0, < 3)
     unicode-display_width (2.5.0)
     unicode-types (1.9.0)
     valkyrie (2.2.0)
@@ -964,62 +953,33 @@ GEM
       rdf-vocab
       reform (~> 2.2)
       reform-rails
-    version_gem (1.1.3)
-    warden (1.2.9)
-      rack (>= 2.0.9)
-    web-console (3.7.0)
-      actionview (>= 5.0)
-      activemodel (>= 5.0)
-      bindex (>= 0.4.0)
-      railties (>= 5.0)
-    webrick (1.8.1)
+    version_gem (1.1.4)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    yard (0.9.34)
-    zeitwerk (2.6.12)
+    yard (0.9.36)
+    zeitwerk (2.6.16)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bixby
-  bootstrap-sass (~> 3.0)
-  byebug
-  coffee-rails (~> 4.2)
   coveralls
   database_cleaner (~> 1.3)
-  devise
-  devise-guests (~> 0.6)
   engine_cart (~> 2.2)
   factory_bot (~> 4.4)
-  fcrepo_wrapper
+  fcrepo_wrapper (~> 0.5, >= 0.5.1)
   iiif_print!
-  jbuilder (~> 2.5)
-  jquery-rails
   json-canonicalization (= 0.3.1)
   newspaper_works_fixtures (~> 0.3, >= 0.3.1)
-  puma (~> 3.11)
-  rails (~> 5.2.8, >= 5.2.8.1)
   rails-controller-testing (~> 1)
-  redis (= 4.8.1)
-  rsolr (>= 1.0, < 3)
   rspec-activemodel-mocks
   rspec-rails
-  sass-rails (~> 5.0)
   shoulda-matchers (~> 3.1)
   solargraph
-  solr_wrapper (>= 0.3)
-  sqlite3
-  turbolinks (~> 5)
-  twitter-typeahead-rails (= 0.11.1.pre.corejavascript)
-  tzinfo-data
-  uglifier (>= 1.3.0)
-  web-console (>= 3.3.0)
+  solr_wrapper (>= 1.1, < 3.0)
   yard
 
-RUBY VERSION
-   ruby 2.7.6p219
-
 BUNDLED WITH
    2.3.20

data/app/actors/iiif_print/actors/cleanup_file_sets_actor_decorator.rb

@@ -22,3 +22,4 @@ module IiifPrint
     end
   end
 end
+Hyrax::Actors::CleanupFileSetsActor.prepend(IiifPrint::Actors::CleanupFileSetsActorDecorator)

data/app/actors/iiif_print/actors/file_set_actor_decorator.rb

@@ -56,3 +56,4 @@ module IiifPrint
     end
   end
 end
+Hyrax::Actors::FileSetActor.prepend(IiifPrint::Actors::FileSetActorDecorator)

data/app/helpers/iiif_print/iiif_helper_decorator.rb

@@ -30,3 +30,4 @@ module IiifPrint
     end
   end
 end
+Hyrax::IiifHelper.prepend(IiifPrint::IiifHelperDecorator)

data/app/indexers/concerns/iiif_print/child_work_indexer_decorator.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module IiifPrint
+  module ChildWorkIndexerDecorator
+    def to_solr
+      super.tap do |index_document|
+        index_solr_doc(index_document)
+      end
+    end
+
+    def generate_solr_document
+      super.tap do |solr_doc|
+        index_solr_doc(solr_doc)
+      end
+    end
+
+    private
+
+    def index_solr_doc(solr_doc)
+      object ||= @object || resource
+      solr_doc['is_child_bsi'] ||= object.try(:is_child)
+      solr_doc['split_from_pdf_id_ssi'] ||= object.try(:split_from_pdf_id)
+      solr_doc['is_page_of_ssim'] = iiif_print_lineage_service.ancestor_ids_for(object)
+      solr_doc['member_ids_ssim'] = iiif_print_lineage_service.descendent_member_ids_for(object)
+    end
+  end
+end
+
+if ActiveModel::Type::Boolean.new.cast(ENV.fetch('HYRAX_VALKYRIE', false))
+  # Newer versions of Hyrax favor `Hyrax::Indexers::PcdmObjectIndexer` and deprecate
+  # `Hyrax::ValkyrieWorkIndexer`
+  indexers = Hyrax.config.curation_concerns.map do |concern|
+    "#{concern}ResourceIndexer".safe_constantize
+  end
+  indexers.each { |indexer| indexer.prepend(IiifPrint::ChildWorkIndexerDecorator) }
+
+  # Versions 3.0+ of Hyrax have `Hyrax::ValkyrieWorkIndexer` so we want to decorate that as
+  # well.  We want to use the elsif construct because later on Hyrax::ValkyrieWorkIndexer
+  # inherits from Hyrax::Indexers::PcdmObjectIndexer and only implements:
+  # `def initialize(*args); super; end`
+  'Hyrax::ValkyrieWorkIndexer'.safe_constantize&.prepend(IiifPrint::ChildWorkIndexerDecorator)
+else
+  # The ActiveFedora::Base indexer for Works
+  Hyrax::WorkIndexer.prepend(IiifPrint::ChildWorkIndexerDecorator)
+end

data/app/indexers/concerns/iiif_print/{file_set_indexer.rb → file_set_indexer_decorator.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module IiifPrint
-  module FileSetIndexer
+  module FileSetIndexerDecorator
     def to_solr
       super.tap do |index_document|
         index_solr_doc(index_document)
@@ -55,3 +55,17 @@ module IiifPrint
     end
   end
 end
+if ActiveModel::Type::Boolean.new.cast(ENV.fetch('HYRAX_VALKYRIE', false))
+  # Newer versions of Hyrax favor `Hyrax::Indexers::FileSetIndexer` and deprecate
+  # `Hyrax::ValkyrieFileSetIndexer`.
+  'Hyrax::Indexers::FileSetIndexer'.safe_constantize&.prepend(IiifPrint::FileSetIndexerDecorator)
+
+  # Versions 3.0+ of Hyrax have `Hyrax::ValkyrieFileSetIndexer` so we want to decorate that as
+  # well.  We want to use the elsif construct because later on Hyrax::ValkyrieFileSetIndexer
+  # inherits from Hyrax::Indexers::FileSetIndexer and only implements:
+  # `def initialize(*args); super; end`
+  'Hyrax::ValkyrieFileSetIndexer'.safe_constantize&.prepend(IiifPrint::FileSetIndexerDecorator)
+else
+  # The ActiveFedora::Base indexer for FileSets
+  Hyrax::FileSetIndexer.prepend(IiifPrint::FileSetIndexerDecorator)
+end