From 44b50e4feb1187c51efc735f4da6be87a400d354 Mon Sep 17 00:00:00 2001
From: mike-thompson-day8 <mike.thompson@day8.com.au>
Date: Wed, 25 Feb 2015 12:51:30 +1100
Subject: [PATCH] Tweaks and cleanup

---
 src/re_frame/handlers.cljs   | 10 ----------
 src/re_frame/middleware.cljs | 37 +++---------------------------------
 2 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/src/re_frame/handlers.cljs b/src/re_frame/handlers.cljs
index 2e8c797..2877ea9 100644
--- a/src/re_frame/handlers.cljs
+++ b/src/re_frame/handlers.cljs
@@ -22,16 +22,6 @@
     (register event-id (middleware handler-fn))))
 
 
-(defn register
-  "register a handler for an event"
-  ([event-id handler-fn]
-    (when (contains? @id->fn event-id)
-      (warn "re-frame: overwriting an event-handler for: " event-id))   ;; allow it, but warn.
-    (swap! id->fn assoc event-id handler-fn))
-
-  ([event-id middleware handler-fn]
-    (register event-id (middleware handler-fn))))
-
 ;; -- The Event Conveyor Belt  --------------------------------------------------------------------
 ;;
 ;; Moves events from "dispatch" to the router loop.
diff --git a/src/re_frame/middleware.cljs b/src/re_frame/middleware.cljs
index d86d141..237e70b 100644
--- a/src/re_frame/middleware.cljs
+++ b/src/re_frame/middleware.cljs
@@ -5,38 +5,7 @@
 
 ;; -- Middleware Factories -------------------------------------------------------------------------
 ;;
-;;  Middleware wraps handlers, providing a composable pipeline.  We use middleware so the handlers
-;;  themselves are kept as simple as possible.  In particualr, the handlers can be kept as pure functions.
-;;
-;;  My attempt to explain, by skirting around the hard bits is as follows ...
-;;
-;;  Use "comp" to compose middelware, like this:
-;;
-;;      (def midware  (comp undoable pure (validate some-fn)))   ;; midware is a function
-;;
-;;  then imagine that we have a pure handler:
-;;
-;;       (defn my-handler
-;;          [db v]
-;;          (assoc db :some-key 42))
-;;
-;;  then apply the composed middleare to my-handler:
-;;
-;;      (def h    (midware my-handler))    ;;  h is "my-handler"  wrapped in middleware
-;;
-;;  I could call h like this:
-;;      (h app-db [:some-key 23])       <----  h is a handler, just pass in 'db' and 'v'
-;;
-;;  Which means, you could just register 'h'
-;;
-;;  (register
-;;      :some-id
-;;      h)
-;;
-;;  Middleware factories do your head in initially, because they involve a function, returning a function,
-;;  returning a function.  So I'd suggest you might want to read this explanation
-;;  (go to "Handlers and Middleware"):
-;;     http://www.flyingmachinestudios.com/programming/boot-clj/
+;; Read this:  https://github.com/Day8/re-frame/wiki/Middleware
 ;;
 
 (defn undoable
@@ -63,7 +32,7 @@
 #_(defn check-schema
 "Middleware for checking that a handlers mutations leave the state in a schema-matching way"
 [a-prismatic-schema]
-(fn middlewear
+(fn middleware
   [next-handler]
   (fn handler
     [db v]
@@ -79,7 +48,7 @@
 The validation function f, might assoc warnings and errors to the new state, created by the handler.
 By validation, I mean validation of what the user has entered, or the state they have taken the app too"
   [f]
-  (fn middlewear
+  (fn middleware
     [next-handler]
     (fn handler
       [db v]