Skip to content

Commit

Permalink
Merge branch 'master' into #3311-upgrade-solr-to-7
Browse files Browse the repository at this point in the history
  • Loading branch information
@murny
murny authored Apr 12, 2024
2 parents add582a + 6186e7d commit 6fa1f38
Show file tree
Hide file tree
Showing 6 changed files with 110 additions and 105 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ New entries in this file should aim to provide a meaningful amount of informatio

## [Unreleased]

### Chores
* Bump rubocop from 1.62.1 to 1.63.1 [PR#3439](https://github.com/ualbertalib/jupiter/pull/3439)

## [2.9.0] - 2024-03-14

Expand Down
4 changes: 2 additions & 2 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ group :development, :test do
# See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
gem 'debug', platforms: [:mri, :mingw, :x64_mingw]

gem 'rubocop', '~> 1.62.1', require: false
gem 'rubocop', '~> 1.63.1', require: false
gem 'rubocop-minitest', require: false
gem 'rubocop-performance', require: false
gem 'rubocop-rails', require: false
Expand All @@ -114,7 +114,7 @@ group :test do
gem 'haikunator'
gem 'shoulda-matchers', '~> 6.2'

gem 'json-schema', '~> 4.2.0'
gem 'json-schema', '~> 4.3.0'
gem 'launchy'
gem 'minitest-retry', require: false
gem 'rdf-isomorphic', '~> 3.3.0'
Expand Down
148 changes: 74 additions & 74 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,78 +43,78 @@ GEM
specs:
aasm (5.5.0)
concurrent-ruby (~> 1.0)
actioncable (7.1.3)
actionpack (= 7.1.3)
activesupport (= 7.1.3)
actioncable (7.1.3.1)
actionpack (= 7.1.3.1)
activesupport (= 7.1.3.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.1.3)
actionpack (= 7.1.3)
activejob (= 7.1.3)
activerecord (= 7.1.3)
activestorage (= 7.1.3)
activesupport (= 7.1.3)
actionmailbox (7.1.3.1)
actionpack (= 7.1.3.1)
activejob (= 7.1.3.1)
activerecord (= 7.1.3.1)
activestorage (= 7.1.3.1)
activesupport (= 7.1.3.1)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.1.3)
actionpack (= 7.1.3)
actionview (= 7.1.3)
activejob (= 7.1.3)
activesupport (= 7.1.3)
actionmailer (7.1.3.1)
actionpack (= 7.1.3.1)
actionview (= 7.1.3.1)
activejob (= 7.1.3.1)
activesupport (= 7.1.3.1)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.2)
actionpack (7.1.3)
actionview (= 7.1.3)
activesupport (= 7.1.3)
actionpack (7.1.3.1)
actionview (= 7.1.3.1)
activesupport (= 7.1.3.1)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actiontext (7.1.3)
actionpack (= 7.1.3)
activerecord (= 7.1.3)
activestorage (= 7.1.3)
activesupport (= 7.1.3)
actiontext (7.1.3.1)
actionpack (= 7.1.3.1)
activerecord (= 7.1.3.1)
activestorage (= 7.1.3.1)
activesupport (= 7.1.3.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.1.3)
activesupport (= 7.1.3)
actionview (7.1.3.1)
activesupport (= 7.1.3.1)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
active_link_to (1.0.5)
actionpack
addressable
activejob (7.1.3)
activesupport (= 7.1.3)
activejob (7.1.3.1)
activesupport (= 7.1.3.1)
globalid (>= 0.3.6)
activemodel (7.1.3)
activesupport (= 7.1.3)
activemodel (7.1.3.1)
activesupport (= 7.1.3.1)
activemodel-serializers-xml (1.0.2)
activemodel (> 5.x)
activesupport (> 5.x)
builder (~> 3.1)
activerecord (7.1.3)
activemodel (= 7.1.3)
activesupport (= 7.1.3)
activerecord (7.1.3.1)
activemodel (= 7.1.3.1)
activesupport (= 7.1.3.1)
timeout (>= 0.4.0)
activestorage (7.1.3)
actionpack (= 7.1.3)
activejob (= 7.1.3)
activerecord (= 7.1.3)
activesupport (= 7.1.3)
activestorage (7.1.3.1)
actionpack (= 7.1.3.1)
activejob (= 7.1.3.1)
activerecord (= 7.1.3.1)
activesupport (= 7.1.3.1)
marcel (~> 1.0)
activesupport (7.1.3)
activesupport (7.1.3.1)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
Expand Down Expand Up @@ -191,7 +191,7 @@ GEM
octokit (>= 4.0)
terminal-table (>= 1, < 4)
date (3.3.4)
debug (1.9.1)
debug (1.9.2)
irb (~> 1.10)
reline (>= 0.3.8)
debug_inspector (1.2.0)
Expand Down Expand Up @@ -224,7 +224,7 @@ GEM
erubi (1.12.0)
et-orbi (1.2.7)
tzinfo
faker (3.2.3)
faker (3.3.1)
i18n (>= 1.8.11, < 2)
faraday (2.9.0)
faraday-net_http (>= 2.0, < 3.2)
Expand Down Expand Up @@ -290,16 +290,16 @@ GEM
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
io-console (0.7.2)
irb (1.11.1)
irb (1.12.0)
rdoc
reline (>= 0.4.2)
jbuilder (2.11.5)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
jsbundling-rails (1.3.0)
railties (>= 6.0.0)
json (2.7.1)
json-schema (4.2.0)
json (2.7.2)
json-schema (4.3.0)
addressable (>= 2.8)
jwt (2.7.1)
kaminari (1.2.2)
Expand Down Expand Up @@ -332,7 +332,7 @@ GEM
net-imap
net-pop
net-smtp
marcel (1.0.2)
marcel (1.0.4)
matrix (0.4.2)
mini_magick (4.12.0)
mini_mime (1.1.5)
Expand All @@ -358,9 +358,9 @@ GEM
timeout
net-smtp (0.4.0.1)
net-protocol
nio4r (2.7.0)
nio4r (2.7.1)
no_proxy_fix (0.1.2)
nokogiri (1.16.3)
nokogiri (1.16.4)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
octokit (8.1.0)
Expand All @@ -387,7 +387,7 @@ GEM
ast (~> 2.4.1)
racc
pg (1.5.6)
psych (5.1.0)
psych (5.1.2)
stringio
public_suffix (5.0.4)
puma (6.4.2)
Expand All @@ -396,7 +396,7 @@ GEM
activesupport (>= 3.0.0)
raabro (1.4.0)
racc (1.7.3)
rack (2.2.8.1)
rack (2.2.9)
rack-protection (3.2.0)
base64 (>= 0.1.0)
rack (~> 2.2, >= 2.2.4)
Expand All @@ -407,30 +407,30 @@ GEM
rackup (1.0.0)
rack (< 3)
webrick
rails (7.1.3)
actioncable (= 7.1.3)
actionmailbox (= 7.1.3)
actionmailer (= 7.1.3)
actionpack (= 7.1.3)
actiontext (= 7.1.3)
actionview (= 7.1.3)
activejob (= 7.1.3)
activemodel (= 7.1.3)
activerecord (= 7.1.3)
activestorage (= 7.1.3)
activesupport (= 7.1.3)
rails (7.1.3.1)
actioncable (= 7.1.3.1)
actionmailbox (= 7.1.3.1)
actionmailer (= 7.1.3.1)
actionpack (= 7.1.3.1)
actiontext (= 7.1.3.1)
actionview (= 7.1.3.1)
activejob (= 7.1.3.1)
activemodel (= 7.1.3.1)
activerecord (= 7.1.3.1)
activestorage (= 7.1.3.1)
activesupport (= 7.1.3.1)
bundler (>= 1.15.0)
railties (= 7.1.3)
railties (= 7.1.3.1)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.1.3)
actionpack (= 7.1.3)
activesupport (= 7.1.3)
railties (7.1.3.1)
actionpack (= 7.1.3.1)
activesupport (= 7.1.3.1)
irb
rackup (>= 1.0.0)
rake (>= 12.2)
Expand Down Expand Up @@ -460,14 +460,14 @@ GEM
rdf-xsd (3.3.0)
rdf (~> 3.3)
rexml (~> 3.2)
rdoc (6.5.0)
rdoc (6.6.3.1)
psych (>= 4.0.0)
redcarpet (3.6.0)
redis (4.8.1)
redis-client (0.20.0)
connection_pool
regexp_parser (2.9.0)
reline (0.4.2)
reline (0.5.0)
io-console (~> 0.5)
representable (3.2.0)
declarative (< 0.1.0)
Expand All @@ -479,10 +479,10 @@ GEM
rexml (3.2.6)
rollbar (3.5.2)
rouge (4.1.3)
rsolr (2.5.0)
rsolr (2.6.0)
builder (>= 2.1.2)
faraday (>= 0.9, < 3, != 2.0.0)
rubocop (1.62.1)
rubocop (1.63.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand All @@ -498,10 +498,10 @@ GEM
rubocop-minitest (0.35.0)
rubocop (>= 1.61, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-performance (1.20.2)
rubocop-performance (1.21.0)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.30.0, < 2.0)
rubocop-rails (2.24.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rails (2.24.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
Expand All @@ -526,7 +526,7 @@ GEM
seed_dump (3.3.1)
activerecord (>= 4)
activesupport (>= 4)
selenium-webdriver (4.18.1)
selenium-webdriver (4.19.0)
base64 (~> 0.2)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
Expand Down Expand Up @@ -580,7 +580,7 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
stringio (3.0.8)
stringio (3.1.0)
strong_migrations (1.8.0)
activerecord (>= 5.2)
sxp (1.3.0)
Expand Down Expand Up @@ -655,7 +655,7 @@ DEPENDENCIES
image_processing
jbuilder
jsbundling-rails
json-schema (~> 4.2.0)
json-schema (~> 4.3.0)
kaminari
launchy
minitest-retry
Expand All @@ -678,7 +678,7 @@ DEPENDENCIES
redis (~> 4.8)
rollbar
rsolr
rubocop (~> 1.62.1)
rubocop (~> 1.63.1)
rubocop-minitest
rubocop-performance
rubocop-rails
Expand Down
8 changes: 2 additions & 6 deletions app/controllers/aip/v1/entities_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,19 +261,15 @@ def owner_email_statement
end

def entity_file_statements
file_statements = []

@entity.files.each do |file|
file_statements << RDF::Statement(
@entity.files.map do |file|
RDF::Statement(
subject: self_subject,
predicate: RDF::Vocab::PCDM.hasMember,
# RDF::URI Overrides the #/ operator to be used as a smart separator when building URIs.
# More information here: https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/URI#%2F-instance_method
object: RDF::URI.new(request.original_url) / 'filesets' / file.fileset_uuid
)
end

file_statements
end

def entity_member_of_statements
Expand Down
8 changes: 4 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"build:css": "sass ./app/assets/stylesheets/application.sass.scss:./app/assets/builds/application.css --no-source-map --load-path=node_modules"
},
"dependencies": {
"@fortawesome/fontawesome-free": "^6.5.1",
"@rails/actiontext": "^6.1.7",
"@fortawesome/fontawesome-free": "^6.5.2",
"@rails/actiontext": "^7.1.3",
"@rails/activestorage": "^6.1.7",
"@rails/ujs": "^6.1.7",
"bootstrap": "^4.6.2",
Expand All @@ -20,9 +20,9 @@
"jquery": "^3.7.1",
"jquery-multidownload": "^4.0.1",
"popper.js": "^1.16.0",
"sass": "^1.72.0",
"sass": "^1.75.0",
"selectize": "^0.12.6",
"trix": "^1.3.1",
"trix": "^2.1.0",
"turbolinks": "^5.2.0"
},
"devDependencies": {
Expand Down
Loading

0 comments on commit 6fa1f38

Please sign in to comment.