Small fixes arising out of lein ancient updates.

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"]
+  :dependencies [[org.clojure/clojure "1.8.0"]
-                 [mw-engine "0.1.5-SNAPSHOT"]
+                 [mw-engine "0.1.6-SNAPSHOT"]
-                 [mw-parser "0.1.5-SNAPSHOT"]
+                 [mw-parser "0.1.6-SNAPSHOT"]
-                 [lib-noir "0.8.4"]
+                 [lib-noir "0.9.9"]
-                 [ring-server "0.3.1"]
+                 [ring-server "0.5.0"]
-                 [selmer "0.6.8"]
+                 [selmer "1.11.3" :exclusions [cheshire
-                 [com.taoensso/timbre "3.2.1"]
+                                               com.fasterxml.jackson.core/jackson-core
-                 [com.taoensso/tower "2.0.2"]
+                                               com.fasterxml.jackson.dataformat/jackson-dataformat-smile
-                 [markdown-clj "0.9.44"]
+                                               com.fasterxml.jackson.dataformat/jackson-dataformat-cbor]]
-                 [environ "0.5.0"]
+                 [hiccup "1.0.5"]
-                 [noir-exception "0.2.2"]]
+                 [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"]
+                        [ring/ring-devel "1.6.3" :exclusions [ring/ring-codec]]
-                        [pjstadig/humane-test-output "0.6.0"]]
+                        [pjstadig/humane-test-output "0.8.3"]]
          :injections [(require 'pjstadig.humane-test-output)
                       (pjstadig.humane-test-output/activate!)]
          :env {:dev true}}}

resources/templates/params.html

@@ -1,6 +1,7 @@
 {% extends "templates/base.html" %}
 {% block content %}
 <form action="{{servlet-context}}/params" method="POST">
+  {% csrf-field %}
 	<p class="widget">
 		<label for="ruleset">The rule set to use</label>
 		<select name="ruleset">

resources/templates/rules.html

@@ -1,6 +1,7 @@
 {% extends "templates/base.html" %}
 {% block content %}
 <form action="{{servlet-context}}/rules" method="POST">
+  {% csrf-field %}
 	<textarea name="src" id="src" rows="10" cols="80">
 {{rule-text}}
 	</textarea>

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!
+    (timbre/merge-config!
-    [:appenders :rotor]
+      {:appenders
-    {:min-level :info
+       {:rotor (rotor/rotor-appender
-     :enabled? true
+                 {:path "mw-ui.log"
-     :async? false ; should be always false for rotor
+                  :max-size (* 512 1024)
-     :max-message-per-msecs nil
+                  :backlog 10})}
-     :fn rotor/appender-fn})
+       :level (or
-  (timbre/set-config!
+                (if (env :dev) :debug)
-    [:shared-appender-config :rotor]
+                :info)})
-    {:path "mw_ui.log" :max-size (* 512 1024) :backlog 10})
 
 
   (if (env :dev) (parser/cache-off!))

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]

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"}