diff --git a/CHANGELOG.md b/CHANGELOG.md index 3036b5bf5..2dadeb455 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/Gemfile b/Gemfile index bd67f847d..9036f3855 100644 --- a/Gemfile +++ b/Gemfile @@ -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 @@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index 4a8201805..bac279cd1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,35 +43,35 @@ 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) @@ -79,15 +79,15 @@ GEM 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) @@ -95,26 +95,26 @@ GEM 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) @@ -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) @@ -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) @@ -290,7 +290,7 @@ 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) @@ -298,8 +298,8 @@ GEM 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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -407,20 +407,20 @@ 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 @@ -428,9 +428,9 @@ GEM 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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -655,7 +655,7 @@ DEPENDENCIES image_processing jbuilder jsbundling-rails - json-schema (~> 4.2.0) + json-schema (~> 4.3.0) kaminari launchy minitest-retry @@ -678,7 +678,7 @@ DEPENDENCIES redis (~> 4.8) rollbar rsolr - rubocop (~> 1.62.1) + rubocop (~> 1.63.1) rubocop-minitest rubocop-performance rubocop-rails diff --git a/app/controllers/aip/v1/entities_controller.rb b/app/controllers/aip/v1/entities_controller.rb index 6c6c1c0e5..6c7fae5ba 100644 --- a/app/controllers/aip/v1/entities_controller.rb +++ b/app/controllers/aip/v1/entities_controller.rb @@ -261,10 +261,8 @@ 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. @@ -272,8 +270,6 @@ def entity_file_statements object: RDF::URI.new(request.original_url) / 'filesets' / file.fileset_uuid ) end - - file_statements end def entity_member_of_statements diff --git a/package.json b/package.json index 9b73e4382..f7595b3ec 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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": { diff --git a/yarn.lock b/yarn.lock index 198a9aab5..bee65af20 100644 --- a/yarn.lock +++ b/yarn.lock @@ -331,10 +331,10 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" -"@fortawesome/fontawesome-free@^6.5.1": - version "6.5.1" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.1.tgz#55cc8410abf1003b726324661ce5b0d1c10de258" - integrity sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw== +"@fortawesome/fontawesome-free@^6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.2.tgz#310fe90cb5a8dee9698833171b98e7835404293d" + integrity sha512-hRILoInAx8GNT5IMkrtIt9blOdrqHOnPBH+k70aWUAqPZPgopb9G5EQJFpaBx/S8zp2fC+mPW349Bziuk1o28Q== "@humanwhocodes/config-array@^0.5.0": version "0.5.0" @@ -403,14 +403,21 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@rails/actiontext@^6.1.7": - version "6.1.7" - resolved "https://registry.yarnpkg.com/@rails/actiontext/-/actiontext-6.1.7.tgz#62997bda1d938743ed36bb802885592b01bc6782" - integrity sha512-o3TYFeFzDQKR22EGqE9qqJ6SD4DM+cATw8nioPtrRkIlAsBIHeaV0h4Kok1sDXyNjXiJztCr89CsfV7YXnYFmw== +"@rails/actiontext@^7.1.3": + version "7.1.3" + resolved "https://registry.yarnpkg.com/@rails/actiontext/-/actiontext-7.1.3.tgz#1b7aa2732c45cbc8a5708c54457c16fb81ce3da3" + integrity sha512-jwY0LJ0xpyIWkYs6BUMY4RcwVA3jZ+bFDPvv5KpKQnw+24BhJVtBLqF0XIsROaRCyabakueRyVuSG9NNhnLTvA== + dependencies: + "@rails/activestorage" ">= 7.1.0-alpha" + +"@rails/activestorage@>= 7.1.0-alpha": + version "7.1.3" + resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-7.1.3.tgz#e83ece6c5fd94b3ddf30a8cf3b8f78cad049e596" + integrity sha512-B+RFYAU8vdTPFg0IJcRp2ey0Qw9hpcUOqHHcWqftDJ76ZMBi9+m/UUeMJlNsSd0l9eD+1HLlFSo1X//cY4yiDw== dependencies: - "@rails/activestorage" "^6.0.0" + spark-md5 "^3.0.1" -"@rails/activestorage@^6.0.0", "@rails/activestorage@^6.1.7": +"@rails/activestorage@^6.1.7": version "6.1.7" resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-6.1.7.tgz#5aaae9f4d10800fdb4fd6fe26fd8b4218579c6e3" integrity sha512-h++k8LBLns4O8AqzdaFp1TsCLP9VSc2hgWI37bjzJ+4D995X7Rd8kdkRmXRaNAUlHDJgy6RpnbhBJ5oiIgWTDw== @@ -2638,10 +2645,10 @@ safe-regex-test@^1.0.0: get-intrinsic "^1.1.3" is-regex "^1.1.4" -sass@^1.72.0: - version "1.72.0" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.72.0.tgz#5b9978943fcfb32b25a6a5acb102fc9dabbbf41c" - integrity sha512-Gpczt3WA56Ly0Mn8Sl21Vj94s1axi9hDIzDFn9Ph9x3C3p4nNyvsqJoQyVXKou6cBlfFWEgRW4rT8Tb4i3XnVA== +sass@^1.75.0: + version "1.75.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.75.0.tgz#91bbe87fb02dfcc34e052ddd6ab80f60d392be6c" + integrity sha512-ShMYi3WkrDWxExyxSZPst4/okE9ts46xZmJDSawJQrnte7M1V9fScVB+uNXOVKRBt0PggHOwoZcn8mYX4trnBw== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" @@ -2742,7 +2749,7 @@ source-map@^0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -spark-md5@^3.0.0: +spark-md5@^3.0.0, spark-md5@^3.0.1: version "3.0.2" resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.2.tgz#7952c4a30784347abcee73268e473b9c0167e3fc" integrity sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw== @@ -2985,10 +2992,10 @@ trim-newlines@^3.0.0: resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== -trix@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/trix/-/trix-1.3.1.tgz#ccce8d9e72bf0fe70c8c019ff558c70266f8d857" - integrity sha512-BbH6mb6gk+AV4f2as38mP6Ucc1LE3OD6XxkZnAgPIduWXYtvg2mI3cZhIZSLqmMh9OITEpOBCCk88IVmyjU7bA== +trix@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/trix/-/trix-2.1.0.tgz#da9daddded6ee0cb2ba5676246bb343e1d45eaab" + integrity sha512-TPhgGvIjM1VqcfoR/OQQERRlMDuEw7UBIoGroJGuiTmu5yqk5KqR29ZzPgGIoOJgsqoAgxGUCK92+CRJLoO43Q== trough@^1.0.0: version "1.0.5"