iiif_print 2.0.1 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 494bfcd0e3f6c84a7b6d81ae45aea07c5a6259a7d692e079bb24ea29f6908442
-  data.tar.gz: fb266b5b22d36bc3cd2e99697f82dab7093912e84957a71e28c84aaef657157b
+  metadata.gz: 42aafdbd6969538637551e48a96a176cc928b2e9e1a4df887b1cb79e4864a6a0
+  data.tar.gz: afbefd582dd694b4168481c2bdbc1d7b3f7866529266433188b3eaa1bf4d6f79
 SHA512:
-  metadata.gz: e48dff9d57b8043d804096e923afe4e21609e7f1ae067e84e1afc895bfd38781f532c036ac513316d517675c45d74f6e4c014e25b578aa3b0074371cdb7fffc8
-  data.tar.gz: 70d83ecf95e10f177c976c2e241be8f613084ac7e360a946edb1dd3919a19140f36ac2c6abe085f5a12bdc62d2ae565bacab3dfd1c64f1645213c5484f46bbe8
+  metadata.gz: 21c03a9ad7de46c271b8296bc65636d02d2b66fa4881c3eb9f669211300c563e40dc2ec3483b0d04d62f2546346f32fbd417577dc64336479b6ed2f049da8305
+  data.tar.gz: 7be1097dea227d4ac82b27fbe31cd5553c46fdc376541afea62023d0adda2b18f2ca74b346da8add4b7e50d78bc8b37c525d0ce3bd52acb118c58b59631893af

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: /app/samvera/hyrax-webapp
+  remote: .
   specs:
-    iiif_print (1.0.0)
+    iiif_print (3.0.1)
       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,33 +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)
+    bigdecimal (3.1.8)
     bindex (0.8.1)
     bixby (5.0.2)
       rubocop (= 1.28.2)
@@ -158,7 +159,7 @@ GEM
       ruby-box
       signet (~> 0.8)
       typhoeus
-    builder (3.2.4)
+    builder (3.3.0)
     byebug (11.1.3)
     cancancan (1.17.0)
     carrierwave (1.3.4)
@@ -174,7 +175,7 @@ GEM
       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 +184,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 +193,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,14 +202,6 @@ 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)
     disposable (0.4.7)
       declarative (>= 0.0.9, < 1.0.0)
@@ -289,11 +283,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 +299,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 +307,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 +320,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 +328,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 +336,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,14 +441,14 @@ 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)
@@ -470,7 +466,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 +478,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 +563,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)
+    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,17 +615,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)
+    public_suffix (5.1.1)
     puma (3.12.6)
     qa (5.11.0)
       activerecord-import
@@ -637,8 +637,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 +676,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 +754,32 @@ 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)
+    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 +788,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 +798,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 +816,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 +837,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 +854,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 +903,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,7 +915,7 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.7.2)
+    sqlite3 (1.7.3)
       mini_portile2 (~> 2.8.0)
     ssrf_filter (1.0.8)
     sxp (1.2.4)
@@ -921,15 +923,17 @@ GEM
       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)
@@ -964,55 +968,45 @@ GEM
       rdf-vocab
       reform (~> 2.2)
       reform-rails
-    version_gem (1.1.3)
-    warden (1.2.9)
-      rack (>= 2.0.9)
+    version_gem (1.1.4)
     web-console (3.7.0)
       actionview (>= 5.0)
       activemodel (>= 5.0)
       bindex (>= 0.4.0)
       railties (>= 5.0)
-    webrick (1.8.1)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     yard (0.9.34)
-    zeitwerk (2.6.12)
+    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)
+  solr_wrapper (>= 1.1, < 3.0)
   sqlite3
   turbolinks (~> 5)
-  twitter-typeahead-rails (= 0.11.1.pre.corejavascript)
   tzinfo-data
   uglifier (>= 1.3.0)
   web-console (>= 3.3.0)

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

data/app/jobs/iiif_print/jobs/child_works_from_pdf_job.rb

@@ -87,7 +87,7 @@ module IiifPrint
         )
         BatchCreateJob.perform_later(user,
                                      @child_work_titles,
-                                     {},
+                                     @resource_types,
                                      @uploaded_files,
                                      attributes.merge!(model: child_model.to_s, split_from_pdf_id: @split_from_pdf_id).with_indifferent_access,
                                      operation)
@@ -99,6 +99,7 @@ module IiifPrint
       def prepare_import_data(original_pdf_path, image_files, user)
         @uploaded_files = []
         @child_work_titles = {}
+        @resource_types = {}
         number_of_pages_in_pdf = image_files.size
         image_files.each_with_index do |image_path, page_number|
           file_id = create_uploaded_file(user, image_path).to_s
@@ -111,6 +112,7 @@ module IiifPrint
             page_padding: number_of_digits(nbr: number_of_pages_in_pdf)
           )
 
+          @resource_types[file_id] = resource_types
           @uploaded_files << file_id
           @child_work_titles[file_id] = child_title
           # save child work info to create the member relationships
@@ -144,10 +146,14 @@ module IiifPrint
         uf.id
       end
 
-      # TODO: what attributes do we need to fill in from the parent work? What about AllinsonFlex?
       def attributes
         IiifPrint.config.child_work_attributes_function.call(parent_work: @parent_work, admin_set_id: @child_admin_set_id)
       end
+
+      # TODO: Does this method need to be configurable?
+      def resource_types
+        @parent_work.try(:resource_type)
+      end
     end
   end
 end

data/app/listeners/iiif_print/listener.rb

@@ -15,7 +15,7 @@ module IiifPrint
       file_set = event[:file_set]
       return false unless file_set
       return false unless file_set.file_set?
-      return false unless file_set.original_file.pdf?
+      return false unless file_set.original_file&.pdf?
 
       work = IiifPrint.parent_for(file_set)
       # A short-circuit to avoid fetching the underlying file.

data/app/models/concerns/iiif_print/solr_document_decorator.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module IiifPrint
+  module SolrDocumentDecorator
+    def digest_sha1
+      digest[/urn:sha1:([\w]+)/, 1]
+    end
+
+    def method_missing(method_name, *args, &block)
+      super unless iiif_print_solr_field_names.include? method_name.to_s
+      self[IiifPrint.solr_name(method_name.to_s)]
+    end
+
+    def respond_to_missing?(method_name, include_private = false)
+      iiif_print_solr_field_names.include?(method_name.to_s) || super
+    end
+
+    # @see https://github.com/samvera/hyrax/commit/7108409c619cd2ba4ae8c836b9f3b429a7e9837b
+    def file_set_ids
+      # Yes, this looks a little odd.  But the truth is the prior key (e.g. `file_set_ids_ssim`) was
+      # an alias of `member_ids_ssim`.
+      self['member_ids_ssim']
+    end
+
+    def any_highlighting?
+      response&.[]('highlighting')&.[](id)&.present?
+    end
+
+    def solr_document
+      self
+    end
+  end
+end
+
+SolrDocument.prepend(IiifPrint::SolrDocumentDecorator)
+SolrDocument.attribute :is_child, Hyrax::SolrDocument::Metadata::Solr::String, 'is_child_bsi'
+SolrDocument.attribute :split_from_pdf_id, Hyrax::SolrDocument::Metadata::Solr::String, 'split_from_pdf_id_ssi'
+SolrDocument.attribute :digest, Hyrax::SolrDocument::Metadata::Solr::String, 'digest_ssim'
+
+# @note These properties came from the newspaper_works gem.  They are configurable.
+SolrDocument.class_attribute :iiif_print_solr_field_names, default: %w[alternative_title genre
+                                                                       issn lccn oclcnum held_by text_direction
+                                                                       page_number section author photographer
+                                                                       volume issue_number geographic_coverage
+                                                                       extent publication_date height width
+                                                                       edition_number edition_name frequency preceded_by
+                                                                       succeeded_by]

data/app/models/iiif_print/iiif_search_decorator.rb

@@ -33,3 +33,4 @@ module IiifPrint
     end
   end
 end
+::BlacklightIiifSearch::IiifSearch.prepend(IiifPrint::IiifSearchDecorator)

data/app/models/iiif_print/iiif_search_response_decorator.rb

@@ -38,3 +38,4 @@ module IiifPrint
     end
   end
 end
+::BlacklightIiifSearch::IiifSearchResponse.prepend(IiifPrint::IiifSearchResponseDecorator)

data/app/presenters/iiif_print/file_set_presenter_decorator.rb

@@ -9,3 +9,4 @@ module IiifPrint
     end
   end
 end
+Hyrax::FileSetPresenter.prepend(IiifPrint::FileSetPresenterDecorator)

data/app/presenters/iiif_print/{iiif_manifest_presenter_behavior.rb → iiif_manifest_presenter/display_image_presenter_decorator.rb}

@@ -1,38 +1,9 @@
 # mixin to provide URL for IIIF Content Search service
 module IiifPrint
-  module IiifManifestPresenterBehavior
-    extend ActiveSupport::Concern
-
-    # Extending the presenter to the base url which includes the protocol.
-    # We need the base url to render the facet links and normalize the interface.
-    attr_accessor :base_url
-
-    def manifest_metadata
-      # ensure we are using a SolrDocument
-      @manifest_metadata ||= IiifPrint.manifest_metadata_from(work: model.solr_document, presenter: self)
-    end
-
-    def search_service
-      Rails.application.routes.url_helpers.solr_document_iiif_search_url(id, host: hostname)
-    end
-
-    # OVERRIDE: Hyrax 3x, avoid nil returning to IIIF Manifest gem
-    # @see https://github.com/samvera/iiif_manifest/blob/c408f90eba11bef908796c7236ba6bcf8d687acc/lib/iiif_manifest/v3/manifest_builder/record_property_builder.rb#L28
-    ##
-    # @return [Array<Hash{String => String}>]
-    def sequence_rendering
-      Array(try(:rendering_ids)).map do |file_set_id|
-        rendering = file_set_presenters.find { |p| p.id == file_set_id }
-        return [] unless rendering
-
-        { '@id' => Hyrax::Engine.routes.url_helpers.download_url(rendering.id, host: hostname),
-          'format' => rendering.mime_type.presence || I18n.t("hyrax.manifest.unknown_mime_text"),
-          'label' => I18n.t("hyrax.manifest.download_text") + (rendering.label || '') }
-      end.flatten
-    end
-
+  module IiifManifestPresenter
     # OVERRIDE: Hyrax v3.x
-    module DisplayImagePresenterBehavior
+    module DisplayImagePresenterDecorator
+      extend ActiveSupport::Concern
       # Extending the presenter to the base url which includes the protocol.
       # We need the base url to render the facet links and normalize the interface.
       attr_accessor :base_url
@@ -128,3 +99,4 @@ module IiifPrint
     end
   end
 end
+Hyrax::IiifManifestPresenter::DisplayImagePresenter.prepend(IiifPrint::IiifManifestPresenter::DisplayImagePresenterDecorator)

data/app/presenters/iiif_print/iiif_manifest_presenter_decorator.rb

@@ -0,0 +1,35 @@
+# mixin to provide URL for IIIF Content Search service
+module IiifPrint
+  module IiifManifestPresenterDecorator
+    extend ActiveSupport::Concern
+
+    # Extending the presenter to the base url which includes the protocol.
+    # We need the base url to render the facet links and normalize the interface.
+    attr_accessor :base_url
+
+    def manifest_metadata
+      # ensure we are using a SolrDocument
+      @manifest_metadata ||= IiifPrint.manifest_metadata_from(work: model.solr_document, presenter: self)
+    end
+
+    def search_service
+      Rails.application.routes.url_helpers.solr_document_iiif_search_url(id, host: hostname)
+    end
+
+    # OVERRIDE: Hyrax 3x, avoid nil returning to IIIF Manifest gem
+    # @see https://github.com/samvera/iiif_manifest/blob/c408f90eba11bef908796c7236ba6bcf8d687acc/lib/iiif_manifest/v3/manifest_builder/record_property_builder.rb#L28
+    ##
+    # @return [Array<Hash{String => String}>]
+    def sequence_rendering
+      Array(try(:rendering_ids)).map do |file_set_id|
+        rendering = file_set_presenters.find { |p| p.id == file_set_id }
+        return [] unless rendering
+
+        { '@id' => Hyrax::Engine.routes.url_helpers.download_url(rendering.id, host: hostname),
+          'format' => rendering.mime_type.presence || I18n.t("hyrax.manifest.unknown_mime_text"),
+          'label' => I18n.t("hyrax.manifest.download_text") + (rendering.label || '') }
+      end.flatten
+    end
+  end
+end
+Hyrax::IiifManifestPresenter.prepend(IiifPrint::IiifManifestPresenterDecorator)

data/app/presenters/iiif_print/{iiif_manifest_presenter_factory_behavior.rb → iiif_manifest_presenter_factory_decorator.rb}

@@ -1,5 +1,5 @@
 module IiifPrint
-  module IiifManifestPresenterFactoryBehavior
+  module IiifManifestPresenterFactoryDecorator
     # This will override Hyrax::IiifManifestPresenter::Factory#build and introducing
     # the expected behavior:
     # - child work images show as canvases in the parent work manifest
@@ -31,3 +31,4 @@ module IiifPrint
     end
   end
 end
+Hyrax::IiifManifestPresenter::Factory.prepend(IiifPrint::IiifManifestPresenterFactoryDecorator)

data/app/renderers/hyrax/renderers/faceted_attribute_renderer_decorator.rb

@@ -16,3 +16,4 @@ module Hyrax
     end
   end
 end
+Hyrax::Renderers::FacetedAttributeRenderer.prepend(Hyrax::Renderers::FacetedAttributeRendererDecorator)

data/app/services/iiif_print/derivative_rodeo_service.rb

@@ -366,7 +366,7 @@ module IiifPrint
                    else
                      # TODO: This is the fedora URL representing the file we uploaded; is that adequate?  Will we
                      # have access to this file?
-                     file_set.original_file.uri.to_s
+                     file_set.original_file&.uri&.to_s
                    end
     end
 

data/app/services/iiif_print/{manifest_builder_service_behavior.rb → manifest_builder_service_decorator.rb}

@@ -1,6 +1,6 @@
 module IiifPrint
   # rubocop:disable Metrics/ModuleLength
-  module ManifestBuilderServiceBehavior
+  module ManifestBuilderServiceDecorator
     def initialize(*args,
                    version: IiifPrint.config.default_iiif_manifest_version,
                    iiif_manifest_factory: iiif_manifest_factory_for(version),
@@ -154,3 +154,4 @@ module IiifPrint
   end
   # rubocop:enable Metrics/ClassLength
 end
+Hyrax::ManifestBuilderService.prepend(IiifPrint::ManifestBuilderServiceDecorator)

data/app/services/iiif_print/simple_schema_loader_decorator.rb

@@ -9,3 +9,4 @@ module IiifPrint
     end
   end
 end
+Hyrax::SimpleSchemaLoader.prepend(IiifPrint::SimpleSchemaLoaderDecorator)

data/app/transactions/hyrax/transactions/steps/delete_all_file_sets_decorator.rb

@@ -33,3 +33,5 @@ module Hyrax
     end
   end
 end
+
+"Hyrax::Transactions::Steps::DeleteAllFileSets".safe_constantize&.prepend(Hyrax::Transactions::Steps::DeleteAllFileSetsDecorator)

data/config/metadata/child_works_from_pdf_splitting.yaml

@@ -4,6 +4,11 @@ attributes:
     multiple: false
     index_keys:
       - "is_child_bsi"
+    form:
+      display: false
+      required: false
+      primary: false
+      multiple: false
     predicate: "http://id.loc.gov/vocabulary/identifiers/isChild"
   split_from_pdf_id:
     type: string
@@ -11,6 +16,7 @@ attributes:
     index_keys:
       - "split_from_pdf_id_ssi"
     form:
+      display: false
       required: false
       primary: false
       multiple: false

data/lib/iiif_print/base_derivative_service.rb

@@ -33,7 +33,7 @@ module IiifPrint
       # @TODO: verify if this works for ActiveFedora and if so, remove commented code.
       #        If not, modify to use adapter.
       # file_set.class.image_mime_types.include?(file_set.mime_type)
-      file_set.original_file.image?
+      file_set.original_file&.image?
     end
 
     def derivative_path_factory

data/lib/iiif_print/blacklight_iiif_search/annotation_decorator.rb

@@ -134,3 +134,4 @@ module IiifPrint
     end
   end
 end
+::BlacklightIiifSearch::IiifSearchAnnotation.prepend(IiifPrint::BlacklightIiifSearch::AnnotationDecorator)

data/lib/iiif_print/configuration.rb

@@ -212,7 +212,7 @@ module IiifPrint
             visibility: 'lease',
             visibility_after_lease: lease.visibility_after_lease,
             visibility_during_lease: lease.visibility_during_lease,
-            lease_release_date: lease.lease_release_date
+            lease_release_date: lease.lease_expiration_date
           }
         else
           visibility_params = { visibility: parent_work.visibility.to_s }

data/lib/iiif_print/data/fileset_helper.rb

@@ -13,7 +13,7 @@ module IiifPrint
       def first_fileset
         # if context is fileset id (e.g. caller is view partial) string,
         #   get the fileset from that id
-        return FileSet.find(@work) if @work.is_a?(String)
+        return Hyrax.query_service.find_by(id: @work) if @work.is_a?(String)
         # if "work" context is a FileSet, not actual work, return it
         return @work if @work.is_a?(Hyrax::FileSet) || @work.is_a?(FileSet)
         # in most cases, get from work's members:

data/lib/iiif_print/engine.rb

@@ -48,55 +48,18 @@ module IiifPrint
 
       Hyrax.publisher.subscribe(IiifPrint::Listener.new) if Hyrax.respond_to?(:publisher)
 
-      Hyrax::IiifManifestPresenter.prepend(IiifPrint::IiifManifestPresenterBehavior)
-      Hyrax::IiifManifestPresenter::Factory.prepend(IiifPrint::IiifManifestPresenterFactoryBehavior)
-      Hyrax::ManifestBuilderService.prepend(IiifPrint::ManifestBuilderServiceBehavior)
-      Hyrax::Renderers::FacetedAttributeRenderer.prepend(Hyrax::Renderers::FacetedAttributeRendererDecorator)
-      Hyrax::WorksControllerBehavior.prepend(IiifPrint::WorksControllerBehaviorDecorator)
-      "Hyrax::Transactions::Steps::DeleteAllFileSets".safe_constantize&.prepend(Hyrax::Transactions::Steps::DeleteAllFileSetsDecorator)
-      # Hyku::WorksControllerBehavior was introduced in Hyku v6.0.0+.  Yes we don't depend on Hyku,
-      # but this allows us to do minimal Hyku antics with IiifPrint.
-      'Hyku::WorksControllerBehavior'.safe_constantize&.prepend(IiifPrint::WorksControllerBehaviorDecorator)
+      # Load locales early so decorators can use them during initialization
+      I18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.yml'),
+                            IiifPrint::Engine.root.join('config', 'locales', '**', '*.yml')]
 
-      Hyrax::FileSetPresenter.prepend(IiifPrint::FileSetPresenterDecorator)
-      Hyrax::WorkShowPresenter.prepend(IiifPrint::WorkShowPresenterDecorator)
-      Hyrax::IiifHelper.prepend(IiifPrint::IiifHelperDecorator)
-
-      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::FileSetIndexer)
-
-        # 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::FileSetIndexer)
-
-        # 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::ChildWorkIndexer) }
-
-        # 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::ChildWorkIndexer)
-      else
-        # The ActiveFedora::Base indexer for FileSets
-        Hyrax::FileSetIndexer.prepend(IiifPrint::FileSetIndexer)
-        # The ActiveFedora::Base indexer for Works
-        Hyrax::WorkIndexer.prepend(IiifPrint::ChildWorkIndexer)
+      # Allows us to use decorator files
+      Dir.glob(File.join(File.dirname(__FILE__), "../../app/**/*_decorator*.rb")).sort.each do |c|
+        Rails.configuration.cache_classes ? require(c) : load(c)
       end
 
-      ::BlacklightIiifSearch::IiifSearchResponse.prepend(IiifPrint::IiifSearchResponseDecorator)
-      ::BlacklightIiifSearch::IiifSearchAnnotation.prepend(IiifPrint::BlacklightIiifSearch::AnnotationDecorator)
-      ::BlacklightIiifSearch::IiifSearch.prepend(IiifPrint::IiifSearchDecorator)
-      Hyrax::Actors::FileSetActor.prepend(IiifPrint::Actors::FileSetActorDecorator)
-      Hyrax::Actors::CleanupFileSetsActor.prepend(IiifPrint::Actors::CleanupFileSetsActorDecorator)
+      Dir.glob(File.join(File.dirname(__FILE__), "../../lib/**/*_decorator*.rb")).sort.each do |c|
+        Rails.configuration.cache_classes ? require(c) : load(c)
+      end
 
       Hyrax.config do |config|
         config.callback.set(:after_create_fileset) do |file_set, user|
@@ -104,12 +67,6 @@ module IiifPrint
         end
       end
     end
-
-    config.after_initialize do
-      IiifPrint::Solr::Document.decorate(SolrDocument)
-      Hyrax::IiifManifestPresenter::DisplayImagePresenter
-        .prepend(IiifPrint::IiifManifestPresenterBehavior::DisplayImagePresenterBehavior)
-    end
     # rubocop:enable Metrics/BlockLength
   end
 end

data/lib/iiif_print/text_extraction_derivative_service.rb

@@ -28,7 +28,10 @@ module IiifPrint
 
       ocr_derivatives.each do |extension, method_name|
         path = prepare_path(extension.to_s)
-        write(content: ocr.public_send(method_name), path: path, extension: extension)
+        content = ocr.public_send(method_name)
+        next if content.blank?
+
+        write(content: content, path: path, extension: extension)
       end
     end
 

data/lib/iiif_print/version.rb

@@ -1,3 +1,3 @@
 module IiifPrint
-  VERSION = '2.0.1'.freeze
+  VERSION = '3.0.1'.freeze
 end

data/lib/iiif_print/works_controller_behavior_decorator.rb

@@ -0,0 +1,13 @@
+module IiifPrint
+  module WorksControllerBehaviorDecorator
+    # Extending the presenter to the base url which includes the protocol.
+    # We need the base url to render the facet links.
+    def iiif_manifest_presenter
+      super.tap { |i| i.base_url = request.base_url }
+    end
+  end
+end
+Hyrax::WorksControllerBehavior.prepend(IiifPrint::WorksControllerBehaviorDecorator)
+# Hyku::WorksControllerBehavior was introduced in Hyku v6.0.0+.  Yes we don't depend on Hyku,
+# but this allows us to do minimal Hyku antics with IiifPrint.
+'Hyku::WorksControllerBehavior'.safe_constantize&.prepend(IiifPrint::WorksControllerBehaviorDecorator)

data/lib/iiif_print.rb

@@ -13,8 +13,6 @@ require "iiif_print/text_formats_from_alto_service"
 require "iiif_print/tiff_derivative_service"
 require "iiif_print/lineage_service"
 require "iiif_print/metadata"
-require "iiif_print/works_controller_behavior"
-require "iiif_print/blacklight_iiif_search/annotation_decorator"
 require "iiif_print/split_pdfs/base_splitter"
 require "iiif_print/split_pdfs/child_work_creation_from_pdf_service"
 require "iiif_print/split_pdfs/derivative_rodeo_splitter"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iiif_print
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.1
 platform: ruby
 authors:
 - Sean Upton
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-13 00:00:00.000000000 Z
+date: 2024-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight_iiif_search
@@ -363,8 +363,8 @@ files:
 - app/helpers/iiif_print/iiif_helper_decorator.rb
 - app/helpers/iiif_print/iiif_print_helper_behavior.rb
 - app/helpers/iiif_print_helper.rb
-- app/indexers/concerns/iiif_print/child_work_indexer.rb
-- app/indexers/concerns/iiif_print/file_set_indexer.rb
+- app/indexers/concerns/iiif_print/child_work_indexer_decorator.rb
+- app/indexers/concerns/iiif_print/file_set_indexer_decorator.rb
 - app/jobs/iiif_print/jobs/application_job.rb
 - app/jobs/iiif_print/jobs/child_works_from_pdf_job.rb
 - app/jobs/iiif_print/jobs/create_relationships_job.rb
@@ -372,7 +372,7 @@ files:
 - app/listeners/iiif_print/listener.rb
 - app/mailers/iiif_print/application_mailer.rb
 - app/models/concerns/iiif_print/set_child_flag.rb
-- app/models/concerns/iiif_print/solr/document.rb
+- app/models/concerns/iiif_print/solr_document_decorator.rb
 - app/models/iiif_print/application_record.rb
 - app/models/iiif_print/derivative_attachment.rb
 - app/models/iiif_print/iiif_search_decorator.rb
@@ -380,15 +380,16 @@ files:
 - app/models/iiif_print/ingest_file_relation.rb
 - app/models/iiif_print/pending_relationship.rb
 - app/presenters/iiif_print/file_set_presenter_decorator.rb
-- app/presenters/iiif_print/iiif_manifest_presenter_behavior.rb
-- app/presenters/iiif_print/iiif_manifest_presenter_factory_behavior.rb
+- app/presenters/iiif_print/iiif_manifest_presenter/display_image_presenter_decorator.rb
+- app/presenters/iiif_print/iiif_manifest_presenter_decorator.rb
+- app/presenters/iiif_print/iiif_manifest_presenter_factory_decorator.rb
 - app/presenters/iiif_print/work_show_presenter_decorator.rb
 - app/renderers/hyrax/renderers/faceted_attribute_renderer_decorator.rb
 - app/search_builders/concerns/iiif_print/allinson_flex_fields.rb
 - app/search_builders/concerns/iiif_print/exclude_models.rb
 - app/search_builders/concerns/iiif_print/highlight_search_params.rb
 - app/services/iiif_print/derivative_rodeo_service.rb
-- app/services/iiif_print/manifest_builder_service_behavior.rb
+- app/services/iiif_print/manifest_builder_service_decorator.rb
 - app/services/iiif_print/pluggable_derivative_service.rb
 - app/services/iiif_print/simple_schema_loader_decorator.rb
 - app/transactions/hyrax/transactions/iiif_print_container_decorator.rb
@@ -401,7 +402,6 @@ files:
 - app/views/hyrax/file_sets/_show_actions.html.erb
 - config/fcrepo_wrapper_test.yml
 - config/initializers/assets.rb
-- config/initializers/simple_schema_loader.rb
 - config/locales/iiif_print.de.yml
 - config/locales/iiif_print.en.yml
 - config/locales/iiif_print.es.yml
@@ -483,7 +483,7 @@ files:
 - lib/iiif_print/text_formats_from_alto_service.rb
 - lib/iiif_print/tiff_derivative_service.rb
 - lib/iiif_print/version.rb
-- lib/iiif_print/works_controller_behavior.rb
+- lib/iiif_print/works_controller_behavior_decorator.rb
 - lib/samvera/derivatives.rb
 - lib/samvera/derivatives/configuration.rb
 - lib/samvera/derivatives/hyrax.rb
@@ -510,7 +510,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: IiifPrint is a gem (Rails "engine") for Hyrax-based digital repository applications

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

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module IiifPrint
-  module ChildWorkIndexer
-    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

data/app/models/concerns/iiif_print/solr/document.rb

@@ -1,63 +0,0 @@
-module IiifPrint::Solr::Document
-  # @note Why decorate?  We want to avoid including this module via generator.  And the generator
-  #       previously did two things: 1) include `IiifPrint::Solr::Document` in `SolrDocument`; 2)
-  #       add the `attribute :is_child` field to the SolrDocument.  We can't rely on `included do`
-  #       block to handle that.
-  #
-  # This method is responsible for configuring the SolrDocument for a Hyrax/Hyku application.  It
-  # does three things:
-  #
-  # 1. Adds instance methods to the SolrDocument (see implementation below)
-  # 2. Adds the `is_child` attribute to the SolrDocument
-  # 3. Adds a class attribute (e.g. `iiif_print_solr_field_names`) to allow further customization.
-  #
-  # @note These `iiif_print_solr_field_names` came from the newspaper_works implementation and are
-  #       carried forward without much consideration, except to say "Make it configurable!"
-  #
-  # @param base [Class<SolrDocument>]
-  # @return [Class<SolrDocument>]
-  def self.decorate(base)
-    base.prepend(self)
-    base.send(:attribute, :is_child, Hyrax::SolrDocument::Metadata::Solr::String, 'is_child_bsi')
-    base.send(:attribute, :split_from_pdf_id, Hyrax::SolrDocument::Metadata::Solr::String, 'split_from_pdf_id_ssi')
-    base.send(:attribute, :digest, Hyrax::SolrDocument::Metadata::Solr::String, 'digest_ssim')
-
-    # @note These properties came from the newspaper_works gem.  They are configurable.
-    base.class_attribute :iiif_print_solr_field_names, default: %w[alternative_title genre
-                                                                   issn lccn oclcnum held_by text_direction
-                                                                   page_number section author photographer
-                                                                   volume issue_number geographic_coverage
-                                                                   extent publication_date height width
-                                                                   edition_number edition_name frequency preceded_by
-                                                                   succeeded_by]
-    base
-  end
-
-  def digest_sha1
-    digest[/urn:sha1:([\w]+)/, 1]
-  end
-
-  def method_missing(method_name, *args, &block)
-    super unless iiif_print_solr_field_names.include? method_name.to_s
-    self[IiifPrint.solr_name(method_name.to_s)]
-  end
-
-  def respond_to_missing?(method_name, include_private = false)
-    iiif_print_solr_field_names.include?(method_name.to_s) || super
-  end
-
-  # @see https://github.com/samvera/hyrax/commit/7108409c619cd2ba4ae8c836b9f3b429a7e9837b
-  def file_set_ids
-    # Yes, this looks a little odd.  But the truth is the prior key (e.g. `file_set_ids_ssim`) was
-    # an alias of `member_ids_ssim`.
-    self['member_ids_ssim']
-  end
-
-  def any_highlighting?
-    response&.[]('highlighting')&.[](id)&.present?
-  end
-
-  def solr_document
-    self
-  end
-end

data/config/initializers/simple_schema_loader.rb

@@ -1 +0,0 @@
-"Hyrax::SimpleSchemaLoader".safe_constantize&.prepend(IiifPrint::SimpleSchemaLoaderDecorator)

data/lib/iiif_print/works_controller_behavior.rb

@@ -1,9 +0,0 @@
-module IiifPrint
-  module WorksControllerBehaviorDecorator
-    # Extending the presenter to the base url which includes the protocol.
-    # We need the base url to render the facet links.
-    def iiif_manifest_presenter
-      super.tap { |i| i.base_url = request.base_url }
-    end
-  end
-end