827 : emails validation in person

app/models/person.rb

@@ -23,6 +23,8 @@ class Person < ApplicationRecord
   accepts_nested_attributes_for :location
 
   validate :preferred_contact_method_present!
+  validates :email, email: true
+  validates :email_2, email: true
 
   def name_and_email
     "#{name} (#{email})"

app/validators/email_validator.rb

@@ -0,0 +1,8 @@
+class EmailValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    return if value.nil? || value.strip.empty?
+    unless /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i.match?(value)
+      record.errors.add attribute, (options[:message] || "is not valid")
+    end
+  end
+end

spec/models/person_spec.rb

@@ -24,6 +24,20 @@
     end
   end
 
+  describe 'email validation' do
+    let(:contact_method) { build :contact_method, name: 'Email', field: 'email' }
+    subject(:person) { build :person, preferred_contact_method: contact_method, email: 'test@missingtld' }
+
+    context 'when the email field is not valid' do
+      it { is_expected.not_to be_valid }
+
+      it 'generates an error on the correct field' do
+        person.valid?
+        expect(person.errors.messages).to eq({email: ['is not valid']})
+      end
+    end
+  end
+
   describe "#anonymized_name_and_email" do
     it "returns blank if name and email are empty" do
       person = build(:person, name: nil, email: nil)