From 4321ec5e39bdb817fbcc61cc40a42b5a23a0a1ce Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Wed, 14 Nov 2018 12:49:17 -0800 Subject: Update deps to modern versions and remove midje --- project.clj | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'project.clj') diff --git a/project.clj b/project.clj index b14ac4e..bcb1454 100644 --- a/project.clj +++ b/project.clj @@ -2,18 +2,16 @@ :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"] - [ring.middleware.logger "0.5.0"] - [ring/ring-devel "1.2.2"] - [environ "0.5.0"] + :dependencies [[org.clojure/clojure "1.9.0"] + [compojure "1.6.1"] + [ring/ring-jetty-adapter "1.7.1"] + [ring/ring-devel "1.7.1"] + [environ "1.1.0"] [hiccup "1.0.5"]] :min-lein-version "2.0.0" :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}} - :dev {:dependencies [[midje "1.6.3"]]}} + :profiles {:production {:env {:production true}}} :ring {:handler pronouns.web/app}) -- cgit From a8e745b5fdbfdf3079dedb9cee541982a8a8d493 Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Wed, 14 Nov 2018 12:54:50 -0800 Subject: Clean up lein profiles --- project.clj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'project.clj') diff --git a/project.clj b/project.clj index bcb1454..5a67479 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,6 @@ :dependencies [[org.clojure/clojure "1.9.0"] [compojure "1.6.1"] [ring/ring-jetty-adapter "1.7.1"] - [ring/ring-devel "1.7.1"] [environ "1.1.0"] [hiccup "1.0.5"]] :min-lein-version "2.0.0" @@ -13,5 +12,8 @@ [lein-ring "0.9.7"]] :hooks [environ.leiningen.hooks] :uberjar-name "pronouns-standalone.jar" - :profiles {:production {:env {:production true}}} + ;; FIXME morgan.astra <2018-11-14 Wed> + ;; Is this production profile used for anything? + :profiles {:production {:env {:production true}} + :dev {:dependencies [[ring/ring-devel "1.7.1"]]}} :ring {:handler pronouns.web/app}) -- cgit From 52a5a3f6abd5295d9bd22002965c0a52a4202713 Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Wed, 14 Nov 2018 13:03:36 -0800 Subject: Bump project version --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'project.clj') diff --git a/project.clj b/project.clj index 5a67479..1cc3d8d 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject witch-house/pronouns "1.11.0-SNAPSHOT" +(defproject witch-house/pronouns "1.12.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" -- cgit From fde31a129a1f2c0dac15ab3f16053465930225cb Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Wed, 14 Nov 2018 14:16:18 -0800 Subject: Fix all remaining http self-links to https --- project.clj | 2 +- src/pronouns/pages.clj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'project.clj') diff --git a/project.clj b/project.clj index 1cc3d8d..a3d6bcf 100644 --- a/project.clj +++ b/project.clj @@ -1,6 +1,6 @@ (defproject witch-house/pronouns "1.12.0-SNAPSHOT" :description "Pronoun.is is a website for personal pronoun usage examples" - :url "http://pronoun.is" + :url "https://pronoun.is" :license "GNU Affero General Public License 3.0" :dependencies [[org.clojure/clojure "1.9.0"] [compojure "1.6.1"] diff --git a/src/pronouns/pages.clj b/src/pronouns/pages.clj index d4051ac..6f7321a 100644 --- a/src/pronouns/pages.clj +++ b/src/pronouns/pages.clj @@ -90,7 +90,7 @@ (defn usage-block [] [:div {:class "section usage"} [:p "Full usage: " - [:tt "http://pronoun.is/subject-pronoun/object-pronoun/possessive-determiner/possessive-pronoun/reflexive"] + [:tt "https://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."]]) @@ -102,7 +102,7 @@ [:p "Written by " (twitter-name "morganastra") ", whose " - (href "http://pronoun.is/ze/zir?or=she" "pronoun.is/ze/zir?or=she")] + (href "https://pronoun.is/she" "pronoun.is/she")] [:p "pronoun.is is free software under the " (href "https://www.gnu.org/licenses/agpl.html" "AGPLv3") "! visit the project on " -- cgit From 67f0a0768750ff98715a48aefc44f315c4875c8c Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Wed, 14 Nov 2018 21:47:31 -0800 Subject: Fix ns issues --- project.clj | 2 +- test/pronouns/util_test.clj | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'project.clj') diff --git a/project.clj b/project.clj index a3d6bcf..a0f77fd 100644 --- a/project.clj +++ b/project.clj @@ -15,5 +15,5 @@ ;; FIXME morgan.astra <2018-11-14 Wed> ;; Is this production profile used for anything? :profiles {:production {:env {:production true}} - :dev {:dependencies [[ring/ring-devel "1.7.1"]]}} + :test {:dependencies [[ring/ring-devel "1.7.1"]]}} :ring {:handler pronouns.web/app}) diff --git a/test/pronouns/util_test.clj b/test/pronouns/util_test.clj index 031f0f9..3aecc2a 100644 --- a/test/pronouns/util_test.clj +++ b/test/pronouns/util_test.clj @@ -1,9 +1,8 @@ (ns pronouns.util-test (:require [pronouns.util :as util] - [clojure.test :refer [deftest testing is]])) + [clojure.test :refer [deftest testing is are]])) -(def test-table [ - ["ze" "hir" "hir" "hirs" "hirself"] +(def test-table [["ze" "hir" "hir" "hirs" "hirself"] ["ze" "zir" "zir" "zirs" "zirself"] ["she" "her" "her" "hers" "herself"] ["he" "him" "his" "his" "himself"] @@ -12,19 +11,19 @@ (deftest table-filters (testing "table-front-filter" - (are [arg return] (= (table-front-filter arg test-table) return) + (are [arg return] (= (util/table-front-filter arg test-table) return) ["she"] [["she" "her" "her" "hers" "herself"]] ["ze"] [["ze" "hir" "hir" "hirs" "hirself"] ["ze" "zir" "zir" "zirs" "zirself"]] ["ze" "zir"] [["ze" "zir" "zir" "zirs" "zirself"]])) (testing "table-end-filter" - (are [arg return] (= (table-end-filter arg test-table) return) + (are [arg return] (= (util/table-end-filter arg test-table) return) ["themself"] [["they" "them" "their" "theirs" "themself"]] - ["themselves" [["they" "them" "their" "theirs" "themselves"]]]))) + ["themselves"] [["they" "them" "their" "theirs" "themselves"]]))) (deftest table-lookup - (are [arg return] (= (table-lookup arg test-table) return) + (are [arg return] (= (util/table-lookup arg test-table) return) ["she"] ["she" "her" "her" "hers" "herself"] ["ze"] ["ze" "hir" "hir" "hirs" "hirself"] ["ze" "zir"] ["ze" "zir" "zir" "zirs" "zirself"] -- cgit