allow all the noir.response/* functions to be nested and add utf-8 to

all generated content types

Signed-off-by: Chris Granger <ibdknox@gmail.com>

src/noir/response.clj

@@ -4,36 +4,47 @@
   (:require [cheshire.core :as json]
             [noir.options :as options]))
 
-(defn xml
-  "Wraps the response with the content type for xml and sets the body to the content."
-  [content]
-  {:headers {"Content-Type" "text/xml"}
-   :body content})
+(defn- ->map [c]
+  (if-not (map? c)
+    {:body c}
+    c))
+
+(defn set-headers
+  "Add a map of headers to the given response. Headers must have
+  string keys:
+
+  (set-headers {\"x-csrf\" csrf}
+    (common/layout [:p \"hey\"]))"
+  [headers content]
+  (update-in (->map content) [:headers] merge headers))
 
 (defn content-type
   "Wraps the response with the given content type and sets the body to the content."
   [ctype content]
-  {:headers {"Content-Type" ctype}
-   :body content})
+  (set-headers {"Content-Type" ctype} content))
+
+(defn xml
+  "Wraps the response with the content type for xml and sets the body to the content."
+  [content]
+  (content-type "text/xml; charset=utf-8" content))
 
 (defn json
   "Wraps the response in the json content type and generates JSON from the content"
   [content]
-  {:headers {"Content-Type" "application/json"}
-   :body (json/generate-string content)})
+  (content-type "application/json; charset=utf-8"
+                (json/generate-string content)))
 
 (defn jsonp
   "Generates JSON for the given content and creates a javascript response for calling
   func-name with it."
   [func-name content]
-  {:headers {"Content-Type" "application/javascript"}
-   :body (str func-name "(" (json/generate-string content) ");")})
+  (content-type "application/json; charset=utf-8"
+                (str func-name "(" (json/generate-string content) ");")))
 
 (defn status
   "Wraps the content in the given status code"
   [code content]
-  {:status code
-   :body content})
+  (assoc (->map content) :status code))
 
 (defn redirect
   "A header redirect to a different url"

src/noir/util/test.clj

@@ -7,7 +7,7 @@
             [noir.cookies :as cookies]
             [noir.options :as options]))
 
-(def content-types {:json "application/json"
+(def content-types {:json "application/json; charset=utf-8"
                     :html "text/html"})
 
 (defmacro with-noir

test/noir/test/core.clj

@@ -87,7 +87,7 @@
 (deftest route-dot-test
   (-> (send-request "/test.json")
       (has-status 200)
-      (has-content-type "application/json")
+      (has-content-type "application/json; charset=utf-8")
       (has-body "{\"json\":\"text\"}")))
 
 (deftest parsing-defpage
@@ -221,8 +221,8 @@
         (has-body "<a href=\"/woohoo/hey\">link</a>"))))
 
 (deftest jsonp
-  (-> (resp/jsonp "jsonp245" {:pinot "noir"}) 
-      (has-content-type "application/javascript")
+  (-> (resp/jsonp "jsonp245" {:pinot "noir"})
+      (has-content-type "application/json; charset=utf-8")
       (has-body "jsonp245({\"pinot\":\"noir\"});")))
 
 (defpage "/with%20space" []
@@ -275,3 +275,18 @@
        "test"
        "test.@domain.com"
        "test@com"))
+
+(defpage "/different/content-type" []
+  (resp/content-type "application/vcard+xml" (resp/xml (html [:vcards]))))
+
+(deftest different-content-type
+  (-> (send-request "/different/content-type")
+      (has-content-type "application/vcard+xml")
+      (has-body "<vcards />")))
+
+(defpage "/different/status" []
+  (resp/status 201 "Something was created"))
+
+(deftest different-header
+  (-> (send-request "/different/status")
+      (has-status 201)))