Merge pull request #43 from garyb/psc-0.7.4-update

Update for PureScript 0.7.4

Author: jdegoes

.travis.yml

@@ -2,13 +2,7 @@ language: node_js
 sudo: false
 node_js:
   - 0.10
-env:
-  - TAG=v0.7.0 PATH=$HOME/bin:$PATH
 install:
-  - mkdir $HOME/bin
-  - wget -O $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$TAG/linux64.tar.gz
-  - tar zxvf $HOME/purescript.tar.gz -C $HOME/bin purescript/psc{,i,-docs,-bundle,-publish} --strip-components=1
-  - chmod a+x $HOME/bin/psc{,i,-docs,-bundle,-publish}
   - npm install bower gulp -g
   - npm install && bower install
 script:

bower.json

@@ -23,7 +23,7 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-aff": "^0.11.0",
+    "purescript-aff": "^0.12.0",
     "purescript-arraybuffer-types": "^0.2.0",
     "purescript-dom": "^0.2.0",
     "purescript-foreign": "^0.7.0",

package.json

@@ -1,13 +1,14 @@
 {
   "private": true,
   "devDependencies": {
+    "body-parser": "^1.13.2",
+    "express": "^4.13.1",
     "gulp": "^3.8.11",
     "gulp-jscs": "^1.6.0",
     "gulp-jshint": "^1.11.2",
     "gulp-plumber": "^1.0.0",
     "gulp-purescript": "^0.6.0",
-    "express": "^4.13.1",
-    "body-parser": "^1.13.2",
+    "purescript": "^0.7.4-rc.2",
     "xmlhttprequest": "^1.7.0"
   }
 }

src/Network/HTTP/Affjax.purs

@@ -28,7 +28,7 @@ import Control.Monad.Eff.Exception (Error(), error)
 import Control.Monad.Eff.Ref (REF(), newRef, readRef, writeRef)
 import Control.Monad.Error.Class (throwError)
 import Data.Either (Either(..), either)
-import Data.Foreign (Foreign(..), F(), parseJSON, readString)
+import Data.Foreign (Foreign(), F(), parseJSON, readString)
 import Data.Function (Fn5(), runFn5, Fn4(), runFn4)
 import Data.Int (toNumber, round)
 import Data.Maybe (Maybe(..), maybe)
@@ -174,7 +174,7 @@ retry policy run req = do
             Just failure -> either throwError pure failure
         Just resp -> pure resp
   where
-    retryState :: Either _ _ -> RetryState _ _
+    retryState :: Either Error (AffjaxResponse b) -> RetryState Error (AffjaxResponse b)
     retryState (Left exn) = Left $ Left exn
     retryState (Right resp) =
       case resp.status of