Skip to content

Commit

Permalink
refactore: add string template for api url
Browse files Browse the repository at this point in the history
  • Loading branch information
u8slvn committed Dec 21, 2018
1 parent 98260dc commit 05af973
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
api:
url: https://api.transilien.com/gare/{departure_station}/depart/{arrival_station}
url: https://api.transilien.com/gare/${departure_station}/depart/${arrival_station}
departure_station: 00000000
arrival_station: 00000000
user: user
Expand Down
6 changes: 4 additions & 2 deletions rerwatcher/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"""

from datetime import datetime
from string import Template

import requests
from lxml import etree
Expand Down Expand Up @@ -66,7 +67,7 @@ class TransilienApi:
'encoding'.
Attributes:
_url (str): https://api.transilien.com/gare/{departure_station}/depart/{arrival_station}
_url (str): https://api.transilien.com/gare/${departure_station}/depart/${arrival_station}
_auth (HTTPBasicAuth): the basic authentication built with the
user and password config params.
_date_format (str): '%d/%m/%Y %H:%M'
Expand All @@ -75,7 +76,8 @@ class TransilienApi:
"""

def __init__(self, config):
self._url = config['api']['url'].format(
url_template = Template(config['api']['url'])
self._url = url_template.substitute(
departure_station=config['api']['departure_station'],
arrival_station=config['api']['arrival_station']
)
Expand Down
2 changes: 1 addition & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
def fake_config():
return {
"api": {
"url": 'https://test.url/{departure_station}/depart/{arrival_station}',
"url": 'https://test.url/${departure_station}/depart/${arrival_station}',
"departure_station": 123,
"arrival_station": 321,
"user": 'user',
Expand Down
3 changes: 2 additions & 1 deletion tests/test_rerwatcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# coding: utf-8

import os
from string import Template
from unittest.mock import patch

from requests.auth import HTTPBasicAuth
Expand Down Expand Up @@ -29,7 +30,7 @@ def test_build_rer_watcher_return_app(load_config, fake_config):
assert isinstance(app, RerWatcher)
assert app._refresh_time == fake_config['refresh_time']['default']
assert isinstance(app._api, TransilienApi)
assert app._api._url == fake_config['api']['url'].format(
assert app._api._url == Template(fake_config['api']['url']).substitute(
departure_station=fake_config['api']['departure_station'],
arrival_station=fake_config['api']['arrival_station'],
)
Expand Down

0 comments on commit 05af973

Please sign in to comment.