From 5831f2f4f6b90a19c646c22c49344453f0abbd41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Natxo=20Cabr=C3=A9?= Date: Fri, 12 Mar 2021 12:45:55 +0100 Subject: [PATCH 1/5] fixed typo in explicitely --- doc/basics/route_syntax.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/basics/route_syntax.md b/doc/basics/route_syntax.md index f7481b50..a91ec097 100644 --- a/doc/basics/route_syntax.md +++ b/doc/basics/route_syntax.md @@ -132,7 +132,7 @@ Routes are just data, so it's easy to create them programmatically: ### Explicit path-parameter syntax -Router options `:syntax` allows the path-parameter syntax to be explicitely defined. It takes a keyword or set of keywords as a value. Valid values are `:colon` and `:bracket`. Default value is `#{:colon :bracket}`. +Router options `:syntax` allows the path-parameter syntax to be explicitly defined. It takes a keyword or set of keywords as a value. Valid values are `:colon` and `:bracket`. Default value is `#{:colon :bracket}`. With defaults: From c5bb467402957394b0eadac8bd0741c413737a83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Natxo=20Cabr=C3=A9?= Date: Fri, 12 Mar 2021 12:50:51 +0100 Subject: [PATCH 2/5] fix route_conflicts link --- doc/basics/router.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/basics/router.md b/doc/basics/router.md index 00348ac7..de10ff6f 100644 --- a/doc/basics/router.md +++ b/doc/basics/router.md @@ -109,6 +109,6 @@ When router is created, the following steps are done: * route arguments are expanded (via `:expand` option) * routes are coerced (via `:coerce` options) * route tree is compiled (via `:compile` options) -* [route conflicts](advanced/route_conflicts.md) are resolved (via `:conflicts` options) +* [route conflicts](route_conflicts.md) are resolved (via `:conflicts` options) * optionally, route data is validated (via `:validate` options) * [router implementation](../advanced/different_routers.md) is automatically selected (or forced via `:router` options) and created From 26c4ebc64568eec1f771ba7e58776baa3313b900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Natxo=20Cabr=C3=A9?= Date: Fri, 12 Mar 2021 12:57:13 +0100 Subject: [PATCH 3/5] defined router var so the merged route tree example returns the commented data structure --- doc/basics/router.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/basics/router.md b/doc/basics/router.md index de10ff6f..fc0b28eb 100644 --- a/doc/basics/router.md +++ b/doc/basics/router.md @@ -85,9 +85,10 @@ As routes are defined as plain data, it's easy to merge multiple route trees int ["/ping" ::ping] ["/db" ::db]]) -(r/router - [admin-routes - user-routes]) +(def router + (r/router + [admin-routes + user-routes])) ``` Merged route tree: From 1e76ea81147667a2ea82c82c2deead53bfbbef5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Natxo=20Cabr=C3=A9?= Date: Fri, 12 Mar 2021 13:24:28 +0100 Subject: [PATCH 4/5] fixed malli create example --- doc/coercion/malli_coercion.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/coercion/malli_coercion.md b/doc/coercion/malli_coercion.md index ee9a37bb..f1ed35e9 100644 --- a/doc/coercion/malli_coercion.md +++ b/doc/coercion/malli_coercion.md @@ -49,11 +49,14 @@ Failing coercion: Using `create` with options to create the coercion instead of `coercion`: ```clj + +(require '[malli.util :as mu]) + (reitit.coercion.malli/create - {:transformers {:body {:default default-transformer-provider - :formats {"application/json" json-transformer-provider}} - :string {:default string-transformer-provider} - :response {:default default-transformer-provider}} + {:transformers {:body {:default reitit.coercion.malli/default-transformer-provider + :formats {"application/json" reitit.coercion.malli/json-transformer-provider}} + :string {:default reitit.coercion.malli/string-transformer-provider} + :response {:default reitit.coercion.malli/default-transformer-provider}} ;; set of keys to include in error messages :error-keys #{:type :coercion :in :schema :value :errors :humanized #_:transformed} ;; schema identity function (default: close all map schemas) From 722bd8950faa21e2d21f5182d334d2e6068e1491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Natxo=20Cabr=C3=A9?= Date: Fri, 12 Mar 2021 13:33:47 +0100 Subject: [PATCH 5/5] removed blank line --- doc/coercion/malli_coercion.md | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/coercion/malli_coercion.md b/doc/coercion/malli_coercion.md index f1ed35e9..0c6a7fb9 100644 --- a/doc/coercion/malli_coercion.md +++ b/doc/coercion/malli_coercion.md @@ -49,7 +49,6 @@ Failing coercion: Using `create` with options to create the coercion instead of `coercion`: ```clj - (require '[malli.util :as mu]) (reitit.coercion.malli/create