Merge branch 'develop' into feature/simple-example

project.clj

@@ -1,4 +1,4 @@
-(defproject re-frame "0.1.7"
+(defproject re-frame "0.1.8"
   :description  "A Reagent Framework For Writing SPAs, in Clojurescript"
   :url          "https://github.com/Day8/re-frame.git"
   :license      {:name "MIT"}

src/re_frame/core.cljs

@@ -11,7 +11,7 @@
 (def dispatch         handlers/dispatch)
 (def dispatch-sync    handlers/dispatch-sync)
 
-(def register-subs subs/register)
+(def register-sub subs/register)
 (def subscribe     subs/subscribe)
 
 
@@ -32,4 +32,4 @@
   ([id handler]
     (register-handler id pure handler))
   ([id middleware handler]
-    (register-handler id (comp pure middleware) handler)))
+    (register-handler id (comp middleware pure) handler)))