Upgrade Curate to Hyrax v5.2.0.

.circleci/config.yml

@@ -2,29 +2,73 @@ version: 2.1
 orbs:
     node: circleci/node@4.9.0
     qlty-orb: qltysh/qlty-orb@0.1.1
-    samvera: samvera/circleci-orb@1.0.0
+    samvera: samvera/circleci-orb@1.0.1
 jobs:
     build:
         parameters:
+            bundler_version:
+                type: string
+                default: 2.4.19
+            fcrepo_version:
+                type: string
+                default: '4.7.5'
+            fcrepo6_domain:
+                type: string
+                default: fcreposix
+            redis_version:
+                type: string
+                default: 7.4.2
+            ruby_type:
+                type: string
+                default: 'ruby'
             ruby_version:
                 type: string
-                default: 2.7.4
-            bundler_version:
+                default: 3.2.9
+            solr_port:
                 type: string
-                default: 2.1.4
-        executor:
-            name: samvera/ruby_fcrepo_solr_redis
-            ruby_version: << parameters.ruby_version >>
-            solr_version: 7-alpine
+                default: '8983'
+            solr_version:
+                type: string
+                default: 7.7.2
         working_directory: ~/project
+        docker:
+            - image: cimg/<< parameters.ruby_type >>:<< parameters.ruby_version >>-browsers
+            - image: samvera/fcrepo4:<< parameters.fcrepo_version >>
+              environment:
+                    CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC"
+            - image: fcrepo/fcrepo:6.5.1-tomcat9
+              name: << parameters.fcrepo6_domain >>
+              environment:
+                    - >-
+                        CATALINA_OPTS=-Dfcrepo.home=/fcrepo-home -Djava.awt.headless=true -Dfile.encoding=UTF-8
+                        -server -Xms1G -Xmx2G -XX:NewSize=256m -XX:MaxNewSize=1G
+                        -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/data/mem
+                        -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true
+                        -Dfcrepo.jms.enabled=false -Dfcrepo.metrics.enable=true
+                    - JAVA_OPTS=-Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true
+            - image: solr:<< parameters.solr_version >>
+              command: bin/solr -cloud -noprompt -f -p << parameters.solr_port >>
+            - image: redis:<< parameters.redis_version >>
+            - image: cimg/mariadb:10.11.4
+        resource_class: medium+
+        environment:
+            BUNDLE_PATH: vendor/bundle
+            BUNDLE_JOBS: 4
+            BUNDLE_RETRY: 3
+            RAILS_ENV: test
+            RACK_ENV: test
+            CIRCLECI_DOMAIN: localhost
+            FCREPO_TEST_PORT: 8080
+            FCREPO6_DOMAIN: << parameters.fcrepo6_domain >>
+            SPEC_OPTS: --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
         parallelism: 4
         steps:
             - checkout
 
             - node/install:
                 install-yarn: true
                 install-npm: false
-                node-version: "v20.15.1"
+                node-version: "v20.20.0"
 
             - samvera/bundle:
                 ruby_version: << parameters.ruby_version >>
@@ -47,7 +91,18 @@ jobs:
                 paths:
                     - ~/project/node_modules
 
-            - samvera/install_solr_core
+            - samvera/install_solr_core:
+                solr_port: << parameters.solr_port >>
+
+            - run:
+                name: Install MySQL client (if not present in primary image)
+                command: |
+                    sudo apt-get update
+                    sudo apt-get install -y mysql-client
+
+            - run:
+                name: Create specific test database
+                command: mysql -h 127.0.0.1 -u root -e "CREATE DATABASE IF NOT EXISTS curate_test;"
 
             - samvera/parallel_rspec
 
@@ -61,7 +116,7 @@ jobs:
 
     coverage:
         docker:
-            - image: cimg/ruby:2.7.4
+            - image: cimg/ruby:3.2.9
         working_directory: ~/project
         parallelism: 1
         steps:

.gitignore

@@ -21,13 +21,12 @@ lib/tasks/ci.rake
 # Ignore coverage report
 coverage
 
-# Ignore webpacker and yarn.
-/public/packs
-/public/packs-test
+# Ignore yarn and pre-compile
 /node_modules
 /yarn-error.log
 yarn-debug.log*
 .yarn-integrity
+public/assets/
 
 # Ignore OS-specific files
 **/.DS_Store
@@ -102,4 +101,5 @@ public/branding
 # fits artifacts
 fits.log
 
+config/emory/index_file_set_results.csv
 imports

.rubocop.yml

@@ -4,7 +4,7 @@ inherit_gem:
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-    TargetRubyVersion: 2.7
+    TargetRubyVersion: 3.2
     Exclude:
         - bin/**/*
         - db/**/*
@@ -19,11 +19,6 @@ Layout/HashAlignment:
 Layout/IndentationConsistency:
     EnforcedStyle: indented_internal_methods
 
-Layout/LineLength:
-    Exclude:
-        - app/importers/curate_record_importer.rb
-        - spec/importers/curate_mapper_spec.rb
-
 Lint/NonLocalExitFromIterator:
     Exclude:
         - app/importers/collection_permission_ensurer.rb
@@ -34,7 +29,7 @@ Metrics/AbcSize:
         - app/importers/*
         - app/indexers/curate_generic_work_indexer.rb
         - app/indexers/curate/file_set_indexer.rb
-        - app/lib/metadata_details.rb
+        - app/parsers/bulkrax/csv_parser.rb
         - config/initializers/bulkrax.rb
         - spec/system/import_langmuir_from_csv_spec.rb
 
@@ -56,55 +51,77 @@ Metrics/ClassLength:
         - app/actors/hyrax/actors/file_set_actor.rb
         - app/controllers/catalog_controller.rb
         - app/controllers/iiif_controller.rb
+        - app/factories/bulkrax/object_factory.rb
+        - app/factories/bulkrax/object_factory_interface.rb
         - app/forms/hyrax/forms/collection_form.rb
         - app/importers/*
         - app/indexers/curate_generic_work_indexer.rb
+        - app/models/bulkrax/csv_entry.rb
+        - app/models/bulkrax/exporter.rb
+        - app/models/concerns/bulkrax/file_factory.rb
         - app/models/curate_generic_work.rb
         - app/models/solr_document.rb
+        - app/parsers/bulkrax/application_parser.rb
+        - app/parsers/bulkrax/csv_parser.rb
         - app/presenters/hyrax/collection_presenter.rb
         - app/services/aspace/api_service.rb
-        # Deprecation warning: Zizia will be removed with Curate v3.
-        - app/uploaders/zizia/csv_manifest_validator.rb
         - spec/**/*
 
 Metrics/CyclomaticComplexity:
     Exclude:
+        - app/controllers/concerns/bulkrax/datatables_behavior.rb
         - app/controllers/iiif_controller.rb
+        - app/factories/bulkrax/object_factory.rb
         - app/importers/curate_record_importer.rb
         - app/importers/yellowback_preprocessor.rb
         - app/indexers/curate_generic_work_indexer.rb
         - app/indexers/curate/file_set_indexer.rb
         - app/jobs/characterize_job.rb
+        - app/models/bulkrax/csv_entry.rb
         - app/models/concerns/hydra/access_controls/visibility.rb
+        - app/parsers/bulkrax/application_parser.rb
+        - app/parsers/bulkrax/csv_parser.rb
         - config/initializers/bulkrax.rb
         - config/initializers/file_actor.rb
 
 Metrics/MethodLength:
     Exclude:
         - app/controllers/background_jobs_controller.rb
+        - app/controllers/concerns/bulkrax/datatables_behavior.rb
         - app/controllers/hyrax/file_sets_controller.rb
         - app/controllers/iiif_controller.rb
+        - app/factories/bulkrax/object_factory_interface.rb
         - app/forms/hyrax/curate_generic_work_form.rb
         - app/importers/*
         - app/indexers/curate_generic_work_indexer.rb
         - app/indexers/curate/file_set_indexer.rb
         - app/jobs/characterize_job.rb
         - app/jobs/create_work_job.rb
+        - app/models/bulkrax/exporter.rb
+        - app/models/concerns/bulkrax/export_behavior.rb
+        - app/models/concerns/bulkrax/import_behavior.rb
+        - app/models/concerns/bulkrax/file_factory.rb
         - app/models/concerns/hydra/access_controls/visibility.rb
+        - app/parsers/bulkrax/application_parser.rb
+        - app/parsers/bulkrax/csv_parser.rb
+        - app/parsers/bulkrax/parser_export_record_set.rb
         - app/presenters/hyrax/collection_presenter.rb
         - app/presenters/hyrax/curate_collection_presenter.rb
-        - app/uploaders/zizia/csv_manifest_validator.rb
         - config/initializers/bulkrax.rb
         - spec/fixtures/manifest_output.rb
         - spec/fixtures/placeholder_manifest_output.rb
 
 Metrics/ModuleLength:
     Exclude:
+        - app/controllers/concerns/bulkrax/datatables_behavior.rb
         - app/lib/metadata_definitions.rb
+        - app/models/concerns/bulkrax/import_behavior.rb
         - app/models/concerns/hyrax/collection_behavior.rb
 
 Metrics/ParameterLists:
     Exclude:
+        - app/factories/bulkrax/object_factory.rb
+        - app/factories/bulkrax/object_factory_interface.rb
         - app/importers/yellowback_preprocessor.rb
         - lib/importing_modules/file_set_methods.rb
         - app/jobs/manifest_persistence_job.rb
@@ -113,21 +130,28 @@ Metrics/ParameterLists:
 
 Metrics/PerceivedComplexity:
     Exclude:
+        - app/controllers/concerns/bulkrax/datatables_behavior.rb
+        - app/forms/hyrax/curate_generic_work_form.rb
         - app/importers/curate_record_importer.rb
         - app/importers/yellowback_preprocessor.rb
-        - app/forms/hyrax/curate_generic_work_form.rb
+        - app/parsers/bulkrax/csv_parser.rb
+        - app/models/bulkrax/csv_entry.rb
 
 Naming/PredicateName:
     Exclude:
         - app/models/concerns/hydra/access_controls/access_right.rb
 
 Rails/Exit:
     Exclude:
-        - 'config/deploy.rb'
+        - config/deploy.rb
 
 Rails/Output:
     Exclude:
-        - 'config/deploy.rb'
+        - config/deploy.rb
+
+Rails/SkipsModelValidations:
+    Exclude:
+        - app/parsers/bulkrax/application_parser.rb
 
 RSpec/AnyInstance:
     Exclude:

.rubocop_todo.yml

@@ -1,3 +1,3 @@
-Style/MethodMissingSuper:
+Lint/MissingSuper:
     Exclude:
         - 'app/models/concerns/hyrax/file_set/characterization.rb'

.ruby-version

@@ -1 +1 @@
-2.7.4
+3.2.9