Merge pull request #94 from witch-house/slash-or

Support `:or` in path, in addition to parameter

2 files changed, 46 insertions, 21 deletions

diff --git a/src/pronouns/pages.clj b/src/pronouns/pages.clj
index ac67970..283a34b 100644
--- a/src/pronouns/pages.clj
+++ b/src/pronouns/pages.clj
@@ -136,13 +136,20 @@
        examples
        (footer-block)]])))
 
-(defn lookup-pronouns [pronouns-string]
+(defn table-lookup* [pronouns-string]
   (let [inputs (s/split pronouns-string #"/")
         n (count inputs)]
     (if (>= n 5)
       (take 5 inputs)
       (u/table-lookup inputs @pronouns-table))))
 
+(defn lookup-pronouns
+  "Given a seq of pronoun sets, look up each set in the pronouns table"
+  [pronoun-sets]
+  (->> pronoun-sets
+       (map (comp table-lookup* escape-html))
+       (filter some?)))
+
 (defn make-link [path]
   (let [link (str "/" path)
         label path]
@@ -184,8 +191,9 @@
         [:ul links]]]
       (footer-block)])))
 
-(defn not-found []
-  (let [title "Pronoun Island: English Language Examples"]
+(defn not-found [path]
+  (let [title "Pronoun Island: English Language Examples"
+        or-re #"/[oO][rR]/"]
     (html
      [:html
       [:head
@@ -194,18 +202,24 @@
        [:link {:rel "stylesheet" :href "/pronouns.css"}]]
       [:body
        (header-block title)
-      [:div {:class "section examples"}
-       [:p [:h2 (str "We couldn't find those pronouns in our database. "
-                     "If you think we should have them, please reach out!")]]]
+       [:div {:class "section examples"}
+        [:p [:h2 "We couldn't find those pronouns in our database :("]
+         "If you think we should have them, please reach out!"]
+        (when (re-find or-re path)
+          (let [alts (s/split path or-re)
+                new-path (str "/" (s/join "/:OR/" alts))]
+            [:div
+             "Did you mean: "
+             (href new-path
+                   (str "pronoun.is"
+                        new-path))]))]
        (footer-block)]])))
 
 (defn pronouns [params]
   (let [path (params :*)
-        alts (or (params "or") [])
-        pronouns (concat [path] (u/vec-coerce alts))
-        pronoun-declensions (filter some? (map #(lookup-pronouns
-                                                 (escape-html %))
-                                               pronouns))]
-    (if (seq pronoun-declensions)
-      (format-pronoun-examples pronoun-declensions)
-      (not-found))))
+        param-alts (u/vec-coerce (or (params "or") []))
+        path-alts (s/split path #"/:[oO][rR]/")
+        pronouns (lookup-pronouns (concat path-alts param-alts))]
+    (if (seq pronouns)
+      (format-pronoun-examples pronouns)
+      (not-found path))))
diff --git a/test/pronouns/pages_test.clj b/test/pronouns/pages_test.clj
index e32a2ee..7563be1 100644
--- a/test/pronouns/pages_test.clj
+++ b/test/pronouns/pages_test.clj
@@ -3,10 +3,21 @@
             [clojure.test :refer [deftest testing is are]]))
 
 (deftest prose-comma-list
-  (testing "prose-comma-list turns a list of strings into a prose list"
-    (are [call result] (= call result)
-      (pages/prose-comma-list ["foo"]) "foo"
-      (pages/prose-comma-list ["foo" "bar"]) "foo and bar"
-      (pages/prose-comma-list ["foo" "bar" "baz"]) "foo, bar, and baz"
-      (pages/prose-comma-list ["foo" "bar" "baz" "bobble"]) "foo, bar, baz, and bobble"
-      (pages/prose-comma-list []) "")))
+  (testing "`prose-comma-list` turns a list of strings into a prose list"
+    (are [v s] (= (pages/prose-comma-list v) s)
+      ["foo" "bar" "baz" "bobble"] "foo, bar, baz, and bobble"
+      ["foo" "bar" "baz"]          "foo, bar, and baz"
+      ["foo" "bar"]                "foo and bar"
+      ["foo"]                      "foo"
+      []                           "")))
+
+(deftest lookup-pronouns
+  (are [pronoun-strs pronouns]
+      (= (pages/lookup-pronouns pronoun-strs)
+         pronouns)
+    ["she/her"]           '(["she" "her" "her" "hers" "herself"])
+    ["she" "they"]        '(["she" "her" "her" "hers" "herself"]
+                            ["they" "them" "their" "theirs" "themselves"])
+    ["she/her" "foo/bar"] '(["she" "her" "her" "hers" "herself"])
+    ["foo/bar"]           '()
+    ["a/b/c/d/e"]         '(("a" "b" "c" "d" "e"))))