From 68c5758eccbbe554e2e5f5cc4a7c42d704a8bbf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Fri, 2 Feb 2024 14:25:47 +0200 Subject: [PATCH] Update dependencies, upgrade to Rails 7.1, require Ruby 3.x --- .ruby-version | 2 +- Gemfile | 13 +- Gemfile.lock | 359 +++++++++++++++++++----------------- app/models/user.rb | 2 +- config/application.rb | 2 - config/environments/test.rb | 2 +- 6 files changed, 201 insertions(+), 179 deletions(-) diff --git a/.ruby-version b/.ruby-version index 37c2961..15a2799 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.2 +3.3.0 diff --git a/Gemfile b/Gemfile index ee14a24..06c4c31 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 7.0.2' +gem 'rails', '~> 7.1' # Use Puma as the app server gem 'puma', '~> 4.1' # View components @@ -22,7 +22,7 @@ gem 'jbuilder', '~> 2.7' # Use Redis adapter to run Action Cable in production # gem 'redis', '~> 4.0' # Use Active Model has_secure_password -gem 'bcrypt', '~> 3.1.7' +gem 'bcrypt', '~> 3.1' # Configuration gem 'dotenv-rails' @@ -62,14 +62,13 @@ gem "sentry-rails" gem 'discourse_api' gem "lnurl" gem 'manifique', git: 'https://gitea.kosmos.org/5apps/manifique.git', branch: 'master' -gem 'nostr', git: 'https://gitea.kosmos.org/kosmos/nostr-gem.git', ref: 'd59f31a' +gem 'nostr' group :development, :test do # Use sqlite3 as the database for Active Record - gem 'sqlite3', '~> 1.4' + gem 'sqlite3', '~> 1.7.2' gem 'rspec-rails' gem 'rails-controller-testing' - gem "byebug", "~> 11.1" end group :development do @@ -90,8 +89,8 @@ group :test do end group :production do - # Use postgresql as the database for Active Record - gem 'pg', '~> 1.2.3' + gem 'pg', '~> 1.5' end + # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] diff --git a/Gemfile.lock b/Gemfile.lock index c04783a..33722e3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,141 +1,137 @@ GIT remote: https://gitea.kosmos.org/5apps/manifique.git - revision: 8d79113438ee7c3e4288f840a135622519cffd5c + revision: aa1bd154270805124ffdecaf5c3bd7349fc9c7e1 branch: master specs: - manifique (0.1.0) - faraday (~> 2.7.11) + manifique (1.0.0) + faraday (~> 2.9.0) faraday-follow_redirects (= 0.3.0) - nokogiri (~> 1.15.4) - -GIT - remote: https://gitea.kosmos.org/kosmos/nostr-gem.git - revision: d59f31a3c63c7642fe2d3eb50b785da54fdabfab - ref: d59f31a - specs: - nostr (0.5.0) - bech32 (~> 1.4) - bip-schnorr (~> 0.6) - ecdsa (~> 1.2) - event_emitter (~> 0.2) - faye-websocket (~> 0.11) - json (~> 2.6) + nokogiri (~> 1.16.0) GEM remote: https://rubygems.org/ specs: - actioncable (7.0.8) - actionpack (= 7.0.8) - activesupport (= 7.0.8) + actioncable (7.1.3) + actionpack (= 7.1.3) + activesupport (= 7.1.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8) - actionpack (= 7.0.8) - activejob (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + 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) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8) - actionpack (= 7.0.8) - actionview (= 7.0.8) - activejob (= 7.0.8) - activesupport (= 7.0.8) + actionmailer (7.1.3) + actionpack (= 7.1.3) + actionview (= 7.1.3) + activejob (= 7.1.3) + activesupport (= 7.1.3) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp - rails-dom-testing (~> 2.0) - actionpack (7.0.8) - actionview (= 7.0.8) - activesupport (= 7.0.8) - rack (~> 2.0, >= 2.2.4) + rails-dom-testing (~> 2.2) + actionpack (7.1.3) + actionview (= 7.1.3) + activesupport (= 7.1.3) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4) + rack-session (>= 1.0.1) rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8) - actionpack (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + 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) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8) - activesupport (= 7.0.8) + actionview (7.1.3) + activesupport (= 7.1.3) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8) - activesupport (= 7.0.8) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.1.3) + activesupport (= 7.1.3) globalid (>= 0.3.6) - activemodel (7.0.8) - activesupport (= 7.0.8) - activerecord (7.0.8) - activemodel (= 7.0.8) - activesupport (= 7.0.8) - activestorage (7.0.8) - actionpack (= 7.0.8) - activejob (= 7.0.8) - activerecord (= 7.0.8) - activesupport (= 7.0.8) + activemodel (7.1.3) + activesupport (= 7.1.3) + activerecord (7.1.3) + activemodel (= 7.1.3) + activesupport (= 7.1.3) + timeout (>= 0.4.0) + activestorage (7.1.3) + actionpack (= 7.1.3) + activejob (= 7.1.3) + activerecord (= 7.1.3) + activesupport (= 7.1.3) marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (7.0.8) + activesupport (7.1.3) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) - aws-eventstream (1.2.0) - aws-partitions (1.839.0) - aws-sdk-core (3.185.1) - aws-eventstream (~> 1, >= 1.0.2) + aws-eventstream (1.3.0) + aws-partitions (1.886.0) + aws-sdk-core (3.191.0) + aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.72.0) - aws-sdk-core (~> 3, >= 3.184.0) + aws-sdk-kms (1.77.0) + aws-sdk-core (~> 3, >= 3.191.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.136.0) - aws-sdk-core (~> 3, >= 3.181.0) + aws-sdk-s3 (1.143.0) + aws-sdk-core (~> 3, >= 3.191.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.6) - aws-sigv4 (1.6.0) + aws-sigv4 (~> 1.8) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) backport (1.2.0) - base64 (0.1.1) - bcrypt (3.1.19) + base64 (0.2.0) + bcrypt (3.1.20) bech32 (1.4.2) thor (>= 1.1.0) - benchmark (0.2.1) + benchmark (0.3.0) + bigdecimal (3.1.6) bindex (0.8.1) bip-schnorr (0.7.0) ecdsa_ext (~> 0.5.0) - brow (0.4.1) builder (3.2.4) - byebug (11.1.3) - capybara (3.39.2) + capybara (3.40.0) addressable matrix mini_mime (>= 0.1.3) - nokogiri (~> 1.8) + nokogiri (~> 1.11) rack (>= 1.6.0) rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) chunky_png (1.4.0) - concurrent-ruby (1.2.2) + concurrent-ruby (1.2.3) connection_pool (2.4.1) - crack (0.4.5) + crack (0.4.6) + bigdecimal rexml crass (1.0.6) - cssbundling-rails (1.3.3) + cssbundling-rails (1.4.0) railties (>= 6.0.0) database_cleaner (2.0.2) database_cleaner-active_record (>= 2, < 3) @@ -143,7 +139,7 @@ GEM activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) - date (3.3.3) + date (3.3.4) devise (4.9.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -153,7 +149,7 @@ GEM devise_ldap_authenticatable (0.8.7) devise (>= 3.4.1) net-ldap (>= 0.16.0) - diff-lcs (1.5.0) + diff-lcs (1.5.1) discourse_api (2.0.1) faraday (~> 2.7) faraday-follow_redirects @@ -165,6 +161,8 @@ GEM railties (>= 3.2) down (5.4.1) addressable (~> 2.8) + drb (2.2.0) + ruby2_keywords e2mmap (0.1.0) ecdsa (1.2.0) ecdsa_ext (0.5.0) @@ -174,58 +172,61 @@ GEM tzinfo event_emitter (0.2.6) eventmachine (1.2.7) - factory_bot (6.2.1) + factory_bot (6.4.6) activesupport (>= 5.0.0) - factory_bot_rails (6.2.0) - factory_bot (~> 6.2.0) + factory_bot_rails (6.4.3) + factory_bot (~> 6.4) railties (>= 5.0.0) - faker (3.2.1) + faker (3.2.3) i18n (>= 1.8.11, < 2) - faraday (2.7.11) - base64 - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) + faraday (2.9.0) + faraday-net_http (>= 2.0, < 3.2) faraday-follow_redirects (0.3.0) faraday (>= 1, < 3) faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (3.0.2) + faraday-net_http (3.1.0) + net-http faye-websocket (0.11.3) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) ffi (1.16.3) - flipper (1.0.0) - brow (~> 0.4.1) + flipper (1.2.2) concurrent-ruby (< 2) - flipper-active_record (1.0.0) + flipper-active_record (1.2.2) activerecord (>= 4.2, < 8) - flipper (~> 1.0.0) - flipper-ui (1.0.0) + flipper (~> 1.2.2) + flipper-ui (1.2.2) erubi (>= 1.0.0, < 2.0.0) - flipper (~> 1.0.0) + flipper (~> 1.2.2) rack (>= 1.4, < 4) rack-protection (>= 1.5.3, <= 4.0.0) sanitize (< 7) - fugit (1.8.1) + fugit (1.9.0) et-orbi (~> 1, >= 1.2.7) raabro (~> 1.4) globalid (1.2.1) activesupport (>= 6.1) - hashdiff (1.0.1) + hashdiff (1.1.0) i18n (1.14.1) concurrent-ruby (~> 1.0) image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) - importmap-rails (1.2.1) + importmap-rails (2.0.1) actionpack (>= 6.0.0) + activesupport (>= 6.0.0) railties (>= 6.0.0) + io-console (0.7.2) + irb (1.11.1) + rdoc + reline (>= 0.4.2) jaro_winkler (1.5.6) jbuilder (2.11.5) actionview (>= 5.0.0) activesupport (>= 5.0.0) jmespath (1.6.2) - json (2.6.3) + json (2.7.1) kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) @@ -245,8 +246,8 @@ GEM rb-inotify (~> 0.9, >= 0.9.10) lnurl (1.1.0) bech32 (~> 1.1) - lockbox (1.3.0) - loofah (2.21.4) + lockbox (1.3.2) + loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -260,57 +261,75 @@ GEM mini_magick (4.12.0) mini_mime (1.1.5) mini_portile2 (2.8.5) - minitest (5.20.0) + minitest (5.21.2) multipart-post (2.3.0) - net-imap (0.3.7) + mutex_m (0.2.0) + net-http (0.4.1) + uri + net-imap (0.4.9.1) date net-protocol - net-ldap (0.18.0) + net-ldap (0.19.0) net-pop (0.1.2) net-protocol - net-protocol (0.2.1) + net-protocol (0.2.2) timeout - net-smtp (0.4.0) + net-smtp (0.4.0.1) net-protocol - nio4r (2.5.9) - nokogiri (1.15.4) + nio4r (2.7.0) + nokogiri (1.16.0) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.15.4-arm64-darwin) + nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.4-x86_64-linux) + nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) + nostr (0.5.0) + bech32 (~> 1.4) + bip-schnorr (~> 0.6) + ecdsa (~> 1.2) + event_emitter (~> 0.2) + faye-websocket (~> 0.11) + json (~> 2.6) orm_adapter (0.5.0) - pagy (6.1.0) - parallel (1.23.0) - parser (3.2.2.4) + pagy (6.4.3) + parallel (1.24.0) + parser (3.3.0.5) ast (~> 2.4.1) racc - pg (1.2.3) - public_suffix (5.0.3) + pg (1.5.4) + psych (5.1.2) + stringio + public_suffix (5.0.4) puma (4.3.12) nio4r (~> 2.0) raabro (1.4.0) - racc (1.7.1) + racc (1.7.3) rack (2.2.8) - rack-protection (3.1.0) + rack-protection (3.2.0) + base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) + rack-session (1.0.2) + rack (< 3) rack-test (2.1.0) rack (>= 1.3) - rails (7.0.8) - actioncable (= 7.0.8) - actionmailbox (= 7.0.8) - actionmailer (= 7.0.8) - actionpack (= 7.0.8) - actiontext (= 7.0.8) - actionview (= 7.0.8) - activejob (= 7.0.8) - activemodel (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + 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) bundler (>= 1.15.0) - railties (= 7.0.8) + railties (= 7.1.3) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -325,21 +344,26 @@ GEM rails-settings-cached (2.8.3) activerecord (>= 5.0.0) railties (>= 5.0.0) - railties (7.0.8) - actionpack (= 7.0.8) - activesupport (= 7.0.8) - method_source + railties (7.1.3) + actionpack (= 7.1.3) + activesupport (= 7.1.3) + irb + rackup (>= 1.0.0) rake (>= 12.2) - thor (~> 1.0) - zeitwerk (~> 2.5) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) rainbow (3.1.1) - rake (13.0.6) + rake (13.1.0) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) rbs (2.8.4) + rdoc (6.6.2) + psych (>= 4.0.0) redis (4.8.1) - regexp_parser (2.8.2) + regexp_parser (2.9.0) + reline (0.4.2) + io-console (~> 0.5) responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) @@ -358,7 +382,7 @@ GEM rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-rails (6.0.3) + rspec-rails (6.1.1) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) @@ -367,19 +391,18 @@ GEM rspec-mocks (~> 3.12) rspec-support (~> 3.12) rspec-support (3.12.1) - rubocop (1.57.1) - base64 (~> 0.1.1) + rubocop (1.60.2) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.4) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.29.0) + rubocop-ast (1.30.0) parser (>= 3.2.1.0) ruby-progressbar (1.13.0) ruby-vips (2.2.0) @@ -390,10 +413,10 @@ GEM sanitize (6.1.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - sentry-rails (5.12.0) + sentry-rails (5.16.1) railties (>= 5.0) - sentry-ruby (~> 5.12.0) - sentry-ruby (5.12.0) + sentry-ruby (~> 5.16.1) + sentry-ruby (5.16.1) concurrent-ruby (~> 1.0, >= 1.0.2) sidekiq (6.5.12) connection_pool (>= 2.2.5, < 3) @@ -403,7 +426,7 @@ GEM rufus-scheduler (~> 3.2) sidekiq (>= 6, < 8) tilt (>= 1.4.0) - solargraph (0.49.0) + solargraph (0.50.0) backport (~> 1.2) benchmark bundler (~> 2.0) @@ -426,15 +449,16 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.6.7) + sqlite3 (1.7.2) mini_portile2 (~> 2.8.0) - sqlite3 (1.6.7-arm64-darwin) - sqlite3 (1.6.7-x86_64-linux) - stimulus-rails (1.3.0) + sqlite3 (1.7.2-arm64-darwin) + sqlite3 (1.7.2-x86_64-linux) + stimulus-rails (1.3.3) railties (>= 6.0.0) + stringio (3.1.0) thor (1.3.0) tilt (2.3.0) - timeout (0.4.0) + timeout (0.4.1) turbo-rails (1.5.0) actionpack (>= 6.0.0) activejob (>= 6.0.0) @@ -442,7 +466,8 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) - view_component (3.6.0) + uri (0.13.0) + view_component (3.10.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -457,6 +482,7 @@ GEM addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) + webrick (1.8.1) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -472,8 +498,7 @@ PLATFORMS DEPENDENCIES aws-sdk-s3 - bcrypt (~> 3.1.7) - byebug (~> 11.1) + bcrypt (~> 3.1) capybara cssbundling-rails database_cleaner @@ -498,11 +523,11 @@ DEPENDENCIES lockbox manifique! net-ldap - nostr! + nostr pagy (~> 6.0, >= 6.0.2) - pg (~> 1.2.3) + pg (~> 1.5) puma (~> 4.1) - rails (~> 7.0.2) + rails (~> 7.1) rails-controller-testing rails-settings-cached (~> 2.8.3) rqrcode (~> 2.0) @@ -513,7 +538,7 @@ DEPENDENCIES sidekiq-scheduler solargraph sprockets-rails - sqlite3 (~> 1.4) + sqlite3 (~> 1.7.2) stimulus-rails turbo-rails tzinfo-data @@ -523,4 +548,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.3.7 + 2.5.5 diff --git a/app/models/user.rb b/app/models/user.rb index 27dfbfd..7bc6091 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -7,7 +7,7 @@ class User < ApplicationRecord attr_accessor :avatar_new attr_accessor :current_password - serialize :preferences, UserPreferences + serialize :preferences, coder: UserPreferences # # Relations diff --git a/config/application.rb b/config/application.rb index fe0be55..89d054a 100644 --- a/config/application.rb +++ b/config/application.rb @@ -42,7 +42,5 @@ module Akkounts config.active_job.queue_adapter = :sidekiq config.action_mailer.deliver_later_queue_name = nil # use "default" queue - - config.active_record.legacy_connection_handling = false end end diff --git a/config/environments/test.rb b/config/environments/test.rb index 7d731e9..a459967 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -26,7 +26,7 @@ Rails.application.configure do config.cache_store = :null_store # Raise exceptions instead of rendering exception templates. - config.action_dispatch.show_exceptions = false + config.action_dispatch.show_exceptions = :none # Disable request forgery protection in test environment. config.action_controller.allow_forgery_protection = false