From 94a15e3b14dd4b145c82d9dd47d64b4890078247 Mon Sep 17 00:00:00 2001 From: Aaron Elkiss Date: Mon, 11 Sep 2023 10:46:17 -0400 Subject: [PATCH] Update to ruby 3.2; update dependencies --- Dockerfile | 2 +- Dockerfile.prod | 2 +- Gemfile.lock | 175 ++++++++++++++++++------------- lib/rights_database/rights.rb | 2 +- lib/rights_database/rights_db.rb | 6 +- 5 files changed, 107 insertions(+), 80 deletions(-) diff --git a/Dockerfile b/Dockerfile index b612a65..bfdef97 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.1 +FROM ruby:3.2 ARG UNAME=app ARG UID=1000 ARG GID=1000 diff --git a/Dockerfile.prod b/Dockerfile.prod index 0b4c1a7..69fbb84 100644 --- a/Dockerfile.prod +++ b/Dockerfile.prod @@ -1,4 +1,4 @@ -FROM ruby:3.1 +FROM ruby:3.2 ARG UNAME=app ARG UID=1000 ARG GID=1000 diff --git a/Gemfile.lock b/Gemfile.lock index 7315373..c23b972 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,184 +1,213 @@ GEM remote: https://rubygems.org/ specs: - activemodel (7.0.4) - activesupport (= 7.0.4) - activesupport (7.0.4) + activemodel (7.0.8) + activesupport (= 7.0.8) + activesupport (7.0.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.1) - public_suffix (>= 2.0.2, < 6.0) aes_key_wrap (1.1.0) ast (2.4.2) attr_required (1.0.1) - bindata (2.4.14) - canister (0.9.1) + base64 (0.1.1) + bigdecimal (3.1.4) + bindata (2.4.15) + canister (0.9.2) coderay (1.1.3) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) + date (3.3.3) diff-lcs (1.5.0) docile (1.4.0) dotenv (2.8.1) - factory_bot (6.2.1) + factory_bot (6.3.0) activesupport (>= 5.0.0) - faraday (2.6.0) + faraday (2.7.10) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-follow_redirects (0.3.0) faraday (>= 1, < 3) - faraday-net_http (3.0.1) - faraday-retry (2.0.0) + faraday-net_http (3.0.2) + faraday-retry (2.2.0) faraday (~> 2.0) hashie (5.0.0) - http-2-next (0.5.0) + http-2-next (0.5.1) httpclient (2.8.3) - httpx (0.21.1) + httpx (0.24.4) http-2-next (>= 0.4.1) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - json (2.6.2) - json-jwt (1.16.1) + json (2.6.3) + json-jwt (1.16.3) activesupport (>= 4.2) aes_key_wrap bindata faraday (~> 2.0) faraday-follow_redirects - mail (2.7.1) + language_server-protocol (3.17.0.3) + lint_roller (1.1.0) + mail (2.8.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp marc (1.2.0) rexml scrub_rb (>= 1.0.1, < 2) unf method_source (1.0.0) milemarker (1.0.0) - mini_mime (1.1.2) - minitest (5.16.3) + mini_mime (1.1.5) + minitest (5.20.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - mysql2 (0.5.4) - net-protocol (0.1.3) + mysql2 (0.5.5) + net-imap (0.3.7) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.1) timeout net-smtp (0.3.3) net-protocol - nio4r (2.5.8) - omniauth (2.1.0) + nio4r (2.5.9) + omniauth (2.1.1) hashie (>= 3.4.6) rack (>= 2.2.3) rack-protection - omniauth_openid_connect (0.4.0) - addressable (~> 2.5) + omniauth_openid_connect (0.7.1) omniauth (>= 1.9, < 3) - openid_connect (~> 1.1) - openid_connect (1.4.2) + openid_connect (~> 2.2) + openid_connect (2.2.0) activemodel attr_required (>= 1.0.0) - json-jwt (>= 1.15.0) + faraday (~> 2.0) + faraday-follow_redirects + json-jwt (>= 1.16) net-smtp - rack-oauth2 (~> 1.21) - swd (~> 1.3) + rack-oauth2 (~> 2.2) + swd (~> 2.0) tzinfo validate_email validate_url - webfinger (~> 1.2) - parallel (1.22.1) - parser (3.1.2.1) + webfinger (~> 2.0) + parallel (1.23.0) + parser (3.2.2.3) ast (~> 2.4.1) - pry (0.14.1) + racc + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (5.0.0) - puma (6.0.0) + public_suffix (5.0.3) + puma (6.3.1) nio4r (~> 2.0) - rack (2.2.4) - rack-oauth2 (1.21.3) + racc (1.7.1) + rack (2.2.8) + rack-oauth2 (2.2.0) activesupport attr_required - httpclient + faraday (~> 2.0) + faraday-follow_redirects json-jwt (>= 1.11.0) rack (>= 2.1.0) - rack-protection (3.0.4) - rack - rack-test (2.0.2) + rack-protection (3.1.0) + rack (~> 2.2, >= 2.2.4) + rack-test (2.1.0) rack (>= 1.3) rainbow (3.1.1) - regexp_parser (2.6.0) - rexml (3.2.5) + regexp_parser (2.8.1) + rexml (3.2.6) rspec (3.12.0) rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) rspec-mocks (~> 3.12.0) - rspec-core (3.12.0) + rspec-core (3.12.2) rspec-support (~> 3.12.0) - rspec-expectations (3.12.0) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-mocks (3.12.0) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-support (3.12.0) - rubocop (1.35.1) + rspec-support (3.12.1) + rubocop (1.56.3) + base64 (~> 0.1.1) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.1.2.1) + parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.20.1, < 2.0) + rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.23.0) - parser (>= 3.1.1.0) - rubocop-performance (1.14.3) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + rubocop-performance (1.19.0) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) scrub_rb (1.0.1) - sequel (5.62.0) - simplecov (0.21.2) + sequel (5.72.0) + bigdecimal + simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov-lcov (0.8.0) simplecov_json_formatter (0.1.4) - sinatra (3.0.4) + sinatra (3.1.0) mustermann (~> 3.0) rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.4) + rack-protection (= 3.1.0) tilt (~> 2.0) solr_cursorstream (0.2.0) faraday faraday-retry httpx milemarker - standard (1.16.1) - rubocop (= 1.35.1) - rubocop-performance (= 1.14.3) + standard (1.31.1) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.56.2) + standard-custom (~> 1.0.0) + standard-performance (~> 1.2) + standard-custom (1.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.50) + standard-performance (1.2.0) + lint_roller (~> 1.1) + rubocop-performance (~> 1.19.0) standardrb (1.0.1) standard - swd (1.3.0) + swd (2.0.2) activesupport (>= 3) attr_required (>= 0.0.5) - httpclient (>= 2.4) - tilt (2.0.11) - timeout (0.3.0) - tzinfo (2.0.5) + faraday (~> 2.0) + faraday-follow_redirects + tilt (2.2.0) + timeout (0.4.0) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (2.3.0) + unicode-display_width (2.4.2) validate_email (0.1.6) activemodel (>= 3.0) mail (>= 2.2.5) validate_url (1.0.15) activemodel (>= 3.0.0) public_suffix - webfinger (1.2.0) + webfinger (2.1.2) activesupport - httpclient (>= 2.4) + faraday (~> 2.0) + faraday-follow_redirects PLATFORMS x86_64-linux @@ -205,4 +234,4 @@ DEPENDENCIES standardrb BUNDLED WITH - 2.3.25 + 2.4.19 diff --git a/lib/rights_database/rights.rb b/lib/rights_database/rights.rb index ce2fe95..9bc4a42 100644 --- a/lib/rights_database/rights.rb +++ b/lib/rights_database/rights.rb @@ -9,7 +9,7 @@ class Rights def initialize(item_id:) @item_id = item_id - @namespace, @id = @item_id.split(/\./, 2) + @namespace, @id = @item_id.split(".", 2) load_from_db end diff --git a/lib/rights_database/rights_db.rb b/lib/rights_database/rights_db.rb index 4af8903..67ab7c4 100644 --- a/lib/rights_database/rights_db.rb +++ b/lib/rights_database/rights_db.rb @@ -16,8 +16,8 @@ class RightsDB < SimpleDelegator attr_reader :rawdb attr_accessor :connection_string - def initialize(connection_string = ENV.fetch("DB_CONNECTION_STRING", nil), **kwargs) - @rawdb = self.class.connection(connection_string, **kwargs) + def initialize(connection_string = ENV.fetch("DB_CONNECTION_STRING", nil), **) + @rawdb = self.class.connection(connection_string, **) super(@rawdb) end @@ -46,8 +46,6 @@ def self.connection(connection_string = ENV.fetch("DB_CONNECTION_STRING", nil), else Sequel.connect(connection_string) end - rescue Sequel::DatabaseConnectionError => e - raise e end class << self