diff options
| author | Matthias Andreas Benkard <code@mail.matthias.benkard.de> | 2012-06-25 17:46:07 +0200 |
|---|---|---|
| committer | Matthias Andreas Benkard <code@mail.matthias.benkard.de> | 2012-06-25 17:46:07 +0200 |
| commit | 06380786543fbe9c85f62ec2c4caa3e8fb6ff36d (patch) | |
| tree | be753d6d53a6cd7decfad711e6c16cd09392e474 /src/mulk/benki/main.clj | |
| parent | 3688af4b9c335f3cc5d8a98b4371a2f8a33b8e3d (diff) | |
Upgrade to Noir 1.3.0 and Hiccup 1.0.0.
Diffstat (limited to 'src/mulk/benki/main.clj')
| -rw-r--r-- | src/mulk/benki/main.clj | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/mulk/benki/main.clj b/src/mulk/benki/main.clj index c5ddfd6..fec1c85 100644 --- a/src/mulk/benki/main.clj +++ b/src/mulk/benki/main.clj @@ -2,9 +2,10 @@ (:refer-clojure) (:use [clojure core repl pprint] noir.core - [hiccup core page-helpers] + [hiccup core page] [mulk.benki util config db]) - (:require [noir server options] + (:require [noir.core] + [noir server options] [mulk.benki wiki auth book_marx id lazychat xmpp genkey] [ring.middleware.file] [noir.session :as session] @@ -15,11 +16,17 @@ [aleph.formats :as aformats] [ring.util.codec :as codec] [clojure.algo.monads :as m] - [clojure.data.json :as json]) + [clojure.data.json :as json] + ) (:import [java.math BigDecimal BigInteger]) (:gen-class)) +(defn wrap-missing-status-code [handler] + (fn [request] + (let [response (handler request)] + (assoc response :status (get response :status 404))))) + (defn wrap-utf-8 [handler] (fn [request] (let [response (handler request) @@ -30,12 +37,6 @@ (assoc-in response [:headers "Content-Type"] utf8ctype) response)))) -(defn wrap-base-uri [handler] - (fn [request] - (let [base-uri (:base-uri @benki-config)] - (hiccup.core/with-base-url base-uri - ((noir.options/wrap-options handler {:base-url base-uri}) request))))) - (defn wrap-cache-control [handler] (fn [request] (let [response (handler request)] @@ -111,8 +112,8 @@ response)))) (do-once ::init + (noir.server/add-middleware #(wrap-missing-status-code %)) (noir.server/add-middleware #(wrap-utf-8 %)) - (noir.server/add-middleware #(wrap-base-uri %)) (noir.server/add-middleware #(wrap-auth-token %)) (noir.server/add-middleware #(wrap-client-cert %)) (noir.server/add-middleware #(wrap-cache-control %)) |