Merge pull request #382 from notch8/change-scientist-to-notch8

Update softserv to notch8

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

@@ -16,16 +16,16 @@ on:
 
 jobs:
   build:
-    uses: scientist-softserv/actions/.github/workflows/[email protected]
+    uses: notch8/actions/.github/workflows/[email protected]
     secrets: inherit
     with:
       platforms: "linux/amd64"
       webTarget: hyku-base
   test:
     needs: build
-    uses: scientist-softserv/actions/.github/workflows/[email protected]
+    uses: notch8/actions/.github/workflows/[email protected]
     with:
       setup_db_cmd: bundle exec rake prepare_and_run_tests
   lint:
     needs: build
-    uses: scientist-softserv/actions/.github/workflows/[email protected]
+    uses: notch8/actions/.github/workflows/[email protected]

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

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

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   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)
@@ -115,6 +115,7 @@ GEM
       i18n
     bcrypt (3.1.20)
     benchmark (0.3.0)
+    bigdecimal (3.1.9)
     bindex (0.8.1)
     bixby (5.0.2)
       rubocop (= 1.28.2)
@@ -149,13 +150,13 @@ 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
@@ -176,15 +177,15 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.2.2)
-    connection_pool (2.4.1)
+    connection_pool (2.5.0)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
       term-ansicolor (~> 1.3)
       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)
@@ -218,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)
@@ -303,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)
@@ -382,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)
@@ -456,7 +457,7 @@ GEM
       activesupport (>= 3.2.18)
       faraday (>= 0.9)
       json
-    iiif_manifest (1.5.0)
+    iiif_manifest (1.6.0)
       activesupport (>= 4)
     jaro_winkler (1.5.6)
     jbuilder (2.12.0)
@@ -486,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)
@@ -559,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)
@@ -574,10 +576,11 @@ GEM
     marcel (1.0.2)
     matrix (0.4.2)
     method_source (1.0.0)
-    mime-types (3.5.2)
+    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.5)
     minitest (5.20.0)
@@ -586,7 +589,7 @@ GEM
     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.6)
       date
@@ -633,14 +636,14 @@ GEM
     psych (3.3.4)
     public_suffix (5.1.1)
     puma (3.12.6)
-    qa (5.11.0)
+    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.7.3)
     rack (2.2.8)
@@ -685,7 +688,7 @@ GEM
     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)
@@ -928,8 +931,8 @@ GEM
     temple (0.10.3)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
     thor (1.3.0)
     thread_safe (0.3.6)
     tilt (2.3.0)
@@ -953,7 +956,7 @@ GEM
     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
@@ -981,7 +984,7 @@ GEM
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     yard (0.9.34)
-    zeitwerk (2.6.16)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   ruby

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.
 

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
 

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

iiif_print.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.email       = ['[email protected]', '[email protected]',
                       '[email protected]', '[email protected]', '[email protected]',
                       '[email protected]', '[email protected]']
-  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.

lib/iiif_print/persistence_layer/valkyrie_adapter.rb

@@ -1,3 +1,5 @@
+# rubocop:disable Metrics/ClassLength
+
 module IiifPrint
   module PersistenceLayer
     class ValkyrieAdapter < AbstractAdapter
@@ -84,7 +86,7 @@ def self.solr_name(field_name)
       #  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:)
+      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
@@ -197,10 +199,11 @@ def self.extract_text_for(file_set:)
       # @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
+        file = file_set.original_file
+        return '' unless file.pdf?
+        file.file.disk_path.to_s
       end
     end
   end
 end
+# rubocop:enable Metrics/ClassLength

lib/iiif_print/split_pdfs/derivative_rodeo_splitter.rb

@@ -76,7 +76,7 @@ def initialize(filename, file_set:, output_tmp_dir: Dir.tmpdir)
       #
       # @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