Feature/rails 6 (#90)

* Update gemfile and run rails app:upgrade

* Fix optional belongs to in mail alias

* Temp disable bullet

* Fix scope deprecation warnings (rails/rails#35186)

* Fix mail delivery job deprecation (rails/rails#34591)

* Switch to load 6.0
- Fix deprecation warnings about initalizers
- Fix model_name eager loading
- Fix autoimport
- Fix carrierwave

* Cleanup

* Rubocop

* Re-enable bullet

* Fix bullet

* Update lockfile

* Update activity spec and rubocop-performance version

* rubocop

* Typo

* Remove secret token since it is not used since rails 6

* Remove carrierwave uploader

* Sentry.rb

* Add additional test case for accept mail

Author: Matthijsy

Gemfile

@@ -34,13 +34,13 @@ gem 'puma', '~> 3.7'
 gem 'pundit', '~> 2.0'
 gem 'rack-attack', '~> 6.0'
 gem 'rack-cors', '~> 1.0', require: 'rack/cors'
-gem 'rails', '~> 5.2.2'
-gem 'rails-i18n', '~> 5.1'
+gem 'rails', '~> 6.0'
+gem 'rails-i18n', '~> 6.0'
 gem 'redis-rails', '~> 5.0.1'
 gem 'rqrcode', '~> 0.10'
 gem 'ruby-filemagic', '~> 0.7'
 gem 'rubyzip', '~> 2.0'
-gem 'sentry-raven', '~> 2.3'
+gem 'sentry-raven', '~> 2.12'
 gem 'sepa_king', '~> 0.11'
 gem 'sidekiq', '~> 5.0'
 gem 'sidekiq-scheduler', '~> 3.0'
@@ -52,7 +52,7 @@ gem 'vpim', '~> 13.11.11'
 group :development, :test do
   gem 'awesome_print'
   gem 'brakeman', require: false
-  gem 'bullet', '=5.7.5'
+  gem 'bullet'
   gem 'colorize'
   gem 'consistency_fail'
   gem 'dotenv-rails'

Gemfile.lock

@@ -10,55 +10,68 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.4)
-      actionpack (= 5.2.4)
+    actioncable (6.0.1)
+      actionpack (= 6.0.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.4)
-      actionpack (= 5.2.4)
-      actionview (= 5.2.4)
-      activejob (= 5.2.4)
+    actionmailbox (6.0.1)
+      actionpack (= 6.0.1)
+      activejob (= 6.0.1)
+      activerecord (= 6.0.1)
+      activestorage (= 6.0.1)
+      activesupport (= 6.0.1)
+      mail (>= 2.7.1)
+    actionmailer (6.0.1)
+      actionpack (= 6.0.1)
+      actionview (= 6.0.1)
+      activejob (= 6.0.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.4)
-      actionview (= 5.2.4)
-      activesupport (= 5.2.4)
+    actionpack (6.0.1)
+      actionview (= 6.0.1)
+      activesupport (= 6.0.1)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4)
-      activesupport (= 5.2.4)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.1)
+      actionpack (= 6.0.1)
+      activerecord (= 6.0.1)
+      activestorage (= 6.0.1)
+      activesupport (= 6.0.1)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.1)
+      activesupport (= 6.0.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.4)
-      activesupport (= 5.2.4)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.1)
+      activesupport (= 6.0.1)
       globalid (>= 0.3.6)
-    activemodel (5.2.4)
-      activesupport (= 5.2.4)
-    activerecord (5.2.4)
-      activemodel (= 5.2.4)
-      activesupport (= 5.2.4)
-      arel (>= 9.0)
-    activestorage (5.2.4)
-      actionpack (= 5.2.4)
-      activerecord (= 5.2.4)
+    activemodel (6.0.1)
+      activesupport (= 6.0.1)
+    activerecord (6.0.1)
+      activemodel (= 6.0.1)
+      activesupport (= 6.0.1)
+    activestorage (6.0.1)
+      actionpack (= 6.0.1)
+      activejob (= 6.0.1)
+      activerecord (= 6.0.1)
       marcel (~> 0.3.1)
-    activesupport (5.2.4)
+    activesupport (6.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     after_commit_action (1.1.0)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
     airbrussh (1.4.0)
       sshkit (>= 1.6.1, != 1.7.0)
-    arel (9.0.0)
     ast (2.4.0)
     awesome_print (1.8.0)
     bcrypt (3.1.13)
@@ -75,9 +88,9 @@ GEM
       msgpack (~> 1.0)
     brakeman (4.7.2)
     builder (3.2.3)
-    bullet (5.7.5)
+    bullet (6.0.2)
       activesupport (>= 3.0.0)
-      uniform_notifier (~> 1.11.0)
+      uniform_notifier (~> 1.11)
     byebug (11.0.1)
     capistrano (3.11.2)
       airbrussh (>= 1.0.0)
@@ -306,33 +319,35 @@ GEM
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.4)
-      actioncable (= 5.2.4)
-      actionmailer (= 5.2.4)
-      actionpack (= 5.2.4)
-      actionview (= 5.2.4)
-      activejob (= 5.2.4)
-      activemodel (= 5.2.4)
-      activerecord (= 5.2.4)
-      activestorage (= 5.2.4)
-      activesupport (= 5.2.4)
+    rails (6.0.1)
+      actioncable (= 6.0.1)
+      actionmailbox (= 6.0.1)
+      actionmailer (= 6.0.1)
+      actionpack (= 6.0.1)
+      actiontext (= 6.0.1)
+      actionview (= 6.0.1)
+      activejob (= 6.0.1)
+      activemodel (= 6.0.1)
+      activerecord (= 6.0.1)
+      activestorage (= 6.0.1)
+      activesupport (= 6.0.1)
       bundler (>= 1.3.0)
-      railties (= 5.2.4)
+      railties (= 6.0.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    rails-i18n (5.1.3)
+    rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
-      railties (>= 5.0, < 6)
-    railties (5.2.4)
-      actionpack (= 5.2.4)
-      activesupport (= 5.2.4)
+      railties (>= 6.0.0, < 7)
+    railties (6.0.1)
+      actionpack (= 6.0.1)
+      activesupport (= 6.0.1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
     rake (13.0.1)
     rb-fsevent (0.10.3)
@@ -481,7 +496,7 @@ GEM
     unf (0.1.4-java)
     unf_ext (0.0.7.6)
     unicode-display_width (1.6.0)
-    uniform_notifier (1.11.0)
+    uniform_notifier (1.13.0)
     url_mount (0.2.1)
       rack
     uuidtools (2.1.5)
@@ -504,6 +519,7 @@ GEM
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
     yard (0.9.20)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   java
@@ -520,7 +536,7 @@ DEPENDENCIES
   binding_of_caller
   bootsnap (~> 1.4)
   brakeman
-  bullet (= 5.7.5)
+  bullet
   capistrano-sidekiq
   carrierwave (= 1.2.2)
   carrierwave-base64 (~> 2.5)
@@ -562,8 +578,8 @@ DEPENDENCIES
   rack-attack (~> 6.0)
   rack-cors (~> 1.0)
   rack-mini-profiler
-  rails (~> 5.2.2)
-  rails-i18n (~> 5.1)
+  rails (~> 6.0)
+  rails-i18n (~> 6.0)
   rb-readline
   redis-rails (~> 5.0.1)
   rqrcode (~> 0.10)
@@ -574,7 +590,7 @@ DEPENDENCIES
   rubocop-rspec
   ruby-filemagic (~> 0.7)
   rubyzip (~> 2.0)
-  sentry-raven (~> 2.3)
+  sentry-raven (~> 2.12)
   sepa_king (~> 0.11)
   sidekiq (~> 5.0)
   sidekiq-scheduler (~> 3.0)

app/jobs/smtp_job.rb

@@ -1,4 +1,4 @@
-class SMTPJob < ApplicationJob
+class SmtpJob < ApplicationJob
   queue_as :default
 
   def perform(mail_alias, enable)
@@ -15,12 +15,12 @@ def enable_smtp(mail_alias)
     password = SecureRandom.hex(16)
     mailgun_client.post("/domains/#{mail_alias.domain}/credentials",
                         'login': mail_alias.email, 'password': password)
-    MailSMTPMailer.enabled_email(mail_alias, password).deliver_later
+    MailSmtpMailer.enabled_email(mail_alias, password).deliver_later
   end
 
   def disable_smtp(mail_alias)
     mailgun_client.delete("/domains/#{mail_alias.domain}/credentials/#{mail_alias.email}")
-    MailSMTPMailer.disabled_email(mail_alias).deliver_later
+    MailSmtpMailer.disabled_email(mail_alias).deliver_later
   end
 
   # :nocov:

app/mailers/mail_smtp_mailer.rb

@@ -1,4 +1,4 @@
-class MailSMTPMailer < ApplicationMailer
+class MailSmtpMailer < ApplicationMailer
   def enabled_email(mail_alias, password)
     @mail_alias = mail_alias
     @password = password

app/models/activity.rb

@@ -28,7 +28,7 @@ class Activity < ApplicationRecord
   scope :closing, (lambda { |days_ahead = 7|
     now = DateTime.current
     ahead = days_ahead.days.from_now.to_datetime
-    Activity.joins(:form).where(form_forms: { respond_until: now..ahead })
+    joins(:form).where(form_forms: { respond_until: now..ahead })
   })
 
   after_save :copy_author_and_group_to_form!

app/models/application_record.rb

@@ -6,7 +6,7 @@ class ApplicationRecord < ActiveRecord::Base
 
   def self.model_names
     @model_names ||= begin
-      Rails.application.eager_load!
+      Zeitwerk::Loader.eager_load_all
       ActiveRecord::Base.descendants.map { |m| m.name.underscore }
     end
   end

app/models/mail_alias.rb

@@ -1,7 +1,7 @@
 class MailAlias < ApplicationRecord
-  belongs_to :group
-  belongs_to :user
-  belongs_to :moderator_group, class_name: 'Group'
+  belongs_to :group, optional: true
+  belongs_to :user, optional: true
+  belongs_to :moderator_group, class_name: 'Group', optional: true
 
   validates :email, presence: true, uniqueness: true
   validates :moderation_type, inclusion: %w[open semi_moderated moderated]
@@ -73,7 +73,7 @@ def known_mail_domains
   def set_smtp
     return unless smtp_enabled_changed?
 
-    SMTPJob.perform_later(self, smtp_enabled)
+    SmtpJob.perform_later(self, smtp_enabled)
   end
   # :nocov:
 end

app/models/user.rb

@@ -78,16 +78,16 @@ class User < ApplicationRecord # rubocop:disable Metrics/ClassLength
   })
   scope :upcoming_birthdays, (lambda { |days_ahead = 7|
     range = (0.days.from_now.to_date..days_ahead.days.from_now.to_date)
-    scope = range.inject(User.birthday) do |birthdays, day|
-      birthdays.or(User.birthday(day.month, day.day))
+    scope = range.inject(birthday) do |birthdays, day|
+      birthdays.or(birthday(day.month, day.day))
     end
     february28 = Date.new(Time.zone.now.year, 2, 28)
-    scope = scope.or(User.birthday(2, 29)) if range.include?(february28) &&
+    scope = scope.or(birthday(2, 29)) if range.include?(february28) &&
       !Date.leap?(Time.zone.now.year)
     scope
   })
   scope :active_users_for_group, (lambda { |group|
-    User.joins(:memberships).merge(Membership.active.where(group: group))
+    joins(:memberships).merge(Membership.active.where(group: group))
   })
   scope :archived, (lambda { |bool = true|
     return where.not(archived_at: nil) if bool

bin/setup

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 require 'fileutils'
-include FileUtils # rubocop:disable Style/MixinUsage
 
 # path to your application root.
 APP_ROOT = File.expand_path('..', __dir__)
@@ -9,8 +8,9 @@ def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
 end
 
-chdir APP_ROOT do
-  # This script is a starting point to setup your application.
+FileUtils.chdir APP_ROOT do
+  # This script is a way to setup or update your development environment automatically.
+  # This script is idempotent, so that you can run it at anytime and get an expectable outcome.
   # Add necessary setup steps to this file.
 
   puts '== Installing dependencies =='
@@ -19,11 +19,11 @@ chdir APP_ROOT do
 
   # puts "\n== Copying sample files =="
   # unless File.exist?('config/database.yml')
-  #   cp 'config/database.yml.sample', 'config/database.yml'
+  #   FileUtils.cp 'config/database.yml.sample', 'config/database.yml'
   # end
 
   puts "\n== Preparing database =="
-  system! 'bin/rails db:setup'
+  system! 'bin/rails db:prepare'
 
   puts "\n== Removing old logs and tempfiles =="
   system! 'bin/rails log:clear tmp:clear'

config/application.rb

@@ -4,28 +4,34 @@
 require 'active_model/railtie'
 require 'active_job/railtie'
 require 'active_record/railtie'
+require 'active_storage/engine'
 require 'action_controller/railtie'
 require 'action_mailer/railtie'
-require 'active_storage/engine'
+# require "action_mailbox/engine"
+# require "action_text/engine"
+# require "action_view/railtie"
+# require "action_cable/engine"
+# require "sprockets/railtie"
+# require "rails/test_unit/railtie"
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
 
 module Amber
   class Application < Rails::Application
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 6.0
+
     # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
+    # Application configuration can go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded after loading
+    # the framework and any gems in your application.
 
     # Only loads a smaller set of middleware suitable for API only apps.
     # Middleware like session, flash, cookies can be added back manually.
     # Skip views, helpers and assets when generating a new resource.
     config.api_only = true
-
-    config.autoload_paths << Rails.root.join('app', 'helpers')
-    config.autoload_paths << Rails.root.join('app', 'paginators')
-
     config.i18n.default_locale = :nl
 
     # Required by message_bus as long as https://github.com/SamSaffron/message_bus/issues/124