Merge pull request #915 from EFForg/jparr/913-rubocop-fixes

Update rubocop and fix issues

.rubocop.yml

@@ -1,14 +1,17 @@
-inherit_from: .rubocop_todo.yml
+require:
+  - rubocop-rails
+  - rubocop-performance
 
 inherit_gem:
   rubocop-github:
-    - config/default_edge.yml
-    - config/rails_edge.yml
+    - config/default.yml
+    - config/rails.yml
 
 AllCops:
-  TargetRailsVersion: 5.0
-  TargetRubyVersion: 2.7
-  NewCops: disable
+  TargetRailsVersion: 6.1
+  TargetRubyVersion: 3.0
+  NewCops: enable
+  SuggestExtensions: false
   Exclude:
     - 'db/**/*'
     - 'config/**/*'
@@ -66,7 +69,10 @@ Performance/Squeeze:
 Performance/StringInclude:
   Enabled: true
 
-### Override rubcop-github ###
+Bundler/OrderedGems:
+  Enabled: false
+
+### Override rubocop-github ###
 
 Style/FrozenStringLiteralComment:
   # We aren't upgrading to Ruby 3.0, so this is just noise
@@ -84,9 +90,6 @@ GitHub/RailsControllerRenderPathsExist:
   # Doesn't seem to work; can't find templates that exist
   Enabled: false
 
-GitHub/RailsApplicationRecord:
-  # Rails/ApplicationRecord does the same thing
-  Enabled: false
 
 Lint/Void:
   Exclude:

app/controllers/admin/action_pages_controller.rb

@@ -23,7 +23,7 @@ class Admin::ActionPagesController < Admin::ApplicationController
   allow_collaborators_to :index, :edit
 
   def index
-    @categories = Category.all.order(:title)
+    @categories = Category.order(:title)
     @authors = User.authors.order(:last_name)
     @actionPages = filter_action_pages
 

app/controllers/admin/institutions_controller.rb

@@ -3,7 +3,7 @@ class Admin::InstitutionsController < Admin::ApplicationController
   before_action :set_categories, only: %i[new edit upload index]
 
   def index
-    @institutions = Institution.includes(:action_pages).all.order(created_at: :desc)
+    @institutions = Institution.includes(:action_pages).order(created_at: :desc)
     @institutions = @institutions.search(params[:q]) if params[:q].present?
     @institutions = @institutions.where(category: params[:category]) if params[:category].present? && params[:category] != "All"
     @institutions = @institutions.paginate(page: params[:page], per_page: 20)

app/controllers/admin/topic_sets_controller.rb

@@ -1,6 +1,6 @@
 class Admin::TopicSetsController < Admin::ApplicationController
   def index
-    topic_sets = TopicSet.all.order(:tier)
+    topic_sets = TopicSet.order(:tier)
     render json: topic_sets
   end
 

app/controllers/registrations_controller.rb

@@ -31,9 +31,7 @@ def handle_nonunique_email
       existing.update(sign_up_params) unless existing.confirmed?
 
       if resource.persisted?
-        # rubocop:todo Rails/SkipsModelValidations
         resource.update_attribute(:unconfirmed_email, account_update_params[:email])
-        # rubocop:enable Rails/SkipsModelValidations
         flash[:notice] = I18n.t "devise.registrations.update_needs_confirmation"
         respond_with resource, location: after_update_path_for(resource)
       else

app/controllers/tools_controller.rb

@@ -179,11 +179,9 @@ def set_user
     @user = current_user
   end
 
-  # rubocop:todo Naming/MemoizedInstanceVariableName
   def set_action_page
     @action_page ||= ActionPage.find_by(id: params[:action_id])
   end
-  # rubocop:enable Naming/MemoizedInstanceVariableName
 
   def create_newsletter_subscription
     if params[:subscribe] && EmailValidator.valid?(params[:subscription][:email])

app/controllers/users_controller.rb

@@ -21,9 +21,7 @@ def update
   end
 
   def clear_activity
-    # rubocop:todo Rails/SkipsModelValidations
     current_user.events.update_all(user_id: nil)
-    # rubocop:enable Rails/SkipsModelValidations
     redirect_to user_path
   end
 

app/helpers/action_page_helper.rb

@@ -66,9 +66,9 @@ def parse_email_text(options = {})
     name = html_escape(options[:name])
 
     email_text
-      .gsub(/\$TITLE/, title)
-      .gsub(/\$URL/, url)
-      .gsub(/\$NAME/, name)
+      .gsub("$TITLE", title)
+      .gsub("$URL", url)
+      .gsub("$NAME", name)
   end
 
   def visible_partners

app/helpers/application_helper.rb

@@ -110,7 +110,7 @@ def messages
     safe_join(messages)
   end
 
-  def percentage(x, y, precision: 0) # rubocop:todo Naming/MethodParameterName
+  def percentage(x, y, precision: 0)
     return "-" unless y > 0
 
     number_to_percentage((x / y.to_f) * 100, precision: precision)

app/mailers/user_mailer.rb

@@ -4,15 +4,13 @@ class UserMailer < ActionMailer::Base
   layout "email"
   after_action :check_bounces
 
-  # rubocop:todo Naming/MethodParameterName
   def thanks_message(email, actionPage, options = {})
     @email = email
     @user = options[:user]
     @actionPage = actionPage
     @name = options[:name].presence || "Friend of Digital Freedom"
     mail(to: email, subject: "Thanks for taking action")
   end
-  # rubocop:enable Naming/MethodParameterName
 
   def signup_attempt_with_existing_email(user, _options = {})
     @user = user

app/models/action_institution.rb

@@ -1,4 +1,4 @@
-class ActionInstitution < ActiveRecord::Base
+class ActionInstitution < ApplicationRecord
   belongs_to :institution
   belongs_to :action_page
 

app/models/action_page.rb

@@ -1,4 +1,4 @@
-class ActionPage < ActiveRecord::Base
+class ActionPage < ApplicationRecord
   extend AmazonCredentials
   extend FriendlyId
 
@@ -36,13 +36,11 @@ class ActionPage < ActiveRecord::Base
   belongs_to :congress_message_campaign
   belongs_to :call_campaign
   belongs_to :category, optional: true
-  # rubocop:todo Rails/InverseOf
   belongs_to :active_action_page_for_redirect, class_name: "ActionPage",
                                                foreign_key: "archived_redirect_action_page_id"
-  # rubocop:enable Rails/InverseOf
-  # rubocop:todo Rails/InverseOf
+
   belongs_to :author, class_name: "User", foreign_key: :user_id, optional: true
-  # rubocop:enable Rails/InverseOf
+
 
   accepts_nested_attributes_for :tweet, :petition, :email_campaign,
                                 :call_campaign, :congress_message_campaign, :affiliation_types, :partnerships,
@@ -151,13 +149,11 @@ def image
     [og_image, background_image, featured_image].find(&:present?)
   end
 
-  # rubocop:todo Naming/MemoizedInstanceVariableName
   def actions_taken_percent
     return 0 if view_count == 0
 
     @percent ||= (action_count / view_count.to_f) * 100
   end
-  # rubocop:enable Naming/MemoizedInstanceVariableName
 
   def status
     if archived?

app/models/affiliation.rb

@@ -1,4 +1,4 @@
-class Affiliation < ActiveRecord::Base
+class Affiliation < ApplicationRecord
   belongs_to :action_page
   belongs_to :signature
   belongs_to :affiliation_type

app/models/affiliation_type.rb

@@ -1,4 +1,4 @@
-class AffiliationType < ActiveRecord::Base
+class AffiliationType < ApplicationRecord
   belongs_to :action_page
   has_many :affiliations
 end

app/models/ahoy/event.rb

@@ -1,5 +1,5 @@
 module Ahoy
-  class Event < ActiveRecord::Base
+  class Event < ApplicationRecord
     self.table_name = "ahoy_events"
 
     belongs_to :visit

app/models/application_record.rb

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

app/models/bounce.rb

@@ -1,2 +1,2 @@
-class Bounce < ActiveRecord::Base
+class Bounce < ApplicationRecord
 end