From 00a93be8b90c3bdbd96315383c233b0a4aee87a8 Mon Sep 17 00:00:00 2001
From: Christian Mueller <chmllr@me.com>
Date: Sun, 19 Jan 2014 22:39:58 +0100
Subject: [PATCH] redis hierarchy levels changed to keywords

---
 src/NoteHub/storage.clj | 73 +++++++++++++++++------------------------
 1 file changed, 31 insertions(+), 42 deletions(-)

diff --git a/src/NoteHub/storage.clj b/src/NoteHub/storage.clj
index 34ac51f..e84c0e9 100644
--- a/src/NoteHub/storage.clj
+++ b/src/NoteHub/storage.clj
@@ -13,102 +13,91 @@
 (defn get-current-date []
   (str (java.util.Date.)))
 
-; hierarchy levels
-(def note "note")
-(def published "published")
-(def edited "edited")
-(def views "views")
-(def password "password")
-(def sessions "sessions")
-(def short-url "short-url")
-(def publisher "publisher")
-(def publisher-key "publisher-key")
-
 (defn valid-publisher? [pid]
-  (= 1 (redis :hexists publisher-key pid)))
+  (= 1 (redis :hexists :publisher-key pid)))
 
 (defn register-publisher [pid]
   "Returns nil if given PID exists or a PSK otherwise"
   (when (not (valid-publisher? pid))
     (let [psk (encrypt (str (rand-int Integer/MAX_VALUE) pid))]
-      (redis :hset publisher-key pid psk)
+      (redis :hset :publisher-key pid psk)
       psk)))
 
 (defn revoke-publisher [pid]
-  (redis :hdel publisher-key pid))
+  (redis :hdel :publisher-key pid))
 
 (defn get-psk [pid]
-  (redis :hget publisher-key pid))
+  (redis :hget :publisher-key pid))
 
 (defn create-session []
   (let [token (encrypt (str (rand-int Integer/MAX_VALUE)))]
-    (do (redis :sadd sessions token)
+    (do (redis :sadd :sessions token)
       token)))
 
 (defn invalidate-session [token]
-  (let [was-valid (redis :sismember sessions token)]
-    (redis :srem sessions token)
+  (let [was-valid (redis :sismember :sessions token)]
+    (redis :srem :sessions token)
     (= 1 was-valid)))
 
 (defn edit-note [noteID text]
-  (redis :hset edited noteID (get-current-date))
-  (redis :hset note noteID text))
+  (redis :hset :edited noteID (get-current-date))
+  (redis :hset :note noteID text))
 
 (defn add-note
   ([noteID text pid] (add-note noteID text pid nil))
   ([noteID text pid passwd]
-   (redis :hset note noteID text)
-   (redis :hset published noteID (get-current-date))
-   (redis :hset publisher noteID pid)
+   (redis :hset :note noteID text)
+   (redis :hset :published noteID (get-current-date))
+   (redis :hset :publisher noteID pid)
    (when (not (blank? passwd))
-     (redis :hset password noteID passwd))))
+     (redis :hset :password noteID passwd))))
 
 (defn valid-password? [noteID passwd]
-  (let [stored (redis :hget password noteID)]
+  (let [stored (redis :hget :password noteID)]
     (and (not (= 0 stored)) (= stored passwd))))
 
 (defn get-note-views [noteID]
-  (redis :hget views noteID))
+  (redis :hget :views noteID))
 
 (defn get-publisher [noteID]
-  (redis :hget publisher noteID))
+  (redis :hget :publisher noteID))
 
 (defn get-note-statistics [noteID]
   {:views (get-note-views noteID)
-   :published (redis :hget published noteID)
-   :edited (redis :hget edited noteID)
+   :published (redis :hget :published noteID)
+   :edited (redis :hget :edited noteID)
    :publisher (get-publisher noteID)})
 
 (defn note-exists? [noteID]
-  (= 1 (redis :hexists note noteID)))
+  (= 1 (redis :hexists :note noteID)))
 
 (defn get-note [noteID]
   (when (note-exists? noteID)
     (do
-      (redis :hincrby views noteID 1)
-      (redis :hget note noteID))))
+      (redis :hincrby :views noteID 1)
+      (redis :hget :note noteID))))
 
 (defn delete-note [noteID]
-  (doseq [kw [password views note published edited publisher]]
+  (doseq [kw [:password :views :note :published :edited :publisher]]
     ; TODO: delete short url by looking for the title
     (redis :hdel kw noteID)))
 
 (defn short-url-exists? [url]
-  (= 1 (redis :hexists short-url url)))
+  (= 1 (redis :hexists :short-url url)))
 
 (defn get-short-url [noteID]
-  (redis :hget short-url noteID))
+  (redis :hget :short-url noteID))
 
 (defn resolve-url [url]
-  (let [value (redis :hget short-url url)]
+  (let [value (redis :hget :short-url url)]
     (when value
       (read-string value))))
 
 (defn delete-short-url [noteID]
-  (let [value (redis :hget short-url noteID)]
+  (let [value (redis :hget :short-url noteID)]
     (do
-      (redis :hdel short-url noteID)
-      (redis :hdel short-url value))))
+      (redis :hdel :short-url noteID)
+      (redis :hdel :short-url value))))
 
 (defn create-short-url
   "Creates a short url for the given request metadata or extracts
@@ -116,7 +105,7 @@
   [arg]
   (let [key (str (into (sorted-map) arg))]
     (if (short-url-exists? key)
-      (redis :hget short-url key)
+      (redis :hget :short-url key)
       (let [hash-stream (partition 5 (repeatedly #(rand-int 36)))
             hash-to-string (fn [hash]
                              (apply str
@@ -129,6 +118,6 @@
         (do
           ; we create two mappings: key params -> short url and back,
           ; s.t. we can later easily check whether a short url already exists
-          (redis :hset short-url url key)
-          (redis :hset short-url key url)
+          (redis :hset :short-url url key)
+          (redis :hset :short-url key url)
           url)))))
\ No newline at end of file