Merge branch 'release/20210322-1'

.dockerdev/Dockerfile

@@ -32,6 +32,7 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
 
 # Install dependencies
 COPY Aptfile /tmp/Aptfile
+RUN apt-key adv --refresh-keys --keyserver ha.pool.sks-keyservers.net
 RUN apt-get update -qq && DEBIAN_FRONTEND=noninteractive apt-get -yq dist-upgrade && \
   DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
     libpq-dev \

.gitignore

@@ -45,3 +45,4 @@ yarn-debug.log*
 /config/credentials/development.key
 .aws
 coverage
+tags

.rspec

@@ -1 +1,3 @@
+--color
 --require spec_helper
+--require rails_helper

.rubocop.yml

@@ -1,3 +1,42 @@
 inherit_from: .rubocop_todo.yml
+require: 
+  - rubocop-performance
+  - rubocop-rails
+  - rubocop-rspec
+
 AllCops:
   NewCops: enable
+  Exclude:
+    - 'bin/**/*'
+    - 'config/**/*'
+    - 'db/**/*'
+    - 'script/**/*'
+    - 'lib/**/*'
+    - 'node_modules/**/*'
+    - 'spec/**/*'
+    - 'README.md'
+    - 'Procfile'
+    - 'config.ru'
+    - 'package.json'
+    - 'Rakefile'
+    - ''
+    - ''
+    - ''
+    - ''
+    - ''
+    - ''
+
+Layout/LineLength:
+  Max: 100
+
+Metrics/BlockLength:
+  Exclude:
+    - config/**/*
+    - spec/**/*
+
+Lint/AmbiguousBlockAssociation:
+  Exclude:
+    - spec/**/*
+
+Style/Documentation:
+  Enabled: false

.rubocop_todo.yml

@@ -1,181 +1,54 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-02-11 11:37:41 UTC using RuboCop version 1.9.1.
+# on 2021-03-18 11:08:20 UTC using RuboCop version 1.11.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: outdent, indent
-Layout/AccessModifierIndentation:
-  Exclude:
-    - 'bin/bundle'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: with_first_argument, with_fixed_indentation
-Layout/ArgumentAlignment:
-  Exclude:
-    - 'bin/webpack'
-    - 'bin/webpack-dev-server'
-
-# Offense count: 6
-# Cop supports --auto-correct.
-Layout/EmptyLineAfterGuardClause:
-  Exclude:
-    - 'bin/bundle'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: empty_lines, no_empty_lines
-Layout/EmptyLinesAroundBlockBody:
-  Exclude:
-    - 'db/schema.rb'
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 103
 
 # Offense count: 1
 Lint/MissingSuper:
   Exclude:
     - 'app/components/notification_component.rb'
 
-# Offense count: 3
-# Configuration parameters: AllowKeywordBlockArguments.
-Lint/UnderscorePrefixedVariableName:
-  Exclude:
-    - 'db/seeds/administrator.rb'
-    - 'db/seeds/news_items.rb'
-    - 'db/seeds/users.rb'
-
-# Offense count: 5
+# Offense count: 2
 # Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 30
-
-# Offense count: 6
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
-# IgnoredMethods: refine
-Metrics/BlockLength:
-  Max: 77
+  Max: 18
 
 # Offense count: 1
-# Configuration parameters: IgnoredMethods.
-Metrics/CyclomaticComplexity:
-  Max: 10
-
-# Offense count: 7
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
-  Max: 19
+  Max: 12
 
-# Offense count: 1
-# Configuration parameters: IgnoredMethods.
-Metrics/PerceivedComplexity:
-  Max: 10
-
-# Offense count: 2
+# Offense count: 3
 # Configuration parameters: EnforcedStyleForLeadingUnderscores.
 # SupportedStylesForLeadingUnderscores: disallowed, required, optional
 Naming/MemoizedInstanceVariableName:
   Exclude:
     - 'app/controllers/application_controller.rb'
 
-# Offense count: 23
-Style/Documentation:
-  Enabled: false
-
-# Offense count: 3
-# Cop supports --auto-correct.
-Style/ExpandPathArguments:
-  Exclude:
-    - 'bin/bundle'
-    - 'bin/rails'
-    - 'bin/rake'
-
-# Offense count: 92
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: always, always_true, never
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
 # Offense count: 1
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
+# Configuration parameters: Include.
+# Include: app/controllers/**/*.rb
+Rails/LexicallyScopedActionFilter:
   Exclude:
     - 'app/controllers/users/registrations_controller.rb'
 
-# Offense count: 3
-# Cop supports --auto-correct.
-Style/IfUnlessModifier:
-  Exclude:
-    - 'bin/bundle'
-
-# Offense count: 2
-Style/MixinUsage:
-  Exclude:
-    - 'db/seeds.rb'
-
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: MinDigits, Strict.
-Style/NumericLiterals:
-  Exclude:
-    - 'db/schema.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/PerlBackrefs:
-  Exclude:
-    - 'bin/bundle'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/RedundantBegin:
+Rails/OutputSafety:
   Exclude:
-    - 'bin/yarn'
+    - 'app/views/feeds/rss.rss.builder'
 
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: .
-# SupportedStyles: use_perl_names, use_english_names
-Style/SpecialGlobalVars:
-  EnforcedStyle: use_perl_names
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/StderrPuts:
-  Exclude:
-    - 'bin/yarn'
-
-# Offense count: 147
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiterals:
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
   Exclude:
-    - 'bin/bundle'
-    - 'bin/webpack'
-    - 'bin/webpack-dev-server'
-    - 'bin/yarn'
-    - 'config/puma.rb'
-    - 'config/spring.rb'
-    - 'db/schema.rb'
-
-# Offense count: 7
-# Cop supports --auto-correct.
-# Configuration parameters: WordRegex.
-# SupportedStyles: percent, brackets
-Style/WordArray:
-  EnforcedStyle: percent
-  MinSize: 5
-
-# Offense count: 20
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Max: 287
+    - 'app/controllers/users/registrations_controller.rb'

Gemfile

@@ -5,19 +5,38 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 ruby '2.7.2'
 
-gem 'bootsnap', '>= 1.4.2', require: false # Reduces boot times through caching; required in config/boot.rb
+gem 'aws-sdk-s3', require: false
+gem 'bootsnap', '>= 1.4.2', require: false # Reduces boot times through caching; required in
+# config/boot.rb
+gem 'contentful'
+gem 'devise' # Devise is a flexible authentication solution for Rails based on Warden
+gem 'friendly_id' # FriendlyId is the "Swiss Army bulldozer" of slugging and permalink plugins for
+# Active Record.
+gem 'image_processing' # Use Active Storage variant
 gem 'jbuilder', '~> 2.11' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'pg'
 gem 'puma', '~> 5.2' # Use Puma as the app server
-gem 'rails', '~> 6.1.2'
+gem 'rails', '~> 6.1.3'
+gem 'recaptcha' # This gem provides helper methods for the reCAPTCHA API
+gem 'redis'
+gem 'rich_text_renderer'
 gem 'sass-rails', '>= 6' # Use SCSS for stylesheets
 gem 'sidekiq'
+gem 'sitemap_generator' # SitemapGenerator is the easiest way to generate Sitemaps in Ruby. Rails
+# integration provides access to the Rails route helpers within your sitemap config file and
+# automatically makes the rake tasks available to you.
 gem 'turbolinks', '~> 5' # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
+gem 'view_component'
 gem 'webpacker', '~> 5.2' # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
+gem 'whenever'
 
 group :development, :test do
   gem 'brakeman'
-  gem 'byebug', platforms: %i[mri mingw x64_mingw] # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem 'byebug', platforms: %i[mri mingw x64_mingw] # Call 'byebug' anywhere in the code to stop
+  # execution and get a debugger console
+  gem 'rubocop'
+  gem 'rubocop-faker'
+  gem 'rubocop-performance'
   gem 'rubocop-rails'
   gem 'rubocop-rspec'
 end
@@ -31,9 +50,10 @@ group :development do
   gem 'listen', '~> 3.3'
   gem 'pry-rails'
   gem 'rails-erd'
-  gem 'spring' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+  gem 'spring' # Spring speeds up development by keeping your application running in the background.
   gem 'spring-watcher-listen', '~> 2.0.0'
-  gem 'web-console', '>= 3.3.0' # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
+  gem 'web-console', '>= 3.3.0' # Access an interactive console on exception pages or by calling
+  # 'console' anywhere in the code.
 end
 
 group :test do
@@ -43,9 +63,9 @@ group :test do
   gem 'rspec-core'
   gem 'rspec-expectations'
   gem 'rspec-mocks'
-  gem 'rspec-rails' # Rspec-rails brings the RSpec testing framework to Ruby on Rails as a drop-in alternative to its default testing framework, Minitest.
+  gem 'rspec-rails' # Rspec-rails brings the RSpec testing framework to Ruby on Rails as a drop-in
+  # alternative to its default testing framework, Minitest.
   gem 'rspec-support'
-  gem 'rubocop', require: false
   gem 'selenium-webdriver'
   gem 'shoulda-matchers', '~> 4.5'
   gem 'simplecov'
@@ -54,16 +74,3 @@ end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
-
-# Added for this project
-gem 'aws-sdk-s3', require: false
-gem 'contentful'
-gem 'devise' # Devise is a flexible authentication solution for Rails based on Warden
-gem 'friendly_id' # FriendlyId is the "Swiss Army bulldozer" of slugging and permalink plugins for Active Record.
-gem 'image_processing', '~> 1.12' # Use Active Storage variant
-gem 'recaptcha' # This gem provides helper methods for the reCAPTCHA API
-gem 'redis'
-gem 'rich_text_renderer'
-gem 'sitemap_generator' # SitemapGenerator is the easiest way to generate Sitemaps in Ruby. Rails integration provides access to the Rails route helpers within your sitemap config file and automatically makes the rake tasks available to you.
-gem 'view_component'
-gem 'whenever'