crappyrules
/
notehub
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

publisher removed from the statistics node of the API response

master
Christian Müller 11 years ago
parent
a0e84c0df9
commit
0a099649fb
3 changed files with 118 additions and 117 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 207
      src/notehub/handler.clj
  2. 7
      src/notehub/storage.clj
  3. 21
      src/notehub/views.clj

207
src/notehub/handler.clj
Unescape View File

@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
(ns notehub.handler
(:use
(:use
compojure.core
iokv.core
notehub.views
[clojure.string :rename {replace sreplace} :only [replace]])
(:require
(:require
[ring.adapter.jetty :as jetty]
[clojure.core.cache :as cache]
[hiccup.util :as util]
@ -41,119 +41,120 @@ @@ -41,119 +41,120 @@
:body content})
(defroutes api-routes
(GET "/note" {params :params}
(generate-string (api/version-manager api/get-note params)))
(GET "/note" {params :params}
(generate-string (api/version-manager api/get-note params)))
(POST "/note" {params :params}
(generate-string (api/version-manager api/post-note params)))
(POST "/note" {params :params}
(generate-string (api/version-manager api/post-note params)))
(PUT "/note" {params :params}
(generate-string (api/version-manager api/update-note params))))
(PUT "/note" {params :params}
(generate-string (api/version-manager api/update-note params))))
(defroutes app-routes
(GET "/api" [] (layout :no-js (get-message :api-title)
[:article (md-to-html (slurp "API.md"))]))
(context "/api" []
#(ring.util.response/content-type (api-routes %) "application/json"))
(GET "/" [] landing-page)
(GET "/:year/:month/:day/:title/export" [year month day title]
(when-let [md-text (:note (api/get-note {:noteID (api/build-key year month day title)}))]
(return-content-type "text/plain; charset=utf-8" md-text)))
(GET "/:year/:month/:day/:title/stats" [year month day title]
(let [note-id (api/build-key year month day title)]
(statistics-page (api/derive-title (storage/get-note note-id))
(storage/get-note-statistics note-id))))
(GET "/:year/:month/:day/:title/edit" [year month day title]
(let [note-id (api/build-key year month day title)]
(note-update-page
note-id
(:note (api/get-note {:noteID note-id})))))
(GET "/new" [] (new-note-page
(str
(current-timestamp)
(storage/sign (rand-int Integer/MAX_VALUE)))))
(GET "/:year/:month/:day/:title" [year month day title :as params]
(let [params (assoc (:query-params params)
:year year :month month :day day :title title)
note-id (api/build-key year month day title)
short-url (storage/create-short-url note-id params)]
(when (storage/note-exists? note-id)
(if (cache/has? @page-cache short-url)
(do
(swap! page-cache cache/hit short-url)
(storage/increment-note-view note-id))
(swap! page-cache cache/miss short-url
(note-page (api/get-note {:noteID note-id})
(api/url short-url))))
(cache/lookup @page-cache short-url))))
(GET "/:short-url" [short-url]
(when-let [params (storage/resolve-url short-url)]
(let [{:keys [year month day title]} params
rest-params (dissoc params :year :month :day :title)
core-url (api/url year month day title)
long-url (if (empty? rest-params) core-url (util/url core-url rest-params))]
(redirect long-url))))
(POST "/post-note" [session note signature password]
(if (and session
(.startsWith session
(str (current-timestamp)))
(= signature (storage/sign session note)))
(let [pid "NoteHub"
psk (storage/get-psk pid)
params {:note note
:pid pid
:signature (storage/sign pid psk note)
:password password}]
(if (storage/valid-publisher? pid)
(let [resp (api/post-note params)]
(if (get-in resp [:status :success])
(redirect (:longURL resp))
(response 400)))
(response 500)))
(response 400)))
(POST "/update-note" [noteID note password]
(let [pid "NoteHub"
psk (storage/get-psk pid)
params {:noteID noteID :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)))]
(if (get-in resp [:status :success])
(do
(doseq [url (storage/get-short-urls noteID)]
(swap! page-cache cache/evict url))
(redirect (:longURL resp)))
(response 403)))
(response 500))))
(route/resources "/")
(route/not-found (response 404)))
(GET "/api" [] (layout :no-js (get-message :api-title)
[:article (md-to-html (slurp "API.md"))]))
(context "/api" []
#(ring.util.response/content-type (api-routes %) "application/json"))
(GET "/" [] landing-page)
(GET "/:year/:month/:day/:title/export" [year month day title]
(when-let [md-text (:note (api/get-note {:noteID (api/build-key year month day title)}))]
(return-content-type "text/plain; charset=utf-8" md-text)))
(GET "/:year/:month/:day/:title/stats" [year month day title]
(let [note-id (api/build-key year month day title)]
(statistics-page (api/derive-title (storage/get-note note-id))
(storage/get-note-statistics note-id)
(storage/get-publisher note-id))))
(GET "/:year/:month/:day/:title/edit" [year month day title]
(let [note-id (api/build-key year month day title)]
(note-update-page
note-id
(:note (api/get-note {:noteID note-id})))))
(GET "/new" [] (new-note-page
(str
(current-timestamp)
(storage/sign (rand-int Integer/MAX_VALUE)))))
(GET "/:year/:month/:day/:title" [year month day title :as params]
(let [params (assoc (:query-params params)
:year year :month month :day day :title title)
note-id (api/build-key year month day title)
short-url (storage/create-short-url note-id params)]
(when (storage/note-exists? note-id)
(if (cache/has? @page-cache short-url)
(do
(swap! page-cache cache/hit short-url)
(storage/increment-note-view note-id))
(swap! page-cache cache/miss short-url
(note-page (api/get-note {:noteID note-id})
(api/url short-url))))
(cache/lookup @page-cache short-url))))
(GET "/:short-url" [short-url]
(when-let [params (storage/resolve-url short-url)]
(let [{:keys [year month day title]} params
rest-params (dissoc params :year :month :day :title)
core-url (api/url year month day title)
long-url (if (empty? rest-params) core-url (util/url core-url rest-params))]
(redirect long-url))))
(POST "/post-note" [session note signature password]
(if (and session
(.startsWith session
(str (current-timestamp)))
(= signature (storage/sign session note)))
(let [pid "NoteHub"
psk (storage/get-psk pid)
params {:note note
:pid pid
:signature (storage/sign pid psk note)
:password password}]
(if (storage/valid-publisher? pid)
(let [resp (api/post-note params)]
(if (get-in resp [:status :success])
(redirect (:longURL resp))
(response 400)))
(response 500)))
(response 400)))
(POST "/update-note" [noteID note password]
(let [pid "NoteHub"
psk (storage/get-psk pid)
params {:noteID noteID :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)))]
(if (get-in resp [:status :success])
(do
(doseq [url (storage/get-short-urls noteID)]
(swap! page-cache cache/evict url))
(redirect (:longURL resp)))
(response 403)))
(response 500))))
(route/resources "/")
(route/not-found (response 404)))
(def app
(let [handler (handler/site app-routes)]
(fn [request]
(let [{:keys [server-name server-port]} request
hostURL (str "https://" server-name
(when (not= 80 server-port) (str ":" server-port)))
(when (not= 80 server-port) (str ":" server-port)))
request (assoc-in request [:params :hostURL] hostURL)]
(if (get-setting :dev-mode)
(handler request)
(try (handler request)
(catch Exception e
(do
;TODO (log e)
(response 500)))))))))
(handler request)
(try (handler request)
(catch Exception e
(do
;TODO (log e)
(response 500)))))))))
(defn -main [& [port]]
(jetty/run-jetty #'app

7
src/notehub/storage.clj
Unescape View File

@ -15,13 +15,13 @@ @@ -15,13 +15,13 @@
(.update md5Instance (.getBytes input))
(apply str
(map #(let [c (Integer/toHexString (bit-and 0xff %))]
(if (= 1 (count c)) (str "0" c) c))
(if (= 1 (count c)) (str "0" c) c))
(.digest md5Instance)))))))
(defmacro redis [cmd & body]
`(car/wcar conn
(~(symbol "car" (name cmd))
~@body)))
~@body)))
(defn get-current-date []
(.getTime (java.util.Date.)))
@ -72,8 +72,7 @@ @@ -72,8 +72,7 @@
(defn get-note-statistics [noteID]
{:views (get-note-views noteID)
:published (redis :hget :published noteID)
:edited (redis :hget :edited noteID)
:publisher (get-publisher noteID)})
:edited (redis :hget :edited noteID)})
(defn note-exists? [noteID]
(= 1 (redis :hexists :note noteID)))

21
src/notehub/views.clj
Unescape View File

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
(ns notehub.views
(:use
(:use
iokv.core
[clojure.string :rename {replace sreplace} :only [replace]]
[hiccup.form]
@ -68,23 +68,24 @@ @@ -68,23 +68,24 @@
[:a.landing-button {:href "/new" :style "color: white"} (get-message :new-page)]]
[:div#dashed-line]
[:article.helvetica.bottom-space
{:style "font-size: 1em"}
(md-to-html (slurp "LANDING.md"))]
{:style "font-size: 1em"}
(md-to-html (slurp "LANDING.md"))]
[:div#footer (md-to-html (get-message :footer))]))
(defn statistics-page [note-title stats]
(let [page-title (get-message :statistics)]
(defn statistics-page [note-title stats publisher]
(let [page-title (get-message :statistics)
info (assoc stats :publisher publisher)]
(layout :no-js page-title
[:h2.central-element note-title]
[:h3.central-element.helvetica page-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)]])
#(when-let [v (% info)]
[: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 [note-id note]

Write Preview
Loading…
Cancel
Save