Update to latest Piaf

Author: ulrikstrid

VERSION

@@ -1 +1 @@
-0.4.2
+0.5.0

bin/Auth.re

@@ -58,7 +58,7 @@ let login_form_markup =
   </Layout>;
 
 let post_handler = (~session_key, req: Morph.Request.t) => {
-  let referer = Piaf.Headers.get(req.request.message.headers, "Referer");
+  let referer = Piaf.Headers.get(req.request.headers, "Referer");
 
   Lwt.bind(
     Piaf.Body.to_string(req.request.body),
@@ -121,12 +121,9 @@ let middleware =
     : Morph.Server.middleware =>
   (next, req) => {
     (
-      switch (req.request.message.meth) {
+      switch (req.request.meth) {
       | `POST =>
-        Routes.match'(
-          ~target=req.request.message.target,
-          post_routes(~session_key),
-        )
+        Routes.match'(~target=req.request.target, post_routes(~session_key))
       | _ => None
       }
     )

bin/Router.re

@@ -8,9 +8,9 @@ let make =
   let post_router = Routes.one_of(post);
 
   let route_match =
-    switch (req.request.message.meth) {
-    | `GET => Routes.match'(~target=req.request.message.target, get_router)
-    | `POST => Routes.match'(~target=req.request.message.target, post_router)
+    switch (req.request.meth) {
+    | `GET => Routes.match'(~target=req.request.target, get_router)
+    | `POST => Routes.match'(~target=req.request.target, post_router)
     | _ => None
     };
 

docs/markdown/simple-switch-based-router.md

@@ -15,13 +15,13 @@ The example code bellow shows some common usecases
 ```reason
 let handler = ({request, _}: Morph.Request.t) => {
   let path_parts =
-    request.message.target
+    request.target
     |> Uri.of_string
     |> Uri.path
     |> String.split_on_char('/')
     |> List.filter(s => s != "");
 
-  switch (request.message.meth, path_parts) {
+  switch (request.meth, path_parts) {
   | (_, []) => Morph.Response.text("Hello world!")
   | (_, ["greet", name]) =>
     Morph.Response.text("Hello " ++ name ++ "!")
@@ -38,12 +38,12 @@ let handler = ({request, _}: Morph.Request.t) => {
 ```ocaml
 let handler ({request; _}: Morph.Request.t) =
   let path_parts =
-      request.message.target
+      request.target
       |> Uri.of_string
       |> Uri.path
       |> String.split_on_char '/'
       |> List.filter (fun s  -> s <> "") in
-  (match (request.message.meth, path_parts) with
+  (match (request.meth, path_parts) with
   | (_,[]) ->
       Morph.Response.text "Hello world!"
   | (_,"greet"::name::[]) ->

docs/markdown/with-routes-package.md

@@ -69,7 +69,7 @@ Lastly you create a routes callback and start the server. In this case we pass i
 
 ```reason
 let handler = {request, _} =>
-  Routes.match(~target=request.message.target, routes)
+  Routes.match(~target=request.target, routes)
   |> (
     fun
     | Some(res) => res(request)
@@ -85,7 +85,7 @@ Morph.start(~servers=[server], handler) |> Lwt_main.run;
 ```ocaml
 let () =
   let handler (req: Morph.Request.t) =
-    (Routes.match' ~target:req.request.message.target routes)
+    (Routes.match' ~target:req.request.target routes)
     |> (function
       | Some handler -> handler req
       | None -> Morph.Response.not_found ())

docs/markdown/writing-middleware.md

@@ -64,8 +64,8 @@ let logger service (req: Morph.Request.t) =
   Logs.info (fun m ->
       m
         ("http: %s request to %s finished in %fms")
-        (Piaf.Method.to_string req.request.message.meth)
-        req.request.message.target
+        (Piaf.Method.to_string req.request.meth)
+        req.request.target
         (Mtime.Span.abs_diff start_request end_request |> Mtime.Span.to_ms)) ;
   response;
 ```