diff options
author | Rémy Coutable <remy@rymai.me> | 2016-10-24 10:58:03 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-10-24 10:58:03 +0000 |
commit | 5bd4bee00fd1c5bd0bbccd330bf10fd9edc5e742 (patch) | |
tree | fb1acc7062e342d075fb9888d787202f15d9e878 | |
parent | ed256037427f1a9b92fabe430e392e600720a29f (diff) | |
parent | b1ce2eb1e5f6a4a5b413381489fbb7e63ff3e1e5 (diff) | |
download | gitlab-ce-5bd4bee00fd1c5bd0bbccd330bf10fd9edc5e742.tar.gz |
Merge branch 'remove-callback' into 'master'
This MR removes AR before_validation callback in favor setter.
## Why was this MR needed?
Because setters is good practice to normalize model attributes instead AR callbacks. Because new object should be valid right after initialization.
If it MR interested I can try to find other places where we can use setters.
See merge request !6763
-rw-r--r-- | CHANGELOG.md | 1 | ||||
-rw-r--r-- | app/models/email.rb | 6 | ||||
-rw-r--r-- | spec/models/email_spec.rb | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 909af5fc053..1191c6a592c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ Please view this file on the master branch, on stable branches it's out of date. - Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests method - Fix documents and comments on Build API `scope` + - Refactor email, use setter method instead AR callbacks for email attribute (Semyon Pupkov) ## 8.13.1 (unreleased) - Fix error in generating labels diff --git a/app/models/email.rb b/app/models/email.rb index 32a412ab878..826d4f16edb 100644 --- a/app/models/email.rb +++ b/app/models/email.rb @@ -7,10 +7,8 @@ class Email < ActiveRecord::Base validates :email, presence: true, uniqueness: true, email: true validate :unique_email, if: ->(email) { email.email_changed? } - before_validation :cleanup_email - - def cleanup_email - self.email = self.email.downcase.strip + def email=(value) + write_attribute(:email, value.downcase.strip) end def unique_email diff --git a/spec/models/email_spec.rb b/spec/models/email_spec.rb index d9df9e0f907..fe4de1b2afb 100644 --- a/spec/models/email_spec.rb +++ b/spec/models/email_spec.rb @@ -6,4 +6,9 @@ describe Email, models: true do subject { build(:email) } end end + + it 'normalize email value' do + expect(described_class.new(email: ' inFO@exAMPLe.com ').email) + .to eq 'info@example.com' + end end |