From 7a6ff43b2c0c9daf582d376a390fccad1277354e Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Fri, 13 Nov 2020 21:55:13 -0500 Subject: [PATCH] Update flask example and tutorial --- docs/tutorials/flask.rst | 15 +++++++++------ examples/miniapps/flask/README.rst | 4 ++-- examples/miniapps/flask/githubnavigator/views.py | 3 ++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/docs/tutorials/flask.rst b/docs/tutorials/flask.rst index 54ceb73c..5034d787 100644 --- a/docs/tutorials/flask.rst +++ b/docs/tutorials/flask.rst @@ -707,17 +707,19 @@ Let's inject ``SearchService`` into the ``index`` view. We will use :ref:`Wiring Edit ``views.py``: .. code-block:: python - :emphasize-lines: 4,6-7,10,14 + :emphasize-lines: 4,6-7,10-11,15 + :emphasize-lines: 4,6-7,10-11,15 """Views module.""" from flask import request, render_template - from dependency_injector.wiring import Provide + from dependency_injector.wiring import inject, Provide from .services import SearchService from .containers import Container + @inject def index(search_service: SearchService = Provide[Container.search_service]): query = request.args.get('query', 'Dependency Injector') limit = request.args.get('limit', 10, int) @@ -783,17 +785,18 @@ Let's make some refactoring. We will move these values to the config. Edit ``views.py``: .. code-block:: python - :emphasize-lines: 10-16 + :emphasize-lines: 11-17 """Views module.""" from flask import request, render_template - from dependency_injector.wiring import Provide + from dependency_injector.wiring import inject, Provide from .services import SearchService from .containers import Container + @inject def index( search_service: SearchService = Provide[Container.search_service], default_query: str = Provide[Container.config.default.query], @@ -972,9 +975,9 @@ You should see: githubnavigator/containers.py 7 0 100% githubnavigator/services.py 14 0 100% githubnavigator/tests.py 34 0 100% - githubnavigator/views.py 9 0 100% + githubnavigator/views.py 10 0 100% ---------------------------------------------------- - TOTAL 79 0 100% + TOTAL 80 0 100% .. note:: diff --git a/examples/miniapps/flask/README.rst b/examples/miniapps/flask/README.rst index 118c4e52..d825a81e 100644 --- a/examples/miniapps/flask/README.rst +++ b/examples/miniapps/flask/README.rst @@ -95,6 +95,6 @@ The output should be something like: githubnavigator/containers.py 7 0 100% githubnavigator/services.py 14 0 100% githubnavigator/tests.py 34 0 100% - githubnavigator/views.py 9 0 100% + githubnavigator/views.py 10 0 100% ---------------------------------------------------- - TOTAL 79 0 100% + TOTAL 80 0 100% diff --git a/examples/miniapps/flask/githubnavigator/views.py b/examples/miniapps/flask/githubnavigator/views.py index 22a3d35d..5cccdad2 100644 --- a/examples/miniapps/flask/githubnavigator/views.py +++ b/examples/miniapps/flask/githubnavigator/views.py @@ -1,12 +1,13 @@ """Views module.""" from flask import request, render_template -from dependency_injector.wiring import Provide +from dependency_injector.wiring import inject, Provide from .services import SearchService from .containers import Container +@inject def index( search_service: SearchService = Provide[Container.search_service], default_query: str = Provide[Container.config.default.query],