Skip to content
Merged
Show file tree
Hide file tree
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
22 changes: 22 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[run]
branch = true
omit =
'*/flask/*',
'*/click/*',
'*/jinja2/*',
'*/werkzeug/*',
'*/itsdangerous.py',
'*/markupsafe/*',
'config.py',
'tests.py'

source = .

[report]
show_missing = true
# skip_covered = true
exclude_lines =
if __name__ == .__main__.:

[html]
title = "pyGlialo Coverage Report"
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
language: python
python:
- "3.4"
- "3.5"
install:
- pip install -r requirements_tests.txt
- pip install coveralls
script:
script:
python tests.py
after_success:
coveralls
2 changes: 1 addition & 1 deletion config.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
meetup_api_key = 'no-api-key-provided'

URL_EVENTS = 'https://api.meetup.com/Python-Milano/events'
URL_RSVPS = 'https://api.meetup.com/2/rsvps?offset=0&format=json&event_id={id}&key=' + meetup_api_key
URL_RSVPS = 'https://api.meetup.com/Python-Milano/events/{id}/rsvps/?key=' + meetup_api_key
1 change: 0 additions & 1 deletion flask_pyGlialo.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ def spread_the_goodies():
def save_winner(name):
if name not in pyglialo.list_of_winners:
pyglialo.list_of_winners.append(name)
pyglialo.remove_rsvp(name)
return redirect(url_for('saved'))


Expand Down
18 changes: 6 additions & 12 deletions pyglialo.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,25 +38,19 @@ def load_meetup_data(self):

def extract_safe_winner(self):
self.winner = None
if self.event_rsvps and len(self.event_rsvps['results']):
lucky_number = random.randint(0, abs(len(self.event_rsvps['results']) - 1))
winner = self.event_rsvps['results'][lucky_number]
self.remove_rsvp(winner['member']['member_id'])
if self.event_rsvps and len(self.event_rsvps):
lucky_number = random.randint(0, abs(len(self.event_rsvps) - 1))
winner = self.event_rsvps[lucky_number]
self.event_rsvps.remove(winner)
if winner['response'] == 'yes':
self.winner = {
'name': winner['member']['name'],
'member_id': winner['member']['member_id'],
'photo_url': winner.get('member_photo', {}).get('photo_link', '/static/img/no_image.png')
'member_id': winner['member']['id'],
'photo_url': winner['member'].get('photo', {}).get('photo_link', '/static/img/no_image.png')
}
else:
self.extract_safe_winner()

def remove_rsvp(self, rsvp_id):
for idx, result in enumerate(self.event_rsvps['results']):
if rsvp_id == result['member']['member_id']:
self.event_rsvps['results'].pop(idx)
break

def save_winners_list(self):
file_date = datetime.datetime.now()
with open("winner_list_{}.txt".format(file_date.strftime("%Y-%m-%d")), "w") as out_file:
Expand Down
1 change: 1 addition & 0 deletions requirements_tests.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
coverage>4
coveralls>1
flake8>3
-r requirements.txt
Loading