From 221ad4d8c0444db5c6e79ea981ac602b5c6eb20e Mon Sep 17 00:00:00 2001 From: Daria Phoebe Brashear Date: Tue, 9 Feb 2016 12:49:20 -0500 Subject: [PATCH 01/25] add fae pronouns to the database --- resources/pronouns.tab | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/pronouns.tab b/resources/pronouns.tab index d8fe3ce..e19c6e7 100644 --- a/resources/pronouns.tab +++ b/resources/pronouns.tab @@ -23,3 +23,4 @@ se sim ser sers serself zme zmyr zmyr zmyrs zmyrself ve vem vir virs vemself zee zed zeta zetas zedself +fae faer faer faers faerself From b3a7b60a101c003c583b0edbad46acd980e7d80f Mon Sep 17 00:00:00 2001 From: Alice Wyan Date: Wed, 20 Apr 2016 16:15:32 +0100 Subject: [PATCH 02/25] Added zie/hir pronouns --- resources/pronouns.tab | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/pronouns.tab b/resources/pronouns.tab index e19c6e7..723533b 100644 --- a/resources/pronouns.tab +++ b/resources/pronouns.tab @@ -24,3 +24,4 @@ zme zmyr zmyr zmyrs zmyrself ve vem vir virs vemself zee zed zeta zetas zedself fae faer faer faers faerself +zie hir hir hirs hirself From 89bb78554f62762d237cae41282dbc0bfe8a8372 Mon Sep 17 00:00:00 2001 From: Jamie Culpon Date: Thu, 26 May 2016 19:05:42 -0700 Subject: [PATCH 03/25] Add si/hyr pronouns Add si/hyr pronouns, used by some nonbinary folks in the Vermont area. --- resources/pronouns.tab | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/pronouns.tab b/resources/pronouns.tab index 723533b..bfdea53 100644 --- a/resources/pronouns.tab +++ b/resources/pronouns.tab @@ -25,3 +25,4 @@ ve vem vir virs vemself zee zed zeta zetas zedself fae faer faer faers faerself zie hir hir hirs hirself +si hyr hyr hyrs hyrself From 1e3ef97b2b30a2ed0e3d1d723f34870757a7bd76 Mon Sep 17 00:00:00 2001 From: Cassie Peele Date: Mon, 30 May 2016 19:06:52 -0400 Subject: [PATCH 04/25] add kit pronouns --- resources/pronouns.tab | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/pronouns.tab b/resources/pronouns.tab index 723533b..a7891e3 100644 --- a/resources/pronouns.tab +++ b/resources/pronouns.tab @@ -25,3 +25,4 @@ ve vem vir virs vemself zee zed zeta zetas zedself fae faer faer faers faerself zie hir hir hirs hirself +kit kit kits kits kitself From f0f6c207daea6efff6422e0a79fa388198fc9d4d Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Sun, 7 Aug 2016 03:04:39 -0700 Subject: [PATCH 05/25] add experimental support for multiple pronoun sets --- src/pronouns/pages.clj | 46 ++++++++++++++++++++++++++---------------- src/pronouns/util.clj | 3 +++ src/pronouns/web.clj | 10 ++++----- 3 files changed, 37 insertions(+), 22 deletions(-) diff --git a/src/pronouns/pages.clj b/src/pronouns/pages.clj index 3e63437..2a0c732 100644 --- a/src/pronouns/pages.clj +++ b/src/pronouns/pages.clj @@ -71,20 +71,22 @@ (defn format-pronoun-examples - [subject object possessive-determiner possessive-pronoun reflexive] + [pronoun-declension alternates] + (println pronoun-declension) + (println alternates) (let [title "Pronoun Island: English Language Examples"] - (html - [:html - [:head - [:title title] - [:meta {:name "viewport" :content "width=device-width"}] - [:link {:rel "stylesheet" :href "/pronouns.css"}]] - [:body - (title-block title) - (examples-block subject object possessive-determiner possessive-pronoun reflexive) - (about-block) - (contact-block)]]))) - + (html + [:html + [:head + [:title title] + [:meta {:name "viewport" :content "width=device-width"}] + [:link {:rel "stylesheet" :href "/pronouns.css"}]] + [:body + (title-block title) + (apply examples-block pronoun-declension) + (map #(apply examples-block %) alternates) + (about-block) + (contact-block)]]))) (defn parse-pronouns-with-lookup [pronouns-string pronouns-table] (let [inputs (s/split pronouns-string #"/") @@ -121,8 +123,18 @@ "add them, or issue a pull request at " "https://github.com/witch-house/pronoun.is/blob/master/resources/pronouns.tab")) -(defn pronouns [path pronouns-table] - (let [pronouns (parse-pronouns-with-lookup (escape-html path) pronouns-table)] - (if pronouns - (apply format-pronoun-examples pronouns) +(defn pronouns [params pronouns-table] + (println params) + (let [path (params :*) + ors (u/vec-coerce (params "or")) + a (println path) + pronoun-declension (parse-pronouns-with-lookup (escape-html path) + pronouns-table) + alternates (map #(parse-pronouns-with-lookup (escape-html %) + pronouns-table) + ors) + ] + (println pronoun-declension) + (if pronoun-declension + (format-pronoun-examples pronoun-declension alternates) (not-found)))) diff --git a/src/pronouns/util.clj b/src/pronouns/util.clj index 4d4f928..3a4bf10 100644 --- a/src/pronouns/util.clj +++ b/src/pronouns/util.clj @@ -29,3 +29,6 @@ "given a list of pronoun rows, return a list of minimum unabiguous paths" [pronouns-table] (map (partial minimum-unambiguous-path pronouns-table) pronouns-table)) + +(defn vec-coerce [x] + (if (vector? x) x [x])) diff --git a/src/pronouns/web.clj b/src/pronouns/web.clj index 23ac603..cb5e6c9 100644 --- a/src/pronouns/web.clj +++ b/src/pronouns/web.clj @@ -6,8 +6,7 @@ [clojure.string :as s] [ring.middleware.logger :as logger] [ring.middleware.stacktrace :as trace] - [ring.middleware.session :as session] - [ring.middleware.session.cookie :as cookie] + [ring.middleware.params :as params] [ring.adapter.jetty :as jetty] [environ.core :refer [env]] [pronouns.util :as u] @@ -23,7 +22,7 @@ :headers {"Content-Type" "text/html"} :body (pages/front pronouns-table)}) - (GET "/pronouns.css" {params :params} + (GET "/pronouns.css" [] {:status 200 :headers {"Content-Type" "text/css"} :body (slurp (io/resource "pronouns.css"))}) @@ -31,7 +30,7 @@ (GET "/*" {params :params} {:status 200 :headers {"Content-Type" "text/html"} - :body (pages/pronouns (:* params) pronouns-table)}) + :body (pages/pronouns params pronouns-table)}) (ANY "*" [] (route/not-found (slurp (io/resource "404.html"))))) @@ -48,7 +47,8 @@ (-> app-routes logger/wrap-with-logger wrap-error-page - trace/wrap-stacktrace)) + trace/wrap-stacktrace + params/wrap-params)) (defn -main [] (let [port (Integer. (:port env From f7e3f082cebec1c7f601bb3d3ed021c7acf6d841 Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Sun, 7 Aug 2016 03:18:47 -0700 Subject: [PATCH 06/25] add descriptive headers for multiple pronoun sets #38 --- src/pronouns/pages.clj | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/src/pronouns/pages.clj b/src/pronouns/pages.clj index 2a0c732..dcade59 100644 --- a/src/pronouns/pages.clj +++ b/src/pronouns/pages.clj @@ -43,13 +43,17 @@ (defn examples-block [subject object possessive-determiner possessive-pronoun reflexive] - [:div {:class "examples"} - [:p [:h2 "Here are some usage examples for my pronouns:"]] - (subject-example subject) - (object-example object) - (posessive-determiner-example subject possessive-determiner) - (possessive-pronoun-example possessive-pronoun) - (reflexive-example subject reflexive)]) + (let [sub-obj (str subject "/" object) + header-str (str "Here are some usage examples for my " + sub-obj + " pronouns")] + [:div {:class "examples"} + [:p [:h2 header-str]] + (subject-example subject) + (object-example object) + (posessive-determiner-example subject possessive-determiner) + (possessive-pronoun-example possessive-pronoun) + (reflexive-example subject reflexive)])) (defn about-block [] [:div {:class "about"} @@ -72,8 +76,6 @@ (defn format-pronoun-examples [pronoun-declension alternates] - (println pronoun-declension) - (println alternates) (let [title "Pronoun Island: English Language Examples"] (html [:html @@ -88,7 +90,7 @@ (about-block) (contact-block)]]))) -(defn parse-pronouns-with-lookup [pronouns-string pronouns-table] +(defn lookup-pronouns [pronouns-string pronouns-table] (let [inputs (s/split pronouns-string #"/") n (count inputs)] (if (>= n 5) @@ -124,16 +126,13 @@ "https://github.com/witch-house/pronoun.is/blob/master/resources/pronouns.tab")) (defn pronouns [params pronouns-table] - (println params) (let [path (params :*) ors (u/vec-coerce (params "or")) - a (println path) - pronoun-declension (parse-pronouns-with-lookup (escape-html path) - pronouns-table) - alternates (map #(parse-pronouns-with-lookup (escape-html %) - pronouns-table) - ors) - ] + pronoun-declension (lookup-pronouns (escape-html path) + pronouns-table) + alternates (map #(lookup-pronouns (escape-html %) + pronouns-table) + ors)] (println pronoun-declension) (if pronoun-declension (format-pronoun-examples pronoun-declension alternates) From a4369bf8498a8fd314ef6f7a5bd45cb212bec161 Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Sun, 7 Aug 2016 03:20:31 -0700 Subject: [PATCH 07/25] remove errant println! --- src/pronouns/pages.clj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pronouns/pages.clj b/src/pronouns/pages.clj index dcade59..2aaf964 100644 --- a/src/pronouns/pages.clj +++ b/src/pronouns/pages.clj @@ -133,7 +133,6 @@ alternates (map #(lookup-pronouns (escape-html %) pronouns-table) ors)] - (println pronoun-declension) (if pronoun-declension (format-pronoun-examples pronoun-declension alternates) (not-found)))) From 3c2bf7a8f8f0c76cfb7e2b57b244764e0482421c Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Sun, 7 Aug 2016 03:26:45 -0700 Subject: [PATCH 08/25] update @morganastra's pronouns --- src/pronouns/pages.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pronouns/pages.clj b/src/pronouns/pages.clj index 2aaf964..9c42a0a 100644 --- a/src/pronouns/pages.clj +++ b/src/pronouns/pages.clj @@ -69,7 +69,7 @@ "Written by " (twitter-name "morganastra") ", whose " - [:a {:href "http://pronoun.is/ze/zir"} "pronoun.is/ze/zir"] + [:a {:href "http://pronoun.is/ze/zir?or=she"} "pronoun.is/ze/zir?or=she"] ". " "Visit the project on " [:a {:href "https://github.com/witch-house/pronoun.is"} "github!"]]])) From 1afca666f4f231fb912bd7804dcdf8682e817dab Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Sun, 7 Aug 2016 03:55:53 -0700 Subject: [PATCH 09/25] fix error with single pronoun set --- src/pronouns/pages.clj | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/pronouns/pages.clj b/src/pronouns/pages.clj index 9c42a0a..f73a12e 100644 --- a/src/pronouns/pages.clj +++ b/src/pronouns/pages.clj @@ -75,7 +75,7 @@ (defn format-pronoun-examples - [pronoun-declension alternates] + [pronoun-declensions] (let [title "Pronoun Island: English Language Examples"] (html [:html @@ -85,8 +85,7 @@ [:link {:rel "stylesheet" :href "/pronouns.css"}]] [:body (title-block title) - (apply examples-block pronoun-declension) - (map #(apply examples-block %) alternates) + (map #(apply examples-block %) pronoun-declensions) (about-block) (contact-block)]]))) @@ -127,12 +126,11 @@ (defn pronouns [params pronouns-table] (let [path (params :*) - ors (u/vec-coerce (params "or")) - pronoun-declension (lookup-pronouns (escape-html path) - pronouns-table) - alternates (map #(lookup-pronouns (escape-html %) + alts (or (params "or") []) + pronouns (concat [path] (u/vec-coerce alts)) + pronoun-declensions (map #(lookup-pronouns (escape-html %) pronouns-table) - ors)] - (if pronoun-declension - (format-pronoun-examples pronoun-declension alternates) + pronouns)] + (if pronoun-declensions + (format-pronoun-examples pronoun-declensions) (not-found)))) From cd832bcd7049e9d4ce80ef2907e084edc5813319 Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Sun, 7 Aug 2016 05:47:00 -0700 Subject: [PATCH 10/25] use pretty formatting on not found page, remove github PR link fixes #54 fixes #27 fixes #23 --- src/pronouns/pages.clj | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/src/pronouns/pages.clj b/src/pronouns/pages.clj index f73a12e..bf67f75 100644 --- a/src/pronouns/pages.clj +++ b/src/pronouns/pages.clj @@ -120,17 +120,30 @@ (contact-block)]))) (defn not-found [] - (str "We couldn't find those pronouns in our database, please ask us to " - "add them, or issue a pull request at " - "https://github.com/witch-house/pronoun.is/blob/master/resources/pronouns.tab")) + (let [title "Pronoun Island: English Language Examples"] + (html + [:html + [:head + [:title title] + [:meta {:name "viewport" :content "width=device-width"}] + [:link {:rel "stylesheet" :href "/pronouns.css"}]] + [:body + (title-block title) + [:div {:class "examples"} + [:p [:h2 (str "We couldn't find those pronouns in our database." + "If you think we should have them, please reach out!")]]] + (about-block) + (contact-block)]]))) (defn pronouns [params pronouns-table] (let [path (params :*) alts (or (params "or") []) pronouns (concat [path] (u/vec-coerce alts)) - pronoun-declensions (map #(lookup-pronouns (escape-html %) - pronouns-table) - pronouns)] - (if pronoun-declensions + pronoun-declensions (filter some? (map #(lookup-pronouns (escape-html %) + pronouns-table) + pronouns))] + (println path) + (println pronoun-declensions) + (if (seq pronoun-declensions) (format-pronoun-examples pronoun-declensions) (not-found)))) From cc63e119bc7d4031b37ee2ebcef38c854ad40dce Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Sun, 7 Aug 2016 15:05:40 -0700 Subject: [PATCH 11/25] Add ne/nem pronouns --- resources/pronouns.tab | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/pronouns.tab b/resources/pronouns.tab index 37e8d34..64ccbbb 100644 --- a/resources/pronouns.tab +++ b/resources/pronouns.tab @@ -27,3 +27,4 @@ fae faer faer faers faerself zie hir hir hirs hirself si hyr hyr hyrs hyrself kit kit kits kits kitself +ne nem nir nirs nemself From e3c5f5d366af76cb39f2716455cb220abdc0bfae Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Tue, 9 Aug 2016 21:05:50 -0700 Subject: [PATCH 12/25] get rid of useless config var and use dynamic var for *pronouns-table*, clean up project.clj --- project.clj | 14 +++++++------- src/pronouns/config.clj | 5 +++++ src/pronouns/pages.clj | 21 +++++++++++---------- src/pronouns/util.clj | 13 +++++++------ src/pronouns/web.clj | 19 ++++++++----------- 5 files changed, 38 insertions(+), 34 deletions(-) create mode 100644 src/pronouns/config.clj diff --git a/project.clj b/project.clj index 961c733..88084dc 100644 --- a/project.clj +++ b/project.clj @@ -1,5 +1,5 @@ -(defproject pronouns "1.0.0-SNAPSHOT" - :description "FIXME: write description" +(defproject witch-house/pronouns "1.9.0-SNAPSHOT" + :description "Pronoun.is is a web app for showing usage examples of personal pronouns in English." :url "http://pronouns.herokuapp.com" :license {:name "FIXME: choose" :url "http://example.com/FIXME"} @@ -8,12 +8,12 @@ [ring/ring-jetty-adapter "1.2.2"] [ring.middleware.logger "0.5.0"] [ring/ring-devel "1.2.2"] - [ring-basic-authentication "1.0.5"] [environ "0.5.0"] - [hiccup "1.0.5"] - [com.cemerick/drawbridge "0.0.6"]] + [hiccup "1.0.5"]] :min-lein-version "2.0.0" - :plugins [[environ/environ.lein "0.2.1"]] + :plugins [[environ/environ.lein "0.2.1"] + [lein-ring "0.9.7"]] :hooks [environ.leiningen.hooks] :uberjar-name "pronouns-standalone.jar" - :profiles {:production {:env {:production true}}}) + :profiles {:production {:env {:production true}}} + :ring {:handler pronouns.web/app}) diff --git a/src/pronouns/config.clj b/src/pronouns/config.clj new file mode 100644 index 0000000..fdb4c97 --- /dev/null +++ b/src/pronouns/config.clj @@ -0,0 +1,5 @@ +(ns pronouns.config + (:require [pronouns.util :as u])) + +(def ^:dynamic *pronouns-table* + (u/slurp-tabfile "resources/pronouns.tab")) diff --git a/src/pronouns/pages.clj b/src/pronouns/pages.clj index bf67f75..708d912 100644 --- a/src/pronouns/pages.clj +++ b/src/pronouns/pages.clj @@ -1,5 +1,6 @@ (ns pronouns.pages (:require [clojure.string :as s] + [pronouns.config :refer [*pronouns-table*]] [pronouns.util :as u] [hiccup.core :refer :all] [hiccup.util :refer [escape-html]])) @@ -89,20 +90,22 @@ (about-block) (contact-block)]]))) -(defn lookup-pronouns [pronouns-string pronouns-table] +(defn lookup-pronouns [pronouns-string] (let [inputs (s/split pronouns-string #"/") n (count inputs)] + (println *pronouns-table*) (if (>= n 5) (take 5 inputs) - (u/table-lookup inputs pronouns-table)))) + (u/table-lookup inputs *pronouns-table*)))) (defn make-link [path] (let [link (str "/" path) label path] [:li [:a {:href link} label]])) -(defn front [pronouns-table] - (let [abbreviations (u/abbreviate pronouns-table) +(defn front [] + (let [blah (println *pronouns-table*) + abbreviations (u/abbreviate *pronouns-table*) links (map make-link abbreviations) title "Pronoun Island"] (html @@ -135,15 +138,13 @@ (about-block) (contact-block)]]))) -(defn pronouns [params pronouns-table] +(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-table) - pronouns))] - (println path) - (println pronoun-declensions) + pronoun-declensions (filter some? (map #(lookup-pronouns + (escape-html %)) + pronouns))] (if (seq pronoun-declensions) (format-pronoun-examples pronoun-declensions) (not-found)))) diff --git a/src/pronouns/util.clj b/src/pronouns/util.clj index 3a4bf10..ef353a8 100644 --- a/src/pronouns/util.clj +++ b/src/pronouns/util.clj @@ -16,19 +16,20 @@ (table-lookup query-key (slurp-tabfile tabfile))) (defn minimum-unambiguous-path - ([pronouns-table sections] (minimum-unambiguous-path pronouns-table sections 1)) - ([pronouns-table sections number-of-sections] + ([table sections] (minimum-unambiguous-path table sections 1)) + ([table sections number-of-sections] (let [sections-subset (take number-of-sections sections) - results (filter #(= (take number-of-sections %) sections-subset) pronouns-table)] + results (filter #(= (take number-of-sections %) sections-subset) + table)] (case (count results) 0 nil 1 (clojure.string/join "/" sections-subset) - (recur pronouns-table sections (+ number-of-sections 1)))))) + (recur table sections (+ number-of-sections 1)))))) (defn abbreviate "given a list of pronoun rows, return a list of minimum unabiguous paths" - [pronouns-table] - (map (partial minimum-unambiguous-path pronouns-table) pronouns-table)) + [table] + (map (partial minimum-unambiguous-path table) table)) (defn vec-coerce [x] (if (vector? x) x [x])) diff --git a/src/pronouns/web.clj b/src/pronouns/web.clj index cb5e6c9..9219369 100644 --- a/src/pronouns/web.clj +++ b/src/pronouns/web.clj @@ -12,15 +12,11 @@ [pronouns.util :as u] [pronouns.pages :as pages])) -(def config {:default-server-port 5000 - :pronoun-table-path "resources/pronouns.tab"}) -(def pronouns-table (u/slurp-tabfile (:pronoun-table-path config))) - (defroutes app-routes (GET "/" [] {:status 200 :headers {"Content-Type" "text/html"} - :body (pages/front pronouns-table)}) + :body (pages/front)}) (GET "/pronouns.css" [] {:status 200 @@ -30,7 +26,7 @@ (GET "/*" {params :params} {:status 200 :headers {"Content-Type" "text/html"} - :body (pages/pronouns params pronouns-table)}) + :body (pages/pronouns params)}) (ANY "*" [] (route/not-found (slurp (io/resource "404.html"))))) @@ -39,9 +35,11 @@ (fn [req] (try (handler req) (catch Exception e - {:status 500 - :headers {"Content-Type" "text/html"} - :body (slurp (io/resource "500.html"))})))) + (binding [*out* *err*] + (println e) + {:status 500 + :headers {"Content-Type" "text/html"} + :body (slurp (io/resource "500.html"))}))))) (def app (-> app-routes @@ -51,8 +49,7 @@ params/wrap-params)) (defn -main [] - (let [port (Integer. (:port env - (:default-server-port config)))] + (let [port (Integer. (:port env))] (jetty/run-jetty app {:port port}))) ;; For interactive development: From a228358111bbce6aa7c402a54fb9a39bff1aa924 Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Tue, 9 Aug 2016 21:30:46 -0700 Subject: [PATCH 13/25] update readme, add real site url to project.clj, remove obsolete doc comment from web.clj --- README.md | 18 +++++++++--------- project.clj | 4 +--- quickstart.sh | 5 ----- src/pronouns/web.clj | 4 ---- 4 files changed, 10 insertions(+), 21 deletions(-) delete mode 100755 quickstart.sh diff --git a/README.md b/README.md index d061e39..900405d 100644 --- a/README.md +++ b/README.md @@ -33,20 +33,20 @@ Ctrl+q ### Running the app in a dev environment You can launch the app on your own computer by running the following -commands: +command: ``` -$ lein uberjar -$ java -cp target/pronouns-standalone.jar clojure.main -m pronouns.web +$ lein ring server ``` -Then browse to localhost:5000 +This will launch a server running the app and open your default web browser to the index page. The server will automatically reload files as you edit them. -You can also just run quickstart.sh which will do all of these things for you. Do it like this to get an example running on port 666 +## Philosophy on pronoun inclusion + +Pronoun.is aims foremost and exclusively to be a useful resource for people to communicate the personal pronoun they use for themselves. + +It is possible to use these example sentences to demonstrate the usage of words that are not personal pronouns, or even cleverly insert an [entire story](http://pronoun.is/she/or%20they,%20those%20ships%20who%20were%20docked%20and%20still%20equipped%20with%20ancillaries,%20arranged%20to%20share%20the%20duty%20of%20monitoring%20our%20guest%20as%20it%20fit%20into%20their%20routines;%20that%20was%20the%20agreement,%20despite%20it%20being%20less%20convenient%20for%20me%20to%20participate%20at%20all,%20on%20the%20grounds%20that%20certain%20visitors%20might%20prefer%20a%20constant%20individual%20companion%20to%20what%20might%20seem,%20depending%20on%20their%20past%20experiences,%20to%20be%20undue%20attention%20from%20every%20soldier%20they%20passed.%20As%20usual,%20then,%20I%20took%20the%20first%20shift/the%20one%20possession%20of%20hers%20that%20Station%20Security%20hadn't%20confiscated,%20a/knowingly%20left%20with%20her.%20What%20a%20Presger%20frisbee%20might%20do%20or%20even%20look%20like%20I%20couldn't%20say.%20She%20hadn't%20seemed%20the%20sort%20to%20have%20alien%20technology,%20but,%20then%20again,%20neither%20had%20I/another%20unremarkable%20stranger,%20quite%20a%20ways%20down%20the%20concourse,%20who%20caught%20it%20with%20a%20degree%20of%20coordination%20that%20most%20would%20have%20overlooked.%20It%20did%20not%20escape%20my%20notice,%20however.%20"Cousin,"%20I%20said,%20enough%20to%20convey%20-%20unless%20our%20visitor%20were%20quite%20ignorant,%20but,%20of%20course,%20at%20this%20point%20I%20was%20certain%20that%20she%20couldn't%20be%20-%20both%20that%20I%20knew%20what%20she%20was%20not%20and%20that%20I%20was%20giving%20her%20the%20benefit%20of%20the%20doubt%20as%20to%20what,%20or%20who,%20she%20was)! However, as a policy we will not include such entries in the database. -``` -$ ./quickstart.sh 666 -``` ## License -Copyright © 2014-2015 Morgan Astra +Copyright © 2014-2016 Morgan Astra diff --git a/project.clj b/project.clj index 88084dc..ac5653d 100644 --- a/project.clj +++ b/project.clj @@ -1,8 +1,6 @@ (defproject witch-house/pronouns "1.9.0-SNAPSHOT" :description "Pronoun.is is a web app for showing usage examples of personal pronouns in English." - :url "http://pronouns.herokuapp.com" - :license {:name "FIXME: choose" - :url "http://example.com/FIXME"} + :url "http://pronoun.is" :dependencies [[org.clojure/clojure "1.6.0"] [compojure "1.1.8"] [ring/ring-jetty-adapter "1.2.2"] diff --git a/quickstart.sh b/quickstart.sh deleted file mode 100755 index 8969778..0000000 --- a/quickstart.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -export PORT=6666 -lein uberjar -java -cp target/pronouns-standalone.jar clojure.main -m pronouns.web diff --git a/src/pronouns/web.clj b/src/pronouns/web.clj index 9219369..6c758fe 100644 --- a/src/pronouns/web.clj +++ b/src/pronouns/web.clj @@ -51,7 +51,3 @@ (defn -main [] (let [port (Integer. (:port env))] (jetty/run-jetty app {:port port}))) - -;; For interactive development: -;; (.stop server) -;; (def server (-main)) From 06b1ce52ce95d83efd7a28251a3515e55f2628d8 Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Wed, 10 Aug 2016 13:23:16 -0700 Subject: [PATCH 14/25] add .nrepl-port to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index fffd8d2..91c4c9a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ pom.xml /checkouts /.env /target +.nrepl-port From 06f82d6837867f6e2dcf39257f6ad26e38738556 Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Tue, 20 Sep 2016 15:40:01 -0700 Subject: [PATCH 15/25] Add GPL license fixes #11 --- COPYING | 518 ++++++++++++++++++++++++++++++++++++++++ README.md | 14 ++ src/pronouns/config.clj | 16 ++ src/pronouns/pages.clj | 33 ++- src/pronouns/util.clj | 16 ++ src/pronouns/web.clj | 16 ++ 6 files changed, 609 insertions(+), 4 deletions(-) create mode 100644 COPYING diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..29c3097 --- /dev/null +++ b/COPYING @@ -0,0 +1,518 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + + Version 3, 19 November 2007 + +Copyright © 2007 Free Software Foundation, Inc. Everyone is +permitted to copy and distribute verbatim copies of this license document, but +changing it is not allowed. Preamble + +The GNU Affero General Public License is a free, copyleft license for software +and other kinds of works, specifically designed to ensure cooperation with the +community in the case of network server software. + +The licenses for most software and other practical works are designed to take +away your freedom to share and change the works. By contrast, our General Public +Licenses are intended to guarantee your freedom to share and change all versions +of a program--to make sure it remains free software for all its users. + +When we speak of free software, we are referring to freedom, not price. Our +General Public Licenses are designed to make sure that you have the freedom to +distribute copies of free software (and charge for them if you wish), that you +receive source code or can get it if you want it, that you can change the +software or use pieces of it in new free programs, and that you know you can do +these things. + +Developers that use our General Public Licenses protect your rights with two +steps: (1) assert copyright on the software, and (2) offer you this License +which gives you legal permission to copy, distribute and/or modify the software. + +A secondary benefit of defending all users' freedom is that improvements made in +alternate versions of the program, if they receive widespread use, become +available for other developers to incorporate. Many developers of free software +are heartened and encouraged by the resulting cooperation. However, in the case +of software used on network servers, this result may fail to come about. The GNU +General Public License permits making a modified version and letting the public +access it on a server without ever releasing its source code to the public. + +The GNU Affero General Public License is designed specifically to ensure that, +in such cases, the modified source code becomes available to the community. It +requires the operator of a network server to provide the source code of the +modified version running there to the users of that server. Therefore, public +use of a modified version, on a publicly accessible server, gives the public +access to the source code of the modified version. + +An older license, called the Affero General Public License and published by +Affero, was designed to accomplish similar goals. This is a different license, +not a version of the Affero GPL, but Affero has released a new version of the +Affero GPL which permits relicensing under this license. + +The precise terms and conditions for copying, distribution and modification +follow. TERMS AND CONDITIONS 0. Definitions. + +"This License" refers to version 3 of the GNU Affero General Public License. + +"Copyright" also means copyright-like laws that apply to other kinds of works, +such as semiconductor masks. + +"The Program" refers to any copyrightable work licensed under this License. Each +licensee is addressed as "you". "Licensees" and "recipients" may be individuals +or organizations. + +To "modify" a work means to copy from or adapt all or part of the work in a +fashion requiring copyright permission, other than the making of an exact copy. +The resulting work is called a "modified version" of the earlier work or a work +"based on" the earlier work. + +A "covered work" means either the unmodified Program or a work based on the +Program. + +To "propagate" a work means to do anything with it that, without permission, +would make you directly or secondarily liable for infringement under applicable +copyright law, except executing it on a computer or modifying a private copy. +Propagation includes copying, distribution (with or without modification), +making available to the public, and in some countries other activities as well. + +To "convey" a work means any kind of propagation that enables other parties to +make or receive copies. Mere interaction with a user through a computer network, +with no transfer of a copy, is not conveying. + +An interactive user interface displays "Appropriate Legal Notices" to the extent +that it includes a convenient and prominently visible feature that (1) displays +an appropriate copyright notice, and (2) tells the user that there is no +warranty for the work (except to the extent that warranties are provided), that +licensees may convey the work under this License, and how to view a copy of this +License. If the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. 1. Source Code. + +The "source code" for a work means the preferred form of the work for making +modifications to it. "Object code" means any non-source form of a work. + +A "Standard Interface" means an interface that either is an official standard +defined by a recognized standards body, or, in the case of interfaces specified +for a particular programming language, one that is widely used among developers +working in that language. + +The "System Libraries" of an executable work include anything, other than the +work as a whole, that (a) is included in the normal form of packaging a Major +Component, but which is not part of that Major Component, and (b) serves only to +enable use of the work with that Major Component, or to implement a Standard +Interface for which an implementation is available to the public in source code +form. A "Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system (if any) on +which the executable work runs, or a compiler used to produce the work, or an +object code interpreter used to run it. + +The "Corresponding Source" for a work in object code form means all the source +code needed to generate, install, and (for an executable work) run the object +code and to modify the work, including scripts to control those activities. +However, it does not include the work's System Libraries, or general-purpose +tools or generally available free programs which are used unmodified in +performing those activities but which are not part of the work. For example, +Corresponding Source includes interface definition files associated with source +files for the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, such as by +intimate data communication or control flow between those subprograms and other +parts of the work. + +The Corresponding Source need not include anything that users can regenerate +automatically from other parts of the Corresponding Source. + +The Corresponding Source for a work in source code form is that same work. 2. +Basic Permissions. + +All rights granted under this License are granted for the term of copyright on +the Program, and are irrevocable provided the stated conditions are met. This +License explicitly affirms your unlimited permission to run the unmodified +Program. The output from running a covered work is covered by this License only +if the output, given its content, constitutes a covered work. This License +acknowledges your rights of fair use or other equivalent, as provided by +copyright law. + +You may make, run and propagate covered works that you do not convey, without +conditions so long as your license otherwise remains in force. You may convey +covered works to others for the sole purpose of having them make modifications +exclusively for you, or provide you with facilities for running those works, +provided that you comply with the terms of this License in conveying all +material for which you do not control copyright. Those thus making or running +the covered works for you must do so exclusively on your behalf, under your +direction and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + +Conveying under any other circumstances is permitted solely under the conditions +stated below. Sublicensing is not allowed; section 10 makes it unnecessary. 3. +Protecting Users' Legal Rights From Anti-Circumvention Law. + +No covered work shall be deemed part of an effective technological measure under +any applicable law fulfilling obligations under article 11 of the WIPO copyright +treaty adopted on 20 December 1996, or similar laws prohibiting or restricting +circumvention of such measures. + +When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention is +effected by exercising rights under this License with respect to the covered +work, and you disclaim any intention to limit operation or modification of the +work as a means of enforcing, against the work's users, your or third parties' +legal rights to forbid circumvention of technological measures. 4. Conveying +Verbatim Copies. + +You may convey verbatim copies of the Program's source code as you receive it, +in any medium, provided that you conspicuously and appropriately publish on each +copy an appropriate copyright notice; keep intact all notices stating that this +License and any non-permissive terms added in accord with section 7 apply to the +code; keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + +You may charge any price or no price for each copy that you convey, and you may +offer support or warranty protection for a fee. 5. Conveying Modified Source +Versions. + +You may convey a work based on the Program, or the modifications to produce it +from the Program, in the form of source code under the terms of section 4, +provided that you also meet all of these conditions: + +a) The work must carry prominent notices stating that you modified it, and +giving a relevant date. b) The work must carry prominent notices stating that it +is released under this License and any conditions added under section 7. This +requirement modifies the requirement in section 4 to "keep intact all notices". +c) You must license the entire work, as a whole, under this License to anyone +who comes into possession of a copy. This License will therefore apply, along +with any applicable section 7 additional terms, to the whole of the work, and +all its parts, regardless of how they are packaged. This License gives no +permission to license the work in any other way, but it does not invalidate such +permission if you have separately received it. d) If the work has interactive +user interfaces, each must display Appropriate Legal Notices; however, if the +Program has interactive interfaces that do not display Appropriate Legal +Notices, your work need not make them do so. + +A compilation of a covered work with other separate and independent works, which +are not by their nature extensions of the covered work, and which are not +combined with it such as to form a larger program, in or on a volume of a +storage or distribution medium, is called an "aggregate" if the compilation and +its resulting copyright are not used to limit the access or legal rights of the +compilation's users beyond what the individual works permit. Inclusion of a +covered work in an aggregate does not cause this License to apply to the other +parts of the aggregate. 6. Conveying Non-Source Forms. + +You may convey a covered work in object code form under the terms of sections 4 +and 5, provided that you also convey the machine-readable Corresponding Source +under the terms of this License, in one of these ways: + +a) Convey the object code in, or embodied in, a physical product (including a +physical distribution medium), accompanied by the Corresponding Source fixed on +a durable physical medium customarily used for software interchange. b) Convey +the object code in, or embodied in, a physical product (including a physical +distribution medium), accompanied by a written offer, valid for at least three +years and valid for as long as you offer spare parts or customer support for +that product model, to give anyone who possesses the object code either (1) a +copy of the Corresponding Source for all the software in the product that is +covered by this License, on a durable physical medium customarily used for +software interchange, for a price no more than your reasonable cost of +physically performing this conveying of source, or (2) access to copy the +Corresponding Source from a network server at no charge. c) Convey individual +copies of the object code with a copy of the written offer to provide the +Corresponding Source. This alternative is allowed only occasionally and +noncommercially, and only if you received the object code with such an offer, in +accord with subsection 6b. d) Convey the object code by offering access from a +designated place (gratis or for a charge), and offer equivalent access to the +Corresponding Source in the same way through the same place at no further +charge. You need not require recipients to copy the Corresponding Source along +with the object code. If the place to copy the object code is a network server, +the Corresponding Source may be on a different server (operated by you or a +third party) that supports equivalent copying facilities, provided you maintain +clear directions next to the object code saying where to find the Corresponding +Source. Regardless of what server hosts the Corresponding Source, you remain +obligated to ensure that it is available for as long as needed to satisfy these +requirements. e) Convey the object code using peer-to-peer transmission, +provided you inform other peers where the object code and Corresponding Source +of the work are being offered to the general public at no charge under +subsection 6d. + +A separable portion of the object code, whose source code is excluded from the +Corresponding Source as a System Library, need not be included in conveying the +object code work. + +A "User Product" is either (1) a "consumer product", which means any tangible +personal property which is normally used for personal, family, or household +purposes, or (2) anything designed or sold for incorporation into a dwelling. In +determining whether a product is a consumer product, doubtful cases shall be +resolved in favor of coverage. For a particular product received by a particular +user, "normally used" refers to a typical or common use of that class of +product, regardless of the status of the particular user or of the way in which +the particular user actually uses, or expects or is expected to use, the +product. A product is a consumer product regardless of whether the product has +substantial commercial, industrial or non-consumer uses, unless such uses +represent the only significant mode of use of the product. + +"Installation Information" for a User Product means any methods, procedures, +authorization keys, or other information required to install and execute +modified versions of a covered work in that User Product from a modified version +of its Corresponding Source. The information must suffice to ensure that the +continued functioning of the modified object code is in no case prevented or +interfered with solely because modification has been made. + +If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as part of a +transaction in which the right of possession and use of the User Product is +transferred to the recipient in perpetuity or for a fixed term (regardless of +how the transaction is characterized), the Corresponding Source conveyed under +this section must be accompanied by the Installation Information. But this +requirement does not apply if neither you nor any third party retains the +ability to install modified object code on the User Product (for example, the +work has been installed in ROM). + +The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates for a +work that has been modified or installed by the recipient, or for the User +Product in which it has been modified or installed. Access to a network may be +denied when the modification itself materially and adversely affects the +operation of the network or violates the rules and protocols for communication +across the network. + +Corresponding Source conveyed, and Installation Information provided, in accord +with this section must be in a format that is publicly documented (and with an +implementation available to the public in source code form), and must require no +special password or key for unpacking, reading or copying. 7. Additional Terms. + +"Additional permissions" are terms that supplement the terms of this License by +making exceptions from one or more of its conditions. Additional permissions +that are applicable to the entire Program shall be treated as though they were +included in this License, to the extent that they are valid under applicable +law. If additional permissions apply only to part of the Program, that part may +be used separately under those permissions, but the entire Program remains +governed by this License without regard to the additional permissions. + +When you convey a copy of a covered work, you may at your option remove any +additional permissions from that copy, or from any part of it. (Additional +permissions may be written to require their own removal in certain cases when +you modify the work.) You may place additional permissions on material, added by +you to a covered work, for which you have or can give appropriate copyright +permission. + +Notwithstanding any other provision of this License, for material you add to a +covered work, you may (if authorized by the copyright holders of that material) +supplement the terms of this License with terms: + +a) Disclaiming warranty or limiting liability differently from the terms of +sections 15 and 16 of this License; or b) Requiring preservation of specified +reasonable legal notices or author attributions in that material or in the +Appropriate Legal Notices displayed by works containing it; or c) Prohibiting +misrepresentation of the origin of that material, or requiring that modified +versions of such material be marked in reasonable ways as different from the +original version; or d) Limiting the use for publicity purposes of names of +licensors or authors of the material; or e) Declining to grant rights under +trademark law for use of some trade names, trademarks, or service marks; or f) +Requiring indemnification of licensors and authors of that material by anyone +who conveys the material (or modified versions of it) with contractual +assumptions of liability to the recipient, for any liability that these +contractual assumptions directly impose on those licensors and authors. + +All other non-permissive additional terms are considered "further restrictions" +within the meaning of section 10. If the Program as you received it, or any part +of it, contains a notice stating that it is governed by this License along with +a term that is a further restriction, you may remove that term. If a license +document contains a further restriction but permits relicensing or conveying +under this License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does not survive +such relicensing or conveying. + +If you add terms to a covered work in accord with this section, you must place, +in the relevant source files, a statement of the additional terms that apply to +those files, or a notice indicating where to find the applicable terms. + +Additional terms, permissive or non-permissive, may be stated in the form of a +separately written license, or stated as exceptions; the above requirements +apply either way. 8. Termination. + +You may not propagate or modify a covered work except as expressly provided +under this License. Any attempt otherwise to propagate or modify it is void, and +will automatically terminate your rights under this License (including any +patent licenses granted under the third paragraph of section 11). + +However, if you cease all violation of this License, then your license from a +particular copyright holder is reinstated (a) provisionally, unless and until +the copyright holder explicitly and finally terminates your license, and (b) +permanently, if the copyright holder fails to notify you of the violation by +some reasonable means prior to 60 days after the cessation. + +Moreover, your license from a particular copyright holder is reinstated +permanently if the copyright holder notifies you of the violation by some +reasonable means, this is the first time you have received notice of violation +of this License (for any work) from that copyright holder, and you cure the +violation prior to 30 days after your receipt of the notice. + +Termination of your rights under this section does not terminate the licenses of +parties who have received copies or rights from you under this License. If your +rights have been terminated and not permanently reinstated, you do not qualify +to receive new licenses for the same material under section 10. 9. Acceptance +Not Required for Having Copies. + +You are not required to accept this License in order to receive or run a copy of +the Program. Ancillary propagation of a covered work occurring solely as a +consequence of using peer-to-peer transmission to receive a copy likewise does +not require acceptance. However, nothing other than this License grants you +permission to propagate or modify any covered work. These actions infringe +copyright if you do not accept this License. Therefore, by modifying or +propagating a covered work, you indicate your acceptance of this License to do +so. 10. Automatic Licensing of Downstream Recipients. + +Each time you convey a covered work, the recipient automatically receives a +license from the original licensors, to run, modify and propagate that work, +subject to this License. You are not responsible for enforcing compliance by +third parties with this License. + +An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered work results +from an entity transaction, each party to that transaction who receives a copy +of the work also receives whatever licenses to the work the party's predecessor +in interest had or could give under the previous paragraph, plus a right to +possession of the Corresponding Source of the work from the predecessor in +interest, if the predecessor has it or can get it with reasonable efforts. + +You may not impose any further restrictions on the exercise of the rights +granted or affirmed under this License. For example, you may not impose a +license fee, royalty, or other charge for exercise of rights granted under this +License, and you may not initiate litigation (including a cross-claim or +counterclaim in a lawsuit) alleging that any patent claim is infringed by +making, using, selling, offering for sale, or importing the Program or any +portion of it. 11. Patents. + +A "contributor" is a copyright holder who authorizes use under this License of +the Program or a work on which the Program is based. The work thus licensed is +called the contributor's "contributor version". + +A contributor's "essential patent claims" are all patent claims owned or +controlled by the contributor, whether already acquired or hereafter acquired, +that would be infringed by some manner, permitted by this License, of making, +using, or selling its contributor version, but do not include claims that would +be infringed only as a consequence of further modification of the contributor +version. For purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of this License. + +Each contributor grants you a non-exclusive, worldwide, royalty-free patent +license under the contributor's essential patent claims, to make, use, sell, +offer for sale, import and otherwise run, modify and propagate the contents of +its contributor version. + +In the following three paragraphs, a "patent license" is any express agreement +or commitment, however denominated, not to enforce a patent (such as an express +permission to practice a patent or covenant not to sue for patent infringement). +To "grant" such a patent license to a party means to make such an agreement or +commitment not to enforce a patent against the party. + +If you convey a covered work, knowingly relying on a patent license, and the +Corresponding Source of the work is not available for anyone to copy, free of +charge and under the terms of this License, through a publicly available network +server or other readily accessible means, then you must either (1) cause the +Corresponding Source to be so available, or (2) arrange to deprive yourself of +the benefit of the patent license for this particular work, or (3) arrange, in a +manner consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have actual +knowledge that, but for the patent license, your conveying the covered work in a +country, or your recipient's use of the covered work in a country, would +infringe one or more identifiable patents in that country that you have reason +to believe are valid. + +If, pursuant to or in connection with a single transaction or arrangement, you +convey, or propagate by procuring conveyance of, a covered work, and grant a +patent license to some of the parties receiving the covered work authorizing +them to use, propagate, modify or convey a specific copy of the covered work, +then the patent license you grant is automatically extended to all recipients of +the covered work and works based on it. + +A patent license is "discriminatory" if it does not include within the scope of +its coverage, prohibits the exercise of, or is conditioned on the non-exercise +of one or more of the rights that are specifically granted under this License. +You may not convey a covered work if you are a party to an arrangement with a +third party that is in the business of distributing software, under which you +make payment to the third party based on the extent of your activity of +conveying the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory patent +license (a) in connection with copies of the covered work conveyed by you (or +copies made from those copies), or (b) primarily for and in connection with +specific products or compilations that contain the covered work, unless you +entered into that arrangement, or that patent license was granted, prior to 28 +March 2007. + +Nothing in this License shall be construed as excluding or limiting any implied +license or other defenses to infringement that may otherwise be available to you +under applicable patent law. 12. No Surrender of Others' Freedom. + +If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not excuse +you from the conditions of this License. If you cannot convey a covered work so +as to satisfy simultaneously your obligations under this License and any other +pertinent obligations, then as a consequence you may not convey it at all. For +example, if you agree to terms that obligate you to collect a royalty for +further conveying from those to whom you convey the Program, the only way you +could satisfy both those terms and this License would be to refrain entirely +from conveying the Program. 13. Remote Network Interaction; Use with the GNU +General Public License. + +Notwithstanding any other provision of this License, if you modify the Program, +your modified version must prominently offer all users interacting with it +remotely through a computer network (if your version supports such interaction) +an opportunity to receive the Corresponding Source of your version by providing +access to the Corresponding Source from a network server at no charge, through +some standard or customary means of facilitating copying of software. This +Corresponding Source shall include the Corresponding Source for any work covered +by version 3 of the GNU General Public License that is incorporated pursuant to +the following paragraph. + +Notwithstanding any other provision of this License, you have permission to link +or combine any covered work with a work licensed under version 3 of the GNU +General Public License into a single combined work, and to convey the resulting +work. The terms of this License will continue to apply to the part which is the +covered work, but the work with which it is combined will remain governed by +version 3 of the GNU General Public License. 14. Revised Versions of this +License. + +The Free Software Foundation may publish revised and/or new versions of the GNU +Affero General Public License from time to time. Such new versions will be +similar in spirit to the present version, but may differ in detail to address +new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies +that a certain numbered version of the GNU Affero General Public License "or any +later version" applies to it, you have the option of following the terms and +conditions either of that numbered version or of any later version published by +the Free Software Foundation. If the Program does not specify a version number +of the GNU Affero General Public License, you may choose any version ever +published by the Free Software Foundation. + +If the Program specifies that a proxy can decide which future versions of the +GNU Affero General Public License can be used, that proxy's public statement of +acceptance of a version permanently authorizes you to choose that version for +the Program. + +Later license versions may give you additional or different permissions. +However, no additional obligations are imposed on any author or copyright holder +as a result of your choosing to follow a later version. 15. Disclaimer of +Warranty. + +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER +PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER +EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE +QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE +DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. +16. Limitation of Liability. + +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY +COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS +PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, +INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE +THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED +INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE +PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY +HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 17. Interpretation of +Sections 15 and 16. + +If the disclaimer of warranty and limitation of liability provided above cannot +be given local legal effect according to their terms, reviewing courts shall +apply local law that most closely approximates an absolute waiver of all civil +liability in connection with the Program, unless a warranty or assumption of +liability accompanies a copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS \ No newline at end of file diff --git a/README.md b/README.md index 900405d..5f2bb1c 100644 --- a/README.md +++ b/README.md @@ -50,3 +50,17 @@ It is possible to use these example sentences to demonstrate the usage of words ## License Copyright © 2014-2016 Morgan Astra + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see */ + diff --git a/src/pronouns/config.clj b/src/pronouns/config.clj index fdb4c97..b0c83d5 100644 --- a/src/pronouns/config.clj +++ b/src/pronouns/config.clj @@ -1,3 +1,19 @@ +;; pronoun.is - a website for pronoun usage examples +;; Copyright (C) 2014 - 2016 Morgan Astra + +;; This program is free software: you can redistribute it and/or modify +;; it under the terms of the GNU Affero General Public License as +;; published by the Free Software Foundation, either version 3 of the +;; License, or (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU Affero General Public License for more details. + +;; You should have received a copy of the GNU Affero General Public License +;; along with this program. If not, see + (ns pronouns.config (:require [pronouns.util :as u])) diff --git a/src/pronouns/pages.clj b/src/pronouns/pages.clj index 708d912..25ab4ee 100644 --- a/src/pronouns/pages.clj +++ b/src/pronouns/pages.clj @@ -1,3 +1,19 @@ +;; pronoun.is - a website for pronoun usage examples +;; Copyright (C) 2014 - 2016 Morgan Astra + +;; This program is free software: you can redistribute it and/or modify +;; it under the terms of the GNU Affero General Public License as +;; published by the Free Software Foundation, either version 3 of the +;; License, or (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU Affero General Public License for more details. + +;; You should have received a copy of the GNU Affero General Public License +;; along with this program. If not, see + (ns pronouns.pages (:require [clojure.string :as s] [pronouns.config :refer [*pronouns-table*]] @@ -5,6 +21,10 @@ [hiccup.core :refer :all] [hiccup.util :refer [escape-html]])) +(defn href + [url text] + [:a {:href url} text]) + (defn wrap-pronoun [pronoun] [:b pronoun]) @@ -64,15 +84,20 @@ [:p "This is a bit unwieldy. If we have a good guess we'll let you use just the first one or two."]]) (defn contact-block [] - (let [twitter-name (fn [handle] [:a {:href (str "https://www.twitter.com/" handle)} (str "@" handle)])] + (let [twitter-name (fn [handle] (href (str "https://www.twitter.com/" handle) + (str "@" handle)))] [:div {:class "contact"} [:p "Written by " (twitter-name "morganastra") ", whose " - [:a {:href "http://pronoun.is/ze/zir?or=she"} "pronoun.is/ze/zir?or=she"] + (href "http://pronoun.is/ze/zir?or=she" "pronoun.is/ze/zir?or=she") ". " - "Visit the project on " [:a {:href "https://github.com/witch-house/pronoun.is"} "github!"]]])) + "pronoun.is is free software under the " + (href "https://www.gnu.org/licenses/agpl.html" "AGPLv3") + ", visit the project on " + (href "https://github.com/witch-house/pronoun.is" "github") + ","]])) (defn format-pronoun-examples @@ -101,7 +126,7 @@ (defn make-link [path] (let [link (str "/" path) label path] - [:li [:a {:href link} label]])) + [:li (href link label)])) (defn front [] (let [blah (println *pronouns-table*) diff --git a/src/pronouns/util.clj b/src/pronouns/util.clj index ef353a8..5aa9530 100644 --- a/src/pronouns/util.clj +++ b/src/pronouns/util.clj @@ -1,3 +1,19 @@ +;; pronoun.is - a website for pronoun usage examples +;; Copyright (C) 2014 - 2016 Morgan Astra + +;; This program is free software: you can redistribute it and/or modify +;; it under the terms of the GNU Affero General Public License as +;; published by the Free Software Foundation, either version 3 of the +;; License, or (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU Affero General Public License for more details. + +;; You should have received a copy of the GNU Affero General Public License +;; along with this program. If not, see + (ns pronouns.util (:require [clojure.string :as s])) diff --git a/src/pronouns/web.clj b/src/pronouns/web.clj index 6c758fe..168ed62 100644 --- a/src/pronouns/web.clj +++ b/src/pronouns/web.clj @@ -1,3 +1,19 @@ +;; pronoun.is - a website for pronoun usage examples +;; Copyright (C) 2014 - 2016 Morgan Astra + +;; This program is free software: you can redistribute it and/or modify +;; it under the terms of the GNU Affero General Public License as +;; published by the Free Software Foundation, either version 3 of the +;; License, or (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU Affero General Public License for more details. + +;; You should have received a copy of the GNU Affero General Public License +;; along with this program. If not, see + (ns pronouns.web (:require [compojure.core :refer [defroutes GET PUT POST DELETE ANY]] [compojure.handler :refer [site]] From 364552f49a372eb223f62a319dc63768451f7b94 Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Tue, 20 Sep 2016 16:02:48 -0700 Subject: [PATCH 16/25] remove superfluous println calls --- src/pronouns/pages.clj | 10 ++++++---- src/pronouns/web.clj | 1 - 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/pronouns/pages.clj b/src/pronouns/pages.clj index 25ab4ee..da6d46e 100644 --- a/src/pronouns/pages.clj +++ b/src/pronouns/pages.clj @@ -92,12 +92,15 @@ (twitter-name "morganastra") ", whose " (href "http://pronoun.is/ze/zir?or=she" "pronoun.is/ze/zir?or=she") - ". " + [:br] + [:br] "pronoun.is is free software under the " (href "https://www.gnu.org/licenses/agpl.html" "AGPLv3") - ", visit the project on " + "! visit the project on " (href "https://github.com/witch-house/pronoun.is" "github") - ","]])) + [:br] + [:br] + "<3"]])) (defn format-pronoun-examples @@ -118,7 +121,6 @@ (defn lookup-pronouns [pronouns-string] (let [inputs (s/split pronouns-string #"/") n (count inputs)] - (println *pronouns-table*) (if (>= n 5) (take 5 inputs) (u/table-lookup inputs *pronouns-table*)))) diff --git a/src/pronouns/web.clj b/src/pronouns/web.clj index 168ed62..eda8376 100644 --- a/src/pronouns/web.clj +++ b/src/pronouns/web.clj @@ -52,7 +52,6 @@ (try (handler req) (catch Exception e (binding [*out* *err*] - (println e) {:status 500 :headers {"Content-Type" "text/html"} :body (slurp (io/resource "500.html"))}))))) From 93c37971682cbcbda3139c7e8a47ca21311f8947 Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Tue, 20 Sep 2016 16:17:58 -0700 Subject: [PATCH 17/25] add 'section' CSS class for repeated declarations --- resources/pronouns.css | 17 ++++------------- src/pronouns/pages.clj | 15 +++++++-------- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/resources/pronouns.css b/resources/pronouns.css index 1285cee..59160b5 100644 --- a/resources/pronouns.css +++ b/resources/pronouns.css @@ -3,32 +3,23 @@ body { background-color: #F6CEFC; } -.examples { +.section { margin: 8px; padding: 4px 6px 4px 6px; border: 4px solid #eeeeee; } +.examples { +} + .title { - margin: 8px; - padding: 4px 6px 4px 6px; - border: 4px solid #eeeeee; } .about { - margin: 8px; - padding: 4px 6px 4px 6px; - border: 4px solid #eeeeee; } .contact { - margin: 8px; - padding: 4px 6px 4px 6px; - border: 4px solid #eeeeee; } .table { - margin: 8px; - padding: 4px 6px 4px 6px; - border: 4px solid #eeeeee; } diff --git a/src/pronouns/pages.clj b/src/pronouns/pages.clj index da6d46e..f9fde11 100644 --- a/src/pronouns/pages.clj +++ b/src/pronouns/pages.clj @@ -59,7 +59,7 @@ ".")) (defn title-block [title] - [:div {:class "title"} + [:div {:class "section title"} [:h1 title]]) (defn examples-block @@ -68,7 +68,7 @@ header-str (str "Here are some usage examples for my " sub-obj " pronouns")] - [:div {:class "examples"} + [:div {:class "section examples"} [:p [:h2 header-str]] (subject-example subject) (object-example object) @@ -77,7 +77,7 @@ (reflexive-example subject reflexive)])) (defn about-block [] - [:div {:class "about"} + [:div {:class "section about"} [:p "Full usage: " [:tt "http://pronoun.is/subject-pronoun/object-pronoun/possessive-determiner/possessive-pronoun/reflexive"] " displays examples of your pronouns."] @@ -86,7 +86,7 @@ (defn contact-block [] (let [twitter-name (fn [handle] (href (str "https://www.twitter.com/" handle) (str "@" handle)))] - [:div {:class "contact"} + [:div {:class "section contact"} [:p "Written by " (twitter-name "morganastra") @@ -131,8 +131,7 @@ [:li (href link label)])) (defn front [] - (let [blah (println *pronouns-table*) - abbreviations (u/abbreviate *pronouns-table*) + (let [abbreviations (u/abbreviate *pronouns-table*) links (map make-link abbreviations) title "Pronoun Island"] (html @@ -143,7 +142,7 @@ [:link {:rel "stylesheet" :href "/pronouns.css"}]] [:body (title-block title) - [:div {:class "table"} + [:div {:class "section table"} [:p "pronoun.is is a www site for showing people how to use pronouns in English."] [:p "here are some pronouns the site knows about:"] [:ul links]]] @@ -159,7 +158,7 @@ [:link {:rel "stylesheet" :href "/pronouns.css"}]] [:body (title-block title) - [:div {:class "examples"} + [: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!")]]] (about-block) From 5d85c1a5e7fbe3f06667982bf1a8f1353921a76f Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Tue, 20 Sep 2016 18:04:16 -0700 Subject: [PATCH 18/25] allow ellipses to shorten unambiguous path, e.g. /they/.../themself per #46 --- resources/pronouns.tab | 1 + src/pronouns/util.clj | 32 +++++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/resources/pronouns.tab b/resources/pronouns.tab index 64ccbbb..b6e00dd 100644 --- a/resources/pronouns.tab +++ b/resources/pronouns.tab @@ -3,6 +3,7 @@ ze zir zir zirs zirself she her her hers herself he him his his himself they them their theirs themselves +they them their theirs themself xey xem xyr xyrs xemself sie hir hir hirs hirself it it its its itself diff --git a/src/pronouns/util.clj b/src/pronouns/util.clj index 5aa9530..5086634 100644 --- a/src/pronouns/util.clj +++ b/src/pronouns/util.clj @@ -21,26 +21,40 @@ (let [lines (s/split (slurp path) #"\n")] (map #(s/split % #"\t") lines))) +(defn table-front-filter + [query-key table] + (let [arity (count query-key)] + (filter #(= query-key (take arity %)) table))) + +(defn table-end-filter + [query-key table] + (let [table-arity (count (first table)) + query-arity (count query-key)] + (filter #(= query-key (drop (- table-arity query-arity) %)) table))) + (defn table-lookup [query-key table] - (let [arity (count query-key) - filtered-table (filter #(= query-key (take arity %)) table)] - (first filtered-table))) + (if (some #(= "..." %) query-key) + (let [[query-front query-end-] (split-with #(not= "..." %) query-key) + query-end (drop 1 query-end-) + front-matches (table-front-filter query-front table)] + (first (table-end-filter query-end front-matches))) + (first (table-front-filter query-key table)))) (defn tabfile-lookup [query-key tabfile] (table-lookup query-key (slurp-tabfile tabfile))) (defn minimum-unambiguous-path - ([table sections] (minimum-unambiguous-path table sections 1)) - ([table sections number-of-sections] - (let [sections-subset (take number-of-sections sections) - results (filter #(= (take number-of-sections %) sections-subset) + ([table columns] (minimum-unambiguous-path table columns 1)) + ([table columns number-of-columns] + (let [columns-subset (take number-of-columns columns) + results (filter #(= (take number-of-columns %) columns-subset) table)] (case (count results) 0 nil - 1 (clojure.string/join "/" sections-subset) - (recur table sections (+ number-of-sections 1)))))) + 1 (clojure.string/join "/" columns-subset) + (recur table columns (+ number-of-columns 1)))))) (defn abbreviate "given a list of pronoun rows, return a list of minimum unabiguous paths" From 65866ca3915cca368bac8c881d245a3442252639 Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Tue, 20 Sep 2016 18:33:33 -0700 Subject: [PATCH 19/25] standardize the description of what pronoun.is is --- README.md | 2 +- project.clj | 2 +- src/pronouns/pages.clj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5f2bb1c..7b701d5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# [pronoun.is](http://pronoun.is) is a www site for showing people how to use pronouns +**[pronoun.is](http://pronoun.is) is a website for personal pronoun usage examples** ## For users diff --git a/project.clj b/project.clj index ac5653d..a930d9a 100644 --- a/project.clj +++ b/project.clj @@ -1,5 +1,5 @@ (defproject witch-house/pronouns "1.9.0-SNAPSHOT" - :description "Pronoun.is is a web app for showing usage examples of personal pronouns in English." + :description "Pronoun.is is a website for personal pronoun usage examples" :url "http://pronoun.is" :dependencies [[org.clojure/clojure "1.6.0"] [compojure "1.1.8"] diff --git a/src/pronouns/pages.clj b/src/pronouns/pages.clj index f9fde11..b032d34 100644 --- a/src/pronouns/pages.clj +++ b/src/pronouns/pages.clj @@ -143,7 +143,7 @@ [:body (title-block title) [:div {:class "section table"} - [:p "pronoun.is is a www site for showing people how to use pronouns in English."] + [:p "pronoun.is is a website for personal pronoun usage examples"] [:p "here are some pronouns the site knows about:"] [:ul links]]] (contact-block)]))) From 4fc7685f1664e0f4be657cec2450caaf2df850a1 Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Wed, 21 Sep 2016 16:25:33 -0700 Subject: [PATCH 20/25] rearrange p tags to get examples to show up in site preview per #56 --- src/pronouns/pages.clj | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/src/pronouns/pages.clj b/src/pronouns/pages.clj index b032d34..fe9e2aa 100644 --- a/src/pronouns/pages.clj +++ b/src/pronouns/pages.clj @@ -69,38 +69,33 @@ sub-obj " pronouns")] [:div {:class "section examples"} - [:p [:h2 header-str]] - (subject-example subject) - (object-example object) - (posessive-determiner-example subject possessive-determiner) - (possessive-pronoun-example possessive-pronoun) - (reflexive-example subject reflexive)])) + [:h2 header-str] + [:p (subject-example subject) + (object-example object) + (posessive-determiner-example subject possessive-determiner) + (possessive-pronoun-example possessive-pronoun) + (reflexive-example subject reflexive)]])) (defn about-block [] [:div {:class "section about"} [:p "Full usage: " - [:tt "http://pronoun.is/subject-pronoun/object-pronoun/possessive-determiner/possessive-pronoun/reflexive"] - " displays examples of your pronouns."] + [:tt "http://pronoun.is/subject-pronoun/object-pronoun/possessive-determiner/possessive-pronoun/reflexive"] + " displays examples of your pronouns."] [:p "This is a bit unwieldy. If we have a good guess we'll let you use just the first one or two."]]) (defn contact-block [] (let [twitter-name (fn [handle] (href (str "https://www.twitter.com/" handle) (str "@" handle)))] - [:div {:class "section contact"} - [:p - "Written by " - (twitter-name "morganastra") - ", whose " - (href "http://pronoun.is/ze/zir?or=she" "pronoun.is/ze/zir?or=she") - [:br] - [:br] - "pronoun.is is free software under the " - (href "https://www.gnu.org/licenses/agpl.html" "AGPLv3") - "! visit the project on " - (href "https://github.com/witch-house/pronoun.is" "github") - [:br] - [:br] - "<3"]])) + [:footer {:class "section contact"} + [:p "Written by " + (twitter-name "morganastra") + ", whose " + (href "http://pronoun.is/ze/zir?or=she" "pronoun.is/ze/zir?or=she")] + [:p "pronoun.is is free software under the " + (href "https://www.gnu.org/licenses/agpl.html" "AGPLv3") + "! visit the project on " + (href "https://github.com/witch-house/pronoun.is" "github")] + [:p "<3"]])) (defn format-pronoun-examples From 02426e681bccc8f833c1215fac1467ca1da7bc24 Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Wed, 21 Sep 2016 21:36:39 -0700 Subject: [PATCH 21/25] add docstrings to functions in util and remove unused function, fixes #58 --- src/pronouns/util.clj | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/src/pronouns/util.clj b/src/pronouns/util.clj index 5086634..fcea811 100644 --- a/src/pronouns/util.clj +++ b/src/pronouns/util.clj @@ -18,21 +18,25 @@ (:require [clojure.string :as s])) (defn slurp-tabfile [path] + "read a tabfile from a filesystem as a table" (let [lines (s/split (slurp path) #"\n")] (map #(s/split % #"\t") lines))) (defn table-front-filter + "filter a to the rows which begin with " [query-key table] (let [arity (count query-key)] (filter #(= query-key (take arity %)) table))) (defn table-end-filter + "filter a
to the rows which end with " [query-key table] (let [table-arity (count (first table)) query-arity (count query-key)] (filter #(= query-key (drop (- table-arity query-arity) %)) table))) (defn table-lookup + "find the row corresponding to in
" [query-key table] (if (some #(= "..." %) query-key) (let [[query-front query-end-] (split-with #(not= "..." %) query-key) @@ -41,25 +45,26 @@ (first (table-end-filter query-end front-matches))) (first (table-front-filter query-key table)))) -(defn tabfile-lookup - [query-key tabfile] - (table-lookup query-key (slurp-tabfile tabfile))) - (defn minimum-unambiguous-path - ([table columns] (minimum-unambiguous-path table columns 1)) - ([table columns number-of-columns] - (let [columns-subset (take number-of-columns columns) - results (filter #(= (take number-of-columns %) columns-subset) + "compute the shortest (in number of path elements) path which refers to + a specific in a
unambiguously." + ([table row] (minimum-unambiguous-path table row 1)) + ([table row number-of-row] + (let [row-subset (take number-of-row row) + results (filter #(= (take number-of-row %) row-subset) table)] (case (count results) 0 nil - 1 (clojure.string/join "/" columns-subset) - (recur table columns (+ number-of-columns 1)))))) + 1 (clojure.string/join "/" row-subset) + (recur table row (+ number-of-row 1)))))) (defn abbreviate - "given a list of pronoun rows, return a list of minimum unabiguous paths" + "return the list of minimum unabiguous paths from a
" [table] (map (partial minimum-unambiguous-path table) table)) (defn vec-coerce [x] + "wrap a value in a vector if it is not already in one. note that if + is already in a sequence for which vector? is false, this will add + another layer of nesting." (if (vector? x) x [x])) From 9a5a309ea5ba08f2799ebae21933b13dcc42d61e Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Wed, 21 Sep 2016 23:58:16 -0700 Subject: [PATCH 22/25] make the footer sections 0.8em --- resources/pronouns.css | 15 ++++++++++----- src/pronouns/pages.clj | 12 ++++++------ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/resources/pronouns.css b/resources/pronouns.css index 59160b5..c27bd5a 100644 --- a/resources/pronouns.css +++ b/resources/pronouns.css @@ -1,12 +1,17 @@ body { - font-family: Futura, sans-serif; - background-color: #F6CEFC; + font-family: Futura, sans-serif; + background-color: #F6CEFC; +} + +footer { + font-size: 0.8em; } .section { - margin: 8px; - padding: 4px 6px 4px 6px; - border: 4px solid #eeeeee; + margin: 8px; + padding: 4px 6px 4px 6px; + border: 4px solid #EEEEEE; + border-radius: 7px; } .examples { diff --git a/src/pronouns/pages.clj b/src/pronouns/pages.clj index fe9e2aa..60175c9 100644 --- a/src/pronouns/pages.clj +++ b/src/pronouns/pages.clj @@ -86,7 +86,7 @@ (defn contact-block [] (let [twitter-name (fn [handle] (href (str "https://www.twitter.com/" handle) (str "@" handle)))] - [:footer {:class "section contact"} + [:div {:class "section contact"} [:p "Written by " (twitter-name "morganastra") ", whose " @@ -97,6 +97,8 @@ (href "https://github.com/witch-house/pronoun.is" "github")] [:p "<3"]])) +(defn footer-block [] + [:footer (about-block) (contact-block)]) (defn format-pronoun-examples [pronoun-declensions] @@ -110,8 +112,7 @@ [:body (title-block title) (map #(apply examples-block %) pronoun-declensions) - (about-block) - (contact-block)]]))) + (footer-block)]]))) (defn lookup-pronouns [pronouns-string] (let [inputs (s/split pronouns-string #"/") @@ -141,7 +142,7 @@ [:p "pronoun.is is a website for personal pronoun usage examples"] [:p "here are some pronouns the site knows about:"] [:ul links]]] - (contact-block)]))) + (footer-block)]))) (defn not-found [] (let [title "Pronoun Island: English Language Examples"] @@ -156,8 +157,7 @@ [: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!")]]] - (about-block) - (contact-block)]]))) + (footer-block)]]))) (defn pronouns [params] (let [path (params :*) From e5a3e15964788a0f1c1efbc12e9d497a148f6b6f Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Thu, 22 Sep 2016 17:12:15 -0700 Subject: [PATCH 23/25] compute shortest unambiguous paths using ellipses where helpful fixes #46 --- src/pronouns/util.clj | 61 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 48 insertions(+), 13 deletions(-) diff --git a/src/pronouns/util.clj b/src/pronouns/util.clj index fcea811..6d8d37e 100644 --- a/src/pronouns/util.clj +++ b/src/pronouns/util.clj @@ -17,6 +17,8 @@ (ns pronouns.util (:require [clojure.string :as s])) +(defn print-and-return "for debugging" [x] (println x) x) + (defn slurp-tabfile [path] "read a tabfile from a filesystem as a table" (let [lines (s/split (slurp path) #"\n")] @@ -45,23 +47,56 @@ (first (table-end-filter query-end front-matches))) (first (table-front-filter query-key table)))) -(defn minimum-unambiguous-path - "compute the shortest (in number of path elements) path which refers to - a specific in a
unambiguously." - ([table row] (minimum-unambiguous-path table row 1)) - ([table row number-of-row] - (let [row-subset (take number-of-row row) - results (filter #(= (take number-of-row %) row-subset) - table)] - (case (count results) - 0 nil - 1 (clojure.string/join "/" row-subset) - (recur table row (+ number-of-row 1)))))) +(defn shortest-unambiguous-forward-path + "Compute the shortest (in number of path elements) forward path which + unambiguously refers to a specific in a
. The behavior of + this function is undefined if given a that is not in the
. + + See also: shortest-unambiguous-path" + [table row] + (loop [n 1] + (let [row-front (take n row)] + (if (>= 1 (count (table-front-filter row-front table))) + row-front + (recur (inc n)))))) + +(defn shortest-unambiguous-ellipses-path + "Compute the shortest (in number of path elements) ellipses path which + unambiguously refers to a specific in a
. The behavior of + this function is undefined if given a that is not in the
. + + See also: shortest-unambiguous-path" + [table row] + (let [row-end (last row) + filtered-table (table-end-filter [row-end] table)] + (loop [n 1] + (let [row-front (take n row)] + (if (>= 1 (count (table-front-filter row-front filtered-table))) + (concat row-front ["..." row-end]) + (recur (inc n))))))) + +(defn shortest-unambiguous-path + "Compute the shortest (in number of path elements) path which unambiguously + refers to a specific in a
. The behavior of this function is + undefined if given a that is not in the
. + + A path can either be a 'forward path', in which it specifies the row with + elements from the front (e.g. ze/zir), or an 'ellipses path', which elides + unnecessary elements from the middle (e.g. they/.../themselves). If the + shortest forward and ellipses paths are the same length, prefer the forward + path" + [table row] + (let [forward-path (shortest-unambiguous-forward-path table row) + ellipses-path (shortest-unambiguous-ellipses-path table row)] + (s/join "/" + (if (> (count forward-path) (count ellipses-path)) + ellipses-path + forward-path)))) (defn abbreviate "return the list of minimum unabiguous paths from a
" [table] - (map (partial minimum-unambiguous-path table) table)) + (map (partial shortest-unambiguous-path table) table)) (defn vec-coerce [x] "wrap a value in a vector if it is not already in one. note that if From c956d354a1952fb443abe614cee392f5c7762747 Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Thu, 22 Sep 2016 17:17:19 -0700 Subject: [PATCH 24/25] bump version number for deployment --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index a930d9a..770c000 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject witch-house/pronouns "1.9.0-SNAPSHOT" +(defproject witch-house/pronouns "1.10.0-SNAPSHOT" :description "Pronoun.is is a website for personal pronoun usage examples" :url "http://pronoun.is" :dependencies [[org.clojure/clojure "1.6.0"] From 2f767f38a07feccaf2129b78d8183ed57e77ba29 Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Thu, 22 Sep 2016 17:21:30 -0700 Subject: [PATCH 25/25] add :license to project.clj --- project.clj | 1 + 1 file changed, 1 insertion(+) diff --git a/project.clj b/project.clj index 770c000..cddf5f3 100644 --- a/project.clj +++ b/project.clj @@ -1,6 +1,7 @@ (defproject witch-house/pronouns "1.10.0-SNAPSHOT" :description "Pronoun.is is a website for personal pronoun usage examples" :url "http://pronoun.is" + :license "GNU Affero General Public License 3.0" :dependencies [[org.clojure/clojure "1.6.0"] [compojure "1.1.8"] [ring/ring-jetty-adapter "1.2.2"]