Merge pull request #74 from Thimoteus/master

updates for 0.9.1

Author: garyb

.travis.yml

@@ -1,14 +1,16 @@
 language: node_js
 dist: trusty
 sudo: required
-node_js: 5
+node_js: 6
 install:
   - npm install bower -g
   - npm install
-  - bower install
 script:
+  - bower install --production
+  - npm run -s build
+  - bower install
   - node ./test-server.js &
-  - sleep 2 && pulp test
+  - sleep 2 && npm -s test
 after_success:
 - >-
   test $TRAVIS_TAG &&

bower.json

@@ -23,21 +23,21 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-aff": "^0.16.0",
-    "purescript-argonaut-core": "^0.2.0",
+    "purescript-aff": "^1.0.0",
+    "purescript-argonaut-core": "^1.0.0",
     "purescript-arraybuffer-types": "^0.2.0",
-    "purescript-dom": "^0.2.20",
-    "purescript-foreign": "^0.7.0",
-    "purescript-form-urlencoded": "^0.3.0",
-    "purescript-http-methods": "^0.1.1",
-    "purescript-integers": "^0.2.0",
-    "purescript-math": "^0.2.0",
-    "purescript-media-types": "^0.1.1",
-    "purescript-nullable": "^0.2.0",
-    "purescript-refs": "^0.2.0",
-    "purescript-unsafe-coerce": "^0.1.0"
+    "purescript-dom": "^1.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-math": "^2.0.0",
+    "purescript-media-types": "^1.0.0",
+    "purescript-nullable": "^1.0.1",
+    "purescript-refs": "^1.0.0",
+    "purescript-unsafe-coerce": "^1.0.0"
   },
   "devDependencies": {
-    "purescript-console": "^0.1.0"
+    "purescript-console": "^1.0.0"
   }
 }

package.json

@@ -2,16 +2,17 @@
   "private": true,
   "scripts": {
     "clean": "rimraf output && rimraf .pulp-cache",
-    "build": "jshint src && jscs src && pulp build",
+    "build": "jshint src && jscs src && pulp build --censor-lib --strict",
     "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",
-    "pulp": "^8.2.0",
-    "purescript": "^0.7.6",
+    "pulp": "^9.0.1",
+    "purescript": "^0.9.1",
+    "purescript-psa": "^0.3.9",
     "rimraf": "^2.5.2",
     "xhr2": "^0.1.3"
   }

src/Network/HTTP/Affjax.purs

@@ -16,7 +16,7 @@ module Network.HTTP.Affjax
   , retry
   ) where
 
-import Prelude
+import Prelude hiding (max)
 
 import Control.Bind ((<=<))
 import Control.Monad.Aff (Aff(), makeAff, makeAff', Canceler(..), attempt, later', forkAff, cancel)
@@ -31,7 +31,8 @@ import Data.Array as Arr
 import Data.Either (Either(..), either)
 import Data.Foldable (any)
 import Data.Foreign (Foreign(), F(), parseJSON, readString)
-import Data.Function (Fn5(), runFn5, Fn4(), runFn4, on)
+import Data.Function (on)
+import Data.Function.Uncurried (Fn5(), runFn5, Fn4(), runFn4)
 import Data.HTTP.Method (Method(..), CustomMethod())
 import Data.HTTP.Method as Method
 import Data.Int (toNumber, round)
@@ -44,8 +45,8 @@ import Math (max, pow)
 
 import DOM.XHR.Types (XMLHttpRequest())
 
-import Network.HTTP.Affjax.Request
-import Network.HTTP.Affjax.Response
+import Network.HTTP.Affjax.Request (class Requestable, RequestContent, toRequest)
+import Network.HTTP.Affjax.Response (class Respondable, ResponseContent, ResponseType(..), fromResponse, responseType, responseTypeToString)
 import Network.HTTP.RequestHeader (RequestHeader(..), requestHeaderName, requestHeaderValue)
 import Network.HTTP.ResponseHeader (ResponseHeader(), responseHeader)
 import Network.HTTP.StatusCode (StatusCode(..))

src/Network/HTTP/Affjax/Request.purs

@@ -1,6 +1,6 @@
 module Network.HTTP.Affjax.Request
   ( RequestContent()
-  , Requestable, toRequest
+  , class Requestable, toRequest
   ) where
 
 import Prelude

src/Network/HTTP/Affjax/Response.purs

@@ -1,7 +1,7 @@
 module Network.HTTP.Affjax.Response
   ( ResponseType(..), responseTypeToString
   , ResponseContent()
-  , Respondable, responseType, fromResponse
+  , class Respondable, responseType, fromResponse
   ) where
 
 import Prelude

src/Network/HTTP/RequestHeader.purs

@@ -2,7 +2,7 @@ module Network.HTTP.RequestHeader where
 
 import Prelude
 
-import Data.MediaType (MediaType(), mediaTypeToString)
+import Data.MediaType (MediaType(), unMediaType)
 
 data RequestHeader
   = Accept MediaType
@@ -16,16 +16,16 @@ instance eqRequestHeader :: Eq RequestHeader where
   eq _ _ = false
 
 instance showRequestHeader :: Show RequestHeader where
-  show (Accept m) = "(Accept " ++ show m ++ ")"
-  show (ContentType m) = "(ContentType " ++ show m ++ ")"
-  show (RequestHeader h v) = "(RequestHeader " ++ show h ++ " " ++ show v ++ ")"
+  show (Accept m) = "(Accept " <> show m <> ")"
+  show (ContentType m) = "(ContentType " <> show m <> ")"
+  show (RequestHeader h v) = "(RequestHeader " <> show h <> " " <> show v <> ")"
 
 requestHeaderName :: RequestHeader -> String
 requestHeaderName (Accept _) = "Accept"
 requestHeaderName (ContentType _) = "Content-Type"
 requestHeaderName (RequestHeader h _) = h
 
 requestHeaderValue :: RequestHeader -> String
-requestHeaderValue (Accept m) = mediaTypeToString m
-requestHeaderValue (ContentType m) = mediaTypeToString m
+requestHeaderValue (Accept m) = unMediaType m
+requestHeaderValue (ContentType m) = unMediaType m
 requestHeaderValue (RequestHeader _ v) = v

src/Network/HTTP/ResponseHeader.purs

@@ -16,7 +16,7 @@ instance eqResponseHeader :: Eq ResponseHeader where
   eq (ResponseHeader h1 v1) (ResponseHeader h2 v2) = h1 == h2 && v1 == v2
 
 instance showResponseHeader :: Show ResponseHeader where
-  show (ResponseHeader h v) = "(ResponseHeader " ++ show h ++ " " ++ show v ++ ")"
+  show (ResponseHeader h v) = "(ResponseHeader " <> show h <> " " <> show v <> ")"
 
 responseHeaderName :: ResponseHeader -> String
 responseHeaderName (ResponseHeader h _) = h

src/Network/HTTP/StatusCode.purs

@@ -8,4 +8,4 @@ instance eqStatusCode :: Eq StatusCode where
   eq (StatusCode x) (StatusCode y) = x == y
 
 instance showStatusCode :: Show StatusCode where
-  show (StatusCode code) = "(StatusCode " ++ show code ++ ")"
+  show (StatusCode code) = "(StatusCode " <> show code <> ")"

test/Main.purs

@@ -8,7 +8,7 @@ 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, print)
+import Control.Monad.Eff.Console (CONSOLE(), log, logShow)
 import Control.Monad.Eff.Exception
 import Control.Monad.Eff.Ref (REF())
 
@@ -32,27 +32,27 @@ assertFail msg = let e = error msg
                  in makeAff \errback _ -> errback e
 
 assertMsg :: forall e. String -> Boolean -> Assert e Unit
-assertMsg _   true  = return unit
+assertMsg _   true  = pure unit
 assertMsg msg false = assertFail msg
 
 assertRight :: forall e a b. Either a b -> Assert e b
 assertRight x = case x of
   Left y -> logAny' y >>= \_ -> assertFail "Expected a Right value"
-  Right y -> return y
+  Right y -> pure y
 
 assertLeft :: forall e a b. Either a b -> Assert e a
 assertLeft x = case x of
   Right y -> logAny' y >>= \_ -> assertFail "Expected a Left value"
-  Left y -> return y
+  Left y -> pure y
 
 assertEq :: forall e a. (Eq a, Show a) => a -> a -> Assert e Unit
 assertEq x y = if x == y
-                 then return unit
+                 then pure unit
                  else assertFail $ "Expected " <> show x <> ", got " <> show y
 
 -- | For helping type inference
 typeIs :: forall e a. a -> Assert e Unit
-typeIs = const (return unit)
+typeIs = const (pure unit)
 
 type MainEffects e =
   ( ref :: REF
@@ -63,7 +63,7 @@ type MainEffects e =
   )
 
 main :: Eff (MainEffects (ajax :: AJAX)) Unit
-main = runAff (\e -> print e >>= \_ -> throwException e) (const $ log "affjax: All good!") $ do
+main = void $ runAff (\e -> logShow e >>= \_ -> throwException e) (const $ log "affjax: All good!") $ do
   let ok200 = StatusCode 200
   let notFound404 = StatusCode 404