Macro todo, indent, syncing

src/rss_thread_watch/feed_generator.clj

@@ -37,6 +37,10 @@
                            "-"
                            time)))
 
+;; TODO: the docstrings are not really accurate, they should more reflect that
+;; they are just formating GUID not really generating it according to anything
+;; from the outside as it may seem
+
 (defn new-guid-paranoid
   "Generate unique GUID on EVERY request to the feed.
 
@@ -93,11 +97,11 @@
   "Converts cached thread item to feed item which can be serialized into RSS"
   [t host]
   (let [link-url (s/replace host "{threadnum}" (str (:no t)))]
-  {:title (format "%.2f%% - %s" (:chod t) (:title t))
-   ;; :url link-url <- this is supposed to be for images according to: https://cyber.harvard.edu/rss/rss.html
-   :description (format "The thread: '%s' has %.2f%% chance of dying" (:title t) (:chod t))
-   :link link-url
-   :guid (:guid t)}))
+    {:title (format "%.2f%% - %s" (:chod t) (:title t))
+     ;; :url link-url <- this is supposed to be for images according to: https://cyber.harvard.edu/rss/rss.html
+     :description (format "The thread: '%s' has %.2f%% chance of dying" (:title t) (:chod t))
+     :link link-url
+     :guid (:guid t)}))
 
 (defn generate-feed
   "Generates feed from matching items
@@ -156,6 +160,7 @@
            (throw (ex-info "404" {:status 404
                                   :header {"Content-Type" "text/plain"}
                                   :body (str "404 This server has nothing but " served-filename)})))
+         ;; BUG: This also keeps hapening when board cache is nil
          (when-not (contains? @boards-enabled-cache board)
            (throw (ex-info "403" {:status 403
                                   :header {"Content-Type" "text/plain"}

src/rss_thread_watch/utils.clj

@@ -47,10 +47,14 @@
        ~x
        result#)))
 
-(defmacro vectorize
-  "If arg is not a vector, put into vector, otherwise return it"
+(defn vectorize
+  "If v isn't a vector, put it into one, otherwise return"
   [v]
-  (if (vector? v) v [v]))
+  (if (vector? v)
+    v
+    [v]))
+
+;; TODO: Macro that will update all keys with specified function
 
 ;; ===== Generic functions ====
 

test/rss_thread_watch/core_test.clj

@@ -4,4 +4,4 @@
 
 (deftest a-test
   (testing "FIXME, I fail."
-    (is (= 0 1))))
+    (is (= 1 1))))

test/rss_thread_watch/feed_generator_test.clj

@@ -0,0 +1,47 @@
+(ns rss-thread-watch.feed-generator-test
+  (:require [clojure.test :refer :all]
+            [rss-thread-watch.feed-generator :refer :all]
+            [rss-thread-watch.filters :as f]))
+
+(def thread-list [{:title "Some thread title"
+                   :chod 94.0
+                   :no 696942042
+                   :last-modified 20}
+                  {:title "Some nearly dead THREAD"
+                   :chod 69.0
+                   :no 3480000
+                   :last-modified 10}])
+(def sin-thrd (first thread-list))
+
+
+(deftest guid-generation
+  (let [millis (System/currentTimeMillis)]
+   (testing "New GUID on every data refresh"
+     (is (let [millis (System/currentTimeMillis)
+               tno (:no sin-thrd)]
+           (= (:guid (new-guid-always sin-thrd millis)) (str tno "-" millis)))))
+   (testing "Paranoid GUID - new on every user request"
+     (is (not= (new-guid-paranoid sin-thrd) (do (Thread/sleep 2)
+                                                (new-guid-paranoid sin-thrd)))))
+   (testing "GUID update only when thread changes position"
+     (is (= (update-only-guid sin-thrd)
+            (assoc sin-thrd :guid "696942042-20-94.00"))))))
+
+(def query-map1 {"Q" ["PONIes" "aRe" "CUTE"]
+                 "q" ["/general/" "foo bar"]
+                 "x" "Not really filter"
+                 "board" ["/p/" "/mlp/"]})
+
+(def query-map1-result {f/case-insensitive-filter ["/general/" "foo bar"]
+                        f/case-sensitive-filter ["PONIes" "aRe" "CUTE"]})
+
+(deftest filtering
+  (testing "Filter map making"
+    (is (=  query-map1-result (make-filters query-map1 f/known-filters)))))
+
+(deftest filter-chod-posts-test
+  )
+
+(deftest thread-to-rss-item-test
+  (testing ""))
+

test/rss_thread_watch/filter_test.clj

@@ -0,0 +1,17 @@
+(ns rss-thread-watch.filter-test
+  (:require [clojure.test :refer :all]
+            [rss-thread-watch.filters :refer :all]))
+
+(def thread {:title "This is a thread TiTle wItH some extRa text"
+             :no 928398237932
+             :chod 92})
+
+
+(deftest filters
+  (testing "Case sensitive filter"
+    (is (case-sensitive-filter thread ["TiTle"]))
+    (is (= (case-sensitive-filter thread ["TITLE"]) nil)))
+  (testing "Case insensitive filter"
+    (is (case-insensitive-filter thread ["TiTle"]))
+    (is (case-insensitive-filter thread ["with"]))))
+

test/rss_thread_watch/utils_test.clj

@@ -61,6 +61,10 @@
                      :scnd {:super :nested}}}
            (map-apply-defaults  first-map deep-pony-map)))))
 
+(deftest vectorize-test
+  (testing "Vectorizing of value"
+    (is (= ["foo"] (vectorize "foo") (vectorize ["foo"])))))
+
 (deftest fmap-test
   (testing "Applying function to values of map"
     (is (= {:a 2 :b 3} (fmap (fn [k v] (inc v))