Add explicit :body keys to all Hiccup examples

Author: weavejester

index.adoc

@@ -852,9 +852,9 @@ returns a Hiccup data structure.
 
 (defn index [_options]
   (fn [_request]
-    [:html {:lang "en"}
-     [:head [:title "Hello World Wide Web"]]
-     [:body [:h1 "Hello World Wide Web"]]]))
+    {:body [:html {:lang "en"}
+            [:head [:title "Hello World Wide Web"]]
+            [:body [:h1 "Hello World Wide Web"]]]}))
 ----
 
 Finally, we trigger a `(reset)` at the REPL.
@@ -932,42 +932,41 @@ Let's take a closer look at function associated with the route.
 
 (defn index [_options]
   (fn [_request]
-    [:html {:lang "en"}
-     [:head [:title "Hello World Wide Web"]]
-     [:body [:h1 "Hello World Wide Web"]]]))
+    {:body [:html {:lang "en"}
+            [:head [:title "Hello World Wide Web"]]
+            [:body [:h1 "Hello World Wide Web"]]]}))
 ----
 
 This function returns another function, known as a
 https://github.com/ring-clojure/ring[Ring] handler. Usually this
-function will return a response map, but in this case we're returning a
+function will return a full response map, but in this case we're
+omitting all but the `:body`, which contains a
 https://github.com/weavejester/hiccup[Hiccup] vector.
 
 Hiccup is a format for representing HTML as a Clojure data structure.
 Elements are represented by a vector starting with a keyword, followed
 by an optional attribute map and then the element body.
 
 The `:hiccup` feature of the web module adds middleware to turn Hiccup
-vectors into HTML response maps. If the response is a vector, it wraps
-the vector in response map. If the response is already a map, it checks
-the `:body` of the response for a vector.
+vectors into HTML response maps. If the response body is a vector, it
+coverts it to a string of HTML. The missing `:status` and `:headers`
+keys that are usually present in the response map are given default
+values.
 
-If we wanted a custom status code or headers, then the full response
-map could be returned.
+The next example is equivalent, with the default values set explicitly.
 
 [,clojure]
 ----
 (defn index [_options]
   (fn [_request]
     {:status 200
-     :headers {}
+     :headers {"Content-Type" "text/html;charset=UTF-8"}
      :body [:html {:lang "en"}
             [:head [:title "Hello World Wide Web"]]
             [:body [:h1 "Hello World Wide Web"]]]}))
 ----
 
-NOTE: The `:status` and `:headers` keys map optionally be omitted.
-
-Or we could return the string directly:
+Which in turn is also equivalent to:
 
 [,clojure]
 ----
@@ -982,9 +981,6 @@ Or we could return the string directly:
 </html>"}))
 ----
 
-All of these examples are equivalent, but returning a vector is the most
-convenient and concise.
-
 
 === Middleware
 
@@ -1233,9 +1229,9 @@ created earlier.
 
 (defn index [{:keys [db]}]
   (fn [_request]
-    [:html {:lang "en"}
-     [:head [:title "Hello World Wide Web"]]
-     [:body [:h1 "Hello World Wide Web"]]]))
+    {:body [:html {:lang "en"}
+            [:head [:title "Hello World Wide Web"]]
+            [:body [:h1 "Hello World Wide Web"]]]}))
 ----
 
 Before we go further, however, we should set up the database schema via
@@ -1337,11 +1333,11 @@ populate an unordered list. We'll change the index function accordingly.
 
 (defn index [{:keys [db]}]
   (fn [_request]
-    [:html {:lang "en"}
-     [:head [:title "Todo"]]
-     [:body
-      [:ul (for [rs (jdbc/execute! db [list-todos])]
-             [:li (:todo/description rs)])]]]))
+    {:body [:html {:lang "en"}
+            [:head [:title "Todo"]]
+            [:body
+             [:ul (for [rs (jdbc/execute! db [list-todos])]
+              [:li (:todo/description rs)])]]]}))
 ----
 
 TIP: It's often a good idea to factor out each SQL string into its own
@@ -1410,13 +1406,13 @@ codebase.
 
 (defn index [{:keys [db]}]
   (fn [_request]
-    [:html {:lang "en"}
-     [:head [:title "Todo"]]
-     [:body
-      [:ul
-       (for [rs (jdbc/execute! db [list-todos])]
-         [:li (:todo/description rs)])
-       [:li (create-todo-form)]]]]))
+    {:body [:html {:lang "en"}
+            [:head [:title "Todo"]]
+            [:body
+             [:ul
+              (for [rs (jdbc/execute! db [list-todos])]
+                [:li (:todo/description rs)])
+              [:li (create-todo-form)]]]]}))
 
 (defn new-todo [{:keys [db]}]
   (fn [{{:keys [description]} :params}]
@@ -1512,15 +1508,15 @@ our `index` function in the `todo.routes` namespace.
 ----
 (defn index [{:keys [db]}]
   (fn [_request]
-    [:html {:lang "en"}
-     [:head
-      [:title "Todo"]
-      [:script {:src "/cljs/client.js"}]]
-     [:body
-      [:ul
-       (for [rs (jdbc/execute! db [list-todos])]
-         [:li (:todo/description rs)])
-       [:li (create-todo-form)]]]]))
+    {:body [:html {:lang "en"}
+            [:head
+             [:title "Todo"]
+             [:script {:src "/cljs/client.js"}]]
+            [:body
+             [:ul
+              (for [rs (jdbc/execute! db [list-todos])]
+                [:li (:todo/description rs)])
+                [:li (create-todo-form)]]]]}))
 ----
 
 If you restart the REPL and check http://localhost:3000, you should see