Merge pull request #79 from garyb/bump-dependencies

Update dependencies

Author: garyb

bower.json

@@ -23,14 +23,14 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-aff": "^1.0.0",
+    "purescript-aff": "^1.1.0",
     "purescript-argonaut-core": "^1.0.0",
     "purescript-arraybuffer-types": "^0.2.0",
-    "purescript-dom": "^1.0.0",
+    "purescript-dom": "^2.0.0",
     "purescript-foreign": "^1.0.0",
     "purescript-form-urlencoded": "^1.0.0",
     "purescript-http-methods": "^1.0.0",
-    "purescript-integers": "^1.0.0",
+    "purescript-integers": "^1.1.0",
     "purescript-math": "^2.0.0",
     "purescript-media-types": "^1.0.0",
     "purescript-nullable": "^1.0.1",

package.json

@@ -6,14 +6,14 @@
     "test": "jshint src && jscs src && pulp test"
   },
   "devDependencies": {
-    "body-parser": "^1.13.2",
-    "express": "^4.13.1",
-    "jscs": "^2.8.0",
-    "jshint": "^2.9.1",
+    "body-parser": "^1.15.2",
+    "express": "^4.14.0",
+    "jscs": "^3.0.7",
+    "jshint": "^2.9.2",
     "pulp": "^9.0.1",
-    "purescript": "^0.9.1",
+    "purescript": "^0.9.2",
     "purescript-psa": "^0.3.9",
-    "rimraf": "^2.5.2",
+    "rimraf": "^2.5.4",
     "xhr2": "^0.1.3"
   }
 }

test/Main.js

@@ -1,10 +1,8 @@
-'use strict';
+"use strict";
 
-// module Test.Main
-
-exports.logAny = function(a){
+exports.logAny = function (a) {
   return function () {
     console.log(a);
     return {};
   };
-}
+};

test/Main.purs

@@ -2,37 +2,34 @@ module Test.Main where
 
 import Prelude
 
-import Control.Bind
-import Control.Monad.Aff
-import Control.Monad.Aff.AVar (AVAR())
+import Control.Monad.Aff (Aff, cancel, forkAff, attempt, runAff, makeAff)
+import Control.Monad.Aff.AVar (AVAR)
 import Control.Monad.Aff.Console as A
-import Control.Monad.Eff
-import Control.Monad.Eff.Class
-import Control.Monad.Eff.Console (CONSOLE(), log, logShow)
-import Control.Monad.Eff.Exception
-import Control.Monad.Eff.Ref (REF())
+import Control.Monad.Eff (Eff)
+import Control.Monad.Eff.Class (liftEff)
+import Control.Monad.Eff.Console (CONSOLE, log, logShow)
+import Control.Monad.Eff.Exception (EXCEPTION, error, throwException)
+import Control.Monad.Eff.Ref (REF)
 
-import Data.Either
-import Data.Foreign
-import Data.Maybe
+import Data.Either (Either(..))
+import Data.Foreign (Foreign, unsafeFromForeign)
+import Data.Maybe (Maybe(..))
 
-import Network.HTTP.Affjax
-import Network.HTTP.StatusCode
+import Network.HTTP.Affjax as AX
+import Network.HTTP.StatusCode (StatusCode(..))
 
-foreign import logAny
-  :: forall e a. a -> Eff (console :: CONSOLE | e) Unit
+foreign import logAny :: forall e a. a -> Eff (console :: CONSOLE | e) Unit
 
 logAny' :: forall e a. a -> Assert e Unit
 logAny' = liftEff <<< logAny
 
-type Assert e a = Aff (err :: EXCEPTION, console :: CONSOLE, ajax :: AJAX | e) a
+type Assert e a = Aff (err :: EXCEPTION, console :: CONSOLE, ajax :: AX.AJAX | e) a
 
 assertFail :: forall e a. String -> Assert e a
-assertFail msg = let e = error msg
-                 in makeAff \errback _ -> errback e
+assertFail msg = makeAff \errback _ -> errback (error msg)
 
 assertMsg :: forall e. String -> Boolean -> Assert e Unit
-assertMsg _   true  = pure unit
+assertMsg _ true = pure unit
 assertMsg msg false = assertFail msg
 
 assertRight :: forall e a b. Either a b -> Assert e b
@@ -46,9 +43,8 @@ assertLeft x = case x of
   Left y -> pure y
 
 assertEq :: forall e a. (Eq a, Show a) => a -> a -> Assert e Unit
-assertEq x y = if x == y
-                 then pure unit
-                 else assertFail $ "Expected " <> show x <> ", got " <> show y
+assertEq x y =
+  when (x /= y) $ assertFail $ "Expected " <> show x <> ", got " <> show y
 
 -- | For helping type inference
 typeIs :: forall e a. a -> Assert e Unit
@@ -62,7 +58,7 @@ type MainEffects e =
   | e
   )
 
-main :: Eff (MainEffects (ajax :: AJAX)) Unit
+main :: Eff (MainEffects (ajax :: AX.AJAX)) Unit
 main = void $ runAff (\e -> logShow e >>= \_ -> throwException e) (const $ log "affjax: All good!") $ do
   let ok200 = StatusCode 200
   let notFound404 = StatusCode 404
@@ -72,52 +68,52 @@ main = void $ runAff (\e -> logShow e >>= \_ -> throwException e) (const $ log "
   let mirror       = prefix "/mirror"
   let doesNotExist = prefix "/does-not-exist"
   let notJson      = prefix "/not-json"
-  let retryPolicy = defaultRetryPolicy { timeout = Just 500, shouldRetryWithStatusCode = \_ -> true }
+  let retryPolicy = AX.defaultRetryPolicy { timeout = Just 500, shouldRetryWithStatusCode = \_ -> true }
 
   A.log "GET /does-not-exist: should be 404 Not found after retries"
-  (attempt $ retry retryPolicy affjax $ defaultRequest { url = doesNotExist }) >>= assertRight >>= \res -> do
-    typeIs (res :: AffjaxResponse String)
+  (attempt $ AX.retry retryPolicy AX.affjax $ AX.defaultRequest { url = doesNotExist }) >>= assertRight >>= \res -> do
+    typeIs (res :: AX.AffjaxResponse String)
     assertEq notFound404 res.status
 
   A.log "GET /mirror: should be 200 OK"
-  (attempt $ affjax $ defaultRequest { url = mirror }) >>= assertRight >>= \res -> do
-    typeIs (res :: AffjaxResponse Foreign)
+  (attempt $ AX.affjax $ AX.defaultRequest { url = mirror }) >>= assertRight >>= \res -> do
+    typeIs (res :: AX.AffjaxResponse Foreign)
     assertEq ok200 res.status
 
   A.log "GET /does-not-exist: should be 404 Not found"
-  (attempt $ affjax $ defaultRequest { url = doesNotExist }) >>= assertRight >>= \res -> do
-    typeIs (res :: AffjaxResponse String)
+  (attempt $ AX.affjax $ AX.defaultRequest { url = doesNotExist }) >>= assertRight >>= \res -> do
+    typeIs (res :: AX.AffjaxResponse String)
     assertEq notFound404 res.status
 
   A.log "GET /not-json: invalid JSON with Foreign response should throw an error"
-  assertLeft =<< attempt (get doesNotExist :: Affjax (MainEffects ()) Foreign)
+  assertLeft =<< attempt (AX.get doesNotExist :: AX.Affjax (MainEffects ()) Foreign)
 
   A.log "GET /not-json: invalid JSON with String response should be ok"
-  (attempt $ get notJson) >>= assertRight >>= \res -> do
-    typeIs (res :: AffjaxResponse String)
+  (attempt $ AX.get notJson) >>= assertRight >>= \res -> do
+    typeIs (res :: AX.AffjaxResponse String)
     assertEq ok200 res.status
 
   A.log "POST /mirror: should use the POST method"
-  (attempt $ post mirror "test") >>= assertRight >>= \res -> do
+  (attempt $ AX.post mirror "test") >>= assertRight >>= \res -> do
     assertEq ok200 res.status
     assertEq "POST" (_.method $ unsafeFromForeign res.response)
 
   A.log "PUT with a request body"
   let content = "the quick brown fox jumps over the lazy dog"
-  (attempt $ put mirror content) >>= assertRight >>= \res -> do
-    typeIs (res :: AffjaxResponse Foreign)
+  (attempt $ AX.put mirror content) >>= assertRight >>= \res -> do
+    typeIs (res :: AX.AffjaxResponse Foreign)
     assertEq ok200 res.status
     let mirroredReq = unsafeFromForeign res.response
     assertEq "PUT"   mirroredReq.method
     assertEq content mirroredReq.body
 
   A.log "Testing CORS, HTTPS"
-  (attempt $ get "https://cors-test.appspot.com/test") >>= assertRight >>= \res -> do
-    typeIs (res :: AffjaxResponse Foreign)
+  (attempt $ AX.get "https://cors-test.appspot.com/test") >>= assertRight >>= \res -> do
+    typeIs (res :: AX.AffjaxResponse Foreign)
     assertEq ok200 res.status
     -- assertEq (Just "test=test") (lookupHeader "Set-Cookie" res.headers)
 
   A.log "Testing cancellation"
-  canceler <- forkAff (post_ mirror "do it now")
+  canceler <- forkAff (AX.post_ mirror "do it now")
   canceled <- canceler `cancel` error "Pull the cord!"
   assertMsg "Should have been canceled" canceled