diff --git a/Dockerfile b/Dockerfile index a0ca7a55..c08aacfe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,71 +1,31 @@ -FROM ruby:2.5.3 as hyrax-base +ARG RUBY_VERSION=2.7.8 +FROM ruby:$RUBY_VERSION-alpine as builder -RUN echo "deb http://archive.debian.org/debian/ stretch main" > /etc/apt/sources.list && \ - echo "deb http://archive.debian.org/debian-security/ stretch/updates main" >> /etc/apt/sources.list && \ - apt-get update -qq && \ - apt-get -y install apt-transport-https && \ - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ - echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \ - curl -sL https://deb.nodesource.com/setup_8.x | bash - && \ - apt-get update -qq && \ - apt-get install -y \ - build-essential \ - cmake \ - exiftool \ - ffmpeg \ - ghostscript \ - imagemagick \ - libpq-dev \ - libreoffice \ - libvips-dev \ - netcat \ - nodejs \ - screen \ - unzip \ - vim \ - yarn \ - zip \ - && \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ - yarn config set no-progress && \ - yarn config set silent +RUN apk add build-base +RUN wget -O - https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2 | tar -xj && \ + cd jemalloc-5.2.1 && \ + ./configure && \ + make && \ + make install -# If changes are made to fits version or location, -# amend `LD_LIBRARY_PATH` in docker-compose.yml accordingly. -RUN mkdir -p /app/fits && \ - curl -fSL -o /app/fits/fits-latest.zip https://github.com/harvard-lts/fits/releases/download/1.4.0/fits-latest.zip && \ - cd /app/fits && unzip fits-latest.zip && chmod +X /app/fits/fits.sh && \ - cp -r /app/fits/* /usr/local/bin/ +FROM ghcr.io/scientist-softserv/dev-ops/samvera:f71b284f as hyrax-base -# Change the order so exif tool is better positioned and use the biggest size if more than one -# size exists in an image file (pyramidal tifs mostly) -COPY --chown=1001:101 ./ops/fits.xml /app/fits/xml/fits.xml -COPY --chown=1001:101 ./ops/exiftool_image_to_fits.xslt /app/fits/xml/exiftool/exiftool_image_to_fits.xslt -RUN ln -sf /usr/lib/libmediainfo.so.0 /app/fits/tools/mediainfo/linux/libmediainfo.so.0 && \ - ln -sf /usr/lib/libzen.so.0 /app/fits/tools/mediainfo/linux/libzen.so.0 +COPY --chown=1001:101 $APP_PATH/Gemfile* /app/samvera/hyrax-webapp/ +RUN bundle install --jobs "$(nproc)" +COPY --chown=1001:101 $APP_PATH/bin/db-migrate-seed.sh /app/samvera/ -COPY ./ops/bin /app/samvera -ENV PATH="/app/samvera:$PATH" -ENV RAILS_ROOT="/app/samvera/hyrax-webapp" +COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp -RUN mkdir /opt/csv -RUN mkdir -p /app/samvera/hyrax-webapp -WORKDIR /app/samvera/hyrax-webapp -ADD Gemfile /app/samvera/hyrax-webapp/Gemfile -ADD Gemfile.lock /app/samvera/hyrax-webapp/Gemfile.lock -# for engine dev only -#ADD vendor/engines/bulkrax /app/samvera/hyrax-webapp/vendor/engines/bulkrax +ARG HYKU_BULKRAX_ENABLED="true" +RUN sh -l -c " \ + yarn install && \ + RAILS_ENV=production SECRET_KEY_BASE=FAKEFAKEFAKEFAKEFAKEFAKEFAKEFAKEFAKEFAKEFAKEFAKEFAKEFAKEFAKEFAKE DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake assets:precompile" +RUN ln -sf /app/samvera/branding /app/samvera/hyrax-webapp/public/branding -ENV BUNDLE_JOBS=4 -RUN cd /app/samvera/hyrax-webapp && ls -l && bundle install -ADD . /app/samvera/hyrax-webapp -RUN npm install shx --global && cd /app/samvera/hyrax-webapp && yarn install -RUN cd /app/samvera/hyrax-webapp && NODE_ENV=production DB_ADAPTER=nulldb bundle exec rake assets:clobber assets:precompile && ln -s /app/samvera/branding /app/samvera/hyrax-webapp/public/branding -EXPOSE 3000 +CMD ./bin/web -ENTRYPOINT ["hyrax-entrypoint.sh"] -CMD ["bundle", "exec", "puma", "-v", "-b", "tcp://0.0.0.0:3000"] +COPY --from=builder /usr/local/lib/libjemalloc.so.2 /usr/local/lib/ +ENV LD_PRELOAD=/usr/local/lib/libjemalloc.so.2 FROM hyrax-base as hyrax-worker -ENV MALLOC_ARENA_MAX=2 CMD ./bin/worker diff --git a/Gemfile b/Gemfile index 13b7ee5e..ecbb1db7 100644 --- a/Gemfile +++ b/Gemfile @@ -1,13 +1,12 @@ source 'https://rubygems.org' -ruby '2.5.3' -gem 'rails', '5.1.6' +gem 'rails', '~> 5.2' gem 'activejob-scheduler', git: 'https://github.com/notch8/activejob-scheduler.git' gem 'blacklight_range_limit' -# TODO: do a new release and use the versioned version of bulkrax when the upgrade work is complete -gem 'bulkrax', git: 'https://github.com/samvera-labs/bulkrax.git', branch: 'v4.4-patch' -# gem 'bulkrax', '~> 4.4.0' +gem 'bootsnap' +gem 'bulkrax', git: 'https://github.com/samvera/bulkrax.git', branch: 'oai-fixes' +# gem 'bulkrax', path: 'vendor/engines/bulkrax' gem 'activerecord-nulldb-adapter' gem 'bixby', group: %i[development test] gem 'byebug', group: %i[development test] @@ -23,10 +22,11 @@ gem 'factory_bot_rails', group: %i[development test] gem 'fcrepo_wrapper', group: %i[development test] gem 'final_redirect_url' gem 'flutie' +gem 'marcel' gem 'oai', git: 'https://github.com/notch8/ruby-oai.git', branch: 'quote-marks' gem 'health-monitor-rails', git: 'https://github.com/notch8/health-monitor-rails.git' # , git: 'https://github.com/orangewolf/hyrax.git', branch: 'collection_path_js_fix_2.5.1' -gem 'hyrax', '~> 2.6' +gem 'hyrax', '~> 2.9.6' gem 'hyrax-iiif_av', git: 'https://github.com/samvera-labs/hyrax-iiif_av.git', branch: 'uv_meet_av' # remove if iiif 0.6 is supported or if upgraded to hyrax 3 gem 'iiif_manifest', git: 'https://github.com/samvera-labs/iiif_manifest.git', ref: '4219eb57ae9fbcd178391f401928040ebe057529' @@ -45,6 +45,9 @@ gem 'pronto-rails_schema', require: false gem 'pronto-rubocop', require: false gem 'pry-byebug', group: %i[development test] gem 'puma', '~> 3.7' +gem 'redis', '~> 4.0' +gem 'redis-namespace', '~> 1.5' +gem 'redlock', '~> 1.0' gem 'riiif', '~> 1.1' gem 'rinku' gem 'rsolr', '~> 2.2' diff --git a/Gemfile.lock b/Gemfile.lock index 0f2ff9be..105cb08f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,26 +35,6 @@ GIT rails (>= 5.1.6) rubyzip (>= 1.0.0) -GIT - remote: https://github.com/samvera-labs/bulkrax.git - revision: 8d12806a57f5aca52e1ae85d21d92894eee36381 - branch: v4.4-patch - specs: - bulkrax (4.4.2) - bagit (~> 0.4) - coderay - iso8601 (~> 0.9.0) - kaminari - language_list (~> 1.2, >= 1.2.1) - libxml-ruby (~> 3.1.0) - loofah (>= 2.2.3) - oai (>= 0.4, < 2.x) - rack (>= 2.0.6) - rails (>= 5.1.6) - rdf (>= 2.0.2, < 4.0) - rubyzip - simple_form - GIT remote: https://github.com/samvera-labs/hyrax-iiif_av.git revision: 7066aef23c6f7dec0c19626a480a79899b5cf1fb @@ -82,94 +62,125 @@ GIT samvera-nesting_indexer (2.0.0) dry-equalizer +GIT + remote: https://github.com/samvera/bulkrax.git + revision: 1119e4a3c410f1cf6a5275f244d6474ff9ba90a0 + branch: oai-fixes + specs: + bulkrax (7.0.0) + bagit (~> 0.4) + coderay + denormalize_fields + iso8601 (~> 0.9.0) + kaminari + language_list (~> 1.2, >= 1.2.1) + libxml-ruby (~> 3.2.4) + loofah (>= 2.2.3) + oai (>= 0.4, < 2.x) + rack (>= 2.0.6) + rails (>= 5.1.6) + rdf (>= 2.0.2, < 4.0) + rubyzip + simple_form + GEM remote: https://rubygems.org/ specs: - actioncable (5.1.6) - actionpack (= 5.1.6) + actioncable (5.2.8.1) + actionpack (= 5.2.8.1) nio4r (~> 2.0) - websocket-driver (~> 0.6.1) - actionmailer (5.1.6) - actionpack (= 5.1.6) - actionview (= 5.1.6) - activejob (= 5.1.6) + websocket-driver (>= 0.6.1) + actionmailer (5.2.8.1) + actionpack (= 5.2.8.1) + actionview (= 5.2.8.1) + activejob (= 5.2.8.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.6) - actionview (= 5.1.6) - activesupport (= 5.1.6) - rack (~> 2.0) + actionpack (5.2.8.1) + actionview (= 5.2.8.1) + activesupport (= 5.2.8.1) + rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.6) - activesupport (= 5.1.6) + actionview (5.2.8.1) + activesupport (= 5.2.8.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - active-fedora (11.5.4) + active-fedora (12.2.4) active-triples (>= 0.11.0, < 2.0.0) - activemodel (>= 4.2, < 5.2) - activesupport (>= 4.2.4, < 5.2) + activemodel (>= 4.2.10, < 5.3) + activesupport (>= 4.2.4, < 5.3) deprecation - faraday (~> 0.12.1) + faraday (~> 0.12) faraday-encoding (= 0.0.4) - ldp (~> 0.7.0) + ldp (>= 0.7.0, < 2) + rdf-vocab (< 3.1.5) rsolr (>= 1.1.2, < 3) ruby-progressbar (~> 1.0) - solrizer (>= 3.4, < 5) - active-triples (1.1.0) + active-triples (1.2.0) activemodel (>= 3.0.0) activesupport (>= 3.0.0) rdf (>= 2.0.2, < 4.0) rdf-vocab (>= 2.0, < 4.0) - active_encode (0.6.0) + active_encode (0.8.2) rails - activejob (5.1.6) - activesupport (= 5.1.6) + sprockets (< 4) + activejob (5.2.8.1) + activesupport (= 5.2.8.1) globalid (>= 0.3.6) - activemodel (5.1.6) - activesupport (= 5.1.6) - activerecord (5.1.6) - activemodel (= 5.1.6) - activesupport (= 5.1.6) - arel (~> 8.0) - activerecord-import (1.0.3) - activerecord (>= 3.2) + activemodel (5.2.8.1) + activesupport (= 5.2.8.1) + activemodel-serializers-xml (1.0.2) + activemodel (> 5.x) + activesupport (> 5.x) + builder (~> 3.1) + activerecord (5.2.8.1) + activemodel (= 5.2.8.1) + activesupport (= 5.2.8.1) + arel (>= 9.0) + activerecord-import (1.5.1) + activerecord (>= 4.2) activerecord-nulldb-adapter (0.3.9) activerecord (>= 2.0.0) - activesupport (5.1.6) + activestorage (5.2.8.1) + actionpack (= 5.2.8.1) + activerecord (= 5.2.8.1) + marcel (~> 1.0.0) + activesupport (5.2.8.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) - almond-rails (0.1.0) - rails (>= 4.2, < 6) - arel (8.0.0) + addressable (2.8.6) + public_suffix (>= 2.0.2, < 6.0) + almond-rails (0.3.0) + rails (>= 4.2) + amazing_print (1.5.0) + arel (9.0.0) ast (2.4.2) - autoprefixer-rails (9.6.1.1) - execjs - awesome_nested_set (3.2.0) - activerecord (>= 4.0.0, < 7.0) - aws-eventstream (1.0.3) - aws-partitions (1.235.0) - aws-sdk-core (3.75.0) - aws-eventstream (~> 1.0, >= 1.0.2) - aws-partitions (~> 1, >= 1.228.0) - aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-kms (1.25.0) - aws-sdk-core (~> 3, >= 3.71.0) + autoprefixer-rails (10.4.16.0) + execjs (~> 2) + awesome_nested_set (3.6.0) + activerecord (>= 4.0.0, < 7.2) + aws-eventstream (1.3.0) + aws-partitions (1.895.0) + aws-sdk-core (3.191.3) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.8) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.77.0) + aws-sdk-core (~> 3, >= 3.191.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.53.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-s3 (1.143.0) + aws-sdk-core (~> 3, >= 3.191.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.1.0) - aws-eventstream (~> 1.0, >= 1.0.2) + aws-sigv4 (~> 1.8) + aws-sigv4 (1.8.0) + aws-eventstream (~> 1, >= 1.0.2) babel-source (5.8.35) babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) @@ -177,6 +188,7 @@ GEM bagit (0.4.4) docopt (~> 0.5.0) validatable (~> 1.6) + base64 (0.2.0) bcp47 (0.3.3) i18n bcrypt (3.1.12) @@ -187,7 +199,7 @@ GEM rubocop-performance rubocop-rails rubocop-rspec - blacklight (6.20.0) + blacklight (6.25.0) bootstrap-sass (~> 3.2) deprecation globalid @@ -211,24 +223,22 @@ GEM jquery-rails rails (>= 3.0) tether-rails + bootsnap (1.13.0) + msgpack (~> 1.2) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) brakeman (5.2.3) breadcrumbs_on_rails (3.0.1) - browse-everything (1.0.2) + browse-everything (1.3.0) addressable (~> 2.5) aws-sdk-s3 - dropbox_api (>= 0.1.10) - google-api-client (~> 0.23) - google_drive (~> 2.1) - googleauth (= 0.6.6) - puma (~> 3.11) - rails (>= 4.2, < 6.0) + dropbox_api (>= 0.1.20) + google-apis-drive_v3 + googleauth (>= 0.6.6, < 2.0) + rails (>= 4.2, < 7.2) ruby-box signet (~> 0.8) - sprockets (~> 3.7) - thor (~> 0.19) typhoeus builder (3.2.4) byebug (10.0.2) @@ -240,10 +250,11 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (>= 2.0, < 4.0) - carrierwave (1.3.1) + carrierwave (1.3.4) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) + ssrf_filter (~> 1.0, < 1.1.0) childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) chronic (0.10.2) @@ -258,12 +269,11 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.10) - connection_pool (2.2.2) + concurrent-ruby (1.2.3) + connection_pool (2.4.1) crass (1.0.6) daemons (1.3.1) - declarative (0.0.10) - declarative-option (0.1.0) + declarative (0.0.20) delayed_job (4.1.5) activesupport (>= 3.0, < 5.3) delayed_job_active_record (4.1.3) @@ -276,7 +286,9 @@ GEM sinatra (>= 1.4.4) delayed_job_worker_pool (0.3.0) delayed_job (>= 3.0, < 4.2) - deprecation (1.0.0) + denormalize_fields (1.3.0) + activerecord (>= 4.1.14, < 8.0.0) + deprecation (1.1.0) activesupport devise (4.5.0) bcrypt (~> 3.0) @@ -287,76 +299,92 @@ GEM devise-guests (0.6.1) devise diff-lcs (1.3) + digest (3.1.1) docopt (0.5.0) - dropbox_api (0.1.17) - faraday (>= 0.8, <= 0.15.4) + draper (4.0.2) + actionpack (>= 5.0) + activemodel (>= 5.0) + activemodel-serializers-xml (>= 1.0) + activesupport (>= 5.0) + request_store (>= 1.0) + ruby2_keywords + dropbox_api (0.1.21) + faraday (< 3.0) oauth2 (~> 1.1) - dry-configurable (0.9.0) + dry-configurable (0.12.1) concurrent-ruby (~> 1.0) - dry-core (~> 0.4, >= 0.4.7) + dry-core (~> 0.5, >= 0.5.0) dry-container (0.7.2) concurrent-ruby (~> 1.0) dry-configurable (~> 0.1, >= 0.1.3) - dry-core (0.4.9) + dry-core (0.6.0) concurrent-ruby (~> 1.0) - dry-equalizer (0.2.2) - dry-events (0.2.0) + dry-equalizer (0.3.0) + dry-events (0.3.0) concurrent-ruby (~> 1.0) - dry-core (~> 0.4) - dry-equalizer (~> 0.2) + dry-core (~> 0.5, >= 0.5) dry-inflector (0.2.0) - dry-logic (0.6.1) + dry-initializer (3.0.4) + dry-logic (1.2.0) concurrent-ruby (~> 1.0) - dry-core (~> 0.2) - dry-equalizer (~> 0.2) - dry-matcher (0.8.2) - dry-core (>= 0.4.8) - dry-monads (1.3.1) + dry-core (~> 0.5, >= 0.5) + dry-matcher (0.9.0) + dry-core (~> 0.4, >= 0.4.8) + dry-monads (1.3.5) concurrent-ruby (~> 1.0) dry-core (~> 0.4, >= 0.4.4) dry-equalizer - dry-struct (0.6.0) - dry-core (~> 0.4, >= 0.4.3) - dry-equalizer (~> 0.2) - dry-types (~> 0.13) + dry-schema (1.6.2) + concurrent-ruby (~> 1.0) + dry-configurable (~> 0.8, >= 0.8.3) + dry-core (~> 0.5, >= 0.5) + dry-initializer (~> 3.0) + dry-logic (~> 1.0) + dry-types (~> 1.5) + dry-struct (1.4.0) + dry-core (~> 0.5, >= 0.5) + dry-types (~> 1.5) ice_nine (~> 0.11) - dry-transaction (0.13.0) + dry-transaction (0.13.2) dry-container (>= 0.2.8) dry-events (>= 0.1.0) dry-matcher (>= 0.7.0) dry-monads (>= 0.4.0) - dry-types (0.14.1) + dry-types (1.5.1) concurrent-ruby (~> 1.0) dry-container (~> 0.3) - dry-core (~> 0.4, >= 0.4.4) - dry-equalizer (~> 0.2) + dry-core (~> 0.5, >= 0.5) dry-inflector (~> 0.1, >= 0.1.2) - dry-logic (~> 0.5, >= 0.5) - dry-validation (0.13.3) + dry-logic (~> 1.0, >= 1.0.2) + dry-validation (1.6.0) concurrent-ruby (~> 1.0) - dry-configurable (~> 0.1, >= 0.1.3) - dry-core (~> 0.2, >= 0.2.1) + dry-container (~> 0.7, >= 0.7.1) + dry-core (~> 0.4) dry-equalizer (~> 0.2) - dry-logic (~> 0.5, >= 0.5.0) - dry-types (~> 0.14.0) - ebnf (1.1.3) - rdf (~> 3.0) - sxp (~> 1.0) + dry-initializer (~> 3.0) + dry-schema (~> 1.5, >= 1.5.2) + ebnf (2.2.1) + amazing_print (~> 1.2) + htmlentities (~> 4.3) + rdf (~> 3.1) + scanf (~> 1.0) + sxp (~> 1.1) + unicode-types (~> 1.6) equivalent-xml (0.6.0) nokogiri (>= 1.4.3) - erubi (1.11.0) + erubi (1.12.0) erubis (2.7.0) et-orbi (1.2.4) tzinfo - ethon (0.12.0) - ffi (>= 1.3.0) - execjs (2.7.0) + ethon (0.16.0) + ffi (>= 1.15.0) + execjs (2.9.1) factory_bot (6.1.0) activesupport (>= 5.0.0) factory_bot_rails (6.1.0) factory_bot (~> 6.1.0) railties (>= 5.0.0) - faraday (0.12.2) + faraday (0.17.6) multipart-post (>= 1.2, < 3) faraday-encoding (0.0.4) faraday @@ -364,100 +392,104 @@ GEM faraday (>= 0.7.4, < 1.0) fcrepo_wrapper (0.9.0) ruby-progressbar - ffi (1.9.25) + ffi (1.16.3) final_redirect_url (0.1.0) flay (2.13.0) erubi (~> 1.10) path_expander (~> 1.0) ruby_parser (~> 3.0) sexp_processor (~> 4.0) - flipflop (2.6.0) + flipflop (2.7.1) activesupport (>= 4.0) + terminal-table (>= 1.8) flot-rails (0.0.7) jquery-rails flutie (2.1.0) - font-awesome-rails (4.7.0.5) - railties (>= 3.2, < 6.1) + font-awesome-rails (4.7.0.8) + railties (>= 3.2, < 8.0) fugit (1.5.0) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.4) + geocoder (1.8.2) gitlab (4.18.0) httparty (~> 0.18) terminal-table (>= 1.5.1) - globalid (1.0.0) + globalid (1.1.0) activesupport (>= 5.0) - google-api-client (0.32.1) + google-apis-core (0.11.3) addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.5, < 0.10.0) - httpclient (>= 2.8.1, < 3.0) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) mini_mime (~> 1.0) representable (~> 3.0) - retriable (>= 2.0, < 4.0) - signet (~> 0.10) - google_drive (2.1.3) - google-api-client (>= 0.11.0, < 1.0.0) - googleauth (>= 0.5.0, < 1.0.0) - nokogiri (>= 1.5.3, < 2.0.0) - googleauth (0.6.6) - faraday (~> 0.12) + retriable (>= 2.0, < 4.a) + rexml + google-apis-drive_v3 (0.46.0) + google-apis-core (>= 0.11.0, < 2.a) + googleauth (1.1.3) + faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) - memoist (~> 0.12) + memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.7) - haml (5.1.2) + signet (>= 0.16, < 2.a) + haml (5.2.2) temple (>= 0.8.0) tilt hamster (3.0.0) concurrent-ruby (~> 1.0) + hashie (5.0.0) hiredis (0.6.3) htmlentities (4.3.4) - http_logger (0.5.1) + http_logger (0.7.0) httparty (0.20.0) mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - hydra-access-controls (10.7.0) + hydra-access-controls (11.0.7) active-fedora (>= 10.0.0) activesupport (>= 4, < 6) blacklight (>= 5.16) blacklight-access_controls (~> 0.6.0) cancancan (~> 1.8) deprecation (~> 1.0) - hydra-core (10.7.0) - hydra-access-controls (= 10.7.0) + hydra-core (11.0.7) + hydra-access-controls (= 11.0.7) railties (>= 4.0.0, < 6) - hydra-derivatives (3.5.0) - active-fedora (>= 11.3.1, < 14) + hydra-derivatives (3.7.0) + active-fedora (>= 11.5.6, != 13.2.1, != 13.2.0, != 13.1.3, != 13.1.2, != 13.1.1, != 13.1.0, != 13.0.0, != 12.2.1, != 12.2.0, != 12.1.1, != 12.1.0, != 12.0.3, != 12.0.2, != 12.0.1, != 12.0.0) active_encode (~> 0.1) - activesupport (>= 4.0, < 6) + activesupport (>= 4.0, < 7) addressable (~> 2.5) deprecation mime-types (> 2.0, < 4.0) mini_magick (>= 3.2, < 5) - hydra-editor (4.0.2) + hydra-editor (5.0.5) active-fedora (>= 9.0.0) + activerecord (~> 5.0) almond-rails (~> 0.1) cancancan (~> 1.8) - rails (>= 4.2.0, < 6) - simple_form (~> 3.2) + rails (>= 5, < 6) + simple_form (>= 4.1.0, < 6.0) + sprockets (~> 3.7) sprockets-es6 - hydra-file_characterization (1.1.0) + hydra-file_characterization (1.2.0) activesupport (>= 3.0.0) - hydra-head (10.7.0) - hydra-access-controls (= 10.7.0) - hydra-core (= 10.7.0) - rails (>= 3.2.6) - hydra-pcdm (1.1.0) - active-fedora (>= 10, < 14) + hydra-head (11.0.7) + 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) mime-types (>= 1) + rdf-vocab hydra-works (1.2.0) activesupport (>= 4.2.10, < 6.0) hydra-derivatives (~> 3.0) hydra-file_characterization (~> 1.0) hydra-pcdm (>= 0.9) - hyrax (2.6.0) - active-fedora (~> 11.5, >= 11.5.2) + hyrax (2.9.6) + active-fedora (>= 11.5.2, < 13) almond-rails (~> 0.1) awesome_nested_set (~> 3.1) blacklight (~> 6.14) @@ -466,16 +498,17 @@ GEM browse-everything (>= 0.16) carrierwave (~> 1.0) clipboard-rails (~> 1.5) + draper (~> 4.0) dry-equalizer (~> 0.2) - dry-struct (~> 0.1) + dry-struct (>= 0.1, < 2.0) dry-transaction (~> 0.11) - dry-validation (~> 0.9) + dry-validation (>= 0.9, < 2.0) flipflop (~> 2.3) flot-rails (~> 0.0.6) font-awesome-rails (~> 4.2) hydra-derivatives (~> 3.3) hydra-editor (>= 3.3, < 6.0) - hydra-head (>= 10.6.1) + hydra-head (>= 10.6.1, < 12) hydra-works (>= 0.16, < 2.0) iiif_manifest (>= 0.3, < 0.6) jquery-datatables-rails (~> 3.4) @@ -483,7 +516,7 @@ GEM json-schema kaminari_route_prefix (~> 0.1.1) legato (~> 0.3) - linkeddata + linkeddata (~> 3.1) mailboxer (~> 0.12) nest (~> 3.1) noid-rails (~> 3.0.0) @@ -492,10 +525,11 @@ GEM posix-spawn power_converter (~> 0.1, >= 0.1.2) pul_uv_rails (~> 2.0) - qa (~> 2.0) + qa (>= 2.0, < 6.0) rails (~> 5.0) rails_autolink (~> 1.1) rdf-rdfxml + rdf-vocab (< 3.1.5) redis-namespace (~> 1.5) redlock (>= 0.1.2) retriable (>= 2.9, < 4.0) @@ -503,61 +537,68 @@ GEM sass-rails (~> 5.0) select2-rails (~> 3.5) signet + solrizer (>= 3.4, < 5) tinymce-rails (~> 4.1) hyrax-spec (0.3.2) rspec (~> 3.6) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) ice_nine (0.11.2) + io-wait (0.3.1) iso8601 (0.9.1) - jbuilder (2.7.0) - activesupport (>= 4.2.0) - multi_json (>= 1.2) - jmespath (1.4.0) + jbuilder (2.11.5) + actionview (>= 5.0.0) + activesupport (>= 5.0.0) + jmespath (1.6.2) jquery-datatables-rails (3.4.0) actionpack (>= 3.1) jquery-rails railties (>= 3.1) sass-rails - jquery-rails (4.3.3) + jquery-rails (4.6.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) - json (2.2.0) - json-ld (3.0.2) - multi_json (~> 1.12) - rdf (>= 2.2.8, < 4.0) - json-ld-preloaded (3.0.6) - json-ld (~> 3.0) - multi_json (~> 1.12) - rdf (~> 3.0) - json-schema (2.8.1) - addressable (>= 2.4) - jwt (2.2.1) - kaminari (1.2.1) + json (2.7.1) + json-canonicalization (0.2.1) + json-ld (3.1.10) + htmlentities (~> 4.3) + json-canonicalization (~> 0.2) + link_header (~> 0.0, >= 0.0.8) + multi_json (~> 1.14) + rack (~> 2.0) + rdf (~> 3.1) + json-ld-preloaded (3.1.6) + json-ld (~> 3.1) + rdf (~> 3.1) + json-schema (4.1.1) + addressable (>= 2.8) + jwt (2.8.1) + base64 + kaminari (1.2.2) activesupport (>= 4.1.0) - kaminari-actionview (= 1.2.1) - kaminari-activerecord (= 1.2.1) - kaminari-core (= 1.2.1) - kaminari-actionview (1.2.1) + kaminari-actionview (= 1.2.2) + kaminari-activerecord (= 1.2.2) + kaminari-core (= 1.2.2) + kaminari-actionview (1.2.2) actionview - kaminari-core (= 1.2.1) - kaminari-activerecord (1.2.1) + kaminari-core (= 1.2.2) + kaminari-activerecord (1.2.2) activerecord - kaminari-core (= 1.2.1) - kaminari-core (1.2.1) + kaminari-core (= 1.2.2) + kaminari-core (1.2.2) kaminari_route_prefix (0.1.1) kaminari (~> 1.0) language_list (1.2.1) - ld-patch (0.3.3) - ebnf (~> 1.1) - rdf (>= 2.2, < 4.0) - rdf-xsd (>= 2.2, < 4.0) - sparql (>= 2.2, < 4.0) - sxp (~> 1.0) - ldp (0.7.2) + ld-patch (3.1.3) + ebnf (~> 2.1) + rdf (~> 3.1) + rdf-xsd (~> 3.1) + sparql (~> 3.1) + sxp (~> 1.1) + ldp (1.0.3) deprecation faraday http_logger @@ -567,94 +608,121 @@ GEM rdf-turtle rdf-vocab (>= 0.8) slop + ldpath (1.1.0) + nokogiri (~> 1.8) + parslet + rdf (~> 3.0) legato (0.7.0) multi_json - libxml-ruby (3.1.0) + libxml-ruby (3.2.4) link_header (0.0.8) - linkeddata (3.0.1) + linkeddata (3.1.1) equivalent-xml (~> 0.6) - json-ld (>= 2.2.1, < 4.0) - ld-patch (~> 0.3, >= 0.3.3) - nokogiri (~> 1.8) - nokogumbo (~> 1.5) - rdf (~> 3.0) - rdf-aggregate-repo (>= 2.2.1, < 4.0) - rdf-isomorphic (~> 3.0) - rdf-json (>= 2.2, < 4.0) - rdf-microdata (>= 2.2.3, < 4.0) - rdf-n3 (~> 3.0) - rdf-normalize (~> 0.3, >= 0.3.3) - rdf-rdfa (~> 3.0) - rdf-rdfxml (>= 2.2.1, < 4.0) - rdf-reasoner (~> 0.5.0) - rdf-tabular (>= 2.2.1, < 4.0) - rdf-trig (>= 2.2, < 4.0) - rdf-trix (>= 2.2.1, < 4.0) - rdf-turtle (~> 3.0, >= 3.0.1) - rdf-vocab (~> 3.0) - rdf-xsd (~> 3.0) - shex (~> 0.5, >= 0.5.2) - sparql (~> 3.0) - sparql-client (~> 3.0) + json-ld (~> 3.1, >= 3.1.1) + json-ld-preloaded (~> 3.1, >= 3.1.1) + ld-patch (~> 3.1) + nokogiri (~> 1.10) + nokogumbo (~> 2.0) + rdf (~> 3.1, >= 3.1.1) + rdf-aggregate-repo (~> 3.1) + rdf-isomorphic (~> 3.1) + rdf-json (~> 3.1) + rdf-microdata (~> 3.1) + rdf-n3 (~> 3.1) + rdf-normalize (~> 0.4) + rdf-rdfa (~> 3.1) + rdf-rdfxml (~> 3.1) + rdf-reasoner (~> 0.6) + rdf-tabular (~> 3.1) + rdf-trig (~> 3.1) + rdf-trix (~> 3.1) + rdf-turtle (~> 3.1) + rdf-vocab (~> 3.1, >= 3.1.2) + rdf-xsd (~> 3.1) + shex (~> 0.6) + sparql (~> 3.1) + sparql-client (~> 3.1) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.19.0) + logger (1.6.0) + loofah (2.22.0) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp mailboxer (0.15.1) carrierwave (>= 0.5.8) rails (>= 5.0.0) - memoist (0.16.0) + marcel (1.0.4) + memoist (0.16.2) method_source (0.9.2) - mime-types (3.3) + mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2019.1009) - mini_magick (4.9.5) + mime-types-data (3.2024.0206) + mini_magick (4.12.0) mini_mime (1.1.2) mini_portile2 (2.6.1) minitest (5.15.0) - multi_json (1.13.1) + msgpack (1.7.2) + multi_json (1.15.0) multi_xml (0.6.0) - multipart-post (2.1.1) + multipart-post (2.4.0) mustermann (1.0.3) nest (3.2.0) redic - net-http-persistent (3.1.0) + net-http-persistent (4.0.2) connection_pool (~> 2.2) - nio4r (2.5.8) + net-imap (0.2.2) + digest + net-protocol + strscan + net-pop (0.1.2) + net-protocol + net-protocol (0.1.2) + io-wait + timeout + net-smtp (0.3.0) + digest + net-protocol + timeout + nio4r (2.7.0) noid (0.9.0) - noid-rails (3.0.1) - actionpack (>= 5.0.0, < 6) + noid-rails (3.0.3) + actionpack (>= 5.0.0, < 7) noid (~> 0.9) nokogiri (1.12.5) mini_portile2 (~> 2.6.1) racc (~> 1.4) - nokogumbo (1.5.0) - nokogiri - oauth (0.5.4) - oauth2 (1.4.2) - faraday (>= 0.8, < 2.0) + nokogumbo (2.0.5) + nokogiri (~> 1.8, >= 1.8.4) + oauth (0.6.2) + snaky_hash (~> 2.0) + version_gem (~> 1.1) + oauth2 (1.4.11) + faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (>= 1.2, < 3) + rack (>= 1.2, < 4) octokit (4.22.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - openseadragon (0.5.0) + openseadragon (0.6.0) rails (> 3.2.0) orm_adapter (0.5.0) - os (1.0.1) + os (1.1.4) parallel (1.22.1) parser (3.1.2.0) ast (~> 2.4.1) + parslet (2.0.0) path_expander (1.1.0) pg (1.1.3) - posix-spawn (0.3.13) + posix-spawn (0.3.15) power_converter (0.1.2) pronto (0.11.0) gitlab (~> 4.4, >= 4.4.0) @@ -686,42 +754,48 @@ GEM pry (~> 0.10) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (3.0.3) + public_suffix (4.0.7) pul_uv_rails (2.0.1) - puma (3.12.0) - qa (2.2.0) + puma (3.12.6) + qa (5.11.0) activerecord-import deprecation - faraday + faraday (< 3.0, != 2.0.0) + geocoder + ldpath nokogiri (~> 1.6) - rails (~> 5.0) + rails (>= 5.0, < 7.2) rdf raabro (1.4.0) - racc (1.6.0) - rack (2.2.4) + racc (1.7.3) + rack (2.2.8.1) rack-protection (2.0.4) rack - rack-test (2.0.2) + rack-test (2.1.0) rack (>= 1.3) - rails (5.1.6) - actioncable (= 5.1.6) - actionmailer (= 5.1.6) - actionpack (= 5.1.6) - actionview (= 5.1.6) - activejob (= 5.1.6) - activemodel (= 5.1.6) - activerecord (= 5.1.6) - activesupport (= 5.1.6) + rails (5.2.8.1) + actioncable (= 5.2.8.1) + actionmailer (= 5.2.8.1) + actionpack (= 5.2.8.1) + actionview (= 5.2.8.1) + activejob (= 5.2.8.1) + activemodel (= 5.2.8.1) + activerecord (= 5.2.8.1) + activestorage (= 5.2.8.1) + activesupport (= 5.2.8.1) bundler (>= 1.3.0) - railties (= 5.1.6) + railties (= 5.2.8.1) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) - rails_autolink (1.1.6) - rails (> 3.1) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) + rails_autolink (1.1.8) + actionview (> 3.1) + activesupport (> 3.1) + railties (> 3.1) rails_best_practices (1.23.1) activesupport code_analyzer (~> 0.5.5) @@ -730,84 +804,88 @@ GEM json require_all (~> 3.0) ruby-progressbar - railties (5.1.6) - actionpack (= 5.1.6) - activesupport (= 5.1.6) + railties (5.2.8.1) + actionpack (= 5.2.8.1) + activesupport (= 5.2.8.1) method_source rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) + thor (>= 0.19.0, < 2.0) rainbow (3.1.1) - rake (13.0.6) - rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) + rake (13.1.0) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) rdf (3.1.15) hamster (~> 3.0) link_header (~> 0.0, >= 0.0.8) - rdf-aggregate-repo (2.2.1) - rdf (>= 2.2, < 4.0) - rdf-isomorphic (3.0.0) - rdf (~> 3.0) - rdf-json (2.2.0) - rdf (>= 2.2, < 4.0) - rdf-microdata (2.2.3) + rdf-aggregate-repo (3.1.0) + rdf (~> 3.1) + rdf-isomorphic (3.1.1) + rdf (~> 3.1) + rdf-json (3.1.0) + rdf (~> 3.1) + rdf-microdata (3.1.1) htmlentities (~> 4.3) - nokogiri (~> 1.8) - rdf (>= 2.2.8, < 4.0) - rdf-xsd (>= 2.2, < 4.0) - rdf-n3 (3.1.0) - rdf (~> 3.0) - sparql (~> 3.0) - sxp (~> 1.0) - rdf-normalize (0.3.3) - rdf (>= 2.2, < 4.0) - rdf-rdfa (3.0.1) - haml (~> 5.0) + nokogiri (~> 1.10) + rdf (~> 3.1) + rdf-xsd (~> 3.1) + rdf-n3 (3.1.2) + ebnf (~> 2.1) + rdf (~> 3.1, >= 3.1.8) + sparql (~> 3.1, >= 3.1.4) + sxp (~> 1.1) + rdf-normalize (0.4.0) + rdf (~> 3.1) + rdf-rdfa (3.1.0) + haml (~> 5.1) htmlentities (~> 4.3) - rdf (~> 3.0) - rdf-aggregate-repo (>= 2.2, < 4.0) - rdf-xsd (~> 3.0) - rdf-rdfxml (2.2.1) + rdf (~> 3.1) + rdf-aggregate-repo (~> 3.1) + rdf-xsd (~> 3.1) + rdf-rdfxml (3.1.1) htmlentities (~> 4.3) - rdf (>= 2.2, < 4.0) - rdf-rdfa (>= 2.2, < 4.0) - rdf-xsd (>= 2.2, < 4.0) - rdf-reasoner (0.5.2) - rdf (~> 3.0) - rdf-vocab (~> 3.0) - rdf-xsd (~> 3.0) - rdf-tabular (2.2.2) + rdf (~> 3.1) + rdf-rdfa (~> 3.1) + rdf-xsd (~> 3.1) + rdf-reasoner (0.7.2) + rdf (~> 3.1, >= 3.1.12) + rdf-xsd (~> 3.1) + rdf-tabular (3.1.1) addressable (~> 2.3) bcp47 (~> 0.3, >= 0.3.3) - json-ld (>= 2.1, < 4.0) - rdf (~> 3.0) - rdf-vocab (~> 3.0) - rdf-xsd (~> 3.0) - rdf-trig (3.0.1) - ebnf (~> 1.1) - rdf (~> 3.0) - rdf-turtle (~> 3.0, >= 3.0.3) - rdf-trix (2.2.1) - rdf (>= 2.2, < 4.0) - rdf-turtle (3.0.6) - ebnf (~> 1.1) - rdf (~> 3.0) - rdf-vocab (3.0.14) - rdf (~> 3.0, >= 3.0.11) - rdf-xsd (3.0.1) - rdf (~> 3.0) + json-ld (~> 3.1) + rdf (~> 3.1) + rdf-vocab (~> 3.1) + rdf-xsd (~> 3.1) + rdf-trig (3.1.2) + ebnf (~> 2.1) + rdf (~> 3.1) + rdf-turtle (~> 3.1) + rdf-trix (3.1.1) + rdf (~> 3.1) + rdf-xsd (~> 3.1) + rdf-turtle (3.1.3) + ebnf (~> 2.1) + rdf (~> 3.1, >= 3.1.8) + rdf-vocab (3.1.4) + rdf (~> 3.1) + rdf-xsd (3.1.1) + rdf (~> 3.1) + rexml (~> 3.2) redic (1.5.3) hiredis - redis (4.1.2) - redis-namespace (1.6.0) - redis (>= 3.0.4) - redlock (1.0.1) - redis (>= 3.0.0, < 5.0) + redis (4.8.1) + redis-namespace (1.11.0) + redis (>= 4) + redlock (1.3.2) + redis (>= 3.0.0, < 6.0) regexp_parser (2.4.0) - representable (3.0.4) + representable (3.2.0) declarative (< 0.1.0) - declarative-option (< 0.2.0) + trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) + request_store (1.6.0) + rack (>= 1.4) require_all (3.0.0) responders (2.4.0) actionpack (>= 4.2.0, < 5.3) @@ -818,9 +896,9 @@ GEM deprecation (>= 1.0.0) railties (>= 4.2, < 6) rinku (2.0.6) - rsolr (2.2.1) + rsolr (2.5.0) builder (>= 2.1.2) - faraday (>= 0.9.0) + faraday (>= 0.9, < 3, != 2.0.0) rspec (3.8.0) rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) @@ -867,58 +945,63 @@ GEM json multipart-post oauth2 - ruby-progressbar (1.10.0) + ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) ruby_dep (1.5.0) ruby_parser (3.19.1) sexp_processor (~> 4.16) rubyzip (1.2.2) rugged (1.0.1) - sass (3.6.0) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.7) - railties (>= 4.0.0, < 6) + sass-rails (5.1.0) + railties (>= 5.2.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sassc (2.2.0) + sassc (2.4.0) ffi (~> 1.9) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) - select2-rails (3.5.10) - thor (~> 0.14) + scanf (1.0.0) + select2-rails (3.5.11) selenium-webdriver (3.14.0) childprocess (~> 0.5) rubyzip (~> 1.2) sentry-raven (2.7.4) faraday (>= 0.7.6, < 1.0) sexp_processor (4.16.1) - shex (0.5.2) - ebnf (~> 1.1) - json-ld (>= 2.2, < 4.0) - json-ld-preloaded (>= 2.2, < 4.0) - rdf (>= 2.2, < 4.0) - rdf-xsd (>= 2.2, < 4.0) - sparql (>= 2.2, < 4.0) - sxp (~> 1.0) - signet (0.12.0) - addressable (~> 2.3) - faraday (~> 0.9) + shex (0.6.4) + ebnf (~> 2.1, >= 2.2) + htmlentities (~> 4.3) + json-ld (~> 3.1) + json-ld-preloaded (~> 3.1) + rdf (~> 3.1) + rdf-xsd (~> 3.1) + sparql (~> 3.1) + sxp (~> 1.1) + signet (0.16.1) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simple_form (3.5.1) - actionpack (> 4, < 5.2) - activemodel (> 4, < 5.2) + simple_form (5.3.0) + actionpack (>= 5.2) + activemodel (>= 5.2) sinatra (2.0.4) mustermann (~> 1.0) rack (~> 2.0) rack-protection (= 2.0.4) tilt (~> 2.0) - slop (4.7.0) + slop (4.10.1) + snaky_hash (2.0.1) + hashie + version_gem (~> 1.1, >= 1.1.1) solr_wrapper (2.0.0) faraday retriable @@ -928,17 +1011,18 @@ GEM activesupport nokogiri xml-simple - sparql (3.0.2) + sparql (3.1.8) builder (~> 3.2) - ebnf (~> 1.1) - rdf (~> 3.0) - rdf-aggregate-repo (>= 2.2, < 4.0) - rdf-xsd (~> 3.0) - sparql-client (~> 3.0) - sxp (~> 1.0) - sparql-client (3.0.1) - net-http-persistent (>= 2.9, < 4) - rdf (~> 3.0) + ebnf (~> 2.1) + logger (~> 1.4) + rdf (~> 3.1, >= 3.1.14) + rdf-aggregate-repo (~> 3.1) + rdf-xsd (~> 3.1) + sparql-client (~> 3.1, >= 3.1.2) + sxp (~> 1.1) + sparql-client (3.1.2) + net-http-persistent (~> 4.0, >= 4.0.1) + rdf (~> 3.1) spring (2.0.2) activesupport (>= 4.2) spring-watcher-listen (2.0.1) @@ -951,22 +1035,26 @@ GEM babel-source (>= 5.8.11) babel-transpiler sprockets (>= 3.0.0) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) - sxp (1.0.2) - rdf (~> 3.0) - temple (0.8.2) + ssrf_filter (1.0.8) + strscan (3.1.0) + sxp (1.1.0) + rdf (~> 3.1) + temple (0.10.3) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) tether-rails (1.4.0) rails (>= 3.1) - thor (0.20.3) + thor (1.2.2) thread_safe (0.3.6) - tilt (2.0.8) - tinymce-rails (4.9.6) + tilt (2.3.0) + timeout (0.4.0) + tinymce-rails (4.9.11) railties (>= 3.1.1) + trailblazer-option (0.1.2) travis-release (0.0.4) bundler rake @@ -974,15 +1062,17 @@ GEM actionpack (>= 3.1) jquery-rails railties (>= 3.1) - typhoeus (1.3.1) + typhoeus (1.4.1) ethon (>= 0.9.0) - tzinfo (1.2.10) + tzinfo (1.2.11) thread_safe (~> 0.1) uber (0.1.0) uglifier (4.1.19) execjs (>= 0.3.0, < 3) unicode-display_width (2.1.0) + unicode-types (1.9.0) validatable (1.6.7) + version_gem (1.1.3) warden (1.2.7) rack (>= 1.0) web-console (3.7.0) @@ -990,12 +1080,13 @@ GEM activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) - websocket-driver (0.6.5) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) whenever (1.0.0) chronic (>= 0.6.3) - xml-simple (1.1.5) + xml-simple (1.1.9) + rexml xpath (3.1.0) nokogiri (~> 1.8) xray-rails (0.3.2) @@ -1009,6 +1100,7 @@ DEPENDENCIES activerecord-nulldb-adapter bixby blacklight_range_limit + bootsnap bulkrax! byebug capybara (~> 2.13) @@ -1024,13 +1116,14 @@ DEPENDENCIES final_redirect_url flutie health-monitor-rails! - hyrax (~> 2.6) + hyrax (~> 2.9.6) hyrax-iiif_av! hyrax-spec iiif_manifest! jbuilder (~> 2.5) jquery-rails listen (>= 3.0.5, < 3.2) + marcel oai! pg pronto @@ -1042,7 +1135,10 @@ DEPENDENCIES pry-byebug pry-rails puma (~> 3.7) - rails (= 5.1.6) + rails (~> 5.2) + redis (~> 4.0) + redis-namespace (~> 1.5) + redlock (~> 1.0) riiif (~> 1.1) rinku rsolr (~> 2.2) @@ -1061,8 +1157,5 @@ DEPENDENCIES willow_sword! xray-rails -RUBY VERSION - ruby 2.5.3p105 - BUNDLED WITH 1.17.3 diff --git a/app/models/ability.rb b/app/models/ability.rb index 58bfb7d9..b1cff96d 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -4,6 +4,14 @@ class Ability include Hyrax::Ability self.ability_logic += [:everyone_can_create_curation_concerns] + def can_import_works? + can_create_any_work? + end + + def can_export_works? + can_create_any_work? + end + # Define any customized permissions here. def custom_permissions # Limits deleting objects to a the admin user diff --git a/app/models/bulkrax/cdri_work_entry.rb b/app/models/bulkrax/cdri_work_entry.rb index f07008c1..26db8676 100644 --- a/app/models/bulkrax/cdri_work_entry.rb +++ b/app/models/bulkrax/cdri_work_entry.rb @@ -18,7 +18,15 @@ def files_path end def factory - @factory ||= Bulkrax::ObjectFactory.new(parsed_metadata, identifier, false, user, factory_class) + @factory ||= Bulkrax::ObjectFactory.new(attributes: self.parsed_metadata, + source_identifier_value: identifier, + work_identifier: parser.work_identifier, + work_identifier_search_field: parser.work_identifier_search_field, + related_parents_parsed_mapping: parser.related_parents_parsed_mapping, + user: user, + klass: factory_class, + importer_run_id: importerexporter.last_run.id, + ) end def factory_class @@ -50,8 +58,7 @@ def build_metadata if raw_metadata_xml["ComponentFileName"].present? parsed_metadata['file'] = - [File.join(files_path, -raw_metadata_xml["ComponentFileName"].downcase)] + [File.join(files_path, raw_metadata_xml["ComponentFileName"].downcase)] end parsed_metadata[work_identifier] ||= [self.identifier] parsed_metadata['has_manifest'] = "1" diff --git a/bin/bundle b/bin/bundle index 66e9889e..f19acf5b 100755 --- a/bin/bundle +++ b/bin/bundle @@ -1,3 +1,3 @@ #!/usr/bin/env ruby -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) load Gem.bin_path('bundler', 'bundle') diff --git a/bin/db-migrate-seed.sh b/bin/db-migrate-seed.sh new file mode 100755 index 00000000..c25f28e6 --- /dev/null +++ b/bin/db-migrate-seed.sh @@ -0,0 +1,16 @@ +#!/bin/sh +set -e + +db-wait.sh "$DATABASE_HOST:$DB_PORT" +if [ "$FCREPO_HOST" ]; then + db-wait.sh "$FCREPO_HOST:$FCREPO_PORT" +fi +db-wait.sh "$SOLR_HOST:$SOLR_PORT" + +migrations_run=`PGPASSWORD=$DATABASE_PASSWORD psql -h $DATABASE_HOST -U $DATABASE_USER $DATABASE_DB -t -c "SELECT version FROM schema_migrations ORDER BY schema_migrations" | wc -c` +migrations_fs=`ls -l db/migrate/ | awk '{print $9}' | grep -o '[0-9]\+' | wc -c` +if [[ "$migrations_run" -lt "$migrations_fs" ]]; then + bundle exec rails db:create + bundle exec rails db:migrate + bundle exec rails db:seed +fi diff --git a/bin/rails b/bin/rails index 5badb2fd..07396602 100755 --- a/bin/rails +++ b/bin/rails @@ -1,9 +1,4 @@ #!/usr/bin/env ruby -begin - load File.expand_path('../spring', __FILE__) -rescue LoadError => e - raise unless e.message.include?('spring') -end APP_PATH = File.expand_path('../config/application', __dir__) require_relative '../config/boot' require 'rails/commands' diff --git a/bin/rake b/bin/rake index d87d5f57..17240489 100755 --- a/bin/rake +++ b/bin/rake @@ -1,9 +1,4 @@ #!/usr/bin/env ruby -begin - load File.expand_path('../spring', __FILE__) -rescue LoadError => e - raise unless e.message.include?('spring') -end require_relative '../config/boot' require 'rake' Rake.application.run diff --git a/bin/setup b/bin/setup index 78c4e861..94fd4d79 100755 --- a/bin/setup +++ b/bin/setup @@ -1,10 +1,9 @@ #!/usr/bin/env ruby -require 'pathname' require 'fileutils' include FileUtils # path to your application root. -APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) +APP_ROOT = File.expand_path('..', __dir__) def system!(*args) system(*args) || abort("\n== Command #{args} failed ==") @@ -21,7 +20,6 @@ chdir APP_ROOT do # Install JavaScript dependencies if using Yarn # system('bin/yarn') - # puts "\n== Copying sample files ==" # unless File.exist?('config/database.yml') # cp 'config/database.yml.sample', 'config/database.yml' diff --git a/bin/update b/bin/update index a8e4462f..58bfaed5 100755 --- a/bin/update +++ b/bin/update @@ -1,10 +1,9 @@ #!/usr/bin/env ruby -require 'pathname' require 'fileutils' include FileUtils # path to your application root. -APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) +APP_ROOT = File.expand_path('..', __dir__) def system!(*args) system(*args) || abort("\n== Command #{args} failed ==") @@ -18,6 +17,9 @@ chdir APP_ROOT do system! 'gem install bundler --conservative' system('bundle check') || system!('bundle install') + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + puts "\n== Updating database ==" system! 'bin/rails db:migrate' diff --git a/bin/web b/bin/web new file mode 100755 index 00000000..92015f38 --- /dev/null +++ b/bin/web @@ -0,0 +1,6 @@ +#!/usr/local/bin/ruby +if ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'] && !ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'].empty? + %x{echo #{ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE']} | base64 --decode > prod-cred.p12} +end + +exec "bundle exec puma -v -b tcp://0.0.0.0:3000" \ No newline at end of file diff --git a/bin/yarn b/bin/yarn index c2bacef8..460dd565 100755 --- a/bin/yarn +++ b/bin/yarn @@ -1,8 +1,8 @@ #!/usr/bin/env ruby -VENDOR_PATH = File.expand_path('..', __dir__) -Dir.chdir(VENDOR_PATH) do +APP_ROOT = File.expand_path('..', __dir__) +Dir.chdir(APP_ROOT) do begin - exec "yarnpkg #{ARGV.join(" ")}" + exec "yarnpkg", *ARGV rescue Errno::ENOENT $stderr.puts "Yarn executable was not detected in the system." $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install" diff --git a/config/boot.rb b/config/boot.rb index 30f5120d..b9e460ce 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -1,3 +1,4 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/environments/development.rb b/config/environments/development.rb index d934ebc6..5251d81a 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -15,8 +15,11 @@ # Show full error reports. config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. - if Rails.root.join('tmp/caching-dev.txt').exist? + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? config.action_controller.perform_caching = true config.cache_store = :memory_store @@ -29,6 +32,9 @@ config.cache_store = :null_store end + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + # Don't care if the mailer can't send. config.action_mailer.raise_delivery_errors = false config.action_mailer.delivery_method = :smtp @@ -49,6 +55,9 @@ # Raise an error on page load if there are pending migrations. config.active_record.migration_error = :page_load + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + # Debug mode disables concatenation and preprocessing of assets. # This option may cause significant delays in view rendering with a large # number of complex assets. diff --git a/config/environments/production.rb b/config/environments/production.rb index dce98430..d2957e86 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -42,6 +42,9 @@ # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + # Mount Action Cable outside main process or domain # config.action_cable.mount_path = nil # config.action_cable.url = 'wss://example.com/cable' diff --git a/config/environments/test.rb b/config/environments/test.rb index 8e5cbde5..0a38fd3c 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -15,7 +15,7 @@ # Configure public file server for tests with Cache-Control for performance. config.public_file_server.enabled = true config.public_file_server.headers = { - 'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}" + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" } # Show full error reports and disable caching. @@ -27,6 +27,10 @@ # Disable request forgery protection in test environment. config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + config.action_mailer.perform_caching = false # Tell Action Mailer not to deliver emails to the real world. diff --git a/config/initializers/bulkrax.rb b/config/initializers/bulkrax.rb index 4b50227c..c5f0926f 100644 --- a/config/initializers/bulkrax.rb +++ b/config/initializers/bulkrax.rb @@ -34,7 +34,7 @@ 'date' => { from: ['date'], split: /\s*[;]\s*/ }, 'description' => { from: ['description'] }, 'format_digital' => { from: ['format'], parsed: true, split: /\s*[;]\s*/ }, - 'identifier' => { from: ['identifier'], if: ['match?', /http(s{0,1}):\/\//], source_identifier: true }, + 'identifier' => { from: ['identifier'], if: ['match?', /http(s{0,1}):\/\//], source_identifier: true, search_field: 'identifier_tesim' }, 'language' => { from: ['language'], split: /\s*[;]\s*/, parsed: true }, 'place'=>{:from=>['coverage'], split: /\s*[;]\s*/ }, 'publisher' => { from: ['publisher'], split: /\s*[;]\s*/ }, diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb new file mode 100644 index 00000000..d3bcaa5e --- /dev/null +++ b/config/initializers/content_security_policy.rb @@ -0,0 +1,25 @@ +# Be sure to restart your server when you modify this file. + +# Define an application-wide content security policy +# For further information see the following documentation +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy + +# Rails.application.config.content_security_policy do |policy| +# policy.default_src :self, :https +# policy.font_src :self, :https, :data +# policy.img_src :self, :https, :data +# policy.object_src :none +# policy.script_src :self, :https +# policy.style_src :self, :https + +# # Specify URI for violation reports +# # policy.report_uri "/csp-violation-report-endpoint" +# end + +# If you are using UJS then enable automatic nonce generation +# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) } + +# Report CSP violations to a specified URI +# For further information see the following documentation: +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only +# Rails.application.config.content_security_policy_report_only = true diff --git a/config/initializers/new_framework_defaults_5_2.rb b/config/initializers/new_framework_defaults_5_2.rb new file mode 100644 index 00000000..c383d072 --- /dev/null +++ b/config/initializers/new_framework_defaults_5_2.rb @@ -0,0 +1,38 @@ +# Be sure to restart your server when you modify this file. +# +# This file contains migration options to ease your Rails 5.2 upgrade. +# +# Once upgraded flip defaults one by one to migrate to the new default. +# +# Read the Guide for Upgrading Ruby on Rails for more info on each option. + +# Make Active Record use stable #cache_key alongside new #cache_version method. +# This is needed for recyclable cache keys. +# Rails.application.config.active_record.cache_versioning = true + +# Use AES-256-GCM authenticated encryption for encrypted cookies. +# Also, embed cookie expiry in signed or encrypted cookies for increased security. +# +# This option is not backwards compatible with earlier Rails versions. +# It's best enabled when your entire app is migrated and stable on 5.2. +# +# Existing cookies will be converted on read then written with the new scheme. +# Rails.application.config.action_dispatch.use_authenticated_cookie_encryption = true + +# Use AES-256-GCM authenticated encryption as default cipher for encrypting messages +# instead of AES-256-CBC, when use_authenticated_message_encryption is set to true. +# Rails.application.config.active_support.use_authenticated_message_encryption = true + +# Add default protection from forgery to ActionController::Base instead of in +# ApplicationController. +# Rails.application.config.action_controller.default_protect_from_forgery = true + +# Store boolean values are in sqlite3 databases as 1 and 0 instead of 't' and +# 'f' after migrating old data. +# Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true + +# Use SHA-1 instead of MD5 to generate non-sensitive digests, such as the ETag header. +# Rails.application.config.active_support.use_sha1_digests = true + +# Make `form_with` generate id attributes for any generated HTML tags. +# Rails.application.config.action_view.form_with_generates_ids = true diff --git a/config/puma.rb b/config/puma.rb index 1e19380d..b2102072 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -15,6 +15,9 @@ # environment ENV.fetch("RAILS_ENV") { "development" } +# Specifies the `pidfile` that Puma will use. +pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" } + # Specifies the number of `workers` to boot in clustered mode. # Workers are forked webserver processes. If using threads and workers together # the concurrency of the application would be max `threads` * `workers`. @@ -26,31 +29,9 @@ # Use the `preload_app!` method when specifying a `workers` number. # This directive tells Puma to first boot the application and load code # before forking the application. This takes advantage of Copy On Write -# process behavior so workers use less memory. If you use this option -# you need to make sure to reconnect any threads in the `on_worker_boot` -# block. +# process behavior so workers use less memory. # # preload_app! -# If you are preloading your application and using Active Record, it's -# recommended that you close any connections to the database before workers -# are forked to prevent connection leakage. -# -# before_fork do -# ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord) -# end - -# The code in the `on_worker_boot` will be called if you are using -# clustered mode by specifying a number of `workers`. After each worker -# process is booted, this block will be run. If you are using the `preload_app!` -# option, you will want to use this block to reconnect to any threads -# or connections that may have been created at application boot, as Ruby -# cannot share connections between processes. -# -# on_worker_boot do -# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) -# end -# - # Allow puma to be restarted by `rails restart` command. plugin :tmp_restart diff --git a/config/spring.rb b/config/spring.rb index c9119b40..9fa7863f 100644 --- a/config/spring.rb +++ b/config/spring.rb @@ -1,6 +1,6 @@ -%w( +%w[ .ruby-version .rbenv-vars tmp/restart.txt tmp/caching-dev.txt -).each { |path| Spring.watch(path) } +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 00000000..d32f76e8 --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/db/migrate/20240304200131_add_search_field_to_importers.rb b/db/migrate/20240304200131_add_search_field_to_importers.rb new file mode 100644 index 00000000..3b9e3e2a --- /dev/null +++ b/db/migrate/20240304200131_add_search_field_to_importers.rb @@ -0,0 +1,8 @@ +class AddSearchFieldToImporters < ActiveRecord::Migration[5.2] + def change + Bulkrax::Importer.find_each do |i| + i.field_mapping['identifier']["search_field"] = "identifier_tesim" if i.field_mapping&.[]('identifier')&.[]("search_field") + i.save + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 670cbf25..b7a1c7dd 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20220609001128) do +ActiveRecord::Schema.define(version: 2024_03_04_200131) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -40,6 +40,10 @@ t.datetime "last_succeeded_at" t.string "importerexporter_type", default: "Bulkrax::Importer" t.integer "import_attempts", default: 0 + t.string "status_message", default: "Pending" + t.index ["identifier", "importerexporter_id", "importerexporter_type"], name: "bulkrax_identifier_idx" + t.index ["importerexporter_id", "importerexporter_type"], name: "bulkrax_entries_importerexporter_idx" + t.index ["type"], name: "index_bulkrax_entries_on_type" end create_table "bulkrax_exporter_runs", force: :cascade do |t| @@ -72,6 +76,7 @@ t.string "workflow_status" t.boolean "include_thumbnails", default: false t.boolean "generated_metadata", default: false + t.string "status_message", default: "Pending" t.index ["user_id"], name: "index_bulkrax_exporters_on_user_id" end @@ -112,6 +117,7 @@ t.boolean "validate_only" t.datetime "last_error_at" t.datetime "last_succeeded_at" + t.string "status_message", default: "Pending" t.index ["user_id"], name: "index_bulkrax_importers_on_user_id" end @@ -122,7 +128,9 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.integer "order", default: 0 + t.index ["child_id"], name: "index_bulkrax_pending_relationships_on_child_id" t.index ["importer_run_id"], name: "index_bulkrax_pending_relationships_on_importer_run_id" + t.index ["parent_id"], name: "index_bulkrax_pending_relationships_on_parent_id" end create_table "bulkrax_statuses", force: :cascade do |t| @@ -136,6 +144,9 @@ t.string "runnable_type" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["error_class"], name: "index_bulkrax_statuses_on_error_class" + t.index ["runnable_id", "runnable_type"], name: "bulkrax_statuses_runnable_idx" + t.index ["statusable_id", "statusable_type"], name: "bulkrax_statuses_statusable_idx" end create_table "checksum_audit_logs", force: :cascade do |t| diff --git a/docker-compose.yml b/docker-compose.yml index 949bc077..2ec097b2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -60,6 +60,8 @@ services: condition: service_started initialize_app: condition: service_completed_successfully + ports: + - '3000' redis: image: redis:3 @@ -114,7 +116,7 @@ services: entrypoint: ["sh", "-c"] command: - > - bundle && db-migrate-seed.sh + bundle && rails db:migrate && db-migrate-seed.sh depends_on: postgres: condition: service_started