Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update exercise-1.py #36

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions exercise-1.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,31 @@
Poniżej przedstawiono klasę Person, która reprezentuje pojedynczą osobę - jej
imię, nazwisko oraz adres mailowy. Jest to przykład złamania tej zasady,
ponieważ w środku niej znajduje się walidacja adresu email.

Jako ćwiczenie, spróbuj zrefaktoryzować ten kod tak, aby sama walidacja znalazła
się w osobnej klasie reprezentującej adres email.
"""

import re
import unittest

class Email:
def __init__(self):
self.email_pattern = re.compile(r'^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$')

EMAIL_PATTERN = re.compile(r'^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$')

def validate_email(self, email):
if self.email_pattern.match(email) is None:
raise ValueError('Invalid email')
else:
return email

class Person:
def __init__(self, first_name, last_name, email):
assert isinstance(first_name, str)
assert isinstance(last_name, str)
assert isinstance(email, str)

email_class = Email()

self.first_name = first_name
self.last_name = last_name
if EMAIL_PATTERN.match(email) is None:
raise ValueError('Invalid email')
else:
self.email = email
self.email = email_class.email_validation(email)