Merge pull request #15 from slamdata/updates

Update Aff, uppercase effect

Author: jdegoes

README.md

@@ -2,18 +2,18 @@
 
 ## Module Network.HTTP.Affjax
 
-#### `Ajax`
+#### `AJAX`
 
 ``` purescript
-data Ajax :: !
+data AJAX :: !
 ```
 
 The effect type for AJAX requests made with Affjax.
 
 #### `Affjax`
 
 ``` purescript
-type Affjax e a = Aff (ajax :: Ajax | e) (AffjaxResponse a)
+type Affjax e a = Aff (ajax :: AJAX | e) (AffjaxResponse a)
 ```
 
 The type for Affjax requests.
@@ -151,7 +151,7 @@ Makes a `DELETE` request to the specified URL and ignores the response.
 #### `affjax'`
 
 ``` purescript
-affjax' :: forall e a b. (Requestable a, Responsable b) => AffjaxRequest a -> (Error -> Eff (ajax :: Ajax | e) Unit) -> (AffjaxResponse b -> Eff (ajax :: Ajax | e) Unit) -> Eff (ajax :: Ajax | e) (Canceler (ajax :: Ajax | e))
+affjax' :: forall e a b. (Requestable a, Responsable b) => AffjaxRequest a -> (Error -> Eff (ajax :: AJAX | e) Unit) -> (AffjaxResponse b -> Eff (ajax :: AJAX | e) Unit) -> Eff (ajax :: AJAX | e) (Canceler (ajax :: AJAX | e))
 ```
 
 Run a request directly without using `Aff`.

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

@@ -1,5 +1,5 @@
 module Network.HTTP.Affjax
-  ( Ajax()
+  ( AJAX()
   , Affjax()
   , AffjaxRequest(), defaultRequest
   , AffjaxResponse()
@@ -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(..))
@@ -31,10 +31,10 @@ import Network.HTTP.StatusCode (StatusCode())
 import Type.Proxy (Proxy(..))
 
 -- | The effect type for AJAX requests made with Affjax.
-foreign import data Ajax :: !
+foreign import data AJAX :: !
 
 -- | The type for Affjax requests.
-type Affjax e a = Aff (ajax :: Ajax | e) (AffjaxResponse a)
+type Affjax e a = Aff (ajax :: AJAX | e) (AffjaxResponse a)
 
 type AffjaxRequest a =
   { method :: Method
@@ -120,9 +120,9 @@ delete_ = delete
 -- | Run a request directly without using `Aff`.
 affjax' :: forall e a b. (Requestable a, Responsable b) =>
                          AffjaxRequest a ->
-                         (Error -> Eff (ajax :: Ajax | e) Unit) ->
-                         (AffjaxResponse b -> Eff (ajax :: Ajax | e) Unit) ->
-                         Eff (ajax :: Ajax | e) (Canceler (ajax :: Ajax | e))
+                         (Error -> Eff (ajax :: AJAX | e) Unit) ->
+                         (AffjaxResponse b -> Eff (ajax :: AJAX | e) Unit) ->
+                         Eff (ajax :: AJAX | e) (Canceler (ajax :: AJAX | e))
 affjax' req eb cb =
   runFn5 _ajax responseHeader req' cancelAjax eb cb'
   where
@@ -135,7 +135,7 @@ affjax' req eb cb =
          , username: toNullable req.username
          , password: toNullable req.password
          }
-  cb' :: AffjaxResponse ResponseContent -> Eff (ajax :: Ajax | e) Unit
+  cb' :: AffjaxResponse ResponseContent -> Eff (ajax :: AJAX | e) Unit
   cb' res = case res { response = _  } <$> fromResponse res.response of
     Left err -> eb $ error (show err)
     Right res' -> cb res'
@@ -185,13 +185,13 @@ foreign import _ajax
   }
   """ :: forall e a. Fn5 (String -> String -> ResponseHeader)
                      AjaxRequest
-                     (XMLHttpRequest -> Canceler (ajax :: Ajax | e))
-                     (Error -> Eff (ajax :: Ajax | e) Unit)
-                     (AffjaxResponse Foreign -> Eff (ajax :: Ajax | e) Unit)
-                     (Eff (ajax :: Ajax | e) (Canceler (ajax :: Ajax | e)))
+                     (XMLHttpRequest -> Canceler (ajax :: AJAX | e))
+                     (Error -> Eff (ajax :: AJAX | e) Unit)
+                     (AffjaxResponse Foreign -> Eff (ajax :: AJAX | e) Unit)
+                     (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 :: forall e. XMLHttpRequest -> Canceler (ajax :: AJAX | e)
+cancelAjax xhr = Canceler \err -> makeAff (\eb cb -> runFn4 _cancelAjax xhr err eb cb)
 
 foreign import _cancelAjax
   """
@@ -203,6 +203,6 @@ foreign import _cancelAjax
   };
   """ :: forall e. Fn4 XMLHttpRequest
                        Error
-                       (Error -> Eff (ajax :: Ajax | e) Unit)
-                       (Boolean -> Eff (ajax :: Ajax | e) Unit)
-                       (Eff (ajax :: Ajax | e) Unit)
+                       (Error -> Eff (ajax :: AJAX | e) Unit)
+                       (Boolean -> Eff (ajax :: AJAX | e) Unit)
+                       (Eff (ajax :: AJAX | e) Unit)

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