iiif_print 3.0.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa3dd970a2698e24cea1ee94cbc62540f86a817b9cfcc9befa4d2c5b918adc29
-  data.tar.gz: 860a39b300ec241df49da8cfd562b78e4b8e9d85556c732ffdb48b3bf63ff253
+  metadata.gz: 157690b7a7cc4421d63f7097e28136c642c5ca5b97a598124fca1304cedcda5f
+  data.tar.gz: 31bc61900538c311562a7274d2e419d9fa7370ef0d49bfb65d43a7861679306e
 SHA512:
-  metadata.gz: '0940916e73b7d643c7db3d2f407c65efdda23d89b7710984fe2845d687b2899ea995faf945d5c8dc083755f53efca10bde06938927ae2c35e4652a981a963c0c'
-  data.tar.gz: ef6ff81415505569c2e546428492c686e31fb5a6ac0b1b85a21f7a82d355f6e772d92a57d7fc057f6ddb54c85f97f429981a1320410cdc1cd193ff6892ba295d
+  metadata.gz: 6a92f15f5b538c393de264fd7330fc841257bfa6bcded9ddccfa9fa84a2686fed1bf4b28cd7d80f87788fe2009433d15489574e58e7fadc76ef655921541be04
+  data.tar.gz: bc559c66f29d3d9596b47496c6d251526f2d0ded5f4697cae689d7e8d926fd9ce31f9bd340faaaf2701cdc9aead9f4de8a8329e14f0ee50d3463d4c1d71a85ca

data/.github/workflows/build-lint-test-action.yaml

@@ -16,17 +16,16 @@ on:
 
 jobs:
   build:
-    uses: scientist-softserv/actions/.github/workflows/build.yaml@v0.0.13
+    uses: notch8/actions/.github/workflows/build.yaml@v0.0.15
     secrets: inherit
     with:
       platforms: "linux/amd64"
-      target: hyku-base
-      worker: false
+      webTarget: hyku-base
   test:
     needs: build
-    uses: scientist-softserv/actions/.github/workflows/test.yaml@v0.0.13
+    uses: notch8/actions/.github/workflows/test.yaml@v0.0.15
     with:
       setup_db_cmd: bundle exec rake prepare_and_run_tests
   lint:
     needs: build
-    uses: scientist-softserv/actions/.github/workflows/lint.yaml@v0.0.13
+    uses: notch8/actions/.github/workflows/lint.yaml@v0.0.15

data/CONTRIBUTING.md

@@ -45,7 +45,7 @@ further details.
 ### Reporting Issues
 
 - Make sure you have a [GitHub account](https://github.com/signup/free)
-- Submit a [Github issue](https://github.com/scientist-softserv/iiif_print/issues/) by:
+- Submit a [Github issue](https://github.com/notch8/iiif_print/issues/) by:
   - Clearly describing the issue
     - Provide a descriptive summary
     - Explain the expected behavior

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/scientist-softserv/dev-ops/samvera:e9200061 as hyku-base
+FROM ghcr.io/notch8/dev-ops/samvera:e9200061 as hyku-base
 USER root
 RUN apk add --no-cache sqlite
 USER app

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: .
+  remote: /app/samvera/hyrax-webapp
   specs:
-    iiif_print (3.0.0)
+    iiif_print (3.0.2)
       blacklight_iiif_search (>= 1.0, < 3.0)
       derivative-rodeo (~> 0.5)
       hyrax (>= 2.5, < 6)
@@ -57,15 +57,15 @@ GEM
       globalid (>= 0.3.6)
     activemodel (5.2.8.1)
       activesupport (= 5.2.8.1)
-    activemodel-serializers-xml (1.0.2)
-      activemodel (> 5.x)
-      activesupport (> 5.x)
+    activemodel-serializers-xml (1.0.3)
+      activemodel (>= 5.0.0.a)
+      activesupport (>= 5.0.0.a)
       builder (~> 3.1)
     activerecord (5.2.8.1)
       activemodel (= 5.2.8.1)
       activesupport (= 5.2.8.1)
       arel (>= 9.0)
-    activerecord-import (1.7.0)
+    activerecord-import (2.0.0)
       activerecord (>= 4.2)
     activestorage (5.2.8.1)
       actionpack (= 5.2.8.1)
@@ -84,26 +84,26 @@ GEM
     ast (2.4.2)
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
-    awesome_nested_set (3.6.0)
-      activerecord (>= 4.0.0, < 7.2)
+    awesome_nested_set (3.8.0)
+      activerecord (>= 4.0.0, < 8.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.951.0)
-    aws-sdk-core (3.201.0)
+    aws-partitions (1.1043.0)
+    aws-sdk-core (3.217.0)
       aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.8)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.88.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+    aws-sdk-kms (1.97.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.156.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+    aws-sdk-s3 (1.179.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sdk-sqs (1.80.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+    aws-sdk-sqs (1.91.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.8.0)
+    aws-sigv4 (1.11.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
@@ -113,8 +113,10 @@ GEM
     base64 (0.2.0)
     bcp47 (0.3.3)
       i18n
+    bcrypt (3.1.20)
     benchmark (0.3.0)
-    bigdecimal (3.1.8)
+    bigdecimal (3.1.9)
+    bindex (0.8.1)
     bixby (5.0.2)
       rubocop (= 1.28.2)
       rubocop-ast
@@ -148,17 +150,18 @@ GEM
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
     breadcrumbs_on_rails (3.0.1)
-    browse-everything (1.3.0)
+    browse-everything (1.5.0)
       addressable (~> 2.5)
       aws-sdk-s3
       dropbox_api (>= 0.1.20)
       google-apis-drive_v3
       googleauth (>= 0.6.6, < 2.0)
-      rails (>= 4.2, < 7.2)
+      rails (>= 4.2, < 8.1)
       ruby-box
       signet (~> 0.8)
       typhoeus
-    builder (3.3.0)
+    builder (3.2.4)
+    byebug (11.1.3)
     cancancan (1.17.0)
     carrierwave (1.3.4)
       activemodel (>= 4.0.0)
@@ -166,8 +169,15 @@ GEM
       mime-types (>= 1.16)
       ssrf_filter (~> 1.0, < 1.1.0)
     clipboard-rails (1.7.1)
-    concurrent-ruby (1.3.3)
-    connection_pool (2.4.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)
+    connection_pool (2.5.0)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -175,7 +185,7 @@ GEM
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
     crass (1.0.6)
-    csv (3.3.0)
+    csv (3.3.2)
     database_cleaner (1.99.0)
     date (3.3.4)
     declarative (0.0.20)
@@ -193,7 +203,15 @@ GEM
       mime-types
       mini_magick
       nokogiri
-    diff-lcs (1.5.1)
+    devise (4.9.4)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0)
+      responders
+      warden (~> 1.2.3)
+    devise-guests (0.8.3)
+      devise
+    diff-lcs (1.5.0)
     disposable (0.4.7)
       declarative (>= 0.0.9, < 1.0.0)
       declarative-builder (< 0.2.0)
@@ -201,7 +219,7 @@ GEM
       representable (>= 2.4.0, <= 3.1.0)
       uber (< 0.2.0)
     docile (1.4.0)
-    draper (4.0.2)
+    draper (4.0.4)
       actionpack (>= 5.0)
       activemodel (>= 5.0)
       activemodel-serializers-xml (>= 1.0)
@@ -274,11 +292,11 @@ GEM
       scanf (~> 1.0)
       sxp (~> 1.2)
       unicode-types (~> 1.8)
-    engine_cart (2.6.0)
+    engine_cart (2.5.0)
       rails (>= 5.0)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    erubi (1.13.0)
+    erubi (1.12.0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
     execjs (2.9.1)
@@ -286,19 +304,19 @@ GEM
       activesupport (>= 3.0.0)
     faraday (0.17.6)
       multipart-post (>= 1.2, < 3)
-    faraday-encoding (0.0.5)
+    faraday-encoding (0.0.6)
       faraday
     fcrepo_wrapper (0.9.0)
       ruby-progressbar
     ffi (1.17.0)
-    flipflop (2.7.1)
+    flipflop (2.8.0)
       activesupport (>= 4.0)
       terminal-table (>= 1.8)
     flot-rails (0.0.7)
       jquery-rails
-    font-awesome-rails (4.7.0.8)
-      railties (>= 3.2, < 8.0)
-    geocoder (1.8.3)
+    font-awesome-rails (4.7.0.9)
+      railties (>= 3.2, < 9.0)
+    geocoder (1.8.5)
       base64 (>= 0.1.0)
       csv (>= 3.0.0)
     globalid (1.1.0)
@@ -365,13 +383,13 @@ GEM
       hydra-access-controls (= 11.0.7)
       hydra-core (= 11.0.7)
       rails (>= 5.2, < 6.1)
-    hydra-pcdm (1.3.0)
-      active-fedora (>= 10, < 15)
+    hydra-pcdm (1.4.0)
+      active-fedora (>= 10)
       mime-types (>= 1)
       rdf-vocab
-    hydra-works (2.1.0)
-      activesupport (>= 5.2, < 7.1)
-      hydra-derivatives (~> 3.6)
+    hydra-works (2.2.0)
+      activesupport (>= 5.2, < 8.0)
+      hydra-derivatives (>= 3.6)
       hydra-file_characterization (~> 1.0)
       hydra-pcdm (>= 0.9)
     hyrax (3.6.0)
@@ -432,16 +450,16 @@ GEM
       signet
       tinymce-rails (~> 5.10)
       valkyrie (~> 2, >= 2.1.1)
-    i18n (1.14.5)
+    i18n (1.14.1)
       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.5.0)
+    iiif_manifest (1.6.0)
       activesupport (>= 4)
-    jaro_winkler (1.6.0)
+    jaro_winkler (1.5.6)
     jbuilder (2.12.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
@@ -457,7 +475,7 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    json (2.7.2)
+    json (2.6.3)
     json-canonicalization (0.3.1)
     json-ld (3.1.10)
       htmlentities (~> 4.3)
@@ -469,9 +487,10 @@ GEM
     json-ld-preloaded (3.1.6)
       json-ld (~> 3.1)
       rdf (~> 3.1)
-    json-schema (4.3.0)
-      addressable (>= 2.8)
-    jwt (2.8.2)
+    json-schema (5.1.1)
+      addressable (~> 2.8)
+      bigdecimal (~> 3.1)
+    jwt (2.10.1)
       base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -542,7 +561,7 @@ GEM
       shex (~> 0.6, >= 0.6.4)
       sparql (~> 3.1, >= 3.1.8)
       sparql-client (~> 3.1, >= 3.1.2)
-    logger (1.6.0)
+    logger (1.6.5)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -554,42 +573,41 @@ GEM
     mailboxer (0.15.1)
       carrierwave (>= 0.5.8)
       rails (>= 5.0.0)
-    marcel (1.0.4)
+    marcel (1.0.2)
     matrix (0.4.2)
-    method_source (1.1.0)
-    mime-types (3.5.2)
+    method_source (1.0.0)
+    mime-types (3.6.0)
+      logger
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0702)
-    mini_magick (4.13.1)
+    mime-types-data (3.2025.0107)
+    mini_magick (4.13.2)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.7)
-    minitest (5.24.1)
-    mize (0.4.1)
-      protocol (~> 2.0)
+    mini_portile2 (2.8.5)
+    minitest (5.20.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.4.1)
+    multipart-post (2.3.0)
     nest (3.2.0)
       redic
-    net-http-persistent (4.0.2)
+    net-http-persistent (4.0.5)
       connection_pool (~> 2.2)
-    net-imap (0.4.14)
+    net-imap (0.4.6)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.4.0)
       net-protocol
     newspaper_works_fixtures (0.3.1)
       rails (~> 5.0)
-    nio4r (2.7.3)
+    nio4r (2.6.1)
     noid (0.9.0)
     noid-rails (3.0.3)
       actionpack (>= 5.0.0, < 7)
       noid (~> 0.9)
-    nokogiri (1.15.6)
+    nokogiri (1.15.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth (1.1.0)
@@ -606,29 +624,29 @@ GEM
       rack (>= 1.2, < 4)
     openseadragon (0.6.0)
       rails (> 3.2.0)
+    orm_adapter (0.5.0)
     os (1.1.4)
-    parallel (1.25.1)
-    parser (3.3.3.0)
+    parallel (1.23.0)
+    parser (3.2.2.4)
       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.1.1)
-    qa (5.11.0)
+    puma (3.12.6)
+    qa (5.14.0)
       activerecord-import
       deprecation
       faraday (< 3.0, != 2.0.0)
       geocoder
       ldpath
       nokogiri (~> 1.6)
-      rails (>= 5.0, < 7.2)
+      rails (>= 5.0, < 8.1)
       rdf
-    racc (1.8.0)
-    rack (2.2.9)
+    racc (1.7.3)
+    rack (2.2.8)
     rack-test (2.1.0)
       rack (>= 1.3)
     rails (5.2.8.1)
@@ -666,11 +684,11 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rainbow (3.1.1)
-    rake (13.2.1)
+    rake (13.1.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rdf (3.2.11)
+    rdf (3.2.12)
       link_header (~> 0.0, >= 0.0.8)
     rdf-aggregate-repo (3.2.1)
       rdf (~> 3.2)
@@ -744,33 +762,35 @@ GEM
     reform-rails (0.2.6)
       activemodel (>= 5.0)
       reform (>= 2.3.1, < 3.0.0)
-    regexp_parser (2.9.2)
+    regexp_parser (2.8.2)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
     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.3.1)
-      strscan
+    rexml (3.2.6)
     rsolr (2.6.0)
       builder (>= 2.1.2)
       faraday (>= 0.9, < 3, != 2.0.0)
-    rspec-activemodel-mocks (1.2.0)
+    rspec-activemodel-mocks (1.1.0)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       rspec-mocks (>= 2.99, < 4.0)
-    rspec-core (3.13.0)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
+      rspec-support (~> 3.12.0)
     rspec-rails (5.1.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
@@ -779,7 +799,7 @@ GEM
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.13.1)
+    rspec-support (3.12.1)
     rubocop (1.28.2)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
@@ -789,8 +809,8 @@ GEM
       rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.31.3)
-      parser (>= 3.3.1.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
     rubocop-performance (1.19.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
@@ -807,9 +827,6 @@ 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
@@ -828,7 +845,6 @@ 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)
@@ -894,8 +910,7 @@ GEM
     sparql-client (3.2.2)
       net-http-persistent (~> 4.0, >= 4.0.2)
       rdf (~> 3.2, >= 3.2.11)
-    sprockets (3.7.3)
-      base64
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-es6 (0.9.2)
@@ -906,27 +921,29 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
+    sqlite3 (1.7.3)
+      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.10.2)
-      mize
+    term-ansicolor (1.7.1)
       tins (~> 1.0)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
-    thor (1.3.1)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
+    thor (1.3.0)
     thread_safe (0.3.6)
-    tilt (2.4.0)
+    tilt (2.3.0)
     timeout (0.4.1)
-    tins (1.33.0)
-      bigdecimal
+    tins (1.32.1)
       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
@@ -936,8 +953,10 @@ 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)
+    unicode-types (1.10.0)
     valkyrie (2.2.0)
       activemodel
       activesupport
@@ -954,32 +973,60 @@ GEM
       reform (~> 2.2)
       reform-rails
     version_gem (1.1.4)
+    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)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    yard (0.9.36)
-    zeitwerk (2.6.16)
+    yard (0.9.34)
+    zeitwerk (2.6.18)
 
 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 (~> 0.5, >= 0.5.1)
+  fcrepo_wrapper
   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 (>= 1.1, < 3.0)
+  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)
   yard
 
+RUBY VERSION
+   ruby 2.7.6p219
+
 BUNDLED WITH
    2.3.20

data/README.md

@@ -39,10 +39,10 @@ IiifPrint supports:
 * excluding specified work types to be found in the catalog search
 * external IIIF image urls that work with services such as serverless-iiif or cantaloup
 
-A complete list of features can be found [here](https://github.com/scientist-softserv/iiif_print/wiki/Features-List).
+A complete list of features can be found [here](https://github.com/notch8/iiif_print/wiki/Features-List).
 
 ## Documentation
-A set of helpful documents to help you learn more and deploy IiifPrint can be found on the [Project Wiki](https://github.com/scientist-softserv/iiif_print/wiki).
+A set of helpful documents to help you learn more and deploy IiifPrint can be found on the [Project Wiki](https://github.com/notch8/iiif_print/wiki).
 
 IiifPrint was developed against [Hyku](https://github.com/samvera/hyku) v4.0-v5.0. If your application uses [Bulkrax](https://github.com/samvera-labs/bulkrax), please ensure that its version is 5.0.1 or greater.
 
@@ -232,7 +232,7 @@ end
 
 #### Pre-Process Location
 
-The [DerivativeRodeo](https://github.com/scientist-softserv/derivative_rodeo) allows for specifying a location where you've done pre-processing (e.g. you ran splitting and derivative generation in AWS's Lambda).
+The [DerivativeRodeo](https://github.com/notch8/derivative_rodeo) allows for specifying a location where you've done pre-processing (e.g. you ran splitting and derivative generation in AWS's Lambda).
 
 By default the preprocess location is S3, as that is where SoftServ has been running pre-processing.  However that default may not be adequate for local development.
 

data/app/controllers/iiif_print/split_pdfs_controller.rb

@@ -4,9 +4,10 @@ module IiifPrint
     before_action :authenticate_user!
 
     def create
-      @file_set = FileSet.where(id: params[:file_set_id]).first
+      @file_set = IiifPrint.find_by(id: params[:file_set_id])
       authorize_create_split_request!(@file_set)
-      IiifPrint::Jobs::RequestSplitPdfJob.perform_later(file_set: @file_set, user: current_user)
+
+      IiifPrint::Jobs::RequestSplitPdfJob.perform_later(file_set_id: @file_set.to_param, user: current_user)
       respond_to do |wants|
         wants.html { redirect_to polymorphic_path([main_app, @file_set]), notice: t("iiif_print.file_set.split_submitted", id: @file_set.id) }
         wants.json { render json: { id: @file_set.id, to_param: @file_set.to_param }, status: :ok }
@@ -27,7 +28,7 @@ module IiifPrint
       # Rely on CanCan's authorize! method.  We could add the :split_pdf action to the ability
       # class.  But we're pigging backing on the idea that you can do this if you can edit the work.
       authorize!(:edit, file_set)
-      raise "Expected #{file_set.class} ID=#{file_set.id} #to_param=#{file_set.to_param} to be a PDF.  Instead found mime_type of #{file_set.mime_type}." unless file_set.pdf?
+      raise "Expected #{file_set.class} ID=#{file_set.id} #to_param=#{file_set.to_param} to be a PDF.  Instead found mime_type of #{file_set.mime_type}." unless IiifPrint.pdf?(file_set)
 
       work = IiifPrint.parent_for(file_set)
       raise WorkNotConfiguredToSplitFileSetError.new(file_set: file_set, work: work) unless work&.iiif_print_config&.pdf_splitter_job&.presence

data/app/helpers/iiif_print/iiif_helper_decorator.rb

@@ -26,8 +26,11 @@ module IiifPrint
       search_params = current_search_session.try(:query_params) || {}
       q = search_params['q'].presence || ''
 
+      return unless search_params[:highlight] || params[:highlight]
+
       "&q=#{url_encode(q)}" if q.present?
     end
   end
 end
+
 Hyrax::IiifHelper.prepend(IiifPrint::IiifHelperDecorator)

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

@@ -21,7 +21,7 @@ module IiifPrint
       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)
+      solr_doc['descendent_member_ids_ssim'] = iiif_print_lineage_service.descendent_member_ids_for(object)
     end
   end
 end

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

@@ -33,7 +33,8 @@ module IiifPrint
         # However, there seem to be cases where we still don't have the file when we get here, so to be sure, we
         # re-do the same command that was previously used to prepare the file path. If the file is already here, it
         # simply returns the path, but if not it will copy the file there, giving us one more chance to have what we need.
-        pdf_paths = [Hyrax::WorkingDirectory.find_or_retrieve(pdf_file_set.original_file.id, pdf_file_set.id, pdf_paths.first)] if pdf_file_set
+        redownload = pdf_file_set&.is_a?(ActiveFedora::Base)
+        pdf_paths = [Hyrax::WorkingDirectory.find_or_retrieve(pdf_file_set.original_file.id, pdf_file_set.id, pdf_paths.first)] if redownload
         # handle each input pdf (when input is a file set, we will only have one).
         pdf_paths.each do |original_pdf_path|
           split_pdf(original_pdf_path, user, child_model, pdf_file_set)

data/app/jobs/iiif_print/jobs/request_split_pdf_job.rb

@@ -4,12 +4,12 @@ module IiifPrint
     # Encapsulates logic for cleanup when the PDF is destroyed after pdf splitting into child works
     class RequestSplitPdfJob < IiifPrint::Jobs::ApplicationJob
       ##
-      # @param file_set [FileSet]
+      # @param file_set_id [FileSet id]
       # @param user [User]
       # rubocop:disable Metrics/MethodLength
-      def perform(file_set:, user:)
-        return true unless file_set.pdf?
-
+      def perform(file_set_id:, user:)
+        file_set = IiifPrint.find_by(id: file_set_id)
+        return true unless IiifPrint.pdf?(file_set)
         work = IiifPrint.parent_for(file_set)
 
         # Woe is ye who changes the configuration of the model, thus removing the splitting.
@@ -18,11 +18,11 @@ module IiifPrint
         # clean up any existing spawned child works of this file_set
         IiifPrint::SplitPdfs::DestroyPdfChildWorksService.conditionally_destroy_spawned_children_of(
           file_set: file_set,
-          work: work
+          work: work,
+          user: user
         )
 
-        location = Hyrax::WorkingDirectory.find_or_retrieve(file_set.files.first.id, file_set.id)
-
+        location = IiifPrint.pdf_path_for(file_set: file_set)
         IiifPrint.conditionally_submit_split_for(work: work, file_set: file_set, locations: [location], user: user)
       end
       # rubocop:enable Metrics/MethodLength

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

@@ -15,17 +15,22 @@ module IiifPrint
       iiif_print_solr_field_names.include?(method_name.to_s) || super
     end
 
-    # @see https://github.com/samvera/hyrax/commit/7108409c619cd2ba4ae8c836b9f3b429a7e9837b
+    # consists of member_ids_ssim + its descendents' member_ids (recursively)
     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']
+      self['descendent_member_ids_ssim'] || self['member_ids_ssim']
     end
 
     def any_highlighting?
       response&.[]('highlighting')&.[](id)&.present?
     end
 
+    def any_highlighting_in_all_text_fields?
+      [CatalogController.blacklight_config.iiif_search[:full_text_field]].any? do |field|
+        highlights = response&.dig('highlighting', id, field)
+        highlights&.any? { |text| text.include?("<span class='highlight'>") }
+      end
+    end
+
     def solr_document
       self
     end

data/app/models/iiif_print/iiif_search_decorator.rb

@@ -26,7 +26,7 @@ module IiifPrint
       return { q: 'nil:nil' } unless q
 
       {
-        q: "#{q} AND (#{iiif_config[:object_relation_field]}:\"#{parent_document.id}\" OR id:\"#{parent_document.id}\")",
+        q: "#{q} AND has_model_ssim:FileSet AND (#{iiif_config[:object_relation_field]}:\"#{parent_document.id}\" OR id:\"#{parent_document.id}\")",
         rows: rows,
         page: page
       }

data/app/models/iiif_print/iiif_search_response_decorator.rb

@@ -1,7 +1,7 @@
 module IiifPrint
   module IiifSearchResponseDecorator
     # Enable the user to search for child metadata in the parent's UV
-    # @see https://github.com/scientist-softserv/louisville-hyku/commit/67467e5cf9fdb755f54419f17d3c24c87032d0af
+    # @see https://github.com/notch8/louisville-hyku/commit/67467e5cf9fdb755f54419f17d3c24c87032d0af
     def annotation_list
       json_results = super
 

data/app/presenters/iiif_print/iiif_manifest_presenter_factory_decorator.rb

@@ -14,7 +14,7 @@ module IiifPrint
           presenter_class.for(solr_doc)
         elsif Hyrax.config.curation_concerns.include?(solr_doc.hydra_model)
           # look up file set ids and loop through those
-          file_set_docs = load_file_set_docs(solr_doc.try(:member_ids) || solr_doc.try(:[], 'member_ids_ssim'))
+          file_set_docs = load_file_set_docs(load_file_set_ids(solr_doc))
           file_set_docs.map { |doc| presenter_class.for(doc) } if file_set_docs.length
         end
       end.flatten.compact
@@ -22,6 +22,13 @@ module IiifPrint
 
     private
 
+    def load_file_set_ids(solr_doc)
+      solr_doc.try(:descendent_member_ids_ssim) ||
+        solr_doc.try(:[], 'descendent_member_ids_ssim') ||
+        solr_doc.try(:member_ids_ssim) ||
+        solr_doc.try(:[], 'member_ids_ssim')
+    end
+
     # still create the manifest if the parent work has images attached but the child works do not
     def load_file_set_docs(file_set_ids)
       return [] if file_set_ids.nil?

data/app/presenters/iiif_print/work_show_presenter_decorator.rb

@@ -24,13 +24,20 @@ module IiifPrint
     #
     # @todo Review if this is necessary for Hyrax 5.
     def members_include_viewable_image?
-      all_member_ids = solr_document.try(:member_ids) || solr_document.try(:[], 'member_ids_ssim')
+      all_member_ids = load_file_set_ids(solr_document)
       Array.wrap(all_member_ids).each do |id|
         return true if file_type_and_permissions_valid?(member_presenters_for([id]).first)
       end
       false
     end
 
+    def load_file_set_ids(solr_doc)
+      solr_doc.try(:descendent_member_ids_ssim) ||
+        solr_doc.try(:[], 'descendent_member_ids_ssim') ||
+        solr_doc.try(:member_ids_ssim) ||
+        solr_doc.try(:[], 'member_ids_ssim')
+    end
+
     # This method allows for overriding to add additional file types to mix in with IiifAv
     # TODO: add configuration setting for file types to loop through so an override is unneeded.
     def file_type_and_permissions_valid?(presenter)

data/app/services/iiif_print/manifest_builder_service_decorator.rb

@@ -79,7 +79,7 @@ module IiifPrint
       # uses the 'id' property for v3 manifest and `@id' for v2, which is a URL that contains the FileSet id
       file_set_id = (canvas['id'] || canvas['@id']).split('/').last
       # finds the image that the FileSet is attached to and creates metadata on that canvas
-      image = solr_doc_hits.find { |hit| hit[:member_ids_ssim]&.include?(file_set_id) }
+      image = solr_doc_hits.find { |hit| (hit[:descendent_member_ids_ssim] || hit[:member_ids_ssim])&.include?(file_set_id) }
       return unless image
       # prevents duplicating the child and parent metadata
       return if image.id == presenter.id
@@ -124,7 +124,7 @@ module IiifPrint
     end
 
     def member_ids_for(presenter)
-      member_ids = presenter.try(:ordered_ids) || presenter.try(:member_ids)
+      member_ids = presenter.object.solr_document['descendent_member_ids_ssim'] || presenter.try(:ordered_ids) || presenter.try(:member_ids)
       member_ids.nil? ? [] : member_ids
     end
 

data/app/services/iiif_print/simple_schema_loader_decorator.rb

@@ -9,4 +9,4 @@ module IiifPrint
     end
   end
 end
-Hyrax::SimpleSchemaLoader.prepend(IiifPrint::SimpleSchemaLoaderDecorator)
+Hyrax::SimpleSchemaLoader.prepend(IiifPrint::SimpleSchemaLoaderDecorator) unless Hyrax.config.respond_to?(:simple_schema_loader_config_search_paths)

data/app/views/catalog/_index_header_list_default.html.erb

@@ -3,9 +3,9 @@
 <div class="search-results-title-row">
   <h3 class="search-result-title">
   <% if params['q'].present? && document.any_highlighting? %>
-    <%= link_to document.title_or_label, [document, { parent_query: params['q'] }] %></h3>
+    <%= link_to document.title_or_label, [document, { parent_query: params['q'], highlight: 'true' }] %></h3>
   <% elsif params['q'].present? %>
-    <%= link_to document.title_or_label, [document, { query: params['q'] }] %></h3>
+    <%= link_to document.title_or_label, [document, { query: params['q'] }] %>
   <% else %>
     <%= link_to document.title_or_label, document %></h3>
   <% end %>

data/docker-compose.yml

@@ -6,7 +6,7 @@ x-app: &app
     target: hyku-base
     args:
       - EXTRA_APK_PACKAGES=less vim bash openjdk11-jre ffmpeg rsync exiftool
-  # image: ghcr.io/scientist-softserv/palni-palci:${TAG:-latest}
+  # image: ghcr.io/notch8/palni-palci:${TAG:-latest}
   env_file:
     - .env
   # NOTE: all common env variables moved to .env

data/iiif_print.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.email       = ['sean.upton@utah.edu', 'jacob.reed@utah.edu',
                       'brian.mcbride@utah.edu', 'eenglish@bpl.org', 'kirk.wang@scientist.com',
                       'larita@scientist.com', 'jeremy.n.friesen@gmail.com']
-  spec.homepage    = 'https://github.com/scientist-softserv/iiif_print/'
+  spec.homepage    = 'https://github.com/notch8/iiif_print/'
   spec.description = 'Gem/Engine for IIIF Print works in Hyrax-based Samvera Application.'
   spec.summary     = <<-SUMMARY
   IiifPrint is a gem (Rails "engine") for Hyrax-based digital repository applications to support displaying parent/child works in the same viewer (Universal Viewer) and the ability to search OCR from the parent work to the child work(s). IiifPring was originally based off of the samvera-labs Newspaper gem.

data/lib/iiif_print/blacklight_iiif_search/annotation_decorator.rb

@@ -2,7 +2,7 @@
 module IiifPrint
   module BlacklightIiifSearch
     module AnnotationDecorator
-      INVALID_MATCH_TEXT = "#xywh=INVALID,INVALID,INVALID,INVALID".freeze
+      INVALID_MATCH_TEXT = "#xywh=0,0,0,0".freeze
       ##
       # Create a URL for the annotation
       # use a Hyrax-y URL syntax:

data/lib/iiif_print/configuration.rb

@@ -4,6 +4,12 @@ module IiifPrint
     attr_writer :after_create_fileset_handler
 
     attr_writer :ingest_queue_name
+
+    # Example settings in the initializer:
+    # config.memory_limit = "512MiB"  # Limit for memory usage
+    # config.map_limit = "1GiB"       # Limit for map usage
+    # config.disk_limit = "20KP"      # Limit for disk usage
+    attr_accessor :memory_limit, :map_limit, :disk_limit
     ##
     # @return [Symbol, Proc]
     def ingest_queue_name

data/lib/iiif_print/engine.rb

@@ -48,6 +48,10 @@ module IiifPrint
 
       Hyrax.publisher.subscribe(IiifPrint::Listener.new) if Hyrax.respond_to?(:publisher)
 
+      # 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')]
+
       # 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)
@@ -61,6 +65,8 @@ module IiifPrint
         config.callback.set(:after_create_fileset) do |file_set, user|
           IiifPrint.config.handle_after_create_fileset(file_set, user)
         end
+
+        config.simple_schema_loader_config_search_paths += [IiifPrint::Engine.root] if config.respond_to?(:simple_schema_loader_config_search_paths)
       end
     end
     # rubocop:enable Metrics/BlockLength

data/lib/iiif_print/image_tool.rb

@@ -41,7 +41,7 @@ module IiifPrint
       monochrome &&= destination.slice(-4, 4).index('tif')
       mono_opts = "-depth 1 -monochrome -compress Group4 -type bilevel "
       opts = monochrome ? mono_opts : ''
-      cmd = "convert #{source} #{opts}#{destination}"
+      cmd = "convert #{source} #{opts}#{destination} && sync"
       `#{cmd}`
     end
 
@@ -74,8 +74,22 @@ module IiifPrint
 
     # @return [Array<String>] lines of output from imagemagick `identify`
     def im_identify
-      cmd = "identify -format 'Geometry: %G\nDepth: %[bit-depth]\nColorspace: %[colorspace]\nAlpha: %A\nMIME type: %m\n' #{path}"
-      `#{cmd}`.lines
+      memory_limit = IiifPrint.config.memory_limit
+      map_limit = IiifPrint.config.map_limit
+      disk_limit = IiifPrint.config.disk_limit
+
+      cmd = "identify"
+
+      cmd += " -limit memory #{memory_limit}" if memory_limit.present?
+      cmd += " -limit map #{map_limit}" if map_limit.present?
+      cmd += " -limit disk #{disk_limit}" if disk_limit.present?
+
+      cmd += " -format 'Geometry: %G\nDepth: %[bit-depth]\nColorspace: %[colorspace]\nAlpha: %A\nMIME type: %m\n' #{path}"
+
+      output, status = Open3.capture2(cmd)
+      Rails.logger.info "Identify command output: #{output}"
+      Rails.logger.info "Identify command status: #{status}"
+      output.lines
     end
 
     def im_mime(lines)

data/lib/iiif_print/lineage_service.rb

@@ -47,26 +47,17 @@ module IiifPrint
     ##
     # @param object [#ordered_works, #file_sets, #member_ids]
     # @return [Array<String>] the ids of associated file sets and child works
-    #
-    # @see
-    # https://github.com/samvera/hyrax/blob/2b807fe101176d594129ef8a8fe466d3d03a372b/app/indexers/hyrax/work_indexer.rb#L15-L18
-    # for "clarification" of the comingling of file_set_ids and member_ids
     def self.descendent_member_ids_for(object)
       return unless object.respond_to?(:member_ids)
-
       # enables us to return parents when searching for child OCR
-      #
-      # https://github.com/samvera/hydra-works/blob/c9b9dd0cf11de671920ba0a7161db68ccf9b7f6d/lib/hydra/works/models/concerns/work_behavior.rb#L90-L92
-      #
-      # The Hydara::Works implementation of file_set_ids is "members.select(&:file_set?).map(&:id)";
-      # so no sense doing `object.file_set_ids + object.member_ids`
-      file_set_ids = object.member_ids
+      child_ids = object.member_ids
+      # add in child works & their child works & filesets, recursively
       IiifPrint.object_ordered_works(object)&.each do |child|
-        file_set_ids += Array.wrap(descendent_member_ids_for(child))
+        child_ids += Array.wrap(descendent_member_ids_for(child))
       end
       # We must convert these to strings as Valkyrie's identifiers will be cast to hashes when we
       # attempt to write the SolrDocument.
-      file_set_ids.flatten.uniq.compact.map(&:to_s)
+      child_ids.flatten.compact.map(&:to_s).uniq
     end
     class << self
       alias descendent_file_set_ids_for descendent_member_ids_for

data/lib/iiif_print/persistence_layer/active_fedora_adapter.rb

@@ -184,6 +184,15 @@ module IiifPrint
       def self.extract_text_for(file_set:)
         IiifPrint.config.all_text_generator_function.call(object: file_set) || ''
       end
+
+      ##
+      # Location of the file for resplitting
+      #
+      # @param [FileSet] an ActiveFedora fileset
+      # @return [String] location of the original file
+      def self.pdf_path_for(file_set:)
+        Hyrax::WorkingDirectory.find_or_retrieve(file_set.files.first.id, file_set.id)
+      end
     end
   end
 end

data/lib/iiif_print/persistence_layer/valkyrie_adapter.rb

@@ -1,3 +1,5 @@
+# rubocop:disable Metrics/ClassLength
+
 module IiifPrint
   module PersistenceLayer
     class ValkyrieAdapter < AbstractAdapter
@@ -12,9 +14,7 @@ module IiifPrint
       # @param object [Valkyrie::Resource]
       # @return [Array<Valkyrie::Resource>]
       def self.object_ordered_works(object)
-        child_file_sets = Hyrax.custom_queries.find_child_file_sets(resource: object).to_a
-        child_works = Hyrax.custom_queries.find_child_works(resource: object).to_a
-        child_works + child_file_sets
+        Hyrax.custom_queries.find_child_works(resource: object).to_a
       end
 
       ##
@@ -78,14 +78,28 @@ module IiifPrint
         Hyrax.config.index_field_mapper.solr_name(field_name.to_s)
       end
 
-      # rubocop:disable Lint/UnusedMethodArgument
-      def self.destroy_children_split_from(file_set:, work:, model:, user:)
-        # rubocop:enable Lint/UnusedMethodArgument
-        # look for child records by the file set id they were split from
-        Hyrax.query_service.find_inverse_references_by(resource: file_set, property: :split_from_pdf_id, model: model).each do |child|
-          Hyrax.persister.delete(resource: child)
-          Hyrax.indexing_service.delete(resource: child)
-          Hyrax.publisher.publish('object.deleted', object: child, user: user)
+      # NOTE: this isn't the most efficient method, but it is the most reliable.
+      #  Attribute 'split_from_pdf_id' is saved in Valkyrie as a string rather than as { id: string },
+      #    so we can't use the 'find_inverse_references_by' query.
+      #  Additionally, the attribute does not exist on all child works, as it was added later, so using
+      #    a child work's title allows us to find child works when the attribute isn't present.
+      #  Building a custom query to find these child works directly via the attribute would be more efficient.
+      #    However, it would require more effort for a lesser-used feature, and would not allow for the fallback
+      #    of finding child works by title.
+      def self.destroy_children_split_from(file_set:, work:, _model:, user:)
+        all_child_works = Hyrax.custom_queries.find_child_works(resource: work)
+        return if all_child_works.blank?
+        # look first for children by the file set id they were split from
+        children = all_child_works.select { |m| m.split_from_pdf_id == file_set.id }
+        if children.blank?
+          # find works where file name and work `to_param` are both in the title
+          children = all_child_works.select { |m| m.title.include?(file_set.label) && m.title.include?(work.to_param) }
+        end
+        return if children.blank?
+        children.each do |rcd|
+          Hyrax.persister.delete(resource: rcd)
+          Hyrax.index_adapter.delete(resource: rcd)
+          Hyrax.publisher.publish('object.deleted', object: rcd, user: user)
         end
         true
       end
@@ -178,6 +192,18 @@ module IiifPrint
         return if text_fm.nil?
         text_fm.content
       end
+
+      ##
+      # Location of the file for resplitting
+      #
+      # @param [Hyrax::FileSet] a Valkyrie fileset
+      # @return [String] location of the original file
+      def self.pdf_path_for(file_set:)
+        file = file_set.original_file
+        return '' unless file.pdf?
+        file.file.disk_path.to_s
+      end
     end
   end
 end
+# rubocop:enable Metrics/ClassLength

data/lib/iiif_print/persistence_layer.rb

@@ -113,6 +113,10 @@ module IiifPrint
       def self.extract_text_for(file_set:)
         raise NotImplementedError, "#{self}.{__method__}"
       end
+
+      def self.pdf_path_for(file_set:)
+        raise NotImplementedError, "#{self}.{__method__}"
+      end
     end
   end
 end

data/lib/iiif_print/split_pdfs/child_work_creation_from_pdf_service.rb

@@ -21,7 +21,7 @@ module IiifPrint
       #
       # @return [Symbol] when we don't enqueue the job
       # @return [TrueClass] when we actually enqueue the job underlying job.
-      # rubocop:disable Metrics/MethodLength
+      # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def self.conditionally_enqueue(file_set:, file:, user:, import_url: nil, work: nil)
         work ||= IiifPrint.parent_for(file_set)
 
@@ -36,10 +36,18 @@ module IiifPrint
                          end
         return :no_pdfs_to_split if file_locations.empty?
 
-        IiifPrint.conditionally_submit_split_for(work: work, file_set: file_set, locations: file_locations, user: user)
-        :enqueued
+        file_set_id = file_set.id.try(:id) || file_set.id
+        work_admin_set_id = work.admin_set_id.try(:id) || work.admin_set_id
+        job = work.try(:iiif_print_config)&.pdf_splitter_job&.perform_later(
+          file_set_id,
+          file_locations,
+          user,
+          work_admin_set_id,
+          0 # A no longer used parameter; but we need to preserve the method signature (for now)
+        )
+        job ? :enqueued : :pdf_job_failed_enqueue
       end
-      # rubocop:enable Metrics/MethodLength
+      # rubocop:enable Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       ##
       # @api private
@@ -63,8 +71,8 @@ module IiifPrint
 
         if file.class < Valkyrie::Resource
           # assuming that if one PDF is uploaded to a Valkyrie resource then all of them should be
-          paths = [Hyrax.storage_adapter.file_path(file.file_identifier)]
-          pdfs_only_for(paths)
+          return [] unless file.pdf?
+          [file.file.disk_path.to_s]
         else
           upload_ids = filter_file_ids(file.id.to_s)
           return [] if upload_ids.empty?

data/lib/iiif_print/split_pdfs/derivative_rodeo_splitter.rb

@@ -76,7 +76,7 @@ module IiifPrint
       #
       # @return [String]
       #
-      # @see https://github.com/scientist-softserv/space_stone-serverless/blob/7f46dd5b218381739cd1c771183f95408a4e0752/awslambda/handler.rb#L58-L63
+      # @see https://github.com/notch8/space_stone-serverless/blob/7f46dd5b218381739cd1c771183f95408a4e0752/awslambda/handler.rb#L58-L63
       # rubocop:disable Metrics/MethodLength
       # rubocop:disable Metrics/AbcSize
       def preprocessed_location_template

data/lib/iiif_print/version.rb

@@ -1,3 +1,3 @@
 module IiifPrint
-  VERSION = '3.0.0'.freeze
+  VERSION = '3.0.2'.freeze
 end

data/lib/iiif_print.rb

@@ -66,6 +66,7 @@ module IiifPrint
       :solr_construct_query,
       :solr_name,
       :solr_query,
+      :pdf_path_for,
       to: :persistence_adapter
     )
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iiif_print
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Sean Upton
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-04 00:00:00.000000000 Z
+date: 2025-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight_iiif_search
@@ -491,7 +491,7 @@ files:
 - tasks/copy_authorities_to_test_app.rake
 - tasks/iiif_print_dev.rake
 - tmp/.keep
-homepage: https://github.com/scientist-softserv/iiif_print/
+homepage: https://github.com/notch8/iiif_print/
 licenses:
 - Apache-2.0
 metadata: {}
@@ -510,7 +510,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.20
 signing_key:
 specification_version: 4
 summary: IiifPrint is a gem (Rails "engine") for Hyrax-based digital repository applications