DO. NOT. MERGE! ONLY FOR CCI BUILDS!

.circleci/config.yml

@@ -5,7 +5,7 @@ orbs:
 jobs:
   checkout_code:
     docker:
-      - image: cimg/ruby:2.7
+      - image: cimg/ruby:3.2
     working_directory: ~/app
     steps:
       - restore_cache:
@@ -25,7 +25,7 @@ jobs:
             - app/**/*
   bundle:
     docker:
-      - image: cimg/ruby:2.7-browsers
+      - image: cimg/ruby:3.2-browsers
     environment:
       BUNDLE_PATH: vendor/bundle
     working_directory: ~/app
@@ -35,6 +35,10 @@ jobs:
       - run:
           name: Update Debian Packages for ClamAV
           command: |
+            # Temporary fix for Google Bundle
+            wget -O - "https://dl.google.com/linux/linux_signing_key.pub" | sudo gpg --dearmor -o /etc/apt/keyrings/google-chrome.gpg
+            echo 'c1db534ce40334b793cdbecba6459ddd21ebccbdef24dc603d6b0debcfb8f746  /etc/apt/keyrings/google-chrome.gpg'
+            echo 'deb [arch=amd64 signed-by=/etc/apt/keyrings/google-chrome.gpg] https://dl.google.com/linux/chrome/deb/ stable main' | sudo tee /etc/apt/sources.list.d/google-chrome.list > /dev/null
             sudo apt-get update &&
             sudo apt-get install -y software-properties-common build-essential make apt-utils
       - restore_cache:
@@ -59,7 +63,7 @@ jobs:
             - app/**/*
   lint:
     docker:
-      - image: cimg/ruby:2.7-browsers
+      - image: cimg/ruby:3.2-browsers
     environment:
       BUNDLE_PATH: vendor/bundle
     working_directory: ~/app
@@ -72,11 +76,12 @@ jobs:
       - run: bundle exec rubocop
   test:
     docker:
-      - image: cimg/ruby:2.7-browsers
+      - image: cimg/ruby:3.2-browsers
         environment:
           BUNDLE_PATH: vendor/bundle
           CAPYBARA_APP_HOST: http://test:3001
           FEDORA_URL: http://localhost:8080/fcrepo/rest
+          IIIF_SERVER_BASE_URL: http://localhost:8080/iiif
           HONEYCOMB_DATASET: od2-rails-test
           HONEYCOMB_DEBUG: "true"
           HONEYCOMB_WRITEKEY: buzzzzzzzzzzzzzzzz
@@ -115,6 +120,10 @@ jobs:
       - run:
           name: Update Debian Packages
           command: |
+            # Temporary fix for Google Bundle
+            wget -O - "https://dl.google.com/linux/linux_signing_key.pub" | sudo gpg --dearmor -o /etc/apt/keyrings/google-chrome.gpg
+            echo 'c1db534ce40334b793cdbecba6459ddd21ebccbdef24dc603d6b0debcfb8f746  /etc/apt/keyrings/google-chrome.gpg'
+            echo 'deb [arch=amd64 signed-by=/etc/apt/keyrings/google-chrome.gpg] https://dl.google.com/linux/chrome/deb/ stable main' | sudo tee /etc/apt/sources.list.d/google-chrome.list > /dev/null
             sudo apt-get update -qq
             sudo apt-get upgrade -qq
             sudo apt-get install -y -f software-properties-common build-essential nodejs make apt-utils ffmpeg tesseract-ocr poppler-utils
@@ -230,28 +239,28 @@ jobs:
       - docker/check:
           registry: registry.library.oregonstate.edu
       - docker/pull:
-          images: registry.library.oregonstate.edu/od2_web_cache:latest
+          images: registry.library.oregonstate.edu/od2_web_v4_cache:latest
           ignore-docker-pull-error: true
       - docker/build:
           registry: registry.library.oregonstate.edu
-          image: od2_web
+          image: od2_web_v4
           tag: $TAG
           extra_build_args: --build-arg RAILS_ENV=$RAILS_ENV --build-arg FEDORA_URL=$FEDORA_URL --build-arg DEPLOYED_VERSION=$DEPLOYED_VERSION
-          cache_from: registry.library.oregonstate.edu/od2_web_cache:latest
+          cache_from: registry.library.oregonstate.edu/od2_web_v4_cache:latest
       - docker/push:
           registry: registry.library.oregonstate.edu
-          image: od2_web
+          image: od2_web_v4
           tag: $TAG
       - docker/build:
           registry: registry.library.oregonstate.edu
-          image: od2_web_cache
+          image: od2_web_v4_cache
           tag: "latest"
           extra_build_args: --target gems
-          cache_from: registry.library.oregonstate.edu/od2_web_cache:latest
+          cache_from: registry.library.oregonstate.edu/od2_web_v4_cache:latest
           step-name: "Rebuild cache image"
       - docker/push:
           registry: registry.library.oregonstate.edu
-          image: od2_web_cache
+          image: od2_web_v4_cache
           tag: latest
           step-name: "Push cache image"
 workflows:
@@ -269,7 +278,9 @@ workflows:
             - lint
           filters:
             branches:
-              ignore: master
+              ignore:
+                - master
+                - feature/hyrax-4
       - build_and_push_beavernetes:
           name: Build and push application image to Beavernetes image repository
           requires:
@@ -281,5 +292,6 @@ workflows:
                 - master
                 - /infra\/.*/
                 - /staging\/.*/
-          repo: od2_web
+                - feature/hyrax-4
+          repo: od2_web_v4
           environment: production

.rubocop.yml

@@ -19,6 +19,8 @@ AllCops:
     - 'app/parsers/bulkrax/bagit_complex_parser.rb'
     - 'app/views/bulkrax/**/*'
     - 'app/parsers/bulkrax/parser_export_record_set.rb'
+    - 'app/jobs/bulkrax/export_work_job.rb'
+    - 'spec/controllers/hyrax/homepage_controller_spec.rb'
 
 Metrics/BlockLength:
   ExcludedMethods: ['included']
@@ -43,6 +45,9 @@ Style/CollectionMethods:
 Style/ClassAndModuleChildren:
   Enabled: false
 
+Layout/BlockAlignment:
+  Enabled: false
+
 Style/SingleLineBlockParams:
   Enabled: false
 
@@ -124,6 +129,9 @@ Lint/StructNewOverride:
 Style/ExponentialNotation:
   Enabled: false
 
+RSpec/VerifiedDoubles:
+  Enabled: false
+
 Style/HashEachMethods:
   Enabled: false
 

Dockerfile

@@ -1,12 +1,12 @@
-FROM ruby:2.7-alpine3.15 as bundler
+FROM ruby:3.2.1-alpine3.16 AS bundler
 
 # Necessary for bundler to operate properly
 ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8
 
-RUN gem install bundler -v '2.3.26'
+RUN gem install bundler -v '2.6.8'
 
-FROM bundler as dependencies
+FROM bundler AS dependencies
 
 # The alpine way
 RUN apk --no-cache update && apk --no-cache upgrade && \
@@ -56,9 +56,9 @@ ARG UID=8083
 ARG GID=8083
 
 # Create an app user so our program doesn't run as root.
-RUN addgroup -g "$GID" app && adduser -h /data -u "$UID" -G app -D -H app
+RUN addgroup -g 8083 app && adduser -h /data -u 8083 -G app -D -H app
 
-FROM dependencies as gems
+FROM dependencies AS gems
 
 # Make sure the new user has complete control over all code, including
 # bundler's installed assets
@@ -76,7 +76,7 @@ COPY --chown=app:app build/install_gems.sh /data/build
 USER app
 RUN /data/build/install_gems.sh
 
-FROM gems as code
+FROM gems AS code
 
 # Add the rest of the code
 COPY --chown=app:app . /data
@@ -92,14 +92,14 @@ FROM code
 USER root
 RUN apk --no-cache update && apk del autoconf automake gcc g++ --purge && \
   rm -rf /data/docker-compose.override.yml-example /data/README.md \
-         /data/.env.example /data/config/nginx /data/config/solr
+  /data/.env.example /data/config/nginx /data/config/solr
 USER app
 
 ENV DEPLOYED_VERSION=${DEPLOYED_VERSION}
 
 RUN if [ "${RAILS_ENV}" = "production" ]; then \
-    echo "Precompiling assets with $RAILS_ENV environment"; \
-    rm -rf /data/.cache; \
-    RAILS_ENV=$RAILS_ENV SECRET_KEY_BASE=temporary bundle exec rails assets:precompile; \
-    for f in public/assets/4*.html; do cp $f public/${f:14:3}.html; done; \
+  echo "Precompiling assets with $RAILS_ENV environment"; \
+  rm -rf /data/.cache; \
+  RAILS_ENV=$RAILS_ENV SECRET_KEY_BASE=temporary bundle exec rails assets:precompile; \
+  for f in public/assets/4*.html; do cp $f public/${f:14:3}.html; done; \
   fi

Gemfile

@@ -8,7 +8,7 @@ end
 # TODO: make this a version specification once we get a new release cut
 # gem 'hydra-derivatives', git: 'https://github.com/samvera/hydra-derivatives.git'
 
-gem "blacklight_range_limit", "~> 6"
+gem "blacklight_range_limit", "~> 7.0"
 gem 'browse-everything'
 # coffee-rails is a requirement for Hyrax or one of its dependencies but hasn't
 # been added to either gemspecs
@@ -18,38 +18,43 @@ gem 'dalli', '~> 3.2.3'
 gem 'devise'
 gem "edtf", "~> 3.0"
 gem 'hydra-role-management'
-gem 'hyrax', '3.6.0'
-gem 'hyrax-migrator', github: 'OregonDigital/hyrax-migrator', branch: 'master'
+gem 'hyrax', '~> 4.0'
+# gem 'hyrax-migrator', github: 'OregonDigital/hyrax-migrator', branch: 'master'
 gem 'jquery-rails'
 gem 'sassc-rails'
 gem 'chosen-rails'
 gem 'pg'
-gem 'puma', '~> 5.6'
-gem 'rails', '~> 5.2'
-gem 'rsolr', '>= 1.0'
-gem 'sass-rails', '~> 5.0'
-gem 'sidekiq', '~> 6.4'
+gem 'puma', '~> 4.3.8'
+gem 'rails', '~> 6.0.6'
+gem 'rsolr', '>= 1.0', '< 3'
+gem 'sidekiq', '~> 6.0'
+gem 'sprockets', '3.7.2'
 gem 'streamio-ffmpeg'
 gem 'stemmify'
 gem 'tzinfo-data'
 gem 'uglifier', '>= 1.3.0'
 gem 'ruby-oembed'
-gem 'blacklight_advanced_search', '~> 6.4'
+gem 'bootstrap', '~> 4.0'
+gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
+gem 'blacklight_advanced_search'
 gem 'blacklight-oembed'
 gem 'blacklight_dynamic_sitemap'
 gem 'triplestore-adapter', git: 'https://github.com/osulp/triplestore-adapter'
-gem 'faraday_middleware', '~> 0.10.0'
-gem 'blacklight_iiif_search', '~> 1.0'
+gem 'faraday_middleware'
+gem 'blacklight_iiif_search', '~> 2.0'
 gem 'rubyzip', '~> 2'
 gem 'zip_tricks', '~> 5.3'
 gem 'bulkrax', github: 'samvera/bulkrax', ref: '62517e67876d96c7a0bedb288370a4f10eb0b4c4' #v8.2.0
-gem 'willow_sword', github: 'notch8/willow_sword'
+# gem 'willow_sword', github: 'notch8/willow_sword', branch: 'main'
+gem 'jquery-datatables-rails'
+gem 'concurrent-ruby', '1.3.4'
 
 # Security Audit updates
 gem 'loofah', '>= 2.2.3'
 
 # Login gems
-gem 'omniauth-rails_csrf_protection', '~> 0.1'
+gem 'omniauth'
+gem 'omniauth-rails_csrf_protection', '~> 1.0'
 gem 'omniauth-cas'
 gem 'omniauth-saml'
 
@@ -78,23 +83,23 @@ end
 group :development, :test do
   gem 'axe-matchers'
   gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
-  gem 'capybara', '~> 2.17'
+  gem 'capybara', '~> 3.29'
   gem 'factory_bot_rails'
   gem 'poltergeist'
   gem 'pry-byebug'
   gem 'pry-rails'
-  gem 'rspec-rails'
+  gem 'rspec-rails', '~> 5.0'
   gem 'rubocop', '~> 0.93'
   gem 'rubocop-rspec'
-  gem 'selenium-webdriver', '~> 3'
+  gem 'selenium-webdriver', '~> 4.4'
   gem 'webmock'
+  gem 'rails-controller-testing'
 end
 
 group :test do
   gem 'coveralls', '~> 0.8'
   gem 'database_cleaner', '~> 1.8'
   gem 'equivalent-xml'
-  gem 'rails-controller-testing'
   gem 'rspec'
   gem 'rspec-mocks'
   gem 'rspec-activemodel-mocks'