feat: add nova_json_schemas plugin and replace thoas

config/dev_sys.config.src

@@ -23,6 +23,7 @@
                     {pre_request, nova_request_plugin, #{decode_json_body => true,
                                                          read_urlencoded_body => true,
                                                          parse_qs => true}},
+                    {pre_request, nova_json_schemas, #{render_errors => true}},
                     {pre_requeset, nova_request_old_plugin, #{}}
                    ]},
          {use_persistent_term, true},

priv/schemas/create_item.json

@@ -0,0 +1,12 @@
+{
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": "string"
+    },
+    "quantity": {
+      "type": "integer"
+    }
+  },
+  "required": ["name", "quantity"]
+}

rebar.config

@@ -13,7 +13,8 @@
                ]}.
 
 {deps, [
-        {nova, ".*", {git, "https://github.com/novaframework/nova.git", {branch, "master"}}}
+        {nova, ".*", {git, "https://github.com/novaframework/nova.git", {branch, "master"}}},
+        {nova_json_schemas, ".*", {git, "https://github.com/novaframework/nova_json_schemas.git", {branch, "master"}}}
        ]}.
 
 

rebar.config.script

@@ -4,17 +4,22 @@ NovaBranch = list_to_binary(os:getenv("NOVA_BRANCH", "master")),
 NovaRepo = os:getenv("NOVA_REPO", "novaframework/nova"),
 RepoUrl = "https://github.com/" ++ NovaRepo ++ ".git",
 
-Deps = case NovaBranch of
-            <<"master">> -> {deps, [
-              {nova, ".*", {git, RepoUrl, {branch, "master"}}}
-             ]};
-             <<"refs/tags/", Rest/binary>> ->
-              {deps, [{nova, ".*", {git, RepoUrl, {tag, binary_to_list(Rest)}}}]};
-             NovaBranch -> {deps, [
+NovaDep = case NovaBranch of
+            <<"master">> ->
+              {nova, ".*", {git, RepoUrl, {branch, "master"}}};
+            <<"refs/tags/", Rest/binary>> ->
+              {nova, ".*", {git, RepoUrl, {tag, binary_to_list(Rest)}}};
+            NovaBranch ->
               {nova, ".*", {git, RepoUrl, {branch, binary_to_list(NovaBranch)}}}
-             ]}
-            end,
+          end,
+
+%% Get existing deps from rebar.config (minus nova which we override)
+ExistingDeps = case proplists:get_value(deps, Conf0) of
+                   undefined -> [];
+                   Deps0 -> [D || D <- Deps0, element(1, D) =/= nova]
+               end,
+
+Deps = {deps, [NovaDep | ExistingDeps]},
 Conf1 = proplists:delete(deps, Conf0),
 
 [Deps|Conf1].
-

src/controllers/nova_request_app_main_controller.erl

@@ -13,7 +13,8 @@
          delete_user/1,
          fallback/1,
          return_view_with_ok/1,
-         return_view_with_view/1
+         return_view_with_view/1,
+         create_item/1
         ]).
 -fallback_controller(nova_request_app_fallback_controller).
 
@@ -68,3 +69,6 @@ return_view_with_ok(_) ->
 return_view_with_view(_) ->
     {view, #{message => <<"Hello">>}}.
 
+create_item(#{json := Json}) ->
+    {json, 201, #{}, Json}.
+

src/nova_request_app.app.src

@@ -9,7 +9,8 @@
    [
     kernel,
     stdlib,
-    nova
+    nova,
+    nova_json_schemas
    ]},
   {env,[]},
   {modules, []},

src/nova_request_app_router.erl

@@ -20,7 +20,9 @@ no_fun() ->
                   {"/internalerror", { nova_request_app_main_controller, internal_server_error}, #{methods => [get]}},
                   {"/fallback", { nova_request_app_main_controller, fallback}, #{methods => [get]}},
                   {"/viewok", { nova_request_app_main_controller, return_view_with_ok}, #{methods => [get]}},
-                  {"/viewview", { nova_request_app_main_controller, return_view_with_view}, #{methods => [get]}}
+                  {"/viewview", { nova_request_app_main_controller, return_view_with_view}, #{methods => [get]}},
+                  {"/items", {nova_request_app_main_controller, create_item},
+                   #{methods => [post], extra_state => #{json_schema => "schemas/create_item.json"}}}
                  ]
       },
       #{prefix => "/json_binding",

test/nova_request_app_SUITE.erl

@@ -124,7 +124,9 @@ all() ->
      trailingslash,
      fallback,
      view_with_ok,
-     view_with_view].
+     view_with_view,
+     json_schema_valid,
+     json_schema_invalid].
 %%--------------------------------------------------------------------
 %% @spec TestCase(Config0) ->
 %%               ok | exit() | {skip,Reason} | {comment,Comment} |
@@ -292,9 +294,19 @@ websocket(Path, _Token) ->
             exit(timeout)
     end.
 
+json_schema_valid(_) ->
+    Path = [?BASEPATH, <<"items">>],
+    Json = #{<<"name">> => <<"widget">>, <<"quantity">> => 5},
+    #{status := {201, _}, body := RespBody} = jhn_shttpc:post(Path, encode(Json), opts(json_post)),
+    #{<<"name">> := <<"widget">>, <<"quantity">> := 5} = decode(RespBody).
+
+json_schema_invalid(_) ->
+    Path = [?BASEPATH, <<"items">>],
+    Json = #{<<"name">> => 123},
+    #{status := {400, _}} = jhn_shttpc:post(Path, encode(Json), opts(json_post)).
+
 encode(Json) ->
-    thoas:encode(Json).
+    iolist_to_binary(json:encode(Json)).
 
 decode(Json) ->
-    {ok, Result} = thoas:decode(Json),
-    Result.
+    json:decode(Json).

test/nova_request_app_fun_SUITE.erl

@@ -299,8 +299,7 @@ websocket(Path, _Token) ->
     end.
 
 encode(Json) ->
-    thoas:encode(Json).
+    iolist_to_binary(json:encode(Json)).
 
 decode(Json) ->
-    {ok, Result} = thoas:decode(Json),
-    Result.
+    json:decode(Json).