Skip to content

Commit

Permalink
Merge pull request #2260 from samvera/update-gems
Browse files Browse the repository at this point in the history 
Hyku v6.0.0 release
  • Loading branch information
@kirkkwang
kirkkwang authored Jul 5, 2024
2 parents f7e9a0d + 04fb1a8 commit 5b80a96
Show file tree
Hide file tree
Showing 17 changed files with 152 additions and 111 deletions.
1 change: 1 addition & 0 deletions .env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,4 @@ HYRAX_ANALYTICS=false
##END## Enable Google Analytics

HYRAX_VALKYRIE=true
VALKYRIE_TRANSITION=true
6 changes: 3 additions & 3 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ end
source 'https://rubygems.org'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.0', github: 'rails/rails', branch: '6-1-stable'
gem 'rails', '~> 6.1.7.8'

gem 'active_elastic_job', github: 'active-elastic-job/active-elastic-job', ref: 'ec51c5d9dedc4a1b47f2db41f26d5fceb251e979', group: %i[aws]
gem 'active-fedora', '~> 14.0'
Expand Down Expand Up @@ -51,12 +51,12 @@ gem 'good_job', '~> 2.99'
gem 'googleauth', '~> 1.9.0'
gem 'google-protobuf', force_ruby_platform: true # required because google-protobuf is not compatible with Alpine linux
gem 'grpc', force_ruby_platform: true # required because google-protobuf is not compatible with Alpine linux
gem 'hyrax', github: 'samvera/hyrax', branch: 'double_combo'
gem 'hyrax', github: 'samvera/hyrax', branch: 'main'
gem 'hyrax-doi', github: 'samvera-labs/hyrax-doi', branch: 'rails_hyrax_upgrade'
gem 'hyrax-iiif_av', github: 'samvera-labs/hyrax-iiif_av', branch: 'rails_hyrax_upgrade'
gem 'i18n-debug', require: false, group: %i[development test]
gem 'i18n-tasks', group: %i[development test]
gem 'iiif_print', github: 'scientist-softserv/iiif_print', branch: 'main'
gem 'iiif_print'
gem 'jbuilder', '~> 2.5'
gem 'jquery-rails' # Use jquery as the JavaScript library
gem 'openssl', '>= 3.2.0'
Expand Down
199 changes: 93 additions & 106 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,92 +7,6 @@ GIT
aws-sdk-sqs (~> 1)
rails (>= 4.2)

GIT
remote: https://github.com/rails/rails.git
revision: d16199e507086e3d54d94253b7e1d87ead394d9f
branch: 6-1-stable
specs:
actioncable (6.1.7.6)
actionpack (= 6.1.7.6)
activesupport (= 6.1.7.6)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.7.6)
actionpack (= 6.1.7.6)
activejob (= 6.1.7.6)
activerecord (= 6.1.7.6)
activestorage (= 6.1.7.6)
activesupport (= 6.1.7.6)
mail (>= 2.7.1)
actionmailer (6.1.7.6)
actionpack (= 6.1.7.6)
actionview (= 6.1.7.6)
activejob (= 6.1.7.6)
activesupport (= 6.1.7.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.1.7.6)
actionview (= 6.1.7.6)
activesupport (= 6.1.7.6)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.7.6)
actionpack (= 6.1.7.6)
activerecord (= 6.1.7.6)
activestorage (= 6.1.7.6)
activesupport (= 6.1.7.6)
nokogiri (>= 1.8.5)
actionview (6.1.7.6)
activesupport (= 6.1.7.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.1.7.6)
activesupport (= 6.1.7.6)
globalid (>= 0.3.6)
activemodel (6.1.7.6)
activesupport (= 6.1.7.6)
activerecord (6.1.7.6)
activemodel (= 6.1.7.6)
activesupport (= 6.1.7.6)
activestorage (6.1.7.6)
actionpack (= 6.1.7.6)
activejob (= 6.1.7.6)
activerecord (= 6.1.7.6)
activesupport (= 6.1.7.6)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (6.1.7.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
rails (6.1.7.6)
actioncable (= 6.1.7.6)
actionmailbox (= 6.1.7.6)
actionmailer (= 6.1.7.6)
actionpack (= 6.1.7.6)
actiontext (= 6.1.7.6)
actionview (= 6.1.7.6)
activejob (= 6.1.7.6)
activemodel (= 6.1.7.6)
activerecord (= 6.1.7.6)
activestorage (= 6.1.7.6)
activesupport (= 6.1.7.6)
bundler (>= 1.15.0)
railties (= 6.1.7.6)
sprockets-rails (>= 2.0.0)
railties (6.1.7.6)
actionpack (= 6.1.7.6)
activesupport (= 6.1.7.6)
method_source
rake (>= 12.2)
thor (~> 1.0)

GIT
remote: https://github.com/samvera-labs/hyku_knapsack.git
revision: 5a7c54cace96881a3963ab2fd881ca6ea3f57372
Expand Down Expand Up @@ -147,8 +61,8 @@ GIT

GIT
remote: https://github.com/samvera/hyrax.git
revision: 6447872e0bcea17abfc1aab477f2eea57639298f
branch: double_combo
revision: d4e646c7613febd2195f3835d3b801c6aa7b601d
branch: main
specs:
hyrax (5.0.1)
active-fedora (~> 14.0)
Expand All @@ -168,6 +82,7 @@ GIT
dry-logic (~> 1.5)
dry-monads (~> 1.6)
dry-validation (~> 1.10)
faraday (= 2.9.1)
flipflop (~> 2.3)
flot-rails (~> 0.0.6)
font-awesome-rails (~> 4.2)
Expand Down Expand Up @@ -218,18 +133,6 @@ GIT
public_suffix (>= 2)
rack (>= 1.3.6)

GIT
remote: https://github.com/scientist-softserv/iiif_print.git
revision: fb07dcdafdf1b2e7e05ebd34a50187bf69b46474
branch: main
specs:
iiif_print (2.0.1)
blacklight_iiif_search (>= 1.0, < 3.0)
derivative-rodeo (~> 0.5)
hyrax (>= 2.5, < 6)
nokogiri (>= 1.13.2)
rdf-vocab (~> 3.0)

GIT
remote: https://github.com/scientist-softserv/willow_sword.git
revision: 38a0906647fae2020e8b0b08e296f85c457fcb34
Expand All @@ -253,6 +156,44 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (6.1.7.8)
actionpack (= 6.1.7.8)
activesupport (= 6.1.7.8)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.7.8)
actionpack (= 6.1.7.8)
activejob (= 6.1.7.8)
activerecord (= 6.1.7.8)
activestorage (= 6.1.7.8)
activesupport (= 6.1.7.8)
mail (>= 2.7.1)
actionmailer (6.1.7.8)
actionpack (= 6.1.7.8)
actionview (= 6.1.7.8)
activejob (= 6.1.7.8)
activesupport (= 6.1.7.8)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.1.7.8)
actionview (= 6.1.7.8)
activesupport (= 6.1.7.8)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.7.8)
actionpack (= 6.1.7.8)
activerecord (= 6.1.7.8)
activestorage (= 6.1.7.8)
activesupport (= 6.1.7.8)
nokogiri (>= 1.8.5)
actionview (6.1.7.8)
activesupport (= 6.1.7.8)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
active-fedora (14.0.1)
active-triples (>= 0.11.0, < 2.0.0)
activemodel (>= 5.1)
Expand All @@ -271,14 +212,35 @@ GEM
active_encode (0.8.2)
rails
sprockets (< 4)
activejob (6.1.7.8)
activesupport (= 6.1.7.8)
globalid (>= 0.3.6)
activemodel (6.1.7.8)
activesupport (= 6.1.7.8)
activemodel-serializers-xml (1.0.2)
activemodel (> 5.x)
activesupport (> 5.x)
builder (~> 3.1)
activerecord (6.1.7.8)
activemodel (= 6.1.7.8)
activesupport (= 6.1.7.8)
activerecord-import (1.7.0)
activerecord (>= 4.2)
activerecord-nulldb-adapter (1.0.1)
activerecord (>= 5.2.0, < 7.2)
activestorage (6.1.7.8)
actionpack (= 6.1.7.8)
activejob (= 6.1.7.8)
activerecord (= 6.1.7.8)
activesupport (= 6.1.7.8)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (6.1.7.8)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
aes_key_wrap (1.1.0)
Expand Down Expand Up @@ -586,10 +548,8 @@ GEM
factory_bot_rails (6.4.2)
factory_bot (~> 6.4)
railties (>= 5.0.0)
faraday (2.7.12)
base64
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday (2.9.1)
faraday-net_http (>= 2.0, < 3.2)
faraday-encoding (0.0.5)
faraday
faraday-excon (2.1.0)
Expand Down Expand Up @@ -768,6 +728,12 @@ GEM
json
iiif_manifest (1.3.1)
activesupport (>= 4)
iiif_print (3.0.1)
blacklight_iiif_search (>= 1.0, < 3.0)
derivative-rodeo (~> 0.5)
hyrax (>= 2.5, < 6)
nokogiri (>= 1.13.2)
rdf-vocab (~> 3.0)
iso-639 (0.3.6)
iso8601 (0.9.1)
jaro_winkler (1.5.6)
Expand Down Expand Up @@ -1060,6 +1026,21 @@ GEM
rack (~> 2.2, >= 2.2.4)
rack-test (0.7.0)
rack (>= 1.0, < 3)
rails (6.1.7.8)
actioncable (= 6.1.7.8)
actionmailbox (= 6.1.7.8)
actionmailer (= 6.1.7.8)
actionpack (= 6.1.7.8)
actiontext (= 6.1.7.8)
actionview (= 6.1.7.8)
activejob (= 6.1.7.8)
activemodel (= 6.1.7.8)
activerecord (= 6.1.7.8)
activestorage (= 6.1.7.8)
activesupport (= 6.1.7.8)
bundler (>= 1.15.0)
railties (= 6.1.7.8)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
Expand All @@ -1077,6 +1058,12 @@ GEM
actionview (> 3.1)
activesupport (> 3.1)
railties (> 3.1)
railties (6.1.7.8)
actionpack (= 6.1.7.8)
activesupport (= 6.1.7.8)
method_source
rake (>= 12.2)
thor (~> 1.0)
rainbow (3.1.1)
rake (13.1.0)
rb-fsevent (0.11.2)
Expand Down Expand Up @@ -1505,7 +1492,7 @@ DEPENDENCIES
hyrax-iiif_av!
i18n-debug
i18n-tasks
iiif_print!
iiif_print
jbuilder (~> 2.5)
jquery-rails
json-canonicalization (= 0.3.1)
Expand All @@ -1528,7 +1515,7 @@ DEPENDENCIES
pry-byebug
puma (~> 5.6)
rack-test (= 0.7.0)
rails (~> 6.0)!
rails (~> 6.1.7.8)
rails-controller-testing
rdf (~> 3.2)
redcarpet
Expand Down
16 changes: 16 additions & 0 deletions app/models/concerns/hyrax/solr_document_behavior_decorator.rb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# frozen_string_literal: true

# OVERRIDE Hyrax v5.0.1 for correct return on #hydra_model

module Hyrax
module SolrDocumentBehaviorDecorator
# Remove this once https://github.com/samvera/hyrax/pull/6860 is merged
def hydra_model(classifier: nil)
model = first('has_model_ssim')&.safe_constantize
model = (first('has_model_ssim')&.+ 'Resource')&.safe_constantize if Hyrax.config.valkyrie_transition?
model || model_classifier(classifier).classifier(self).best_model
end
end
end

Hyrax::SolrDocumentBehavior.prepend(Hyrax::SolrDocumentBehaviorDecorator)
8 changes: 8 additions & 0 deletions config/initializers/riiif.rb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
# frozen_string_literal: true

# Loading these constants during runtime would freeze the web service in development.
# Adding the requires here to load them on initialize.
require 'riiif/imagemagick_transformer'
require 'riiif/imagemagick_command_factory'
require 'riiif/crop'
require 'riiif/resize'

Rails.application.reloader.to_prepare do
Riiif::Image.info_service = lambda do |id, _file|
# id will look like a path to a pcdm:file
Expand Down
2 changes: 2 additions & 0 deletions ops/demo-deploy.tmpl.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,8 @@ extraEnvVars: &envVars
value: $SENTRY_DSN
- name: SENTRY_ENVIRONMENT
value: $SENTRY_ENVIRONMENT
- name: VALKYRIE_TRANSITION
value: "true"
worker:
replicaCount: 1
extraVolumeMounts: *volMounts
Expand Down
2 changes: 2 additions & 0 deletions ops/iiif-deploy.tmpl.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,8 @@ extraEnvVars: &envVars
value: $SENTRY_DSN
- name: SENTRY_ENVIRONMENT
value: $SENTRY_ENVIRONMENT
- name: VALKYRIE_TRANSITION
value: "true"

worker:
replicaCount: 1
Expand Down
2 changes: 2 additions & 0 deletions ops/iiif.tmpl.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,8 @@ extraEnvVars: &envVars
value: $SECRET_KEY_BASE
- name: SENTRY_DSN
value: $SENTRY_DSN
- name: VALKYRIE_TRANSITION
value: "true"

worker:
replicaCount: 1
Expand Down
2 changes: 2 additions & 0 deletions ops/staging-deploy.tmpl.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@ extraEnvVars: &envVars
value: $SENTRY_DSN
- name: SENTRY_ENVIRONMENT
value: $SENTRY_ENVIRONMENT
- name: VALKYRIE_TRANSITION
value: "true"

worker:
replicaCount: 1
Expand Down
Loading

0 comments on commit 5b80a96

Please sign in to comment.