Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add specs for BlackListedEmailValidator (#9651)

Browse source 
* Add specs for BlackListedEmailValidator

* Use instance variable
This commit is contained in:
ysksn 2018-12-29 15:23:44 +09:00 • committed by Eugen Rochko
parent 29484f6555
commit 05edec6917
2 changed files with 40 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/validators/blacklisted_email_validator.rb
View file

@ -2,31 +2,32 @@
class BlacklistedEmailValidator < ActiveModel::Validator
def validate(user)
user.errors.add(:email, I18n.t('users.invalid_email')) if blocked_email?(user.email)
@email = user.email
user.errors.add(:email, I18n.t('users.invalid_email')) if blocked_email?
end
private
def blocked_email?(value)
on_blacklist?(value) || not_on_whitelist?(value)
def blocked_email?
on_blacklist? || not_on_whitelist?
end
def on_blacklist?(value)
return true if EmailDomainBlock.block?(value)
def on_blacklist?
return true if EmailDomainBlock.block?(@email)
return false if Rails.configuration.x.email_domains_blacklist.blank?
domains = Rails.configuration.x.email_domains_blacklist.gsub('.', '\.')
regexp = Regexp.new("@(.+\\.)?(#{domains})", true)
value =~ regexp
@email =~ regexp
end
def not_on_whitelist?(value)
def not_on_whitelist?
return false if Rails.configuration.x.email_domains_whitelist.blank?
domains = Rails.configuration.x.email_domains_whitelist.gsub('.', '\.')
regexp = Regexp.new("@(.+\\.)?(#{domains})$", true)
value !~ regexp
@email !~ regexp
end
end