From 7520cd425c1d4939dd2a2b73691ac536050c9b7f Mon Sep 17 00:00:00 2001 From: Tommi Reiman Date: Tue, 2 Mar 2021 21:24:04 +0200 Subject: [PATCH 1/8] malli 0.3.0 --- CHANGELOG.md | 2 +- project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61bd25b6..f2ffb1a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ We use [Break Versioning][breakver]. The version numbers follow a `. Date: Fri, 5 Mar 2021 20:45:28 +0200 Subject: [PATCH 2/8] Update development.md --- doc/development.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/development.md b/doc/development.md index d57abae6..005bb863 100644 --- a/doc/development.md +++ b/doc/development.md @@ -18,13 +18,17 @@ The documentation lives under `doc` and it is hosted on [cljdoc](https://cljdoc.org). See their documentation for [library authors](https://github.com/cljdoc/cljdoc/blob/master/doc/userguide/for-library-authors.adoc) -## To bump up version: +## Making a release We use [Break Versioning][breakver]. Remember our promise: patch-level bumps never include breaking changes! [breakver]: https://github.com/ptaoussanis/encore/blob/master/BREAK-VERSIONING.md ```bash +# Check that you're using Java 8! Making the release with a newer Java version +# means that it is broken when used with Java 8. +java -version + # new version ./scripts/set-version "1.0.0" ./scripts/lein-modules install From c033f10e4ec455f359657a0d1933e46f6e5b96b0 Mon Sep 17 00:00:00 2001 From: Jonathon McKitrick <518057+jmckitrick@users.noreply.github.com> Date: Thu, 11 Mar 2021 08:41:31 -0500 Subject: [PATCH 3/8] Update swagger_ui.cljc Fix spelling in docstring. --- modules/reitit-swagger-ui/src/reitit/swagger_ui.cljc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/reitit-swagger-ui/src/reitit/swagger_ui.cljc b/modules/reitit-swagger-ui/src/reitit/swagger_ui.cljc index 52ee5856..4603b11c 100644 --- a/modules/reitit-swagger-ui/src/reitit/swagger_ui.cljc +++ b/modules/reitit-swagger-ui/src/reitit/swagger_ui.cljc @@ -12,7 +12,7 @@ | :root | optional resource root, defaults to `\"swagger-ui\"` | :url | path to swagger endpoint, defaults to `/swagger.json` | :path | optional path to mount the handler to. Works only if mounted outside of a router. - | :config | parameters passed to swaggger-ui as-is. + | :config | parameters passed to swagger-ui as-is. See https://github.com/swagger-api/swagger-ui/blob/master/docs/usage/configuration.md for all available :config options. 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 4/8] 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 5/8] 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 6/8] 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 7/8] 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 8/8] 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