hyrax 4.0.0.beta2 → 4.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f39a5cb135f87ff31b87b65f105d488572df699258a55c12bcc17f7f9e34b9a1
-  data.tar.gz: c1aa78455834f0440debab01d811044787b1749a6825b937d6f23a114c96027e
+  metadata.gz: a40b509766f1add062da64ebfa925e2f005b37f3b8ba98cf47869b126e5c5edb
+  data.tar.gz: f8d8d154e6c12ba940ea317042ded3bddbbc8c5b3b4ba70df2edcb35715c3aca
 SHA512:
-  metadata.gz: e42131c51271b260719032394cdeed9d5c0464b5aeaf97206a276b79ae68a2bb714a6e255ffb3053275ea3c964014648acbfedbf5dbc098ec63089fd3eb25d2e
-  data.tar.gz: c9c2645320f0ddf32e0d190057ee0fe58ac93886c9c104f0293e47ef44add50c8d3b569dedad6bdc02285b95c9993e3c2dc1a438f74a00cdfa8db65875a179d6
+  metadata.gz: b07a5c4beb95e72e33ebcdb6cd7c68837077760de21f73ff8a216c9a51eef7b32ca8c2331a3cfc54e17aae8964fa2c5cbd5981de052c822502141bc7ad3ee513
+  data.tar.gz: cae0fc1b05c720927879e2c076e3ce9eac3fa623e44012f227ef43814028b95cfd7605c14f87e459d26259f9d3996c15848c25130ad128ca82c3a13a9298f237

data/.circleci/config.yml

@@ -2,22 +2,25 @@ version: 2.1
 orbs:
   samvera: samvera/circleci-orb@1
   browser-tools: circleci/browser-tools@1.3
+  ruby: circleci/ruby@2
+  node: circleci/node@5
+
 jobs:
   bundle:
     parameters:
       ruby_version:
         type: string
-        default: 2.7.6
+        default: 2.7.7
       bundler_version:
         type: string
-        default: 2.3.13
+        default: 2.4.8
       rails_version:
         type: string
-        default: 6.1.6.1
+        default: 6.1.7.2
     executor:
       name: 'samvera/ruby'
       ruby_version: << parameters.ruby_version >>
-    resource_class: medium+
+    resource_class: medium
     environment:
       RAILS_VERSION: << parameters.rails_version >>
       NOKOGIRI_USE_SYSTEM_LIBRARIES: true
@@ -44,8 +47,8 @@ jobs:
       - restore_cache:
           name: Restore rubocop cache
           keys:
-            - v1-ruby<< parameters.ruby_version >>-bundle{{ checksum "Gemfile.lock" }}
-            - v1-ruby<< parameters.ruby_version >>
+            - v1-rubocop-ruby<< parameters.ruby_version >>-bundle{{ checksum "Gemfile.lock" }}
+            - v1-rubocop-ruby<< parameters.ruby_version >>
             - v1
 
       - run:
@@ -54,9 +57,9 @@ jobs:
 
       - save_cache:
           name: Save rubocop cache
-          key: v1-ruby<< parameters.ruby_version >>-bundle{{ checksum "Gemfile.lock" }}
+          key: v1-rubocop-ruby<< parameters.ruby_version >>-bundle{{ checksum "Gemfile.lock" }}
           paths:
-            - ~/.cache
+            - ~/.cache/rubocop_cache
 
       - persist_to_workspace:
           root: ~/
@@ -68,17 +71,17 @@ jobs:
     parameters:
       ruby_version:
         type: string
-        default: 2.7.6
+        default: 2.7.7
       bundler_version:
         type: string
-        default: 2.3.13
+        default: 2.4.8
       rails_version:
         type: string
-        default: 6.1.6.1
+        default: 6.1.7.2
     executor:
       name: 'samvera/ruby_fcrepo_solr_redis_postgres'
       ruby_version: << parameters.ruby_version >>
-    resource_class: medium+
+    resource_class: medium
     environment:
       RAILS_VERSION: << parameters.rails_version >>
       NOKOGIRI_USE_SYSTEM_LIBRARIES: true
@@ -92,6 +95,15 @@ jobs:
       - samvera/bundle:
           ruby_version: << parameters.ruby_version >>
           bundler_version: << parameters.bundler_version >>
+      - run:
+          name: Generate .internal_test_app/Gemfile.lock
+          command: bundle lock
+          working_directory: .internal_test_app
+      - ruby/install-deps:
+          app-dir: .internal_test_app
+      - node/install-packages:
+          pkg-manager: yarn
+          app-dir: .internal_test_app
       - persist_to_workspace:
           root: ~/
           paths:
@@ -102,10 +114,10 @@ jobs:
     parameters:
       ruby_version:
         type: string
-        default: 2.7.6
+        default: 2.7.7
       bundler_version:
         type: string
-        default: 2.3.13
+        default: 2.4.8
       hyrax_valkyrie:
         type: string
         default: "false"
@@ -120,6 +132,7 @@ jobs:
       DATABASE_URL: postgresql://postgres@127.0.0.1/circle_test # Hard-coded with data from CircleCI orb, related to https://github.com/samvera-labs/samvera-circleci-orb/issues/42
       KARMA_BROWSER: ChromeHeadlessCustom
       RAILS_ROOT: .internal_test_app
+      SPEC_OPTS: "" # Clear output conflicts between samvera orb executor and ruby orb rspec command
     steps:
       - attach_workspace:
           at: ~/
@@ -127,17 +140,25 @@ jobs:
           name: Install system dependencies
           command: |
             sudo apt-get update
-            sudo apt-get install imagemagick librsvg2-bin
+            sudo apt-get install imagemagick librsvg2-bin lsof
       - browser-tools/install-chrome
       - browser-tools/install-chromedriver
       - run:
+          name: Check Chrome install
           command: |
             google-chrome --version
             chromedriver --version
-          name: Check Chrome install
+      - restore_cache:
+          keys:
+            - engine-node-v1-{{ checksum "package.json" }}
+      # Call yarn directly for hyrax engine; node orb demands a lockfile to use caching
       - run:
-          name: Yarn install
+          name: Yarn Install (engine)
           command: yarn install
+      - save_cache:
+          key: engine-node-v1-{{ checksum "package.json" }}
+          paths:
+            - node_modules
       - samvera/install_solr_core:
           solr_config_path: .internal_test_app/solr/conf
       - samvera/install_solr_core:
@@ -147,56 +168,47 @@ jobs:
       - samvera/bundle:
           ruby_version: << parameters.ruby_version >>
           bundler_version: << parameters.bundler_version >>
+      # Ensure gems needed by the test app are installed
+      - ruby/install-deps:
+          app-dir: .internal_test_app
+      - node/install-packages:
+          pkg-manager: yarn
+          app-dir: .internal_test_app
       - run:
-          command: bundle exec rake app:db:migrate
-      - samvera/parallel_rspec
+          command: bundle exec rake db:migrate
+          working_directory: .internal_test_app
+      - ruby/rspec-test
+      - store_artifacts:
+          path: Gemfile.lock
+          destination: engine-gemfile-lock
+      - store_artifacts:
+          path: .internal_test_app/Gemfile.lock
+          destination: webapp-gemfile-lock
 
-# Trigger a workflow on the nurax repository that will deploy the most recent hyrax gem code to https://nurax-dev.curationexperts.com/
-  deploy:
-    docker:
-      - image: ubuntu
-    steps:
-      - run:
-          name: Install curl
-          command: apt-get update && apt-get install -y curl
-      - run:
-          name: "Trigger Nurax deploy"
-          command: |
-            curl -X POST https://circleci.com/api/v2/project/gh/curationexperts/nurax/pipeline \
-            --header "Circle-Token: $NURAX_CIRCLECI_TOKEN" \
-            --header 'Accept: text/plain'    \
-            --header 'Content-Type: application/json'
 workflows:
   version: 2
-  ruby2-7-6:
+  ruby2-7:
     jobs:
       - bundle:
-          ruby_version: "2.7.6"
-          rails_version: "6.1.6.1"
-          bundler_version: "2.3.13"
+          ruby_version: "2.7.7"
+          rails_version: "6.1.7.2"
+          bundler_version: "2.4.8"
       - build:
-          ruby_version: "2.7.6"
-          rails_version: "6.1.6.1"
-          bundler_version: "2.3.13"
+          ruby_version: "2.7.7"
+          rails_version: "6.1.7.2"
+          bundler_version: "2.4.8"
           requires:
             - bundle
       - test:
-          name: "ruby2-7-6"
-          ruby_version: "2.7.6"
-          bundler_version: "2.3.13"
+          name: "ruby2-7"
+          ruby_version: "2.7.7"
+          bundler_version: "2.4.8"
           requires:
             - build
       - test:
-          name: "ruby2-7-6-valkyrie"
-          ruby_version: "2.7.6"
-          bundler_version: "2.3.13"
+          name: "ruby2-7-valkyrie"
+          ruby_version: "2.7.7"
+          bundler_version: "2.4.8"
           hyrax_valkyrie: "true"
           requires:
             - build
-  nurax-dev_deploy:
-    jobs:
-      - deploy:
-          filters:
-            branches:
-              only:
-                - main

data/.dassie/Gemfile

@@ -8,7 +8,7 @@ else
 end
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.7.6'
+ruby '2.7.7'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 6.0'

data/.dassie/app/controllers/catalog_controller.rb

@@ -25,7 +25,7 @@ class CatalogController < ApplicationController
 
     # Because too many times on Samvera tech people raise a problem regarding a failed query to SOLR.
     # Often, it's because they inadvertently exceeded the character limit of a GET request.
-    config.http_method = :post
+    config.http_method = Hyrax.config.solr_default_method
 
     ## Default parameters to send to solr for all search-like requests. See also SolrHelper#solr_search_params
     config.default_solr_params = {

data/.dassie/config/initializers/hyrax.rb

@@ -46,6 +46,10 @@ Hyrax.config do |config|
   # Set the system-wide virus scanner
   config.virus_scanner = Hyrax::VirusScanner
 
+  # The default method used for Solr queries. Values are :get or :post.
+  # Post is suggested to prevent issues with URL length.
+  config.solr_default_method = :post
+
   ##
   # To index to the Valkyrie core, uncomment the following lines.
   # config.query_index_from_valkyrie = true

data/.github/SUPPORT.md

@@ -1,10 +1,9 @@
 # Getting Help
 
-If you have questions or need help, please email [the Samvera community tech list](mailto:samvera-tech@googlegroups.com) or stop by the #dev channel in [the Samvera community Slack team](https://wiki.lyrasis.org/pages/viewpage.action?pageId=87460391#Getintouch!-Slack).
+If you have questions or need help, please email [the Samvera community tech list](mailto:samvera-tech@googlegroups.com) or stop by the #dev channel in [the Samvera Community Slack Workspace](https://samvera.atlassian.net/wiki/spaces/samvera/pages/405211682/Getting+Started+in+the+Samvera+Community#Join-the-Samvera-Slack-workspace).
 
 The [Hyrax wiki](https://github.com/samvera/hyrax/wiki) gathers documentation as the community tries things and learns what works. There is useful knowledge and history there but please keep in mind that this information can age quickly. Refer to the [README.md](./README.md) for the best updated guidance we have to offer.
 
-You can also look in the [Samvera Community Knowledge Base](https://samvera.github.io) for help with Hyrax or other Samvera Community questions.
 
 ## Reporting Issues
 
@@ -12,4 +11,4 @@ If you would like to report an issue with Hyrax, first do search [the list of is
 
 ## Reporting Security Issues
 
-To report a security vulnerability, email [samvera-steering@googlegroups.com](mailto:samvera-steering@googlegroups.com) and the Steering Group will coordinate the community response. In your message, please document to the best of your ability cases (relevant software versions, conditions, etc.) where the vulnerability is applicable, the potential negative effects, and any known workarounds or fixes to mitigate the risk. Steering will communicate this to the Partners and the rest of the community in a timely fashion.
+To report a security vulnerability, email [the Samvera Board](mailto:board@samvera.org) and the they will coordinate the community response. In your message, please document to the best of your ability cases (relevant software versions, conditions, etc.) where the vulnerability is applicable, the potential negative effects, and any known workarounds or fixes to mitigate the risk. The Board will communicate this to the Partners and the rest of the community in a timely fashion.

data/.github/workflows/main.yml

@@ -2,16 +2,16 @@ name: Trigger Nurax build
 on:
   workflow_dispatch:
   push:
+    branches:
+      - 'main'
 
 jobs:
   trigger:
     runs-on: ubuntu-latest
     steps:
-    - uses: peter-evans/repository-dispatch@v1
+    - uses: peter-evans/repository-dispatch@v2.1.1
       with:
          token: ${{ secrets.NURAX_ACCESS_TOKEN }}
          event-type: push
-         repository: curationexperts/nurax
+         repository: samvera-labs/nurax
          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
-
-

data/.github/workflows/release.yml

@@ -2,16 +2,22 @@ name: Trigger Nurax build
 on:
   workflow_dispatch:
   release:
+    types: [released]
 
 jobs:
   trigger:
     runs-on: ubuntu-latest
     steps:
-    - uses: peter-evans/repository-dispatch@v1
+    - id: latest-release
+      uses: pozetroninc/github-action-get-latest-release@v0.7.0
+      with:
+        repository: ${{ github.repository }}
+        token: ${{ github.token }}
+        excludes: prerelease, draft
+    - uses: peter-evans/repository-dispatch@v2.1.1
+      if: ${{ steps.latest-release.outputs.release == github.ref_name }}
       with:
          token: ${{ secrets.NURAX_ACCESS_TOKEN }}
          event-type: release
-         repository: curationexperts/nurax
+         repository: samvera-labs/nurax
          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
-
-

data/.koppie/Gemfile

@@ -6,7 +6,7 @@ else
 end
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.7.6'
+ruby '2.7.7'
 
 gem 'bootsnap', '>= 1.1.0', require: false
 gem 'bootstrap', '~> 4.0'
@@ -29,7 +29,6 @@ gem 'turbolinks', '~> 5'
 gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 gem 'uglifier', '>= 1.3.0'
-gem 'valkyrie', '~> 2', '>= 2.1.1'
 
 group :development do
   gem 'better_errors' # add command line in browser when errors

data/.koppie/app/controllers/catalog_controller.rb

@@ -29,7 +29,7 @@ class CatalogController < ApplicationController
 
     # Because too many times on Samvera tech people raise a problem regarding a failed query to SOLR.
     # Often, it's because they inadvertently exceeded the character limit of a GET request.
-    config.http_method = :post
+    config.http_method = Hyrax.config.solr_default_method
 
     ## Default parameters to send to solr for all search-like requests. See also SolrHelper#solr_search_params
     config.default_solr_params = {

data/.koppie/config/authorities/licenses.yml

@@ -1,25 +1,25 @@
 terms:
     - id: http://creativecommons.org/licenses/by/3.0/us/
       term: Attribution 3.0 United States
-      active: true
+      active: false
     - id: http://creativecommons.org/licenses/by-sa/3.0/us/
       term: Attribution-ShareAlike 3.0 United States
-      active: true
+      active: false
     - id: http://creativecommons.org/licenses/by-nc/3.0/us/
       term: Attribution-NonCommercial 3.0 United States
-      active: true
+      active: false
     - id: http://creativecommons.org/licenses/by-nd/3.0/us/
       term: Attribution-NoDerivs 3.0 United States
-      active: true
+      active: false
     - id: http://creativecommons.org/licenses/by-nc-nd/3.0/us/
       term: Attribution-NonCommercial-NoDerivs 3.0 United States
-      active: true
+      active: false
     - id: http://creativecommons.org/licenses/by-nc-sa/3.0/us/
       term: Attribution-NonCommercial-ShareAlike 3.0 United States
-      active: true
+      active: false
     - id: http://www.europeana.eu/portal/rights/rr-r.html
       term: All rights reserved
-      active: true
+      active: false
     - id: https://creativecommons.org/licenses/by/4.0/
       term: Creative Commons BY Attribution 4.0 International
       active: true

data/.koppie/config/initializers/file_services.rb

@@ -0,0 +1,4 @@
+ActiveSupport::Reloader.to_prepare do
+  Hydra::Derivatives.config.output_file_service = Hyrax::ValkyriePersistDerivatives
+  Hydra::Derivatives.config.source_file_service = Hyrax::LocalFileService
+end

data/.koppie/db/schema.rb

@@ -2,8 +2,8 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# This file is the source Rails uses to define your schema when running `rails
-# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
 # be faster and is potentially less error prone than running all of your
 # migrations from scratch. Old migrations may fail to apply correctly if those
 # migrations use external dependencies or application code.

data/.koppie/yarn.lock

@@ -1355,7 +1355,7 @@ unfetch@^4.2.0:
   resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.2.0.tgz#7e21b0ef7d363d8d9af0fb929a5555f6ef97a3be"
   integrity sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==
 
-universalviewer@^3.1.1:
+universalviewer@^3.1.4:
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/universalviewer/-/universalviewer-3.1.4.tgz#5355aa77e06a05d1252f473e7b437caa24ecd9ff"
   integrity sha512-1z/0iN0JcGlN3lNX3/hMts2WAaLdmvG+j50lgqdzKsGex6033XmE30otl0U2UvF21S5U7bVlW+KYlMeIQyTRww==

data/CONTAINERS.md

@@ -191,8 +191,8 @@ We publish several Hyrax images to the [GitHub container registry][ghcr] under
 the [Samvera organization][samvera-packages].  To build them:
 
 ```sh
-export HYRAX_VERSION=v3.4.1 # or desired version
-git checkout $HYRAX_VERSION
+export HYRAX_VERSION=v4.0.0.rc1 # or desired version
+git checkout hyrax-$HYRAX_VERSION
 
 docker build --target hyrax-base --tag ghcr.io/samvera/hyrax/hyrax-base:$(git rev-parse HEAD) .
 

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/samvera/{{library}}/issues/) by:
+* Submit a [Github issue](https://github.com/samvera/hyrax/issues/) by:
   * Clearly describing the issue
     * Provide a descriptive summary
     * Explain the expected behavior
@@ -178,4 +178,4 @@ If you are uncertain, bring other contributors into the conversation by assignin
 * [General GitHub documentation](http://help.github.com/)
 * [GitHub pull request documentation](https://help.github.com/articles/about-pull-requests/)
 * [Pro Git](http://git-scm.com/book) is both a free and excellent book about Git.
-* [A Git Config for Contributing](http://ndlib.github.io/practices/my-typical-per-project-git-config/)
+* [A Git Config for Contributing](http://ndlib.github.io/practices/my-typical-per-project-git-config/)

data/Dockerfile

@@ -1,9 +1,19 @@
-ARG RUBY_VERSION=2.7.6
-FROM ruby:$RUBY_VERSION-alpine3.15 as hyrax-base
+ARG RUBY_VERSION=2.7.7
+
+# Replace with official jemalloc package in alpine 3.17
+FROM ruby:$RUBY_VERSION-alpine3.16 as builder
+RUN apk add build-base curl
+RUN curl -sL https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2 | tar -xj && \
+    cd jemalloc-5.3.0 && \
+    ./configure && \
+    make && \
+    make install
+
+FROM ruby:$RUBY_VERSION-alpine3.16 as hyrax-base
 
 ARG DATABASE_APK_PACKAGE="postgresql-dev"
 ARG EXTRA_APK_PACKAGES="git"
-ARG RUBYGEMS_VERSION=3.3.20
+ARG RUBYGEMS_VERSION=""
 
 RUN apk --no-cache upgrade && \
   apk --no-cache add acl \
@@ -33,6 +43,9 @@ ENV PATH="/app/samvera:$PATH"
 ENV RAILS_ROOT="/app/samvera/hyrax-webapp"
 ENV RAILS_SERVE_STATIC_FILES="1"
 
+COPY --from=builder /usr/local/lib/libjemalloc.so.2 /usr/local/lib/
+ENV LD_PRELOAD="/usr/local/lib/libjemalloc.so.2"
+
 ENTRYPOINT ["hyrax-entrypoint.sh"]
 CMD ["bundle", "exec", "puma", "-v", "-b", "tcp://0.0.0.0:3000"]
 
@@ -49,22 +62,21 @@ ONBUILD RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nu
 
 FROM hyrax-base as hyrax-worker-base
 
-ENV MALLOC_ARENA_MAX=2
-
 USER root
 RUN apk --no-cache add bash \
   ffmpeg \
   mediainfo \
-  openjdk11-jre \
+  openjdk17-jre \
   perl
 USER app
 
 RUN mkdir -p /app/fits && \
     cd /app/fits && \
-    wget https://github.com/harvard-lts/fits/releases/download/1.5.1/fits-1.5.1.zip -O fits.zip && \
+    wget https://github.com/harvard-lts/fits/releases/download/1.6.0/fits-1.6.0.zip -O fits.zip && \
     unzip fits.zip && \
-    rm fits.zip && \
-    chmod a+x /app/fits/fits.sh
+    rm fits.zip tools/mediainfo/linux/libmediainfo.so.0 tools/mediainfo/linux/libzen.so.0 && \
+    chmod a+x /app/fits/fits.sh && \
+    sed -i 's/\(<tool.*TikaTool.*>\)/<!--\1-->/' /app/fits/xml/fits.xml
 ENV PATH="${PATH}:/app/fits"
 
 CMD bundle exec sidekiq