diff --git a/AGENTS.md b/AGENTS.md index b7a02f3..13e4939 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -63,7 +63,6 @@ Warden `Test::Helpers`, DatabaseCleaner (transactional fixtures **off**), ViewCo and assert on DB rows / `enqueued_jobs`. - **Request/component/mailer/job/model/helper** specs in matching `spec/` subdirs. Fixtures live in `spec/fixtures/`; factories in `spec/factories/`. -- `spec_helper.rb` reloads routes before each `type: :controller` spec (Devise + Rails 8 workaround). ## Notes & gotchas diff --git a/Gemfile b/Gemfile index 5debb5f..5ec961f 100644 --- a/Gemfile +++ b/Gemfile @@ -2,9 +2,9 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 8.0' +gem 'rails', '~> 8.1' # Use Puma as the app server -gem 'puma', '~> 6.6' +gem 'puma', '~> 8.0' # View components gem "view_component" # Asset bundler @@ -18,7 +18,7 @@ gem "turbo-rails" # Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev] gem "stimulus-rails" # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -gem 'jbuilder', '~> 2.7' +gem 'jbuilder', '~> 2.15' # Use Active Model has_secure_password gem 'bcrypt', '~> 3.1' @@ -27,7 +27,7 @@ gem 'dotenv-rails' # Authentication gem 'warden' -gem 'devise', '~> 4.9.0' +gem 'devise', '~> 5.0' gem 'devise_ldap_authenticatable' gem 'net-ldap' @@ -73,7 +73,7 @@ end group :development do # Access an interactive console on exception pages or by calling 'console' anywhere in the code. - gem 'web-console', '~> 4.2' + gem 'web-console', '~> 4.3' gem 'listen', '~> 3.2' gem 'letter_opener' gem 'letter_opener_web' diff --git a/Gemfile.lock b/Gemfile.lock index 7111c12..07a76dc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,29 +3,31 @@ GEM specs: aasm (5.5.0) concurrent-ruby (~> 1.0) - actioncable (8.0.2) - actionpack (= 8.0.2) - activesupport (= 8.0.2) + action_text-trix (2.1.19) + railties + actioncable (8.1.3.1) + actionpack (= 8.1.3.1) + activesupport (= 8.1.3.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (8.0.2) - actionpack (= 8.0.2) - activejob (= 8.0.2) - activerecord (= 8.0.2) - activestorage (= 8.0.2) - activesupport (= 8.0.2) + actionmailbox (8.1.3.1) + actionpack (= 8.1.3.1) + activejob (= 8.1.3.1) + activerecord (= 8.1.3.1) + activestorage (= 8.1.3.1) + activesupport (= 8.1.3.1) mail (>= 2.8.0) - actionmailer (8.0.2) - actionpack (= 8.0.2) - actionview (= 8.0.2) - activejob (= 8.0.2) - activesupport (= 8.0.2) + actionmailer (8.1.3.1) + actionpack (= 8.1.3.1) + actionview (= 8.1.3.1) + activejob (= 8.1.3.1) + activesupport (= 8.1.3.1) mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (8.0.2) - actionview (= 8.0.2) - activesupport (= 8.0.2) + actionpack (8.1.3.1) + actionview (= 8.1.3.1) + activesupport (= 8.1.3.1) nokogiri (>= 1.8.5) rack (>= 2.2.4) rack-session (>= 1.0.1) @@ -33,42 +35,43 @@ GEM rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actiontext (8.0.2) - actionpack (= 8.0.2) - activerecord (= 8.0.2) - activestorage (= 8.0.2) - activesupport (= 8.0.2) + actiontext (8.1.3.1) + action_text-trix (~> 2.1.15) + actionpack (= 8.1.3.1) + activerecord (= 8.1.3.1) + activestorage (= 8.1.3.1) + activesupport (= 8.1.3.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (8.0.2) - activesupport (= 8.0.2) + actionview (8.1.3.1) + activesupport (= 8.1.3.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (8.0.2) - activesupport (= 8.0.2) + activejob (8.1.3.1) + activesupport (= 8.1.3.1) globalid (>= 0.3.6) - activemodel (8.0.2) - activesupport (= 8.0.2) - activerecord (8.0.2) - activemodel (= 8.0.2) - activesupport (= 8.0.2) + activemodel (8.1.3.1) + activesupport (= 8.1.3.1) + activerecord (8.1.3.1) + activemodel (= 8.1.3.1) + activesupport (= 8.1.3.1) timeout (>= 0.4.0) - activestorage (8.0.2) - actionpack (= 8.0.2) - activejob (= 8.0.2) - activerecord (= 8.0.2) - activesupport (= 8.0.2) + activestorage (8.1.3.1) + actionpack (= 8.1.3.1) + activejob (= 8.1.3.1) + activerecord (= 8.1.3.1) + activesupport (= 8.1.3.1) marcel (~> 1.0) - activesupport (8.0.2) + activesupport (8.1.3.1) base64 - benchmark (>= 0.3) bigdecimal concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + json logger (>= 1.4.2) minitest (>= 5.1) securerandom (>= 0.3) @@ -96,12 +99,12 @@ GEM aws-sigv4 (1.11.0) aws-eventstream (~> 1, >= 1.0.2) backport (1.2.0) - base64 (0.2.0) - bcrypt (3.1.20) + base64 (0.3.0) + bcrypt (3.1.22) bech32 (1.5.0) thor (>= 1.1.0) - benchmark (0.4.0) - bigdecimal (3.1.9) + benchmark (0.5.0) + bigdecimal (4.1.2) bindex (0.8.1) bip-schnorr (0.7.0) ecdsa_ext (~> 0.5.0) @@ -118,12 +121,12 @@ GEM childprocess (5.1.0) logger (~> 1.5) chunky_png (1.4.0) - concurrent-ruby (1.3.4) - connection_pool (2.5.2) + concurrent-ruby (1.3.8) + connection_pool (3.0.2) crack (1.0.0) bigdecimal rexml - crass (1.0.6) + crass (1.0.7) cssbundling-rails (1.4.3) railties (>= 6.0.0) database_cleaner (2.1.0) @@ -132,17 +135,17 @@ GEM activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) - date (3.4.1) - devise (4.9.4) + date (3.5.1) + devise (5.0.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0) + railties (>= 7.0) responders warden (~> 1.2.3) devise_ldap_authenticatable (0.8.7) devise (>= 3.4.1) net-ldap (>= 0.16.0) - diff-lcs (1.6.1) + diff-lcs (1.6.2) discourse_api (2.0.1) faraday (~> 2.7) faraday-follow_redirects @@ -154,12 +157,13 @@ GEM railties (>= 6.1) down (5.4.2) addressable (~> 2.8) - drb (2.2.1) + drb (2.2.3) ecdsa (1.2.0) ecdsa_ext (0.5.1) ecdsa (~> 1.2.0) + erb (6.0.7) erubi (1.13.1) - et-orbi (1.2.11) + et-orbi (1.4.1) tzinfo event_emitter (0.2.6) eventmachine (1.2.7) @@ -196,34 +200,35 @@ GEM rack-protection (>= 1.5.3, < 5.0.0) rack-session (>= 1.0.2, < 3.0.0) sanitize (< 8) - fugit (1.11.1) - et-orbi (~> 1, >= 1.2.11) + fugit (1.13.0) + et-orbi (~> 1.4) raabro (~> 1.4) - globalid (1.2.1) + globalid (1.4.0) activesupport (>= 6.1) gpgme (2.0.24) mini_portile2 (~> 2.7) hashdiff (1.1.2) - i18n (1.14.7) + i18n (1.15.2) concurrent-ruby (~> 1.0) image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) - importmap-rails (2.1.0) + importmap-rails (2.2.3) actionpack (>= 6.0.0) activesupport (>= 6.0.0) railties (>= 6.0.0) - io-console (0.8.0) - irb (1.15.2) + io-console (0.9.2) + irb (1.18.0) pp (>= 0.6.0) + prism (>= 1.3.0) rdoc (>= 4.0.0) reline (>= 0.4.2) jaro_winkler (1.6.0) - jbuilder (2.13.0) - actionview (>= 5.0.0) - activesupport (>= 5.0.0) + jbuilder (2.15.1) + actionview (>= 7.0.0) + activesupport (>= 7.0.0) jmespath (1.6.2) - json (2.11.3) + json (2.21.2) kramdown (2.5.1) rexml (>= 3.3.9) kramdown-parser-gfm (1.1.0) @@ -247,10 +252,11 @@ GEM lnurl (1.1.1) bech32 (~> 1.1) logger (1.7.0) - loofah (2.24.0) + loofah (2.25.2) crass (~> 1.0.2) nokogiri (>= 1.12.0) - mail (2.8.1) + mail (2.9.1) + logger mini_mime (>= 0.1.1) net-imap net-pop @@ -259,14 +265,15 @@ GEM faraday (~> 2.9.0) faraday-follow_redirects (= 0.3.0) nokogiri (~> 1.16.0) - marcel (1.0.4) + marcel (1.2.1) matrix (0.4.2) - method_source (1.1.0) mini_magick (4.13.2) mini_mime (1.1.5) - mini_portile2 (2.8.8) - minitest (5.25.5) - mission_control-jobs (1.0.2) + mini_portile2 (2.8.9) + minitest (6.0.6) + drb (~> 2.0) + prism (~> 1.5) + mission_control-jobs (1.1.0) actioncable (>= 7.1) actionpack (>= 7.1) activejob (>= 7.1) @@ -279,7 +286,7 @@ GEM multipart-post (2.4.1) net-http (0.6.0) uri - net-imap (0.5.7) + net-imap (0.6.6) date net-protocol net-ldap (0.19.0) @@ -289,7 +296,7 @@ GEM timeout net-smtp (0.5.1) net-protocol - nio4r (2.7.4) + nio4r (2.7.5) nokogiri (1.16.8) mini_portile2 (~> 2.8.2) racc (~> 1.4) @@ -313,24 +320,23 @@ GEM ast (~> 2.4.1) racc pg (1.5.9) - pp (0.6.2) + pp (0.6.4) prettyprint prettyprint (0.2.0) - prism (1.4.0) - propshaft (1.1.0) + prism (1.9.0) + propshaft (1.3.2) actionpack (>= 7.0.0) activesupport (>= 7.0.0) rack - railties (>= 7.0.0) - psych (5.2.3) + psych (5.4.0) date stringio public_suffix (6.0.1) - puma (6.6.0) + puma (8.0.2) nio4r (~> 2.0) - raabro (1.4.0) + raabro (1.5.0) racc (1.8.1) - rack (2.2.13) + rack (2.2.23) rack-protection (3.2.0) base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) @@ -341,61 +347,64 @@ GEM rackup (1.0.1) rack (< 3) webrick - rails (8.0.2) - actioncable (= 8.0.2) - actionmailbox (= 8.0.2) - actionmailer (= 8.0.2) - actionpack (= 8.0.2) - actiontext (= 8.0.2) - actionview (= 8.0.2) - activejob (= 8.0.2) - activemodel (= 8.0.2) - activerecord (= 8.0.2) - activestorage (= 8.0.2) - activesupport (= 8.0.2) + rails (8.1.3.1) + actioncable (= 8.1.3.1) + actionmailbox (= 8.1.3.1) + actionmailer (= 8.1.3.1) + actionpack (= 8.1.3.1) + actiontext (= 8.1.3.1) + actionview (= 8.1.3.1) + activejob (= 8.1.3.1) + activemodel (= 8.1.3.1) + activerecord (= 8.1.3.1) + activestorage (= 8.1.3.1) + activesupport (= 8.1.3.1) bundler (>= 1.15.0) - railties (= 8.0.2) + railties (= 8.1.3.1) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) activesupport (>= 5.0.1.rc1) - rails-dom-testing (2.2.0) + rails-dom-testing (2.3.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.6.2) - loofah (~> 2.21) + rails-html-sanitizer (1.7.1) + loofah (~> 2.25, >= 2.25.2) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) rails-settings-cached (2.8.3) activerecord (>= 5.0.0) railties (>= 5.0.0) - railties (8.0.2) - actionpack (= 8.0.2) - activesupport (= 8.0.2) + railties (8.1.3.1) + actionpack (= 8.1.3.1) + activesupport (= 8.1.3.1) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) + tsort (>= 0.2) zeitwerk (~> 2.6) rainbow (3.1.1) - rake (13.2.1) + rake (13.4.2) rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) rbs (3.9.2) logger - rdoc (6.13.1) + rdoc (7.2.0) + erb psych (>= 4.0.0) + tsort redis (5.4.0) redis-client (>= 0.22.0) redis-client (0.24.0) connection_pool regexp_parser (2.10.0) - reline (0.6.1) + reline (0.7.0) io-console (~> 0.5) - responders (3.1.1) - actionpack (>= 5.2) - railties (>= 5.2) + responders (3.2.0) + actionpack (>= 7.0) + railties (>= 7.0) reverse_markdown (3.0.0) nokogiri rexml (3.4.1) @@ -403,23 +412,23 @@ GEM chunky_png (~> 1.0) rqrcode_core (~> 1.0) rqrcode_core (1.2.0) - rspec-core (3.13.3) + rspec-core (3.13.6) rspec-support (~> 3.13.0) - rspec-expectations (3.13.3) + rspec-expectations (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.2) + rspec-mocks (3.13.8) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-rails (7.1.1) - actionpack (>= 7.0) - activesupport (>= 7.0) - railties (>= 7.0) - rspec-core (~> 3.13) - rspec-expectations (~> 3.13) - rspec-mocks (~> 3.13) - rspec-support (~> 3.13) - rspec-support (3.13.2) + rspec-rails (8.0.4) + actionpack (>= 7.2) + activesupport (>= 7.2) + railties (>= 7.2) + rspec-core (>= 3.13.0, < 5.0.0) + rspec-expectations (>= 3.13.0, < 5.0.0) + rspec-mocks (>= 3.13.0, < 5.0.0) + rspec-support (>= 3.13.0, < 5.0.0) + rspec-support (3.13.7) rubocop (1.75.3) json (~> 2.3) language_server-protocol (~> 3.17.0.2) @@ -467,24 +476,25 @@ GEM tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) yard-solargraph (~> 0.1) - solid_queue (1.1.5) + solid_queue (1.6.0) activejob (>= 7.1) activerecord (>= 7.1) concurrent-ruby (>= 1.3.1) - fugit (~> 1.11.0) + fugit (~> 1.11) railties (>= 7.1) - thor (~> 1.3.1) + thor (>= 1.3.1) sqlite3 (2.6.0) mini_portile2 (~> 2.8.0) sqlite3 (2.6.0-arm64-darwin) sqlite3 (2.6.0-x86_64-linux-gnu) stimulus-rails (1.3.4) railties (>= 6.0.0) - stringio (3.1.7) - thor (1.3.2) + stringio (3.2.0) + thor (1.5.0) tilt (2.6.0) - timeout (0.4.3) - turbo-rails (2.0.13) + timeout (0.6.1) + tsort (0.2.0) + turbo-rails (2.0.23) actionpack (>= 7.1.0) railties (>= 7.1.0) tzinfo (2.0.6) @@ -492,25 +502,24 @@ GEM unicode-display_width (3.1.4) unicode-emoji (~> 4.0, >= 4.0.4) unicode-emoji (4.0.4) - uri (1.0.3) + uri (1.1.1) useragent (0.16.11) - view_component (3.22.0) - activesupport (>= 5.2.0, < 8.1) - concurrent-ruby (= 1.3.4) - method_source (~> 1.0) + view_component (4.12.0) + actionview (>= 7.1.0) + activesupport (>= 7.1.0) + concurrent-ruby (~> 1) warden (1.2.9) rack (>= 2.0.9) - web-console (4.2.1) - actionview (>= 6.0.0) - activemodel (>= 6.0.0) + web-console (4.3.0) + actionview (>= 8.0.0) bindex (>= 0.4.0) - railties (>= 6.0.0) + railties (>= 8.0.0) webmock (3.25.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webrick (1.9.1) - websocket-driver (0.7.7) + webrick (1.9.2) + websocket-driver (0.8.2) base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -520,7 +529,7 @@ GEM yard-solargraph (0.1.0) yard (~> 0.9) zbase32 (0.1.1) - zeitwerk (2.7.2) + zeitwerk (2.8.3) PLATFORMS arm64-darwin-22 @@ -534,7 +543,7 @@ DEPENDENCIES capybara cssbundling-rails database_cleaner - devise (~> 4.9.0) + devise (~> 5.0) devise_ldap_authenticatable discourse_api dotenv-rails @@ -548,7 +557,7 @@ DEPENDENCIES gpgme (~> 2.0.24) image_processing (~> 1.12.2) importmap-rails - jbuilder (~> 2.7) + jbuilder (~> 2.15) kramdown letter_opener letter_opener_web @@ -561,8 +570,8 @@ DEPENDENCIES pagy (~> 6.0, >= 6.0.2) pg (~> 1.5) propshaft - puma (~> 6.6) - rails (~> 8.0) + puma (~> 8.0) + rails (~> 8.1) rails-controller-testing rails-settings-cached (~> 2.8.3) redis (~> 5.4) @@ -578,7 +587,7 @@ DEPENDENCIES tzinfo-data view_component warden - web-console (~> 4.2) + web-console (~> 4.3) webmock zbase32 (~> 0.1.1) diff --git a/app/controllers/turbo_controller.rb b/app/controllers/turbo_controller.rb deleted file mode 100644 index 600e9d2..0000000 --- a/app/controllers/turbo_controller.rb +++ /dev/null @@ -1,18 +0,0 @@ -class TurboController < ApplicationController - class Responder < ActionController::Responder - def to_turbo_stream - controller.render(options.merge(formats: :html)) - rescue ActionView::MissingTemplate => error - if get? - raise error - elsif has_errors? && default_action - render rendering_options.merge(formats: :html, status: :unprocessable_entity) - else - redirect_to navigation_location - end - end - end - - self.responder = Responder - respond_to :html, :turbo_stream -end diff --git a/app/controllers/users/devise_controller.rb b/app/controllers/users/devise_controller.rb index c3aafd5..13b058d 100644 --- a/app/controllers/users/devise_controller.rb +++ b/app/controllers/users/devise_controller.rb @@ -6,7 +6,7 @@ class Users::DeviseController < ApplicationController if get? raise error elsif has_errors? && default_action - render rendering_options.merge(formats: :html, status: :unprocessable_entity) + render error_rendering_options.merge(formats: :html, status: :unprocessable_entity) else redirect_to navigation_location end diff --git a/app/models/lndhub_user.rb b/app/models/lndhub_user.rb index 9fa899c..5f8226f 100644 --- a/app/models/lndhub_user.rb +++ b/app/models/lndhub_user.rb @@ -10,18 +10,18 @@ class LndhubUser < LndhubBase foreign_key: "login" def balance - accounts.current.first.ledgers.sum("account_ledgers.amount").to_i.abs + accounts.current.order(:id).first.ledgers.sum("account_ledgers.amount").to_i.abs end def sum_outgoing - accounts.outgoing.first.ledgers.sum("account_ledgers.amount").to_i.abs + accounts.outgoing.order(:id).first.ledgers.sum("account_ledgers.amount").to_i.abs end def sum_incoming - accounts.incoming.first.ledgers.sum("account_ledgers.amount").to_i.abs + accounts.incoming.order(:id).first.ledgers.sum("account_ledgers.amount").to_i.abs end def sum_fees - accounts.fees.first.ledgers.sum("account_ledgers.amount").to_i.abs + accounts.fees.order(:id).first.ledgers.sum("account_ledgers.amount").to_i.abs end end diff --git a/app/views/devise/shared/_error_messages.html.erb b/app/views/devise/shared/_error_messages.html.erb index 9e4c6b5..6dd7b3b 100644 --- a/app/views/devise/shared/_error_messages.html.erb +++ b/app/views/devise/shared/_error_messages.html.erb @@ -1,5 +1,5 @@ <% if resource.errors.any? %> -
+