Permalink
Browse files

Refactored ring.handler.dump (fixes #54)

  • Loading branch information...
1 parent f441aab commit edf7b3ecca97dfe8d002160544c2c7080a341a0b @weavejester weavejester committed Apr 11, 2012
Showing with 55 additions and 54 deletions.
  1. +36 −0 ring-devel/resources/ring/css/dump.css
  2. +19 −54 ring-devel/src/ring/handler/dump.clj
View
36 ring-devel/resources/ring/css/dump.css
@@ -0,0 +1,36 @@
+/*
+Copyright (c) 2008, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.6.0
+*/
+html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:text-top;}sub{vertical-align:text-bottom;}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit;}input,textarea,select{*font-size:100%;}legend{color:#000;}del,ins{text-decoration:none;}
+
+h3.info {
+ font-size: 1.6em;
+ margin-left: 1em;
+ padding-top: .5em;
+ padding-bottom: .5em;
+}
+
+table.request {
+ font-size: 1.1em;
+ width: 800px;
+ margin-left: 1em;
+ margin-right: 1em;
+ background: lightgrey;
+}
+
+table.request tr {
+ line-height: 1.4em;
+}
+
+table.request td.key {
+ padding-left: .5em;
+ text-aligh: left;
+ width: 150px;
+}
+
+table.request td.val {
+ text-align: left;
+}
View
73 ring-devel/src/ring/handler/dump.clj
@@ -5,28 +5,32 @@
hiccup.def
ring.util.response)
(:require [clojure.set :as set]
- [clojure.pprint :as pprint]))
+ [clojure.pprint :as pprint]
+ [clojure.java.io :as io]))
(declare css)
(def ring-keys
'(:server-port :server-name :remote-addr :uri :query-string :scheme
:request-method :content-type :content-length :character-encoding
- :headers :body))
+ :ssl-client-cert :headers :body))
-(defhtml req-pair
- [key req]
- [:tr [:td.key (h (str key))]
- [:td.val (h (pr-str (key req)))]])
+(defn- style-resource [path]
+ (html [:style {:type "text/css"} (slurp (io/resource path))]))
+
+(defn- req-pair [key req]
+ (html
+ [:tr
+ [:td.key (h (str key))]
+ [:td.val (h (pr-str (key req)))]]))
(defhtml template
[req]
(doctype :xhtml-transitional)
[:html {:xmlns "http://www.w3.org/1999/xhtml"}
[:head
- [:meta {:http-equiv "Content-Type" :content "text/html"}]
- [:title "Ring: Request Dump"]]
- [:style {:type "text/css"} css]
+ [:title "Ring: Request Dump"]
+ (style-resource "ring/css/dump.css")]
[:body
[:div#content
[:h3.info "Ring Request Values"]
@@ -36,11 +40,11 @@
(req-pair key req))]]
(if-let [user-keys (set/difference (set (keys req)) (set ring-keys))]
(html
- [:br]
- [:table.request.user
- [:tbody [:tr
- (for [key (sort user-keys)]
- (req-pair key req))]]]))]]])
+ [:br]
+ [:table.request.user
+ [:tbody [:tr
+ (for [key (sort user-keys)]
+ (req-pair key req))]]]))]]])
(defn handle-dump
"Returns a response tuple corresponding to an HTML dump of the request
@@ -49,43 +53,4 @@
(pprint/pprint req)
(println)
(-> (response (template req))
- (status 200)
- (content-type "text/html")))
-
-(def ^{:private true} css "
-/*
-Copyright (c) 2008, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.net/yui/license.txt
-version: 2.6.0
-*/
-html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:text-top;}sub{vertical-align:text-bottom;}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit;}input,textarea,select{*font-size:100%;}legend{color:#000;}del,ins{text-decoration:none;}
-
-h3.info {
- font-size: 1.6em;
- margin-left: 1em;
- padding-top: .5em;
- padding-bottom: .5em;
-}
-
-table.request {
- font-size: 1.1em;
- width: 800px;
- margin-left: 1em;
- margin-right: 1em;
- background: lightgrey;
-}
-
-table.request tr {
- line-height: 1.4em;
-}
-
-table.request td.key {
- padding-left: .5em;
- text-aligh: left;
- width: 150px;
-}
-
-table.request td.val {
- text-align: left;
-}")
+ (content-type "text/html")))

0 comments on commit edf7b3e

Please sign in to comment.