rename: page_file_resolver -> resolve_page_file
This commit is contained in:
parent
5ce44ba31c
commit
582cc9a2d1
@ -17,7 +17,7 @@ md = markdown.Markdown(extensions=['meta'])
|
|||||||
@bp.route('/<path:path>')
|
@bp.route('/<path:path>')
|
||||||
def display_page(path):
|
def display_page(path):
|
||||||
"""Get the file contents of the requested path and render the file."""
|
"""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)
|
logger.debug("received request for path '%s', resolved to '%s'", path, resolved_path)
|
||||||
try:
|
try:
|
||||||
with app.open_instance_resource(resolved_path, 'r') as entry_file:
|
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'))
|
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.
|
"""Manipulate the request path to find appropriate page file.
|
||||||
|
|
||||||
* convert dir requests to index files
|
* convert dir requests to index files
|
||||||
|
@ -1,19 +1,19 @@
|
|||||||
"""Test page views and helper methods."""
|
"""Test page views and helper methods."""
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from incorporealcms.pages import page_file_resolver
|
from incorporealcms.pages import resolve_page_file
|
||||||
|
|
||||||
|
|
||||||
def test_page_file_resolver_dir_to_index():
|
def test_resolve_page_file_dir_to_index():
|
||||||
assert page_file_resolver('foo/') == 'pages/foo/index.md'
|
assert resolve_page_file('foo/') == 'pages/foo/index.md'
|
||||||
|
|
||||||
|
|
||||||
def test_page_file_resolver_subdir_to_index():
|
def test_resolve_page_file_subdir_to_index():
|
||||||
assert page_file_resolver('foo/bar/') == 'pages/foo/bar/index.md'
|
assert resolve_page_file('foo/bar/') == 'pages/foo/bar/index.md'
|
||||||
|
|
||||||
|
|
||||||
def test_page_file_resolver_other_requests_fine():
|
def test_resolve_page_file_other_requests_fine():
|
||||||
assert page_file_resolver('foo/baz') == 'pages/foo/baz.md'
|
assert resolve_page_file('foo/baz') == 'pages/foo/baz.md'
|
||||||
|
|
||||||
|
|
||||||
def test_page_that_exists(client):
|
def test_page_that_exists(client):
|
||||||
|
Loading…
Reference in New Issue
Block a user