From 061a1ffb2c1e1382e9687030b77fca4ad5b414fe Mon Sep 17 00:00:00 2001 From: Denny de la Haye <2021@denny.me> Date: Mon, 1 Feb 2021 00:33:55 +0000 Subject: [PATCH 1/5] Update version numbers --- Gemfile.lock | 20 +++++++++---------- config/initializers/version.rb | 2 +- plugins/ShinyAccess/Gemfile.lock | 2 +- .../ShinyAccess/lib/shiny_access/version.rb | 2 +- plugins/ShinyBlog/Gemfile.lock | 2 +- plugins/ShinyBlog/lib/shiny_blog/version.rb | 2 +- plugins/ShinyForms/Gemfile.lock | 2 +- plugins/ShinyForms/lib/shiny_forms/version.rb | 2 +- plugins/ShinyInserts/Gemfile.lock | 2 +- .../ShinyInserts/lib/shiny_inserts/version.rb | 2 +- plugins/ShinyLists/Gemfile.lock | 2 +- plugins/ShinyLists/lib/shiny_lists/version.rb | 2 +- plugins/ShinyNews/Gemfile.lock | 2 +- plugins/ShinyNews/lib/shiny_news/version.rb | 2 +- plugins/ShinyNewsletters/Gemfile.lock | 2 +- .../lib/shiny_newsletters/version.rb | 2 +- plugins/ShinyPages/Gemfile.lock | 2 +- plugins/ShinyPages/lib/shiny_pages/version.rb | 2 +- plugins/ShinyProfiles/Gemfile.lock | 2 +- .../lib/shiny_profiles/version.rb | 2 +- plugins/ShinySearch/Gemfile.lock | 2 +- .../ShinySearch/lib/shiny_search/version.rb | 2 +- 22 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0aa555345..f94ef37f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -18,7 +18,7 @@ GIT PATH remote: plugins/ShinyAccess specs: - shiny_access (21.01) + shiny_access (21.02) acts-as-taggable-on acts_as_paranoid nokogiri (>= 1.11.0.rc4) @@ -30,7 +30,7 @@ PATH PATH remote: plugins/ShinyBlog specs: - shiny_blog (21.01) + shiny_blog (21.02) acts-as-taggable-on acts_as_paranoid ckeditor @@ -43,7 +43,7 @@ PATH PATH remote: plugins/ShinyForms specs: - shiny_forms (21.01) + shiny_forms (21.02) acts_as_paranoid nokogiri (>= 1.11.0.rc4) pagy @@ -54,7 +54,7 @@ PATH PATH remote: plugins/ShinyInserts specs: - shiny_inserts (21.01) + shiny_inserts (21.02) acts_as_paranoid ckeditor nokogiri (>= 1.11.0.rc4) @@ -66,7 +66,7 @@ PATH PATH remote: plugins/ShinyLists specs: - shiny_lists (21.01) + shiny_lists (21.02) acts_as_paranoid nokogiri (>= 1.11.0.rc4) pagy @@ -77,7 +77,7 @@ PATH PATH remote: plugins/ShinyNews specs: - shiny_news (21.01) + shiny_news (21.02) acts-as-taggable-on acts_as_paranoid ckeditor @@ -90,7 +90,7 @@ PATH PATH remote: plugins/ShinyNewsletters specs: - shiny_newsletters (21.01) + shiny_newsletters (21.02) acts_as_paranoid ckeditor nokogiri (>= 1.11.0.rc4) @@ -102,7 +102,7 @@ PATH PATH remote: plugins/ShinyPages specs: - shiny_pages (21.01) + shiny_pages (21.02) acts_as_paranoid ckeditor nokogiri (>= 1.11.0.rc4) @@ -114,7 +114,7 @@ PATH PATH remote: plugins/ShinyProfiles specs: - shiny_profiles (21.01) + shiny_profiles (21.02) acts_as_paranoid nokogiri (>= 1.11.0.rc4) pagy @@ -125,7 +125,7 @@ PATH PATH remote: plugins/ShinySearch specs: - shiny_search (21.01) + shiny_search (21.02) acts-as-taggable-on acts_as_paranoid algoliasearch-rails diff --git a/config/initializers/version.rb b/config/initializers/version.rb index 008c59a51..19f156dae 100644 --- a/config/initializers/version.rb +++ b/config/initializers/version.rb @@ -7,4 +7,4 @@ # ShinyCMS is free software; you can redistribute it and/or modify it under the terms of the GPL (version 2 or later) # ShinyCMS version number ('Ubuntu style', YY.MM) -VERSION = '21.01' +VERSION = '21.02' diff --git a/plugins/ShinyAccess/Gemfile.lock b/plugins/ShinyAccess/Gemfile.lock index b2156a7b4..ddc8d9ed2 100644 --- a/plugins/ShinyAccess/Gemfile.lock +++ b/plugins/ShinyAccess/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - shiny_access (21.01) + shiny_access (21.02) acts-as-taggable-on acts_as_paranoid nokogiri (>= 1.11.0.rc4) diff --git a/plugins/ShinyAccess/lib/shiny_access/version.rb b/plugins/ShinyAccess/lib/shiny_access/version.rb index c7592cbbf..1d5f50dd5 100644 --- a/plugins/ShinyAccess/lib/shiny_access/version.rb +++ b/plugins/ShinyAccess/lib/shiny_access/version.rb @@ -8,6 +8,6 @@ # Version number ('Ubuntu style'; year and month) module ShinyAccess - VERSION = '21.01' + VERSION = '21.02' public_constant :VERSION end diff --git a/plugins/ShinyBlog/Gemfile.lock b/plugins/ShinyBlog/Gemfile.lock index a956af52c..e33cad326 100644 --- a/plugins/ShinyBlog/Gemfile.lock +++ b/plugins/ShinyBlog/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - shiny_blog (21.01) + shiny_blog (21.02) acts-as-taggable-on acts_as_paranoid ckeditor diff --git a/plugins/ShinyBlog/lib/shiny_blog/version.rb b/plugins/ShinyBlog/lib/shiny_blog/version.rb index 5ee4a3d10..b256c5907 100644 --- a/plugins/ShinyBlog/lib/shiny_blog/version.rb +++ b/plugins/ShinyBlog/lib/shiny_blog/version.rb @@ -8,6 +8,6 @@ # Version number ('Ubuntu style', YY.MM) - ShinyBlog plugin for ShinyCMS module ShinyBlog - VERSION = '21.01' + VERSION = '21.02' public_constant :VERSION end diff --git a/plugins/ShinyForms/Gemfile.lock b/plugins/ShinyForms/Gemfile.lock index c2f8046c0..86527fe68 100644 --- a/plugins/ShinyForms/Gemfile.lock +++ b/plugins/ShinyForms/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - shiny_forms (21.01) + shiny_forms (21.02) acts_as_paranoid nokogiri (>= 1.11.0.rc4) pagy diff --git a/plugins/ShinyForms/lib/shiny_forms/version.rb b/plugins/ShinyForms/lib/shiny_forms/version.rb index b461f2b3e..65677e91f 100644 --- a/plugins/ShinyForms/lib/shiny_forms/version.rb +++ b/plugins/ShinyForms/lib/shiny_forms/version.rb @@ -8,6 +8,6 @@ # Version number ('Ubuntu style', YY.MM) - ShinyForms plugin for ShinyCMS module ShinyForms - VERSION = '21.01' + VERSION = '21.02' public_constant :VERSION end diff --git a/plugins/ShinyInserts/Gemfile.lock b/plugins/ShinyInserts/Gemfile.lock index d0b424b89..9014757b1 100644 --- a/plugins/ShinyInserts/Gemfile.lock +++ b/plugins/ShinyInserts/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - shiny_inserts (21.01) + shiny_inserts (21.02) acts_as_paranoid ckeditor nokogiri (>= 1.11.0.rc4) diff --git a/plugins/ShinyInserts/lib/shiny_inserts/version.rb b/plugins/ShinyInserts/lib/shiny_inserts/version.rb index 0a4523752..7f179d1af 100644 --- a/plugins/ShinyInserts/lib/shiny_inserts/version.rb +++ b/plugins/ShinyInserts/lib/shiny_inserts/version.rb @@ -8,6 +8,6 @@ # Version number ('Ubuntu style', YY.MM) - ShinyInserts plugin for ShinyCMS module ShinyInserts - VERSION = '21.01' + VERSION = '21.02' public_constant :VERSION end diff --git a/plugins/ShinyLists/Gemfile.lock b/plugins/ShinyLists/Gemfile.lock index 9948fed40..c3d6e8466 100644 --- a/plugins/ShinyLists/Gemfile.lock +++ b/plugins/ShinyLists/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - shiny_lists (21.01) + shiny_lists (21.02) acts_as_paranoid nokogiri (>= 1.11.0.rc4) pagy diff --git a/plugins/ShinyLists/lib/shiny_lists/version.rb b/plugins/ShinyLists/lib/shiny_lists/version.rb index ce5fff8c9..e1ace13a8 100644 --- a/plugins/ShinyLists/lib/shiny_lists/version.rb +++ b/plugins/ShinyLists/lib/shiny_lists/version.rb @@ -8,6 +8,6 @@ # Version number ('Ubuntu style', YY.MM) - ShinyLists plugin for ShinyCMS module ShinyLists - VERSION = '21.01' + VERSION = '21.02' public_constant :VERSION end diff --git a/plugins/ShinyNews/Gemfile.lock b/plugins/ShinyNews/Gemfile.lock index 548ea3e18..08e76e006 100644 --- a/plugins/ShinyNews/Gemfile.lock +++ b/plugins/ShinyNews/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - shiny_news (21.01) + shiny_news (21.02) acts-as-taggable-on acts_as_paranoid ckeditor diff --git a/plugins/ShinyNews/lib/shiny_news/version.rb b/plugins/ShinyNews/lib/shiny_news/version.rb index f5df1aa99..0b0856652 100644 --- a/plugins/ShinyNews/lib/shiny_news/version.rb +++ b/plugins/ShinyNews/lib/shiny_news/version.rb @@ -8,6 +8,6 @@ # Version number ('Ubuntu style', YY.MM) - ShinyNews plugin for ShinyCMS module ShinyNews - VERSION = '21.01' + VERSION = '21.02' public_constant :VERSION end diff --git a/plugins/ShinyNewsletters/Gemfile.lock b/plugins/ShinyNewsletters/Gemfile.lock index 995e8d0e6..24f69dac4 100644 --- a/plugins/ShinyNewsletters/Gemfile.lock +++ b/plugins/ShinyNewsletters/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - shiny_newsletters (21.01) + shiny_newsletters (21.02) acts_as_paranoid ckeditor nokogiri (>= 1.11.0.rc4) diff --git a/plugins/ShinyNewsletters/lib/shiny_newsletters/version.rb b/plugins/ShinyNewsletters/lib/shiny_newsletters/version.rb index 230480173..895e0210c 100644 --- a/plugins/ShinyNewsletters/lib/shiny_newsletters/version.rb +++ b/plugins/ShinyNewsletters/lib/shiny_newsletters/version.rb @@ -8,6 +8,6 @@ # Version number ('Ubuntu style'; year and month) module ShinyNewsletters - VERSION = '21.01' + VERSION = '21.02' public_constant :VERSION end diff --git a/plugins/ShinyPages/Gemfile.lock b/plugins/ShinyPages/Gemfile.lock index ffb494c5a..14b40a374 100644 --- a/plugins/ShinyPages/Gemfile.lock +++ b/plugins/ShinyPages/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - shiny_pages (21.01) + shiny_pages (21.02) acts_as_paranoid ckeditor nokogiri (>= 1.11.0.rc4) diff --git a/plugins/ShinyPages/lib/shiny_pages/version.rb b/plugins/ShinyPages/lib/shiny_pages/version.rb index 09739eab0..c35cc1ced 100644 --- a/plugins/ShinyPages/lib/shiny_pages/version.rb +++ b/plugins/ShinyPages/lib/shiny_pages/version.rb @@ -8,6 +8,6 @@ # Version number ('Ubuntu style', YY.MM) - ShinyPages plugin for ShinyCMS module ShinyPages - VERSION = '21.01' + VERSION = '21.02' public_constant :VERSION end diff --git a/plugins/ShinyProfiles/Gemfile.lock b/plugins/ShinyProfiles/Gemfile.lock index 81c008dac..ac4b1282d 100644 --- a/plugins/ShinyProfiles/Gemfile.lock +++ b/plugins/ShinyProfiles/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - shiny_profiles (21.01) + shiny_profiles (21.02) acts_as_paranoid nokogiri (>= 1.11.0.rc4) pagy diff --git a/plugins/ShinyProfiles/lib/shiny_profiles/version.rb b/plugins/ShinyProfiles/lib/shiny_profiles/version.rb index 373c639dd..fa122b933 100644 --- a/plugins/ShinyProfiles/lib/shiny_profiles/version.rb +++ b/plugins/ShinyProfiles/lib/shiny_profiles/version.rb @@ -8,6 +8,6 @@ # Version number ('Ubuntu style', YY.MM) - ShinyProfiles plugin for ShinyCMS module ShinyProfiles - VERSION = '21.01' + VERSION = '21.02' public_constant :VERSION end diff --git a/plugins/ShinySearch/Gemfile.lock b/plugins/ShinySearch/Gemfile.lock index 1bdcaf6f9..3ce279e07 100644 --- a/plugins/ShinySearch/Gemfile.lock +++ b/plugins/ShinySearch/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - shiny_search (21.01) + shiny_search (21.02) acts-as-taggable-on acts_as_paranoid algoliasearch-rails diff --git a/plugins/ShinySearch/lib/shiny_search/version.rb b/plugins/ShinySearch/lib/shiny_search/version.rb index e2dd43e05..cbab0970c 100644 --- a/plugins/ShinySearch/lib/shiny_search/version.rb +++ b/plugins/ShinySearch/lib/shiny_search/version.rb @@ -8,6 +8,6 @@ # Version number ('Ubuntu style', YY.MM) - ShinySearch plugin for ShinyCMS module ShinySearch - VERSION = '21.01' + VERSION = '21.02' public_constant :VERSION end From 4e34624217120f56f00948dd273a20ecfeb6f0c5 Mon Sep 17 00:00:00 2001 From: Denny de la Haye <2021@denny.me> Date: Mon, 1 Feb 2021 00:35:03 +0000 Subject: [PATCH 2/5] Adding release notes for 21.02 --- docs/release-notes.md | 53 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/docs/release-notes.md b/docs/release-notes.md index 7f880f139..0da00788f 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -5,6 +5,59 @@ This file contains information about changes (particularly breaking changes) between releases - with the most recent release first. +### 2021-02-01 21.02 February 2021: The 'quiet after the storm' release + + * GitHub tag: https://github.com/denny/ShinyCMS-ruby/releases/tag/v21.02 + + * Plugin versions all updated to 21.02, as they all have changes since 21.01 + * Only minor changes in many though, often just the admin search method move + + * Headlines: + * Quiet month, after last month's upgrade extravaganza! + * No really big changes this month; not that many smaller ones either :) + + * Bug fixes: + * Tags on hidden content no longer show up on tag list and tag cloud pages + * Added ShinyTags concern and helpers to enable this + * User profile instantiation in dev is more robust now (lazy-loading issue resolved) + * More robust handling of 404s for non-HTML formats (usually hits from malware) + + * Added: + * ShinyUserAuthentication and ShinyUserAuthorization concerns + * Splitting out auth code from User model + * ShinyUserContent concern - splitting off relations to user-owned content + * Links on user profiles, with a JS UI that very nearly works properly + * ErrorController - more standard way to provide 'smart' 404 (etc) pages + * Changes in several places to raise RecordNotFound to trigger 404 'neatly' + * Added rspec support for optionally raising production-style errors in test env + * Some support for manually overriding open/active status of admin menu items + * lib/gemfile_plugins_helper.rb - new home for plugin-supporting methods from Gemfile + * rubycritic - now uncommented in the Gemfile, reek fixed their ruby 3.0 issues + * zxcvbn-ruby - intelligent password complexity checker + * PasswordsController - JSON endpoint for getting password scores and advice + * activerecord-analyze - adds .analyze method to AR objects, for investigating issues + + * Updated: + * Rails, from 6.1.0 to 6.1.1 + * Puma, from 5.1 to 5.2 + * Blazer, from 2.3.1 to 2.4.0 + * Fixed the issue with recent versions by overriding the clear_helpers method + * MJMLSyntaxValidator rewritten - uses mjml directly rather than Mjml::Parser gem + * Admin area 'quick search' methods moved from controllers to models + * Minor code-quality tweaks in various admin controllers and some models + * In controllers, mostly setting instance variables in before_actions + * In models, several accessors changed from read/write to read-only + * Split user session and user registration tests into two separate files + + * Removed: + * groupdate gem - this is related to Blazer, but wasn't being used + * Various post-login redirect code, particularly for admins + * It was architecturally horrible, and didn't offer enough value to justify that + * user_profile factory - profiles are auto-created along with users now + * There were quite a lot of very minor spec updates to adapt to this + * Static 404 and 500 pages + + ### 2021-01-01 21.01 January 2021: 'Wishing you a Happy New Year, a Happy New Rails, and a Happy New Ruby!' * GitHub tag: https://github.com/denny/ShinyCMS-ruby/releases/tag/v21.01 From d4652d9acf3d0c3a7b7a273b2ce89f0d190838ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Feb 2021 05:36:49 +0000 Subject: [PATCH 3/5] Bump webmock from 3.11.1 to 3.11.2 Bumps [webmock](https://github.com/bblimke/webmock) from 3.11.1 to 3.11.2. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.11.1...v3.11.2) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f94ef37f2..1b1404d41 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -401,7 +401,7 @@ GEM mini_portile2 (2.5.0) minitest (5.14.3) mjml-rails (4.6.1) - msgpack (1.4.1) + msgpack (1.4.2) multi_json (1.15.0) multi_xml (0.6.0) netaddr (2.0.4) @@ -627,7 +627,7 @@ GEM equalizer (~> 0.0, >= 0.0.9) warden (1.2.9) rack (>= 2.0.9) - webmock (3.11.1) + webmock (3.11.2) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) From 121dbf3d5ea1f14e9ecc1e2f6e8251288dd49457 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Feb 2021 05:34:37 +0000 Subject: [PATCH 4/5] Bump capybara from 3.35.1 to 3.35.3 Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.35.1 to 3.35.3. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.35.1...3.35.3) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1b1404d41..27285bec0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -265,7 +265,7 @@ GEM bundler-audit (0.7.0.1) bundler (>= 1.2.0, < 3) thor (>= 0.18, < 2) - capybara (3.35.1) + capybara (3.35.3) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) From fe8754df405c8ce3e1458de2a2eae3dad2e45bcb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Feb 2021 05:35:41 +0000 Subject: [PATCH 5/5] Bump rubycritic from 4.5.2 to 4.6.0 Bumps [rubycritic](https://github.com/whitesmith/rubycritic) from 4.5.2 to 4.6.0. - [Release notes](https://github.com/whitesmith/rubycritic/releases) - [Changelog](https://github.com/whitesmith/rubycritic/blob/main/CHANGELOG.md) - [Commits](https://github.com/whitesmith/rubycritic/compare/v4.5.2...v4.6.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index fa73cb8b6..18f543906 100644 --- a/Gemfile +++ b/Gemfile @@ -173,7 +173,7 @@ source 'https://rubygems.org' do gem 'rails_best_practices' # Ruby Critic generates easy-to-read reports from multiple static analysis tools - gem 'rubycritic', '~> 4.5.0', require: false + gem 'rubycritic', '~> 4.6.0', require: false # Add .analyze method to ActiveRecord objects gem 'activerecord-analyze' diff --git a/Gemfile.lock b/Gemfile.lock index 27285bec0..53472a0e5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -557,7 +557,7 @@ GEM ffi (~> 1.9) ruby_parser (3.15.1) sexp_processor (~> 4.9) - rubycritic (4.5.2) + rubycritic (4.6.0) flay (~> 2.8) flog (~> 4.4) launchy (>= 2.0.0) @@ -565,7 +565,7 @@ GEM rainbow (~> 3.0) reek (~> 6.0, < 7.0) ruby_parser (~> 3.8) - simplecov (>= 0.17.0) + simplecov (>= 0.17.0, < 0.21) tty-which (~> 0.4.0) virtus (~> 1.0) safely_block (0.3.0) @@ -590,7 +590,7 @@ GEM sidekiq-status (1.1.4) chronic_duration sidekiq (>= 3.0) - simplecov (0.21.2) + simplecov (0.20.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) @@ -703,7 +703,7 @@ DEPENDENCIES rubocop-performance! rubocop-rails! rubocop-rspec! - rubycritic (~> 4.5.0)! + rubycritic (~> 4.6.0)! sassc-rails! seed_dump! shiny_access!