Update aff, use Canceler newtype

Author: garyb

bower.json

@@ -19,7 +19,7 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-aff": "~0.9.2",
+    "purescript-aff": "~0.10.0",
     "purescript-arraybuffer-types": "~0.1.1",
     "purescript-dom": "~0.1.2",
     "purescript-foreign": "~0.4.2",

src/Network/HTTP/Affjax.purs

@@ -12,7 +12,7 @@ module Network.HTTP.Affjax
   , delete, delete_
   ) where
 
-import Control.Monad.Aff (Aff(), makeAff, makeAff', Canceler())
+import Control.Monad.Aff (Aff(), makeAff, makeAff', Canceler(..))
 import Control.Monad.Eff (Eff())
 import Control.Monad.Eff.Exception (Error(), error)
 import Data.Either (Either(..))
@@ -191,7 +191,7 @@ foreign import _ajax
                      (Eff (ajax :: Ajax | e) (Canceler (ajax :: Ajax | e)))
 
 cancelAjax :: forall e. XMLHttpRequest -> Canceler (ajax :: Ajax | e)
-cancelAjax xhr err = makeAff (\eb cb -> runFn4 _cancelAjax xhr err eb cb)
+cancelAjax xhr = Canceler \err -> makeAff (\eb cb -> runFn4 _cancelAjax xhr err eb cb)
 
 foreign import _cancelAjax
   """

test/Main.purs

@@ -39,5 +39,5 @@ main = launchAff $ do
   liftEff $ either traceAny (traceAny :: AffjaxResponse Foreign -> _) res
 
   canceler <- forkAff (post_ "/api" "do it now")
-  canceled <- canceler $ error "Pull the cord!"
+  canceled <- canceler `cancel` error "Pull the cord!"
   liftEff $ if canceled then (trace "Canceled") else (trace "Not Canceled")