+ Seznam členů se nepodařilo načíst.
+
+
+ {% endif %}
diff --git a/pyvecorg/templating.py b/pyvecorg/templating.py
index bbd096d..28e26e7 100644
--- a/pyvecorg/templating.py
+++ b/pyvecorg/templating.py
@@ -2,10 +2,7 @@
import textwrap
import jinja2
-import requests
-from slugify import slugify
from markdown import markdown
-from flask import url_for
from pyvecorg import app
@@ -17,11 +14,6 @@ def convert_markdown(text):
return result
-@app.template_filter('avatar_url')
-def get_avatar_url(member):
- return url_for('avatar', name=slugify(member['name']))
-
-
@app.template_filter('url')
def normalize_url(url):
return re.sub(r'^https?://', '', url).rstrip('/')
diff --git a/pyvecorg/views.py b/pyvecorg/views.py
index 8827f2a..59ec717 100755
--- a/pyvecorg/views.py
+++ b/pyvecorg/views.py
@@ -1,15 +1,11 @@
import os
-import io
import platform
from datetime import datetime
-from flask import (request, render_template, redirect, url_for,
- send_from_directory, jsonify, abort, send_file)
-from slugify import slugify
-import requests
+from flask import (render_template, redirect, url_for, send_from_directory,
+ jsonify)
from pyvecorg import app
-from pyvecorg.avatars import get_avatar_url, create_thumbnail
from pyvecorg.data import load_data, select_language
@@ -41,20 +37,3 @@ def index(lang):
@app.route('//api.json')
def api(lang):
return jsonify(select_language(data, lang))
-
-
-@app.route('/static/img/avatars/.png')
-def avatar(name):
- try:
- member = [member for member in data['members']['entries']
- if slugify(member['name']) == name][0]
- except IndexError:
- abort(404)
-
- url = get_avatar_url(member)
- res = requests.get(url)
- res.raise_for_status()
- file = create_thumbnail(io.BytesIO(res.content), 100)
-
- return send_file(file, mimetype='image/png', as_attachment=True,
- attachment_filename=f'{name}.png')
diff --git a/tests/test_data.py b/tests/test_data.py
index 8de47a3..a4f28d0 100644
--- a/tests/test_data.py
+++ b/tests/test_data.py
@@ -9,7 +9,6 @@
from pyvecorg.data import (load_data, select_language,
DATA_PATH, SUPPORTED_LANGS)
-from pyvecorg.avatars import get_avatar_url
STATIC_PATH = os.path.join(DATA_PATH, '..', 'static')
@@ -63,54 +62,52 @@ def test_data_section_is_valid(section_name, section):
@pytest.mark.parametrize('member', [
- member for member in DATA['members']['entries']
+ member for member in DATA['members_list']['entries']
+ if member.get('email')
])
-def test_data_member_is_valid(member):
- assert member['role'] in list(DATA['members']['roles'].keys())
+def test_data_member_with_email_is_valid(member):
+ assert '@' in member['email']
- assert member.get('avatar')
- assert member['avatar'] in ('github', 'twitter', 'email')
- if member.get('email'):
- assert '@' in member['email']
- if member.get('linkedin'):
- assert not member['linkedin'].startswith('http')
- if member.get('github'):
- assert not member['github'].startswith('http')
- if member.get('twitter'):
- assert not member['twitter'].startswith('http')
- assert not member['twitter'].startswith('@')
+@pytest.mark.parametrize('member', [
+ member for member in DATA['members_list']['entries']
+ if member.get('linkedin')
+])
+def test_data_member_with_linkedin_is_valid(member):
+ assert not member['linkedin'].startswith('http')
@pytest.mark.parametrize('member', [
- member for member in DATA['members']['entries']
- if member.get('avatar') == 'github'
+ member for member in DATA['members_list']['entries']
+ if member.get('github')
])
-def test_data_member_has_valid_github_avatar(member):
- assert member.get('github')
- url = get_avatar_url(member)
- is_working_link(url)
+def test_data_member_with_github_is_valid(member):
+ assert not member['github'].startswith('http')
@pytest.mark.parametrize('member', [
- member for member in DATA['members']['entries']
- if member.get('avatar') == 'twitter'
+ member for member in DATA['members_list']['entries']
+ if member.get('twitter')
])
-def test_data_member_has_valid_twitter_avatar(member):
- assert member.get('twitter')
- url = get_avatar_url(member)
- is_working_link(url)
- assert 'default_profile' not in url
+def test_data_member_with_twitter_is_valid(member):
+ assert not member['twitter'].startswith('http')
+ assert not member['twitter'].startswith('@')
@pytest.mark.parametrize('member', [
- member for member in DATA['members']['entries']
- if member.get('avatar') == 'email'
+ member for member in DATA['members_list']['entries']
+ if member.get('role')
])
-def test_data_member_has_valid_gravatar(member):
- assert member.get('email')
- url = get_avatar_url(member)
- is_working_link(url)
+def test_data_member_with_role_is_valid(member):
+ assert member['role'] in list(DATA['members']['roles'].keys())
+
+
+@pytest.mark.parametrize('member', [
+ member for member in DATA['members_list']['entries']
+ if member.get('avatar')
+])
+def test_data_member_with_avatar_is_valid(member):
+ assert member['avatar'] in ('github', 'twitter', 'email')
@pytest.mark.parametrize('logo', frozenset(