From 1e9ce7b9a0cf306df66bc279eea694972d9fdf1f Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Mon, 4 Dec 2017 17:11:30 +0000 Subject: [PATCH] Small fixes arising out of `lein ancient` updates. --- project.clj | 32 ++++++++++++++++++-------------- resources/templates/params.html | 3 ++- resources/templates/rules.html | 3 ++- src/mw_ui/handler.clj | 21 ++++++++++----------- src/mw_ui/layout.clj | 4 ++++ src/mw_ui/render_world.clj | 3 +-- 6 files changed, 37 insertions(+), 29 deletions(-) diff --git a/project.clj b/project.clj index a3a3dfe..2476ddb 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject mw-ui "0.1.5-SNAPSHOT" +(defproject mw-ui "0.1.5" :description "Web-based user interface for MicroWorld" :url "http://www.journeyman.cc/microworld" :manifest { @@ -8,17 +8,21 @@ "build-signature-timestamp" "unset" "Implementation-Version" "unset" } - :dependencies [[org.clojure/clojure "1.6.0"] - [mw-engine "0.1.5-SNAPSHOT"] - [mw-parser "0.1.5-SNAPSHOT"] - [lib-noir "0.8.4"] - [ring-server "0.3.1"] - [selmer "0.6.8"] - [com.taoensso/timbre "3.2.1"] - [com.taoensso/tower "2.0.2"] - [markdown-clj "0.9.44"] - [environ "0.5.0"] - [noir-exception "0.2.2"]] + :dependencies [[org.clojure/clojure "1.8.0"] + [mw-engine "0.1.6-SNAPSHOT"] + [mw-parser "0.1.6-SNAPSHOT"] + [lib-noir "0.9.9"] + [ring-server "0.5.0"] + [selmer "1.11.3" :exclusions [cheshire + com.fasterxml.jackson.core/jackson-core + com.fasterxml.jackson.dataformat/jackson-dataformat-smile + com.fasterxml.jackson.dataformat/jackson-dataformat-cbor]] + [hiccup "1.0.5"] + [com.taoensso/timbre "4.10.0" :exclusions [org.clojure/tools.reader]] + [com.taoensso/tower "3.0.2"] + [markdown-clj "1.0.1"] + [environ "1.1.0"] + [noir-exception "0.2.5"]] :repl-options {:init-ns mw-ui.repl} :plugins [[lein-ring "0.8.11"] @@ -40,8 +44,8 @@ :stacktraces? false :auto-reload? false}} :dev {:dependencies [[ring-mock "0.1.5"] - [ring/ring-devel "1.3.0"] - [pjstadig/humane-test-output "0.6.0"]] + [ring/ring-devel "1.6.3" :exclusions [ring/ring-codec]] + [pjstadig/humane-test-output "0.8.3"]] :injections [(require 'pjstadig.humane-test-output) (pjstadig.humane-test-output/activate!)] :env {:dev true}}} diff --git a/resources/templates/params.html b/resources/templates/params.html index f0e13cb..c872da8 100644 --- a/resources/templates/params.html +++ b/resources/templates/params.html @@ -1,6 +1,7 @@ {% extends "templates/base.html" %} {% block content %}
+ {% csrf-field %}

@@ -11,4 +12,4 @@

-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/src/mw_ui/handler.clj b/src/mw_ui/handler.clj index 66d7fe7..f1d6bd2 100644 --- a/src/mw_ui/handler.clj +++ b/src/mw_ui/handler.clj @@ -8,7 +8,7 @@ [noir.util.middleware :refer [app-handler]] [compojure.route :as route] [taoensso.timbre :as timbre] - [taoensso.timbre.appenders.rotor :as rotor] + [taoensso.timbre.appenders.3rd-party.rotor :as rotor] [selmer.parser :as parser] [environ.core :refer [env]])) @@ -46,16 +46,15 @@ an app server such as Tomcat put any initialization code here" [] - (timbre/set-config! - [:appenders :rotor] - {:min-level :info - :enabled? true - :async? false ; should be always false for rotor - :max-message-per-msecs nil - :fn rotor/appender-fn}) - (timbre/set-config! - [:shared-appender-config :rotor] - {:path "mw_ui.log" :max-size (* 512 1024) :backlog 10}) + (timbre/merge-config! + {:appenders + {:rotor (rotor/rotor-appender + {:path "mw-ui.log" + :max-size (* 512 1024) + :backlog 10})} + :level (or + (if (env :dev) :debug) + :info)}) (if (env :dev) (parser/cache-off!)) diff --git a/src/mw_ui/layout.clj b/src/mw_ui/layout.clj index 9861426..37a4323 100644 --- a/src/mw_ui/layout.clj +++ b/src/mw_ui/layout.clj @@ -3,6 +3,7 @@ mw-ui.layout (:require [selmer.parser :as parser] [clojure.string :as s] + [ring.util.anti-forgery :refer [anti-forgery-field]] [ring.util.response :refer [content-type response]] [compojure.response :refer [Renderable]])) @@ -33,6 +34,9 @@ (def template-path "templates/") +(parser/add-tag! :csrf-field (fn [_ _] (anti-forgery-field))) + + (deftype RenderableTemplate [template params] Renderable (render [this request] diff --git a/src/mw_ui/render_world.clj b/src/mw_ui/render_world.clj index 2d91180..a5635ec 100644 --- a/src/mw_ui/render_world.clj +++ b/src/mw_ui/render_world.clj @@ -78,8 +78,7 @@ (io/get-resource "/rulesets/basic.txt"))) (session/get :rules))) generation (inc (or (session/get :generation) 0)) - w2 (engine/transform-world world rules) - ] + w2 (engine/transform-world world rules)] (session/put! :world w2) (session/put! :generation generation) [:div {:class "world"}