Merge remote-tracking branch 'refs/remotes/origin/dependabot/bundler/…

…rubocop-thread_safety-0.6.0' into dependabot/bundler/rubocop-thread_safety-0.6.0
denny · Jan 15, 2025 · 812a427 · 812a427
2 parents 693b25b + 81a1aa8
commit 812a427
Show file tree

Hide file tree

Showing 27 changed files with 94 additions and 69 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -117,7 +117,7 @@ jobs:
 
       - run:
           name: Audit Gemfile bundle for security issues
-          command: bundle exec bundle-audit check --update
+          command: bundle exec bundle-audit check --update --ignore CVE-2024-54133
 
   # Run rspec tests, for main app and plugins
   rspec:

diff --git a/Gemfile b/Gemfile
@@ -35,7 +35,7 @@ source 'https://rubygems.org' do
   gem 'pg', '~> 1.5.9'
 
   # Webserver
-  gem 'puma', '~> 6.4', groups: %i[ development production ]
+  gem 'puma', '~> 6.5', groups: %i[ development production ]
 
   # Email previews
   gem 'rails_email_preview'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -251,9 +251,9 @@ GEM
     acts_as_list (1.2.4)
       activerecord (>= 6.1)
       activesupport (>= 6.1)
-    acts_as_paranoid (0.10.2)
-      activerecord (>= 6.1, < 8)
-      activesupport (>= 6.1, < 8)
+    acts_as_paranoid (0.10.3)
+      activerecord (>= 6.1, < 8.1)
+      activesupport (>= 6.1, < 8.1)
     acts_as_votable (0.14.0)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
@@ -266,7 +266,7 @@ GEM
       activesupport (>= 6.1)
       device_detector (>= 1)
       safely_block (>= 0.4)
-    airbrake (13.0.4)
+    airbrake (13.0.5)
       airbrake-ruby (~> 6.0)
     airbrake-ruby (6.2.2)
       rbtree3 (~> 0.6)
@@ -280,16 +280,16 @@ GEM
     amazing_print (1.6.0)
     ast (2.4.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1013.0)
-    aws-sdk-core (3.213.0)
+    aws-partitions (1.1023.0)
+    aws-sdk-core (3.214.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
     aws-sdk-kms (1.96.0)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.173.0)
+    aws-sdk-s3 (1.176.1)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -381,9 +381,9 @@ GEM
       pwned (~> 2.4)
     diff-lcs (1.5.1)
     docile (1.4.0)
-    dotenv (3.1.4)
-    dotenv-rails (3.1.4)
-      dotenv (= 3.1.4)
+    dotenv (3.1.7)
+    dotenv-rails (3.1.7)
+      dotenv (= 3.1.7)
       railties (>= 6.1)
     dry-configurable (1.1.0)
       dry-core (~> 1.0, < 2)
@@ -459,7 +459,7 @@ GEM
       sorted_set (~> 1.0)
     iniparse (1.5.0)
     jmespath (1.6.2)
-    json (2.8.2)
+    json (2.9.1)
     language_server-protocol (3.17.0.3)
     launchy (3.0.1)
       addressable (~> 2.8)
@@ -474,7 +474,7 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.1)
+    logger (1.6.3)
     loofah (2.23.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -489,7 +489,7 @@ GEM
     mini_magick (4.13.2)
     mini_mime (1.1.5)
     mini_portile2 (2.8.8)
-    minitest (5.25.2)
+    minitest (5.25.4)
     mjml-rails (4.12.1)
     multi_json (1.15.0)
     mutant (0.12.4)
@@ -511,7 +511,7 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.16.7)
+    nokogiri (1.18.0)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     numerizer (0.1.1)
@@ -557,7 +557,7 @@ GEM
     pry-rails (0.3.11)
       pry (>= 0.13.0)
     public_suffix (6.0.1)
-    puma (6.4.3)
+    puma (6.5.0)
       nio4r (~> 2.0)
     pundit (2.4.0)
       activesupport (>= 3.0.0)
@@ -585,9 +585,9 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
+      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-i18n (7.0.10)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
@@ -612,17 +612,17 @@ GEM
       ffi (~> 1.0)
     rbtree (0.4.6)
     rbtree3 (0.7.1)
-    recaptcha (5.17.0)
+    recaptcha (5.18.0)
     redis (5.3.0)
       redis-client (>= 0.22.0)
-    redis-client (0.22.2)
+    redis-client (0.23.0)
       connection_pool
     reek (6.3.0)
       dry-schema (~> 1.13.0)
       parser (~> 3.3.0)
       rainbow (>= 2.0, < 4.0)
       rexml (~> 3.1)
-    regexp_parser (2.9.2)
+    regexp_parser (2.9.3)
     request_store (1.5.1)
       rack (>= 1.4)
     responders (3.1.1)
@@ -635,12 +635,12 @@ GEM
       rspec-mocks (~> 3.13.0)
     rspec-core (3.13.1)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.2)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-instafail (1.0.0)
       rspec
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-rails (6.1.5)
@@ -651,25 +651,25 @@ GEM
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
-    rspec-support (3.13.1)
+    rspec-support (3.13.2)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
     rspec_pacman_formatter (0.1.7)
       colorize
       rspec
     rss (0.3.1)
       rexml
-    rubocop (1.68.0)
+    rubocop (1.69.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rubocop-ast (>= 1.32.2, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.36.2, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.36.1)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.37.0)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
@@ -678,12 +678,12 @@ GEM
     rubocop-performance (1.23.0)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.27.0)
+    rubocop-rails (2.28.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.2.0)
+    rubocop-rspec (3.3.0)
       rubocop (~> 1.61)
     rubocop-rspec_rails (2.30.0)
       rubocop (~> 1.61)
@@ -724,15 +724,15 @@ GEM
     seed_dump (3.3.1)
       activerecord (>= 4)
       activesupport (>= 4)
-    sentry-rails (5.21.0)
+    sentry-rails (5.22.1)
       railties (>= 5.0)
-      sentry-ruby (~> 5.21.0)
-    sentry-ruby (5.21.0)
+      sentry-ruby (~> 5.22.1)
+    sentry-ruby (5.22.1)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
     set (1.1.0)
     sexp_processor (4.17.0)
-    sidekiq (7.3.6)
+    sidekiq (7.3.7)
       connection_pool (>= 2.3.0)
       logger
       rack (>= 2.2.4)
@@ -782,7 +782,7 @@ GEM
     unparser (0.6.15)
       diff-lcs (~> 1.3)
       parser (>= 3.3.0)
-    view_component (3.20.0)
+    view_component (3.21.0)
       activesupport (>= 5.2.0, < 8.1)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -832,7 +832,7 @@ DEPENDENCIES
   packwerk (~> 3.2)!
   parallel_tests!
   pg (~> 1.5.9)!
-  puma (~> 6.4)!
+  puma (~> 6.5)!
   rails (~> 6.1.7)!
   rails-pg-extras!
   rails_email_preview!

diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
@@ -0,0 +1 @@
+//= link shinycms_manifest.js
diff --git a/db/seeds.rb b/db/seeds.rb
@@ -2,7 +2,7 @@
 
 # ShinyCMS ~ https://shinycms.org
 #
-# Copyright 2009-2021 Denny de la Haye ~ https://denny.me
+# Copyright 2009-2024 Denny de la Haye ~ https://denny.me
 #
 # ShinyCMS is free software; you can redistribute it and/or modify it under the terms of the GPL (version 2 or later)
 

diff --git a/docs/Licensing/index.md b/docs/Licensing/index.md
@@ -1,6 +1,6 @@
 # ShinyCMS: Licensing
 
-ShinyCMS is copyright 2009-2021 Denny de la Haye (https://denny.me)
+ShinyCMS is copyright 2009-2024 Denny de la Haye (https://denny.me)
 
 ShinyCMS is free software; you can redistribute it and/or modify it under the terms of the GPL (version 2 or later). There are copies of both v2 and v3 of the GPL included with the ShinyCMS code, or you can read them online:
 * [GNU GPL v2](gnu-gpl-v2.0.md) / https://opensource.org/licenses/gpl-2.0

diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -4,6 +4,31 @@
 
 This file contains information about changes (particularly breaking changes) between releases - with the most recent release first.
 
+### 2024-11-25  24.11  November 2024: The 'Three Years Off Dead For Tax Reasons' Release
+
+GitHub tag: https://github.com/denny/ShinyCMS-ruby/releases/tag/v24.11
+
+Sorry for the unexpected hiatus in releases. In my defence, I nearly died shortly after the last one.
+
+TL;DR, I turn out to have a massive arteriovenous malformation very near my brain stem, which ruptured on 18 June 2021, causing a haemorrhagic stroke that nearly killed me. In hindsight, that probably explains the insomnia and headaches between 2019 and 2021... I thought they were 'just' work stress.
+
+Anyway, I have been busy learning how to talk again, and then walk again, and then recovering from six months of hospital-food-induced starvation (mostly by eating properly once I was home again, but some exercise too) - so all-in-all typing and coding have had to wait their turn. I'm getting there.
+
+I don't think I've added or removed any features in this release, but there have been many many MANY gem updates - a lot of which were languishing in the dependabot queue while I recovered, and then more that flooded in once I cleared the initial backlog :)
+
+Some highlights include:
+* Ruby, from 3.0.1 to 3.1.6
+* Rails, from 6.1.3.1 to 6.1.7.10
+* Puma, from 5.6.7 to 6.4.3
+* Pg, from 1.2.3 to 1.5.9
+* pundit, from 2.1.0 to 2.4.0
+* packwerk, from 1.1.3 to 3.2.2
+* view_component, from 2.83.0 to 3.20.0
+* Plus: bcrypt, capybara, persistent_dmnd, acts_as_votable, acts-as-taggable-on, sidekiq, codecov, mjml, recapcha, bugsnag, mutant-rspec, parallel_tests, yarn, factorybot-rails, rubocop, rubocop_rails, rubocop-performance, and many many many more.
+
+I'm working on a ShinyShop plugin for the CMS as part of my rehab currently, hopefully that will be ready for initial release some time next year.
+
+
 ### 2021-06-02  21.06  June 2021: The 'Happy Birthday, Fliss!' Edition
 
 GitHub tag: https://github.com/denny/ShinyCMS-ruby/releases/tag/v21.06
@@ -34,12 +59,12 @@ Changed:
 * Moved various top-level methods into classes, to reduce pollution
     * Helper methods for Gemfile also moved from main_app to core plugin
 * Gemfile picks up Ruby version from .ruby-version (using helper method)
-* Moved `credits.md` to 'Contributors.md` which seems more common
+* Moved `credits.md` to `Contributors.md` which seems more common
 * Changed inheritance from core by feature plugin controllers/mailers/etc
     * They now load common behaviour etc from a XyzBase module rather than inheriting it from a BaseXyz class, which feels like looser coupling
 
 Also updated:
-* `bundle update` and 'yarn upgrade`
+* `bundle update` and `yarn upgrade`
     * Fixed pagy, which was pinned due to breaking changes a few releases back
     * But had to pin view_components this time :(
 

diff --git a/lib/templates/shiny/plugin/README.md.tt b/lib/templates/shiny/plugin/README.md.tt
@@ -31,7 +31,7 @@ Please read the Code of Conduct as well.
 
 ## Copyright and Licensing
 
-ShinyCMS is copyright 2009-2021 Denny de la Haye https://denny.me
+ShinyCMS is copyright 2009-2024 Denny de la Haye https://denny.me
 
 This ShinyCMS plugin is free software; you can redistribute it and/or modify it
 under the terms of the GPL (version 2 or later). You should have copies of both

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -10,7 +10,7 @@ site_name:        ShinyCMS
 site_url:         http://docs.shinycms.org/
 site_description: Documentation for users and developers of ShinyCMS (Ruby version)
 site_author:      Denny de la Haye
-copyright:        ShinyCMS is copyright 2009-2021 Denny de la Haye (denny.me)
+copyright:        ShinyCMS is copyright 2009-2024 Denny de la Haye (denny.me)
 
 repo_url: https://github.com/denny/ShinyCMS-ruby/
 edit_uri: ''

diff --git a/plugins/ShinyAccess/README.md b/plugins/ShinyAccess/README.md
@@ -26,6 +26,6 @@ Please read the Code of Conduct as well.
 
 ## Copyright and Licensing
 
-ShinyCMS is copyright 2009-2021 Denny de la Haye https://denny.me
+ShinyCMS is copyright 2009-2024 Denny de la Haye https://denny.me
 
 This ShinyCMS plugin is free software; you can redistribute it and/or modify it under the terms of the GPL (version 2 or later). You should have copies of both v2 and v2 of the GPL in your ShinyCMS docs folder, or you can read them online: https://opensource.org/licenses/gpl-2.0 / https://opensource.org/licenses/gpl-3.0
diff --git a/plugins/ShinyBlog/README.md b/plugins/ShinyBlog/README.md
@@ -33,7 +33,7 @@ Please read the Code of Conduct as well.
 
 ## Copyright and Licensing
 
-ShinyCMS is copyright 2009-2021 Denny de la Haye https://denny.me
+ShinyCMS is copyright 2009-2024 Denny de la Haye https://denny.me
 
 This ShinyCMS plugin is free software; you can redistribute it and/or modify it
 under the terms of the GPL (version 2 or later). You should have copies of both

diff --git a/plugins/ShinyCMS/.rubocop_todo.yml b/plugins/ShinyCMS/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # ShinyCMS ~ https://shinycms.org
 #
-# Copyright 2009-2021 Denny de la Haye ~ https://denny.me
+# Copyright 2009-2024 Denny de la Haye ~ https://denny.me
 #
 # ShinyCMS is free software; you can redistribute it and/or modify it under the terms of the GPL (version 2 or later)
 

diff --git a/plugins/ShinyCMS/README.md b/plugins/ShinyCMS/README.md
@@ -29,13 +29,14 @@ rails shinycms:db:seed
 
 ## Contributing
 
-See the ShinyCMS developer documentation for information on contributing to this plugin or any other part of the ShinyCMS project.
+See the developer documentation for information on ShinyCMS features
+[in progress](docs/Developer/Progress.md) and [to-do](docs/Developer/TODO.md)
 
-Please read the Code of Conduct as well.
+Please read the [Code of Conduct](docs/code-of-conduct.md) as well.
 
 
 ## Copyright and Licensing
 
-ShinyCMS is copyright 2009-2021 Denny de la Haye https://denny.me
+ShinyCMS is copyright 2009-2024 Denny de la Haye https://denny.me
 
 ShinyCMS is free software; you can redistribute it and/or modify it under the terms of the GPL (version 2 or later). You should have copies of both v2 and v2 of the GPL in the included docs folder, or you can read them online: https://opensource.org/licenses/gpl-2.0 / https://opensource.org/licenses/gpl-3.0
diff --git a/plugins/ShinyCMS/app/assets/config/shinycms_manifest.js b/plugins/ShinyCMS/app/assets/config/shinycms_manifest.js
@@ -16,4 +16,4 @@
 //= link smartmenus.css
 
 // Themes
-//= link_tree themes/javascript
+//= link_tree ../../../../../themes/javascript
diff --git a/plugins/ShinyCMS/app/components/shinycms/toolbar/discussions_component.rb b/plugins/ShinyCMS/app/components/shinycms/toolbar/discussions_component.rb
@@ -2,7 +2,7 @@
 
 # ShinyCMS ~ https://shinycms.org
 #
-# Copyright 2009-2021 Denny de la Haye ~ https://denny.me
+# Copyright 2009-2024 Denny de la Haye ~ https://denny.me
 #
 # ShinyCMS is free software; you can redistribute it and/or modify it under the terms of the GPL (version 2 or later)