eliminated storage dependency

src/notehub/handler.clj

@@ -61,10 +61,14 @@
   (GET "/:year/:month/:day/:title/edit" [year month day title]
        (note-update-page year month day title))
 
-  (GET "/new" [] new-note-page)
+  (GET "/new" [] (new-note-page (storage/sign (str (rand-int Integer/MAX_VALUE)))))
 
   (GET "/:year/:month/:day/:title" [year month day title :as params]
-       (note-page year month day title params))
+       (let [params (assoc (:query-params params)
+                           :year year :month month :day day :title title)
+             note-id (api/build-key year month day title)]
+         (when (storage/note-exists? note-id)
+           (note-page note-id (storage/create-short-url note-id params)))))
 
   (GET "/:short-url" [short-url]
        (when-let [params (storage/resolve-url short-url)]
@@ -89,14 +93,14 @@
               (response 500)))
           (response 400)))
 
-  (POST "/update-note" [noteID note password]
+  (POST "/update-note" [note-id note password]
         (let [pid "NoteHub"
               psk (storage/get-psk pid)
-              params {:noteID noteID :note note :password password :pid pid}]
+              params {:noteID note-id :note note :password password :pid pid}]
           (if (storage/valid-publisher? pid)
             (let [resp (api/update-note (assoc params
                                           :signature
-                                          (storage/sign pid psk noteID note password)))]
+                                          (storage/sign pid psk note-id note password)))]
               (if (get-in resp [:status :success])
                 (redirect (:longURL resp))
                 (response 403)))

src/notehub/views.clj

@@ -0,0 +1,118 @@
+(ns notehub.views
+  (:use [notehub.settings]
+        [clojure.string :rename {replace sreplace} :only [replace]]
+        [clojure.core.incubator :only [-?>]]
+        [hiccup.form]
+        [hiccup.core]
+        [hiccup.element]
+        [hiccup.util :only [escape-html]]
+        [hiccup.page :only [include-js html5]])
+  (:require [notehub.api :as api]))
+
+; Creates the main html layout
+(defn layout
+  [title & content]
+  (html5
+    [:head
+     [:title (print-str (get-message :name) "—" title)]
+     [:meta {:charset "UTF-8"}]
+     [:meta {:name "viewport" :content "width=device-width, initial-scale=1.0"}]
+     [:link {:rel "stylesheet/less" :type "text/css" :href "/styles/main.less"}]
+     (html
+       (include-js "/js/less.js")
+       (include-js "/js/themes.js")
+       (include-js "/js/md5.js")
+       (include-js "/js/marked.js")
+       (include-js "/js/main.js"))
+     ; google analytics code should appear in prod mode only
+     (if-not (get-setting :dev-mode) (include-js "/js/google-analytics.js"))]
+    [:body {:onload "onLoad()"} content]))
+
+(defn md-node
+  "Returns an HTML element with a textarea inside
+  containing the markdown text (to keep all chars unescaped)"
+  ([cls input] (md-node cls {} input))
+  ([cls opts input]
+   [(keyword (str (name cls) ".markdown")) opts
+    [:textarea input]]))
+
+(defn- sanitize
+  "Breakes all usages of <script> & <iframe>"
+  [input]
+  (sreplace input #"(</?(iframe|script).*?>|javascript:)" ""))
+
+; input form for the markdown text with a preview area
+(defn- input-form [form-url command fields content passwd-msg]
+  (let [css-class (when (= :publish command) :hidden)]
+    (layout (get-message :new-note)
+            [:article#preview ""]
+            [:div#dashed-line {:class css-class}]
+            [:div.central-element.helvetica {:style "margin-bottom: 3em"}
+             (form-to {:autocomplete :off} [:post form-url]
+                      (hidden-field :action command)
+                      (hidden-field :version api/version)
+                      (hidden-field :password)
+                      fields
+                      (text-area {:class :max-width} :note content)
+                      [:fieldset#input-elems {:class css-class}
+                       (text-field {:class "ui-elem" :placeholder (get-message passwd-msg)}
+                                   :plain-password)
+                       (submit-button {:class "button ui-elem"
+                                       :id :publish-button} (get-message command))])])))
+
+(def landing-page
+  (layout (get-message :page-title)
+          [:div#hero
+           [:h1 (get-message :name)]
+           [:h2 (get-message :title)]
+           [:br]
+           [:a.landing-button {:href "/new" :style "color: white"} (get-message :new-page)]]
+          [:div#dashed-line]
+          (md-node :article.helvetica.bottom-space
+                   {:style "font-size: 1em"}
+                   (slurp "LANDING.md"))
+          (md-node :div.centered.helvetica (get-message :footer))))
+
+
+(defn statistics-page [resp]
+  (let [stats (:statistics resp)
+        title (get-message :statistics)]
+    (layout title
+            [:h2.central-element (api/derive-title (:note resp))]
+            [:h3.central-element.helvetica title]
+            [:table#stats.helvetica.central-element
+             (map
+               #(when-let [v (% stats)]
+                  [:tr
+                   [:td (str (get-message %) ":")]
+                   [:td (if (or (= % :published) (= % :edited))
+                          (str (java.util.Date. (Long/parseLong v))) v)]])
+               [:published :edited :publisher :views])])))
+
+(defn note-update-page [year month day title]
+  (let [note-id (api/build-key year month day title)]
+    (input-form "/update-note" :update
+                (html (hidden-field :noteID note-id))
+                (:note (api/get-note {:noteID note-id})) :enter-passwd)))
+
+(defn new-note-page [signature]
+  (input-form "/post-note" :publish
+              (html (hidden-field :session signature)
+                    (hidden-field {:id :signature} :signature))
+              (get-message :loading) :set-passwd))
+
+(defn note-page [note-id short-url]
+  (let [note (api/get-note {:noteID note-id})
+        sanitized-note (sanitize (:note note))]
+    (layout (:title note)
+            (md-node :article.bottom-space sanitized-note)
+            (let [urls {:short-url (api/url short-url)
+                        :notehub "/"}
+                  links (map #(link-to
+                                (if (urls %)
+                                  (urls %)
+                                  (str (:longURL note) "/" (name %)))
+                                (get-message %))
+                             [:notehub :stats :edit :export :short-url])
+                  links (interpose [:span.middot "&middot;"] links)]
+              [:div#links links]))))