aantron · Willenbrink · May 16, 2025 · May 16, 2025 · May 16, 2025 · May 16, 2025
diff --git a/dune-project b/dune-project
@@ -1 +1 @@
-(lang dune 2.7)
+(lang dune 3.0)
diff --git a/example/4-counter/counter.ml b/example/4-counter/counter.ml
@@ -10,5 +10,5 @@ let () =
   @@ count_requests
   @@ Dream.router [
     Dream.get "/" (fun _ ->
-      Dream.html (Printf.sprintf "Saw %i request(s)!" !count));
+      Dream.html (Printf.sprintf "Responding to the %i. request!" !count));
   ]
diff --git a/test/cram/1-hello.t b/test/cram/1-hello.t
@@ -0,0 +1,4 @@
+  $ hello &> /dev/null &
+  $ $CURL localhost:8080
+  Good morning, world!
+  $ pkill -P $$
diff --git a/test/cram/2-middleware.t b/test/cram/2-middleware.t
@@ -0,0 +1,4 @@
+  $ middleware &> /dev/null &
+  $ $CURL localhost:8080
+  Good morning, world!
+  $ pkill -P $$
diff --git a/test/cram/3-router.t b/test/cram/3-router.t
@@ -0,0 +1,4 @@
+  $ router &> /dev/null &
+  $ $CURL localhost:8080/echo/hello-world
+  hello-world
+  $ pkill -P $$
diff --git a/test/cram/4-counter.t b/test/cram/4-counter.t
@@ -0,0 +1,6 @@
+  $ counter &> /dev/null &
+  $ $CURL localhost:8080
+  Responding to the 1. request!
+  $ $CURL localhost:8080
+  Responding to the 2. request!
+  $ pkill -P $$
diff --git a/test/cram/5-promise.t b/test/cram/5-promise.t
@@ -0,0 +1,7 @@
+  $ promise &> /dev/null &
+  $ $CURL localhost:8080
+    0 request(s) successful<br>  0 request(s) failed
+  $ curl --no-progress-meter localhost:8080/fail
+  $ $CURL localhost:8080
+    1 request(s) successful<br>  1 request(s) failed
+  $ pkill -P $$
diff --git a/test/cram/6-echo.t b/test/cram/6-echo.t
@@ -0,0 +1,4 @@
+  $ echo-server &> /dev/null &
+  $ $CURL localhost:8080/echo --data "Hello, world!"
+  Hello, world!
+  $ pkill -P $$
diff --git a/test/cram/7-template.t b/test/cram/7-template.t
@@ -0,0 +1,9 @@
+  $ template &> /dev/null &
+  $ $CURL localhost:8080/hello-world
+  <html>
+  <body>
+    <h1>The URL parameter was hello-world!</h1>
+  </body>
+  </html>
+
+  $ pkill -P $$
diff --git a/test/cram/8-debug.t b/test/cram/8-debug.t
@@ -0,0 +1,302 @@
+  $ debug &> /dev/null &
+  $ $CURL localhost:8080/bad | sed 's/::1:.*/::1:<omitted>/' | sed 's/dream.request_id: [^<]*/dream.request_id: <omitted>/'
+  <!DOCTYPE html>
+  <html lang="en">
+    <head>
+      <meta charset="utf-8" />
+      <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+      <style>
+
+      body {
+        color: rgb(17, 24, 39);
+        font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Open Sans, Helvetica Neue, Helvetica, Arial, sans-serif;
+        margin: 3rem 2rem;
+      }
+
+      h1 {
+        font-weight: 600;
+        margin: 0;
+      }
+
+      h2 {
+        font-weight: normal;
+      }
+
+      h3 {
+        font-size: 16px;
+        font-weight: normal;
+        border: 1px solid #ddd;
+        margin: 0;
+        padding: 1rem 1.5rem;
+      }
+
+      pre {
+        background-color: rgb(31, 41, 55);
+        color: white;
+        font-family: SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace;
+        font-size: 16px;
+        line-height: 1.5;
+        margin: 0;
+        padding: 1rem;
+      }
+
+      </style>
+      <title>400 Bad Request</title>
+    </head>
+
+    <body>
+      <h1>An error occured!</h1>
+      <h2>400 Bad Request</h2>
+      <p>
+        This error page has been generated by Dream's error handler.<br />
+        Remember to turn debugging mode off when deploying your application in
+        production.
+      </p>
+      <h3>Debug Dump</h3>
+      <pre><code>400 Bad Request
+
+  From: Application
+  Blame: Client
+  Severity: Warning
+
+  Client: ::1:<omitted>
+
+  GET /bad
+  Host: localhost:8080
+  User-Agent: curl/8.9.1
+  Accept: */*
+
+  dream.client: ::1:<omitted>
+  dream.tls: false
+  dream.request_id: <omitted>
+  dream.fd: 6
+  dream.params: </code></pre>
+    </body>
+  </html>
+  $ $CURL localhost:8080/fail | sed 's/::1:.*/::1:<omitted>/' | sed 's/dream.request_id: [^<]*/dream.request_id: <omitted>/'
+  <!DOCTYPE html>
+  <html lang="en">
+    <head>
+      <meta charset="utf-8" />
+      <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+      <style>
+
+      body {
+        color: rgb(17, 24, 39);
+        font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Open Sans, Helvetica Neue, Helvetica, Arial, sans-serif;
+        margin: 3rem 2rem;
+      }
+
+      h1 {
+        font-weight: 600;
+        margin: 0;
+      }
+
+      h2 {
+        font-weight: normal;
+      }
+
+      h3 {
+        font-size: 16px;
+        font-weight: normal;
+        border: 1px solid #ddd;
+        margin: 0;
+        padding: 1rem 1.5rem;
+      }
+
+      pre {
+        background-color: rgb(31, 41, 55);
+        color: white;
+        font-family: SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace;
+        font-size: 16px;
+        line-height: 1.5;
+        margin: 0;
+        padding: 1rem;
+      }
+
+      </style>
+      <title>500 Internal Server Error</title>
+    </head>
+
+    <body>
+      <h1>An error occured!</h1>
+      <h2>500 Internal Server Error</h2>
+      <p>
+        This error page has been generated by Dream's error handler.<br />
+        Remember to turn debugging mode off when deploying your application in
+        production.
+      </p>
+      <h3>Debug Dump</h3>
+      <pre><code>Failure(&quot;The Web app failed!&quot;)
+  Raised at Stdlib__Map.Make.find in file &quot;map.ml&quot;, line 141, characters 10-25
+  Called from Logs.Tag.find in file &quot;src/logs.ml&quot;, line 153, characters 14-32
+
+  From: Application
+  Blame: Server
+  Severity: Error
+
+  Client: ::1:<omitted>
+
+  GET /fail
+  Host: localhost:8080
+  User-Agent: curl/8.9.1
+  Accept: */*
+
+  dream.client: ::1:<omitted>
+  dream.tls: false
+  dream.request_id: <omitted>
+  dream.fd: 6
+  dream.params: </code></pre>
+    </body>
+  </html>
+  <!DOCTYPE html>
+  <html lang="en">
+    <head>
+      <meta charset="utf-8" />
+      <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+      <style>
+
+      body {
+        color: rgb(17, 24, 39);
+        font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Open Sans, Helvetica Neue, Helvetica, Arial, sans-serif;
+        margin: 3rem 2rem;
+      }
+
+      h1 {
+        font-weight: 600;
+        margin: 0;
+      }
+
+      h2 {
+        font-weight: normal;
+      }
+
+      h3 {
+        font-size: 16px;
+        font-weight: normal;
+        border: 1px solid #ddd;
+        margin: 0;
+        padding: 1rem 1.5rem;
+      }
+
+      pre {
+        background-color: rgb(31, 41, 55);
+        color: white;
+        font-family: SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace;
+        font-size: 16px;
+        line-height: 1.5;
+        margin: 0;
+        padding: 1rem;
+      }
+
+      </style>
+      <title>500 Internal Server Error</title>
+    </head>
+
+    <body>
+      <h1>An error occured!</h1>
+      <h2>500 Internal Server Error</h2>
+      <p>
+        This error page has been generated by Dream's error handler.<br />
+        Remember to turn debugging mode off when deploying your application in
+        production.
+      </p>
+      <h3>Debug Dump</h3>
+      <pre><code>Failure(&quot;The Web app failed!&quot;)
+  Raised at Stdlib__Map.Make.find in file &quot;map.ml&quot;, line 141, characters 10-25
+  Called from Logs.Tag.find in file &quot;src/logs.ml&quot;, line 153, characters 14-32
+
+  From: Application
+  Blame: Server
+  Severity: Error
+
+  Client: ::1:<omitted>
+
+  GET /fail
+  Host: localhost:8080
+  User-Agent: curl/8.9.1
+  Accept: */*
+
+  dream.client: ::1:<omitted>
+  dream.tls: false
+  dream.request_id: <omitted>
+  dream.fd: 6
+  dream.params: </code></pre>
+    </body>
+  </html>
+  <!DOCTYPE html>
+  <html lang="en">
+    <head>
+      <meta charset="utf-8" />
+      <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+      <style>
+
+      body {
+        color: rgb(17, 24, 39);
+        font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Open Sans, Helvetica Neue, Helvetica, Arial, sans-serif;
+        margin: 3rem 2rem;
+      }
+
+      h1 {
+        font-weight: 600;
+        margin: 0;
+      }
+
+      h2 {
+        font-weight: normal;
+      }
+
+      h3 {
+        font-size: 16px;
+        font-weight: normal;
+        border: 1px solid #ddd;
+        margin: 0;
+        padding: 1rem 1.5rem;
+      }
+
+      pre {
+        background-color: rgb(31, 41, 55);
+        color: white;
+        font-family: SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace;
+        font-size: 16px;
+        line-height: 1.5;
+        margin: 0;
+        padding: 1rem;
+      }
+
+      </style>
+      <title>500 Internal Server Error</title>
+    </head>
+
+    <body>
+      <h1>An error occured!</h1>
+      <h2>500 Internal Server Error</h2>
+      <p>
+        This error page has been generated by Dream's error handler.<br />
+        Remember to turn debugging mode off when deploying your application in
+        production.
+      </p>
+      <h3>Debug Dump</h3>
+      <pre><code>Failure(&quot;The Web app failed!&quot;)
+  Raised at Stdlib__Map.Make.find in file &quot;map.ml&quot;, line 141, characters 10-25
+  Called from Logs.Tag.find in file &quot;src/logs.ml&quot;, line 153, characters 14-32
+
+  From: Application
+  Blame: Server
+  Severity: Error
+
+  Client: ::1:<omitted>
+
+  GET /fail
+  Host: localhost:8080
+  User-Agent: curl/8.9.1
+  Accept: */*
+
+  dream.client: ::1:<omitted>
+  dream.tls: false
+  dream.request_id: <omitted>
+  dream.fd: 6
+  dream.params: </code></pre>
+    </body>
+  </html>
+  $ pkill -P $$