Refactor email_validator

Author: constantine-nikolaou

app/validators/email_validator.rb

@@ -1,25 +1,15 @@
 class EmailValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    record.errors[attribute] << email_invalid_error_message unless email_valid?(value)
-
-    record.errors[attribute] << email_contains_dots_error_message unless handle_contains_number_of_dots(value)
-
-    record.errors[attribute] << email_ends_with_dot_error_message unless handle_last_character_is_not_dot(value)
+    unless (email_valid?(value) && handle_contains_number_of_dots(value) && handle_last_character_is_not_dot(value))
+      record.errors[attribute] << email_invalid_error_message
+    end
   end
 
   private
 
   def email_invalid_error_message
     # options[:message] || I18n.t('errors.messages.email')
-    (options[:message] || "must be a valid email address")
-  end
-
-  def email_contains_dots_error_message
-    (options[:message] || "must contain fewer dots")
-  end
-
-  def email_ends_with_dot_error_message
-    (options[:message] || "must not end with a dot")
+    (options[:message] || 'must be a valid email address')
   end
 
   def email_valid?(email_address)
@@ -32,13 +22,13 @@ def handle_contains_number_of_dots(email_address)
     return true if email_address.blank?
 
     email_handle = email_address.split('@')
-    email_handle[0].count('.') < 3 if (email_handle && !email_handle.blank?)
+    email_handle[0].count('.') < 3 if email_handle && !email_handle.blank?
   end
 
   def handle_last_character_is_not_dot(email_address)
     return true if email_address.blank?
 
     email_handle = email_address.split('@')
-    email_handle[0][-1] != "." if (email_handle && !email_handle.blank?)
+    email_handle[0][-1] != '.' if email_handle && !email_handle.blank?
   end
 end

spec/requests/registrations_spec.rb

@@ -63,7 +63,7 @@
         click_on('Join us')
 
         expect(page).to have_content("2 errors prohibited this user from being saved")
-        expect(page).to have_content("Email is invalid")
+        expect(page).to have_content("must be a valid email address")
       end
 
       it "email address contains uncommon number of characters" do
@@ -74,7 +74,7 @@
         click_on('Join us')
 
         expect(page).to have_content("1 error prohibited this user from being saved")
-        expect(page).to have_content("must contain fewer dots")
+        expect(page).to have_content("must be a valid email address")
       end
 
       it "email address handle ends with a dot" do
@@ -85,7 +85,7 @@
         click_on('Join us')
 
         expect(page).to have_content("1 error prohibited this user from being saved")
-        expect(page).to have_content("must not end with a dot")
+        expect(page).to have_content("must be a valid email address")
       end
     end
   end