kimendisch/pronoun.lol
0
0
Fork 0
Code Issues Pull Requests Projects Activity

Update deps to modern versions and remove midje

Browse Source
This commit is contained in:
Morgan Astra 2018-11-14 12:49:17 -08:00
parent 05a2d8fcff
commit 4321ec5e39
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
project.clj
View File

@ -2,18 +2,16 @@
:description "Pronoun.is is a website for personal pronoun usage examples" :description "Pronoun.is is a website for personal pronoun usage examples"
:url "http://pronoun.is" :url "http://pronoun.is"
:license "GNU Affero General Public License 3.0" :license "GNU Affero General Public License 3.0"
:dependencies [[org.clojure/clojure "1.6.0"] :dependencies [[org.clojure/clojure "1.9.0"]
[compojure "1.1.8"] [compojure "1.6.1"]
[ring/ring-jetty-adapter "1.2.2"] [ring/ring-jetty-adapter "1.7.1"]
[ring.middleware.logger "0.5.0"] [ring/ring-devel "1.7.1"]
[ring/ring-devel "1.2.2"] [environ "1.1.0"]
[environ "0.5.0"]
[hiccup "1.0.5"]] [hiccup "1.0.5"]]
:min-lein-version "2.0.0" :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"]] [lein-ring "0.9.7"]]
:hooks [environ.leiningen.hooks] :hooks [environ.leiningen.hooks]
:uberjar-name "pronouns-standalone.jar" :uberjar-name "pronouns-standalone.jar"
:profiles {:production {:env {:production true}} :profiles {:production {:env {:production true}}}
:dev {:dependencies [[midje "1.6.3"]]}}
:ring {:handler pronouns.web/app}) :ring {:handler pronouns.web/app})

6
src/pronouns/web.clj
View File

@ -20,13 +20,13 @@
[compojure.route :as route] [compojure.route :as route]
[clojure.string :as s] [clojure.string :as s]
[clojure.java.io :as io] [clojure.java.io :as io]
[ring.middleware.logger :as logger] [ring.adapter.jetty :as jetty]
;[ring.middleware.logger :as logger]
[ring.middleware.stacktrace :as trace] [ring.middleware.stacktrace :as trace]
[ring.middleware.params :as params] [ring.middleware.params :as params]
[ring.middleware.resource :refer [wrap-resource]] [ring.middleware.resource :refer [wrap-resource]]
[ring.middleware.content-type :refer [wrap-content-type]] [ring.middleware.content-type :refer [wrap-content-type]]
[ring.middleware.not-modified :refer [wrap-not-modified]] [ring.middleware.not-modified :refer [wrap-not-modified]]
[ring.adapter.jetty :as jetty]
[environ.core :refer [env]] [environ.core :refer [env]]
[pronouns.util :as u] [pronouns.util :as u]
[pronouns.pages :as pages])) [pronouns.pages :as pages]))
@ -64,7 +64,7 @@
(wrap-resource "images") (wrap-resource "images")
wrap-content-type wrap-content-type
wrap-not-modified wrap-not-modified
logger/wrap-with-logger ;logger/wrap-with-logger
wrap-error-page wrap-error-page
trace/wrap-stacktrace trace/wrap-stacktrace
params/wrap-params)) params/wrap-params))

16
test/pronouns/pages_test.clj
View File

@ -1,10 +1,12 @@
(ns pronouns.pages-test (ns pronouns.pages-test
(:require [pronouns.pages :as pages] (:require [pronouns.pages :as pages]
[midje.sweet :refer :all])) [clojure.test :refer [deftest testing is are]]))
(fact "prose-comma-list turns a list of strings into a prose list with commas" (deftest prose-comma-list
(pages/prose-comma-list ["foo"]) => "foo" (testing "prose-comma-list turns a list of strings into a prose list"
(pages/prose-comma-list ["foo" "bar"]) => "foo and bar" (are [call result] (= call result)
(pages/prose-comma-list ["foo" "bar" "baz"]) => "foo, bar, and baz" (pages/prose-comma-list ["foo"]) "foo"
(pages/prose-comma-list ["foo" "bar" "baz" "bobble"]) => "foo, bar, baz, and bobble" (pages/prose-comma-list ["foo" "bar"]) "foo and bar"
(pages/prose-comma-list []) => "") (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 []) "")))