summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/contact.rb16
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/contact.rb b/lib/contact.rb
index cb9a6e9..d5fd267 100644
--- a/lib/contact.rb
+++ b/lib/contact.rb
@@ -35,12 +35,12 @@ class Contact
@errors << "Du må oppgi poststed."
end
- if @phone.nil? || @phone.strip.empty?
- @errors << "Du må oppgi et telefonnummer"
+ unless valid_phone?
+ @errors << "Telefonnummer mangler eller er ugyldig"
end
- if @email.nil? || @email.strip.empty?
- @errors << "Du må oppgi en epostadresse"
+ unless valid_email?
+ @errors << "E-postadresse mangler eller er ugyldig"
end
@errors
@@ -51,4 +51,12 @@ class Contact
def valid_postcode
@postcode && @postcode =~ /^\d{4}$/
end
+
+ def valid_email?
+ @email && @email =~ /^[A-Z0-9._%+-]+@(?:[A-Z0-9-]{1,63}\.)+[A-Z]{2,}$/i
+ end
+
+ def valid_phone?
+ @phone && @phone =~ /^\+*[0-9- ]{8,}$/
+ end
end