diff --git a/Gemfile b/Gemfile index bcea423f..16b6dc48 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,8 @@ source 'https://rubygems.org' # gem 'rails', '~> 7.1.2' # gem "rails", "~> 7.2.1", ">= 7.2.1.2" -gem 'rails', '~> 8.0.2.1' +gem 'rails', '~> 8.1.1' +#gem 'rails', '7.1.1' gem 'rack-cors', require: 'rack/cors' # Bundle edge Rails instead: @@ -64,7 +65,7 @@ end #gem 'couch_potato', '>= 1.7.1' #, github: 'bterkuile/couch_potato' gem 'mutex_m' # this is because the httpclient 2.8.3 requires it, and that one requires mutex_m, which is removed in ruby 3.4 -gem 'couch_potato', github: 'langalex/couch_potato', branch: :main +gem 'couch_potato', github: 'bterkuile/couch_potato', branch: :main #gem 'simply_stored', path: '~/development/rails/components/simply_stored' #, github: 'bterkuile/simply_stored' gem 'simply_stored', github: 'bterkuile/simply_stored', branch: :master #gem 'orm_adapter', github: 'bterkuile/orm_adapter' @@ -79,15 +80,15 @@ gem 'active_decorator' #, path: '/Users/bterkuile/companytools/development/rails #gem 'paperclip', ['>= 4.2.4', '!= 4.3.0'] #, '3.5.2' # cmtool gem 'kt-paperclip' #gem 'cmtool', path: './../cmtool' -gem 'cmtool', github: 'bterkuile/cmtool', branch: :master +gem 'cmtool', github: 'bterkuile/cmtool', branch: 'master' gem 'kaminari' gem 'rqrcode' gem 'mini_magick' -gem 'active_attr' +gem 'active_attr', github: 'bterkuile/active_attr', branch: 'master' gem 'naught' gem 'cancancan' -gem 'sucker_punch' # Really needed? +#gem 'sucker_punch' # Really needed? #gem 'geokit' gem 'iso_country_codes' diff --git a/Gemfile.lock b/Gemfile.lock index 380f1d98..aaeea08a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,16 @@ +GIT + remote: https://github.com/bterkuile/active_attr.git + revision: d8c4c077833d4ed5bc01260e9f5465e8d17604be + branch: master + specs: + active_attr (0.17.1) + actionpack (>= 3.0.2) + activemodel (>= 3.0.2) + activesupport (>= 3.0.2) + GIT remote: https://github.com/bterkuile/cmtool.git - revision: 557763877cb4c54aca42af5db863769a9d2ffb4c + revision: 647cc38bad68c3bebc304f52fd54540f4559cae3 branch: master specs: cmtool (3.0.0) @@ -14,6 +24,16 @@ GIT pickadate-rails slim-rails +GIT + remote: https://github.com/bterkuile/couch_potato.git + revision: 0dc658df6d8a883a926ecf81f8395884b967cf46 + branch: main + specs: + couch_potato (1.7.1) + activemodel (>= 5.0) + couchrest (~> 2.0.1) + json (~> 2.3) + GIT remote: https://github.com/bterkuile/devise_simply_stored.git revision: d40020669b22bbb14fa40dc4521b2f072eb96e84 @@ -31,50 +51,42 @@ GIT GIT remote: https://github.com/bterkuile/simply_stored.git - revision: 284607e973802ef46d7b47409bcf4beed7c0984c + revision: 4d68cb32061e894eebe9e9da1c43af0d1f05777c branch: master specs: simply_stored (1.0.0) activesupport couch_potato (>= 1.7.0) -GIT - remote: https://github.com/langalex/couch_potato.git - revision: 0dc658df6d8a883a926ecf81f8395884b967cf46 - branch: main - specs: - couch_potato (1.7.1) - activemodel (>= 5.0) - couchrest (~> 2.0.1) - json (~> 2.3) - GEM remote: https://rubygems.org/ specs: ace-rails-ap (4.5) - actioncable (8.0.2.1) - actionpack (= 8.0.2.1) - activesupport (= 8.0.2.1) + action_text-trix (2.1.15) + railties + actioncable (8.1.1) + actionpack (= 8.1.1) + activesupport (= 8.1.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (8.0.2.1) - actionpack (= 8.0.2.1) - activejob (= 8.0.2.1) - activerecord (= 8.0.2.1) - activestorage (= 8.0.2.1) - activesupport (= 8.0.2.1) + actionmailbox (8.1.1) + actionpack (= 8.1.1) + activejob (= 8.1.1) + activerecord (= 8.1.1) + activestorage (= 8.1.1) + activesupport (= 8.1.1) mail (>= 2.8.0) - actionmailer (8.0.2.1) - actionpack (= 8.0.2.1) - actionview (= 8.0.2.1) - activejob (= 8.0.2.1) - activesupport (= 8.0.2.1) + actionmailer (8.1.1) + actionpack (= 8.1.1) + actionview (= 8.1.1) + activejob (= 8.1.1) + activesupport (= 8.1.1) mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (8.0.2.1) - actionview (= 8.0.2.1) - activesupport (= 8.0.2.1) + actionpack (8.1.1) + actionview (= 8.1.1) + activesupport (= 8.1.1) nokogiri (>= 1.8.5) rack (>= 2.2.4) rack-session (>= 1.0.1) @@ -82,48 +94,45 @@ GEM rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actiontext (8.0.2.1) - actionpack (= 8.0.2.1) - activerecord (= 8.0.2.1) - activestorage (= 8.0.2.1) - activesupport (= 8.0.2.1) + actiontext (8.1.1) + action_text-trix (~> 2.1.15) + actionpack (= 8.1.1) + activerecord (= 8.1.1) + activestorage (= 8.1.1) + activesupport (= 8.1.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (8.0.2.1) - activesupport (= 8.0.2.1) + actionview (8.1.1) + activesupport (= 8.1.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - active_attr (0.17.1) - actionpack (>= 3.0.2, < 8.1) - activemodel (>= 3.0.2, < 8.1) - activesupport (>= 3.0.2, < 8.1) - active_decorator (1.4.1) + active_decorator (1.5.1) activesupport - activejob (8.0.2.1) - activesupport (= 8.0.2.1) + activejob (8.1.1) + activesupport (= 8.1.1) globalid (>= 0.3.6) - activemodel (8.0.2.1) - activesupport (= 8.0.2.1) - activerecord (8.0.2.1) - activemodel (= 8.0.2.1) - activesupport (= 8.0.2.1) + activemodel (8.1.1) + activesupport (= 8.1.1) + activerecord (8.1.1) + activemodel (= 8.1.1) + activesupport (= 8.1.1) timeout (>= 0.4.0) - activestorage (8.0.2.1) - actionpack (= 8.0.2.1) - activejob (= 8.0.2.1) - activerecord (= 8.0.2.1) - activesupport (= 8.0.2.1) + activestorage (8.1.1) + actionpack (= 8.1.1) + activejob (= 8.1.1) + activerecord (= 8.1.1) + activesupport (= 8.1.1) marcel (~> 1.0) - activesupport (8.0.2.1) + activesupport (8.1.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) @@ -136,8 +145,7 @@ GEM base64 (0.3.0) bcrypt (3.1.20) bcrypt_pbkdf (1.1.1) - benchmark (0.4.1) - bigdecimal (3.2.2) + bigdecimal (3.3.1) builder (3.3.0) cancancan (3.6.1) capistrano (3.19.2) @@ -182,13 +190,13 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.3.5) - connection_pool (2.5.3) + connection_pool (2.5.4) cookiejar (0.3.4) couchrest (2.0.1) httpclient (~> 2.8) mime-types (>= 1.15) multi_json (~> 1.7) - crack (1.0.0) + crack (1.0.1) bigdecimal rexml crass (1.0.6) @@ -197,7 +205,7 @@ GEM cucumber-messages (28.1.0) cuke_modeler (3.25.0) cucumber-gherkin (< 34.0) - date (3.4.1) + date (3.5.0) devise (4.9.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -222,19 +230,19 @@ GEM eventmachine (>= 1.0.0.beta.4) email_validator (2.2.4) activemodel - erb (5.0.2) + erb (5.1.3) erubi (1.13.1) eventmachine (1.2.7) exception_notification (5.0.1) actionmailer (>= 7.1, < 9) activesupport (>= 7.1, < 9) execjs (2.10.0) - factory_bot (6.5.5) + factory_bot (6.5.6) activesupport (>= 6.1.0) - factory_bot_rails (6.5.0) + factory_bot_rails (6.5.1) factory_bot (~> 6.5) railties (>= 6.1.0) - faraday (2.13.4) + faraday (2.14.0) faraday-net_http (>= 2.0, < 3.5) json logger @@ -264,9 +272,9 @@ GEM fuubar (2.5.1) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) - globalid (1.2.1) + globalid (1.3.0) activesupport (>= 6.1) - hashdiff (1.2.0) + hashdiff (1.2.1) hashie (5.0.0) http_parser.rb (0.8.0) httpclient (2.9.0) @@ -274,12 +282,12 @@ GEM i18n (1.14.7) concurrent-ruby (~> 1.0) io-console (0.8.1) - irb (1.15.2) + irb (1.15.3) pp (>= 0.6.0) rdoc (>= 4.0.0) reline (>= 0.4.2) iso_country_codes (0.7.8) - jquery-rails (4.6.0) + jquery-rails (4.6.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -288,7 +296,7 @@ GEM js-routes (2.3.5) railties (>= 5) sorbet-runtime - json (2.13.2) + json (2.15.2) jwt (3.1.2) base64 kaminari (1.2.2) @@ -319,7 +327,8 @@ GEM loofah (2.24.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) - mail (2.8.1) + mail (2.9.0) + logger mini_mime (>= 0.1.1) net-imap net-pop @@ -330,14 +339,14 @@ GEM mime-types (3.7.0) logger mime-types-data (~> 3.2025, >= 3.2025.0507) - mime-types-data (3.2025.0826) + mime-types-data (3.2025.0924) mimemagic (0.3.10) nokogiri (~> 1) rake mini_magick (5.3.1) logger mini_mime (1.1.5) - minitest (5.25.5) + minitest (5.26.0) momentjs-rails (2.29.4.1) railties (>= 3.1) multi_json (1.17.0) @@ -345,9 +354,9 @@ GEM bigdecimal (~> 3.1) mutex_m (0.3.0) naught (1.1.0) - net-http (0.6.0) + net-http (0.7.0) uri - net-imap (0.5.9) + net-imap (0.5.12) date net-protocol net-pop (0.1.2) @@ -361,21 +370,21 @@ GEM net-smtp (0.5.1) net-protocol net-ssh (7.3.0) - nio4r (2.7.4) - nokogiri (1.18.9-aarch64-linux-gnu) + nio4r (2.7.5) + nokogiri (1.18.10-aarch64-linux-gnu) racc (~> 1.4) - nokogiri (1.18.9-x86_64-darwin) + nokogiri (1.18.10-x86_64-darwin) racc (~> 1.4) - nokogiri (1.18.9-x86_64-linux-gnu) + nokogiri (1.18.10-x86_64-linux-gnu) racc (~> 1.4) - oauth2 (2.0.12) + oauth2 (2.0.17) faraday (>= 0.17.3, < 4.0) jwt (>= 1.0, < 4.0) logger (~> 1.2) multi_xml (~> 0.5) rack (>= 1.2, < 4) snaky_hash (~> 2.0, >= 2.0.3) - version_gem (>= 1.1.8, < 3) + version_gem (~> 1.1, >= 1.1.9) omniauth (1.9.2) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) @@ -403,7 +412,7 @@ GEM capybara (>= 2.1, < 4) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) - pp (0.6.2) + pp (0.6.3) prettyprint prettyprint (0.2.0) pry (0.15.2) @@ -418,10 +427,10 @@ GEM date stringio public_suffix (6.0.2) - puma (6.6.1) + puma (7.1.0) nio4r (~> 2.0) racc (1.8.1) - rack (2.2.17) + rack (2.2.21) rack-cors (2.0.2) rack (>= 2.0.0) rack-session (1.0.2) @@ -431,20 +440,20 @@ GEM rackup (1.0.1) rack (< 3) webrick - rails (8.0.2.1) - actioncable (= 8.0.2.1) - actionmailbox (= 8.0.2.1) - actionmailer (= 8.0.2.1) - actionpack (= 8.0.2.1) - actiontext (= 8.0.2.1) - actionview (= 8.0.2.1) - activejob (= 8.0.2.1) - activemodel (= 8.0.2.1) - activerecord (= 8.0.2.1) - activestorage (= 8.0.2.1) - activesupport (= 8.0.2.1) + rails (8.1.1) + actioncable (= 8.1.1) + actionmailbox (= 8.1.1) + actionmailer (= 8.1.1) + actionpack (= 8.1.1) + actiontext (= 8.1.1) + actionview (= 8.1.1) + activejob (= 8.1.1) + activemodel (= 8.1.1) + activerecord (= 8.1.1) + activestorage (= 8.1.1) + activesupport (= 8.1.1) bundler (>= 1.15.0) - railties (= 8.0.2.1) + railties (= 8.1.1) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -459,34 +468,36 @@ GEM rails-i18n (8.0.2) i18n (>= 0.7, < 2) railties (>= 8.0.0, < 9) - railties (8.0.2.1) - actionpack (= 8.0.2.1) - activesupport (= 8.0.2.1) + railties (8.1.1) + actionpack (= 8.1.1) + activesupport (= 8.1.1) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) + tsort (>= 0.2) zeitwerk (~> 2.6) - rake (13.3.0) - rdoc (6.14.2) + rake (13.3.1) + rdoc (6.15.1) erb psych (>= 4.0.0) - regexp_parser (2.11.2) + tsort + regexp_parser (2.11.3) reline (0.6.2) io-console (~> 0.5) - responders (3.1.1) - actionpack (>= 5.2) - railties (>= 5.2) - rexml (3.4.2) + responders (3.2.0) + actionpack (>= 7.0) + railties (>= 7.0) + rexml (3.4.4) rqrcode (3.1.0) chunky_png (~> 1.0) rqrcode_core (~> 2.0) rqrcode_core (2.0.0) - rspec (3.13.1) + rspec (3.13.2) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.5) + rspec-core (3.13.6) rspec-support (~> 3.13.0) rspec-expectations (3.13.5) diff-lcs (>= 1.2.0, < 2.0) @@ -494,7 +505,7 @@ GEM rspec-its (2.0.0) rspec-core (>= 3.13.0) rspec-expectations (>= 3.13.0) - rspec-mocks (3.13.5) + rspec-mocks (3.13.7) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-rails (8.0.2) @@ -505,7 +516,7 @@ GEM rspec-expectations (~> 3.13) rspec-mocks (~> 3.13) rspec-support (~> 3.13) - rspec-support (3.13.5) + rspec-support (3.13.6) ruby-handlebars (0.4.1) parslet (~> 1.6, >= 1.6.2) ruby-progressbar (1.13.0) @@ -537,7 +548,7 @@ GEM snaky_hash (2.0.3) hashie (>= 0.1.0, < 6) version_gem (>= 1.1.8, < 3) - sorbet-runtime (0.6.12449) + sorbet-runtime (0.6.12690) sprockets (4.2.2) concurrent-ruby (~> 1.0) logger @@ -554,8 +565,6 @@ GEM net-ssh (>= 2.8.0) ostruct stringio (3.1.7) - sucker_punch (3.2.0) - concurrent-ruby (~> 1.0) temple (0.10.4) terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) @@ -564,7 +573,8 @@ GEM thor (1.4.0) tilt (2.6.1) timecop (0.9.10) - timeout (0.4.3) + timeout (0.4.4) + tsort (0.2.0) turnip (4.4.1) cuke_modeler (~> 3.15) rspec (>= 3.0, < 4.0) @@ -572,12 +582,12 @@ GEM concurrent-ruby (~> 1.0) uglifier (4.2.1) execjs (>= 0.3.0, < 3) - uri (1.0.3) + uri (1.1.0) useragent (0.16.11) - version_gem (1.1.8) + version_gem (1.1.9) warden (1.2.9) rack (>= 2.0.9) - webmock (3.25.1) + webmock (3.26.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -598,7 +608,7 @@ PLATFORMS DEPENDENCIES ace-rails-ap - active_attr + active_attr! active_decorator bcrypt_pbkdf cancancan @@ -643,7 +653,7 @@ DEPENDENCIES pry-rails puma (>= 5.0) rack-cors - rails (~> 8.0.2.1) + rails (~> 8.1.1) rails-controller-testing rqrcode rspec-its @@ -654,7 +664,6 @@ DEPENDENCIES simply_stored! slim-rails sprockets-rails - sucker_punch test_squad timecop turnip @@ -662,4 +671,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.6.2 + 2.7.2 diff --git a/app/models/user.rb b/app/models/user.rb index d62ef005..99217024 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -119,7 +119,10 @@ class User # only used for testing so far def active_list - has_active_list? ? List.find(active_list_id) : nil + return nil unless has_active_list? + List.find(active_list_id) + rescue SimplyStored::RecordNotFound + nil end ##################################### diff --git a/config/initializers/queue.rb b/config/initializers/queue.rb index 953d5d23..e4ec8a5b 100644 --- a/config/initializers/queue.rb +++ b/config/initializers/queue.rb @@ -1,4 +1,4 @@ -require 'sucker_punch/async_syntax' # remove for rails >= 5 -Rails.application.configure do - config.active_job.queue_adapter = :sucker_punch -end +# require 'sucker_punch/async_syntax' # remove for rails >= 5 +# Rails.application.configure do +# config.active_job.queue_adapter = :sucker_punch +# end