Check for period immediately after @

SumOfUs · Nov 8, 2016 · 9d34cfa · 9d34cfa
1 parent 8cd5023
commit 9d34cfa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/services/form_validator.rb b/app/services/form_validator.rb
@@ -1,10 +1,13 @@
 # frozen_string_literal: true
+#
 class FormValidator
   MAX_LENGTH = {
     PARAGRAPH: 10_000,
     TEXT: 250
   }.freeze
 
+  EMAIL_REGEXP = /\A(?!.*\.{2})(?!.*@\.)(?!.*\.+@)[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,6}\z/i
+
   def initialize(params, form_elements = nil)
     @params = params.symbolize_keys
     @errors = Hash.new { |hash, key| hash[key] = [] }
@@ -98,9 +101,7 @@ def validate_postal(postal, form_element)
   end
 
   def is_email?(candidate)
-    /\A[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,6}\z/i =~ candidate &&
-      !(/\.\./ =~ candidate) && # Doesn't have two consecutive dots
-      !(/\A.*\.@/ =~ candidate) # Doesn't have a dot just before the @
+    !(EMAIL_REGEXP =~ candidate).nil?
   end
 
   def is_phone(candidate)

diff --git a/spec/services/form_validator_spec.rb b/spec/services/form_validator_spec.rb
@@ -124,6 +124,11 @@
           expect(subject).to_not be_valid
         end
 
+        it 'with a dot just after the @' do
+          params[:email] = 'this@.other.com'
+          expect(subject).to_not be_valid
+        end
+
         it 'with a two consecutive dots' do
           params[:email] = 'thi..s@other..com'
           expect(subject).to_not be_valid