Enable some Rails cops

app/controllers/admin/gestionnaires_controller.rb

@@ -19,7 +19,7 @@ class Admin::GestionnairesController < AdminController
 
   def create
     email = params[:gestionnaire][:email].downcase
-    @gestionnaire = Gestionnaire.find_by_email(email)
+    @gestionnaire = Gestionnaire.find_by(email: email)
     procedure_id = params[:procedure_id]
 
     if @gestionnaire.nil?

app/controllers/admin/procedures_controller.rb

@@ -132,7 +132,7 @@ class Admin::ProceduresController < AdminController
       return redirect_to admin_procedures_path
     end
 
-    procedure_path = ProcedurePath.find_by_path(params[:procedure_path])
+    procedure_path = ProcedurePath.find_by(path: params[:procedure_path])
     if procedure_path
       if procedure_path.administrateur_id == current_administrateur.id
         procedure_path.procedure.archive
@@ -154,7 +154,7 @@ class Admin::ProceduresController < AdminController
   end
 
   def transfer
-    admin = Administrateur.find_by_email(params[:email_admin].downcase)
+    admin = Administrateur.find_by(email: params[:email_admin].downcase)
 
     if admin.nil?
       render '/admin/procedures/transfer', formats: 'js', status: 404

app/controllers/api_controller.rb

@@ -13,7 +13,7 @@ class APIController < ApplicationController
   end
 
   def current_administrateur
-    @administrateur ||= Administrateur.find_by_api_token(params[:token])
+    @administrateur ||= Administrateur.find_by(api_token: params[:token])
   end
 
   def default_format_json

app/controllers/invites_controller.rb

@@ -9,7 +9,7 @@ class InvitesController < ApplicationController
 
     email = params[:email].downcase
 
-    user = User.find_by_email(email)
+    user = User.find_by(email: email)
     invite = class_var.create(dossier: dossier, user: user, email: email, email_sender: email_sender)
 
     if invite.valid?

app/controllers/new_gestionnaire/avis_controller.rb

@@ -13,7 +13,7 @@ module NewGestionnaire
       @avis_a_donner = gestionnaire_avis.without_answer
       @avis_donnes = gestionnaire_avis.with_answer
 
-      @statut = params[:statut].present? ? params[:statut] : A_DONNER_STATUS
+      @statut = params[:statut].presence || A_DONNER_STATUS
 
       @avis = case @statut
       when A_DONNER_STATUS

app/controllers/new_gestionnaire/procedures_controller.rb

@@ -76,7 +76,7 @@ module NewGestionnaire
         filtered_sorted_ids = sorted_ids
       end
 
-      page = params[:page].present? ? params[:page] : 1
+      page = params[:page].presence || 1
 
       filtered_sorted_paginated_ids = Kaminari
         .paginate_array(filtered_sorted_ids)
@@ -187,7 +187,7 @@ module NewGestionnaire
     private
 
     def statut
-      @statut ||= params[:statut].present? ? params[:statut] : 'a-suivre'
+      @statut ||= (params[:statut].presence || 'a-suivre')
     end
 
     def procedure

app/controllers/stats_controller.rb

@@ -170,7 +170,7 @@ class StatsController < ApplicationController
   end
 
   def avis_usage
-    [3.week.ago, 2.week.ago, 1.week.ago].map do |min_date|
+    [3.weeks.ago, 2.weeks.ago, 1.week.ago].map do |min_date|
       max_date = min_date + 1.week
 
       weekly_dossiers = Dossier.includes(:avis).where(created_at: min_date..max_date).to_a
@@ -189,7 +189,7 @@ class StatsController < ApplicationController
   end
 
   def avis_average_answer_time
-    [3.week.ago, 2.week.ago, 1.week.ago].map do |min_date|
+    [3.weeks.ago, 2.weeks.ago, 1.week.ago].map do |min_date|
       max_date = min_date + 1.week
 
       average = Avis.with_answer
@@ -203,7 +203,7 @@ class StatsController < ApplicationController
   end
 
   def avis_answer_percentages
-    [3.week.ago, 2.week.ago, 1.week.ago].map do |min_date|
+    [3.weeks.ago, 2.weeks.ago, 1.week.ago].map do |min_date|
       max_date = min_date + 1.week
 
       weekly_avis = Avis.where(created_at: min_date..max_date)
@@ -222,7 +222,7 @@ class StatsController < ApplicationController
   end
 
   def motivation_usage_dossier
-    [3.week.ago, 2.week.ago, 1.week.ago].map do |date|
+    [3.weeks.ago, 2.weeks.ago, 1.week.ago].map do |date|
       min_date = date.beginning_of_week
       max_date = date.end_of_week
 
@@ -241,7 +241,7 @@ class StatsController < ApplicationController
   end
 
   def motivation_usage_procedure
-    [3.week.ago, 2.week.ago, 1.week.ago].map do |date|
+    [3.weeks.ago, 2.weeks.ago, 1.week.ago].map do |date|
       min_date = date.beginning_of_week
       max_date = date.end_of_week
 

app/controllers/users/description_controller.rb

@@ -88,7 +88,7 @@ class Users::DescriptionController < UsersController
       flash.notice = 'Nouveaux fichiers envoyés' if flash.alert.nil?
     end
 
-    return redirect_to users_dossiers_invite_path(id: current_user.invites.find_by_dossier_id(@dossier.id).id) if invite
+    return redirect_to users_dossiers_invite_path(id: current_user.invites.find_by(dossier_id: @dossier.id).id) if invite
 
     redirect_to users_dossier_recapitulatif_path
   end

app/controllers/users/dossiers/invites_controller.rb

@@ -1,7 +1,7 @@
 class Users::Dossiers::InvitesController < UsersController
   def authenticate_user!
     session["user_return_to"] = request.fullpath
-    return redirect_to new_user_registration_path(user_email: params[:email]) if params[:email].present? && User.find_by_email(params[:email]).nil?
+    return redirect_to new_user_registration_path(user_email: params[:email]) if params[:email].present? && User.find_by(email: params[:email]).nil?
 
     super
   end

app/decorators/entreprise_decorator.rb

@@ -2,7 +2,7 @@ class EntrepriseDecorator < Draper::Decorator
   delegate_all
 
   def raison_sociale_or_name
-    raison_sociale.blank? ? "#{nom} #{prenom}" : raison_sociale
+    raison_sociale.presence || "#{nom} #{prenom}"
   end
 
   def effectif

app/models/administrateur.rb

@@ -1,4 +1,4 @@
-class Administrateur < ActiveRecord::Base
+class Administrateur < ApplicationRecord
   devise :database_authenticatable, :registerable,
     :recoverable, :rememberable, :trackable, :validatable
 

app/models/administration.rb

@@ -1,4 +1,4 @@
-class Administration < ActiveRecord::Base
+class Administration < ApplicationRecord
   # Include default devise modules. Others available are:
   # :confirmable, :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, :rememberable, :trackable, :validatable, :omniauthable, omniauth_providers: [:github]

app/models/assign_to.rb

@@ -1,4 +1,4 @@
-class AssignTo < ActiveRecord::Base
+class AssignTo < ApplicationRecord
   belongs_to :procedure
   belongs_to :gestionnaire
   has_one :procedure_presentation, dependent: :destroy

app/models/cadastre.rb

@@ -1,4 +1,4 @@
-class Cadastre < ActiveRecord::Base
+class Cadastre < ApplicationRecord
   belongs_to :dossier, touch: true
 
   def geometry

app/models/cerfa.rb

@@ -1,4 +1,4 @@
-class Cerfa < ActiveRecord::Base
+class Cerfa < ApplicationRecord
   belongs_to :dossier, touch: true
   belongs_to :user
 

app/models/champ.rb

@@ -1,4 +1,4 @@
-class Champ < ActiveRecord::Base
+class Champ < ApplicationRecord
   self.inheritance_column = :_type_disabled
 
   belongs_to :dossier, touch: true

app/models/commentaire.rb

@@ -1,4 +1,4 @@
-class Commentaire < ActiveRecord::Base
+class Commentaire < ApplicationRecord
   belongs_to :dossier, touch: true
   belongs_to :champ
   belongs_to :piece_justificative
@@ -6,7 +6,7 @@ class Commentaire < ActiveRecord::Base
   mount_uploader :file, CommentaireFileUploader
   validates :file, file_size: { maximum: 20.megabytes, message: "La taille du fichier doit être inférieure à 20 Mo" }
   validate :is_virus_free?
-  validates_presence_of :body, message: "Votre message ne peut être vide"
+  validates :body, presence: { message: "Votre message ne peut être vide" }
 
   default_scope { order(created_at: :asc) }
   scope :updated_since?, -> (date) { where('commentaires.updated_at > ?', date) }

app/models/dossier.rb

@@ -1,4 +1,4 @@
-class Dossier < ActiveRecord::Base
+class Dossier < ApplicationRecord
   enum state: {
     brouillon:       'brouillon',
     en_construction: 'en_construction',

app/models/drop_down_list.rb

@@ -1,4 +1,4 @@
-class DropDownList < ActiveRecord::Base
+class DropDownList < ApplicationRecord
   belongs_to :type_de_champ
 
   def options

app/models/entreprise.rb

@@ -1,10 +1,10 @@
-class Entreprise < ActiveRecord::Base
+class Entreprise < ApplicationRecord
   belongs_to :dossier
   has_one :etablissement, dependent: :destroy
   has_one :rna_information, dependent: :destroy
 
-  validates_presence_of :siren
-  validates_uniqueness_of :dossier_id
+  validates :siren, presence: true
+  validates :dossier_id, uniqueness: true
 
   accepts_nested_attributes_for :rna_information
 

app/models/etablissement.rb

@@ -1,4 +1,4 @@
-class Etablissement < ActiveRecord::Base
+class Etablissement < ApplicationRecord
   belongs_to :dossier
   belongs_to :entreprise
 
@@ -7,7 +7,7 @@ class Etablissement < ActiveRecord::Base
   accepts_nested_attributes_for :exercices
   accepts_nested_attributes_for :entreprise
 
-  validates_uniqueness_of :dossier_id
+  validates :dossier_id, uniqueness: true
 
   def geo_adresse
     [numero_voie, type_voie, nom_voie, complement_adresse, code_postal, localite].join(' ')

app/models/exercice.rb

@@ -1,4 +1,4 @@
-class Exercice < ActiveRecord::Base
+class Exercice < ApplicationRecord
   belongs_to :etablissement
 
   validates :ca, presence: true, allow_blank: false, allow_nil: false

app/models/follow.rb

@@ -1,8 +1,8 @@
-class Follow < ActiveRecord::Base
+class Follow < ApplicationRecord
   belongs_to :gestionnaire
   belongs_to :dossier
 
-  validates_uniqueness_of :gestionnaire_id, :scope => :dossier_id
+  validates :gestionnaire_id, uniqueness: { scope: :dossier_id }
 
   before_create :set_default_date
 

app/models/france_connect_information.rb

@@ -1,4 +1,4 @@
-class FranceConnectInformation < ActiveRecord::Base
+class FranceConnectInformation < ApplicationRecord
   belongs_to :user
 
   validates :france_connect_particulier_id, presence: true, allow_blank: false, allow_nil: false

app/models/gestionnaire.rb

@@ -1,4 +1,4 @@
-class Gestionnaire < ActiveRecord::Base
+class Gestionnaire < ApplicationRecord
   devise :database_authenticatable, :registerable,
     :recoverable, :rememberable, :trackable, :validatable
 

app/models/individual.rb

@@ -1,7 +1,7 @@
-class Individual < ActiveRecord::Base
+class Individual < ApplicationRecord
   belongs_to :dossier
 
-  validates_uniqueness_of :dossier_id
+  validates :dossier_id, uniqueness: true
   validates :gender, presence: true, allow_nil: false, on: :update
   validates :nom, presence: true, allow_blank: false, allow_nil: false, on: :update
   validates :prenom, presence: true, allow_blank: false, allow_nil: false, on: :update

app/models/invite.rb

@@ -1,9 +1,9 @@
-class Invite < ActiveRecord::Base
+class Invite < ApplicationRecord
   belongs_to :dossier
   belongs_to :user
 
-  validates_presence_of :email
-  validates_uniqueness_of :email, :scope => :dossier_id
+  validates :email, presence: true
+  validates :email, uniqueness: { scope: :dossier_id }
 
   validates :email, email_format: true
 end

app/models/module_api_carto.rb

@@ -1,4 +1,4 @@
-class ModuleAPICarto < ActiveRecord::Base
+class ModuleAPICarto < ApplicationRecord
   belongs_to :procedure
 
   validates :use_api_carto, presence: true, allow_blank: true, allow_nil: false

app/models/piece_justificative.rb

@@ -1,4 +1,4 @@
-class PieceJustificative < ActiveRecord::Base
+class PieceJustificative < ApplicationRecord
   belongs_to :dossier, touch: true
   belongs_to :type_de_piece_justificative
   has_one :commentaire

app/models/procedure.rb

@@ -1,4 +1,4 @@
-class Procedure < ActiveRecord::Base
+class Procedure < ApplicationRecord
   has_many :types_de_piece_justificative, -> { order "order_place ASC" }, dependent: :destroy
   has_many :types_de_champ, -> { public_only }, dependent: :destroy
   has_many :types_de_champ_private, -> { private_only }, class_name: 'TypeDeChamp', dependent: :destroy

app/models/procedure_path.rb

@@ -1,4 +1,4 @@
-class ProcedurePath < ActiveRecord::Base
+class ProcedurePath < ApplicationRecord
   validates :path, format: { with: /\A[a-z0-9_\-]{3,50}\z/ }, presence: true, allow_blank: false, allow_nil: false
   validates :administrateur_id, presence: true, allow_blank: false, allow_nil: false
   validates :procedure_id, presence: true, allow_blank: false, allow_nil: false

app/models/procedure_presentation.rb

@@ -1,4 +1,4 @@
-class ProcedurePresentation < ActiveRecord::Base
+class ProcedurePresentation < ApplicationRecord
   belongs_to :assign_to
 
   def displayed_fields

app/models/quartier_prioritaire.rb

@@ -1,4 +1,4 @@
-class QuartierPrioritaire < ActiveRecord::Base
+class QuartierPrioritaire < ApplicationRecord
   belongs_to :dossier, touch: true
 
   def geometry

app/models/rna_information.rb

@@ -1,4 +1,4 @@
-class RNAInformation < ActiveRecord::Base
+class RNAInformation < ApplicationRecord
   belongs_to :entreprise
 
   validates :association_id, presence: true, allow_blank: false, allow_nil: false

app/models/search.rb

@@ -1,7 +1,7 @@
 # See:
 # - https://robots.thoughtbot.com/implementing-multi-table-full-text-search-with-postgres
 # - http://calebthompson.io/talks/search.html
-class Search < ActiveRecord::Base
+class Search < ApplicationRecord
   # :nodoc:
   #
   # Englobs a search result (actually a collection of Search objects) so it acts

app/models/siret.rb

@@ -4,7 +4,7 @@ class Siret
 
   attr_accessor :siret
 
-  validates_presence_of :siret
+  validates :siret, presence: true
   validates :siret, siret_format: true
 
   before_validation :remove_whitespace

app/models/type_de_champ.rb

@@ -1,4 +1,4 @@
-class TypeDeChamp < ActiveRecord::Base
+class TypeDeChamp < ApplicationRecord
   self.inheritance_column = :_type_disabled
 
   enum type_champs: {

app/models/type_de_piece_justificative.rb

@@ -1,4 +1,4 @@
-class TypeDePieceJustificative < ActiveRecord::Base
+class TypeDePieceJustificative < ApplicationRecord
   has_many :pieces_justificatives, dependent: :destroy
 
   belongs_to :procedure

app/models/user.rb

@@ -1,4 +1,4 @@
-class User < ActiveRecord::Base
+class User < ApplicationRecord
   enum loged_in_with_france_connect: {
     particulier: 'particulier',
     entreprise: 'entreprise'
@@ -21,7 +21,7 @@ class User < ActiveRecord::Base
   include CredentialsSyncableConcern
 
   def self.find_for_france_connect email, siret
-    user = User.find_by_email(email)
+    user = User.find_by(email: email)
     if user.nil?
       return User.create(email: email, password: Devise.friendly_token[0, 20], siret: siret)
     else

app/services/staging_auth_service.rb

@@ -1,5 +1,5 @@
 class StagingAuthService
-  CONFIG_PATH = Rails.root.join("config/basic_auth.yml")
+  CONFIG_PATH = Rails.root.join("config", "basic_auth.yml")
 
   def self.authenticate(username, password)
     if enabled?

app/uploaders/attestation_template_logo_uploader.rb

@@ -1,6 +1,6 @@
 class AttestationTemplateLogoUploader < BaseUploader
   def root
-    File.join(Rails.root, 'public')
+    Rails.root.join("public")
   end
 
   # Choose what kind of storage to use for this uploader:

app/uploaders/attestation_template_signature_uploader.rb

@@ -1,6 +1,6 @@
 class AttestationTemplateSignatureUploader < BaseUploader
   def root
-    File.join(Rails.root, 'public')
+    Rails.root.join("public")
   end
 
   # Choose what kind of storage to use for this uploader:

app/uploaders/attestation_uploader.rb

@@ -1,6 +1,6 @@
 class AttestationUploader < BaseUploader
   def root
-    File.join(Rails.root, 'public')
+    Rails.root.join("public")
   end
 
   # Choose what kind of storage to use for this uploader:

app/uploaders/commentaire_file_uploader.rb

@@ -1,6 +1,6 @@
 class CommentaireFileUploader < BaseUploader
   def root
-    File.join(Rails.root, 'public')
+    Rails.root.join("public")
   end
 
   if Features.remote_storage

app/uploaders/local_downloader.rb

@@ -1,7 +1,7 @@
 require 'securerandom'
 
 class LocalDownloader
-  BASE_PATH_DISK = File.join(Rails.root, "public/downloads/")
+  BASE_PATH_DISK = Rails.root.join("public", "downloads")
 
   def initialize(filename, filename_suffix = '')
     @filename = filename.to_s

app/uploaders/procedure_logo_uploader.rb

@@ -1,6 +1,6 @@
 class ProcedureLogoUploader < BaseUploader
   def root
-    File.join(Rails.root, "public")
+    Rails.root.join("public")
   end
 
   # Choose what kind of storage to use for this uploader: