diff --git a/.rubocop.yml b/.rubocop.yml index f4187dbb5..5add6e26a 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -2,7 +2,6 @@ require: - rubocop-performance - rubocop-rails - rubocop-rspec - - ./lib/rubocop/user_find_by.rb Layout/LineLength: Max: 150 @@ -141,10 +140,6 @@ RSpec/MultipleExpectations: RSpec/MultipleMemoizedHelpers: Max: 14 -# custom rules -UseFromEmail: - Enabled: true - AllCops: NewCops: enable Exclude: diff --git a/app/models/contact.rb b/app/models/contact.rb index 07b29fdf3..1e9ab8dc6 100644 --- a/app/models/contact.rb +++ b/app/models/contact.rb @@ -168,9 +168,7 @@ class Contact < ApplicationRecord end def self.from_email(email) - # rubocop:disable UseFromEmail,Migration/DepartmentName find_by(email: email.downcase) - # rubocop:enable UseFromEmail,Migration/DepartmentName end private diff --git a/app/models/user.rb b/app/models/user.rb index b54f74a64..3fdaf7f25 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -157,9 +157,7 @@ class User < ApplicationRecord end def self.from_email(email) - # rubocop:disable UseFromEmail,Migration/DepartmentName find_by(email: email.downcase) - # rubocop:enable UseFromEmail,Migration/DepartmentName end private diff --git a/lib/rubocop/user_find_by.rb b/lib/rubocop/user_find_by.rb deleted file mode 100644 index 0bc248c27..000000000 --- a/lib/rubocop/user_find_by.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'rubocop' - -# Enforces use of from_email for email attribute lookups -class UseFromEmail < RuboCop::Cop::Cop - MSG = 'Use `from_email` for email lookups to ensure case insensitivity.'.freeze - - def_node_matcher :find_by_email?, <<~PATTERN - (send _ :find_by (hash (pair (sym :email) _))) - PATTERN - - def on_send(node) - return unless find_by_email?(node) - - add_offense(node, message: MSG) - end -end