From 582cc9a2d170ae9a5332dff41a73452ba8c28a4f Mon Sep 17 00:00:00 2001 From: "Brian S. Stephan" Date: Sun, 15 Mar 2020 18:52:49 -0500 Subject: [PATCH] rename: page_file_resolver -> resolve_page_file --- incorporealcms/pages.py | 4 ++-- tests/test_pages.py | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/incorporealcms/pages.py b/incorporealcms/pages.py index 41a0d5a..58274e0 100644 --- a/incorporealcms/pages.py +++ b/incorporealcms/pages.py @@ -17,7 +17,7 @@ md = markdown.Markdown(extensions=['meta']) @bp.route('/') def display_page(path): """Get the file contents of the requested path and render the file.""" - resolved_path = page_file_resolver(path) + resolved_path = resolve_page_file(path) logger.debug("received request for path '%s', resolved to '%s'", path, resolved_path) try: with app.open_instance_resource(resolved_path, 'r') as entry_file: @@ -34,7 +34,7 @@ def display_page(path): return render_template('base.html', title=title, content=content, mtime=mtime.strftime('%Y-%m-%d %H:%M:%S %Z')) -def page_file_resolver(path): +def resolve_page_file(path): """Manipulate the request path to find appropriate page file. * convert dir requests to index files diff --git a/tests/test_pages.py b/tests/test_pages.py index 56e1e51..1179f3d 100644 --- a/tests/test_pages.py +++ b/tests/test_pages.py @@ -1,19 +1,19 @@ """Test page views and helper methods.""" import re -from incorporealcms.pages import page_file_resolver +from incorporealcms.pages import resolve_page_file -def test_page_file_resolver_dir_to_index(): - assert page_file_resolver('foo/') == 'pages/foo/index.md' +def test_resolve_page_file_dir_to_index(): + assert resolve_page_file('foo/') == 'pages/foo/index.md' -def test_page_file_resolver_subdir_to_index(): - assert page_file_resolver('foo/bar/') == 'pages/foo/bar/index.md' +def test_resolve_page_file_subdir_to_index(): + assert resolve_page_file('foo/bar/') == 'pages/foo/bar/index.md' -def test_page_file_resolver_other_requests_fine(): - assert page_file_resolver('foo/baz') == 'pages/foo/baz.md' +def test_resolve_page_file_other_requests_fine(): + assert resolve_page_file('foo/baz') == 'pages/foo/baz.md' def test_page_that_exists(client):