Update to Elm 0.18

.travis.yml

@@ -39,7 +39,7 @@ before_install:
     fi
 
 install:
-  - npm install -g elm@0.17.1
+  - npm install -g elm@0.18.0
   - npm install
   - mv $(npm config get prefix)/bin/elm-make $(npm config get prefix)/bin/elm-make-org
   - printf '%s\n\n' '#!/bin/bash' 'echo "Running elm-make with sysconfcpus -n 2"' '$TRAVIS_BUILD_DIR/sysconfcpus/bin/sysconfcpus -n 2 elm-make-org "$@"' > $(npm config get prefix)/bin/elm-make

elm-package.json

@@ -8,17 +8,16 @@
     ],
     "exposed-modules": [],
     "dependencies": {
-        "debois/elm-mdl": "7.6.0 <= v < 8.0.0",
-        "elm-community/result-extra": "2.0.0 <= v < 3.0.0",
-        "elm-lang/core": "4.0.5 <= v < 5.0.0",
-        "elm-lang/html": "1.1.0 <= v < 2.0.0",
-        "elm-lang/navigation": "1.0.0 <= v < 2.0.0",
-        "etaque/elm-simple-form": "4.0.0 <= v < 5.0.0",
-        "evancz/elm-http": "3.0.1 <= v < 4.0.0",
-        "evancz/url-parser": "1.0.0 <= v < 2.0.0",
-        "noahzgordon/elm-jsonapi": "2.0.2 <= v < 3.0.0",
-        "sporto/erl": "10.0.1 <= v < 11.0.0",
-        "sporto/hop": "6.0.0 <= v < 7.0.0"
+        "debois/elm-mdl": "8.1.0 <= v < 9.0.0",
+        "elm-community/result-extra": "2.2.0 <= v < 3.0.0",
+        "elm-lang/core": "5.1.1 <= v < 6.0.0",
+        "elm-lang/html": "2.0.0 <= v < 3.0.0",
+        "elm-lang/http": "1.0.0 <= v < 2.0.0",
+        "elm-lang/navigation": "2.1.0 <= v < 3.0.0",
+        "etaque/elm-form": "2.0.0 <= v < 3.0.0",
+        "evancz/url-parser": "2.0.1 <= v < 3.0.0",
+        "lukewestby/elm-http-builder": "5.1.0 <= v < 6.0.0",
+        "noahzgordon/elm-jsonapi": "2.2.1 <= v < 3.0.0"
     },
-    "elm-version": "0.17.1 <= v < 0.18.0"
+    "elm-version": "0.18.0 <= v < 0.19.0"
 }

src/Api.elm

@@ -12,7 +12,7 @@ module Api
 
 import Result.Extra
 import Http
-import Task exposing (Task)
+import HttpBuilder
 import Json.Decode as Decode
 import Json.Decode exposing (Decoder)
 import Json.Encode as Encode
@@ -78,7 +78,6 @@ facebookAuthUrl =
     let
         facebookRedirectUri =
             Config.baseRoot
-                ++ Config.basePath
                 ++ "/"
                 ++ Config.facebookRedirectPath
     in
@@ -160,7 +159,7 @@ type alias DecodedProposalAttributes =
 
 decodeProposalAttributes : Decoder DecodedProposalAttributes
 decodeProposalAttributes =
-    Decode.object5 DecodedProposalAttributes
+    Decode.map5 DecodedProposalAttributes
         (Decode.at [ "title" ] Decode.string)
         (Decode.at [ "body" ] Decode.string)
         (Decode.at [ "support-count" ] Decode.int)
@@ -173,7 +172,7 @@ decodeParticipantAttributes =
     Decode.at [ "name" ] Decode.string
 
 
-encodeProposalInput : NewProposal -> String
+encodeProposalInput : NewProposal -> Encode.Value
 encodeProposalInput proposalInput =
     JsonApi.Extra.encodeDocument
         "proposal"
@@ -184,7 +183,7 @@ encodeProposalInput proposalInput =
         []
 
 
-encodeSupportProposal : String -> String
+encodeSupportProposal : String -> Encode.Value
 encodeSupportProposal id =
     JsonApi.Extra.encodeDocument
         "support"
@@ -215,7 +214,7 @@ assembleSupport document =
 
 decodeProposalSupportAttributes : Decoder ( Int, Bool )
 decodeProposalSupportAttributes =
-    Decode.object2 (,)
+    Decode.map2 (,)
         (Decode.at [ "support-count" ] Decode.int)
         (Decode.at [ "supported-by-me" ] Decode.bool)
 
@@ -226,60 +225,69 @@ decodeProposalSupportAttributes =
 
 authenticate : String -> (Msg -> a) -> Cmd a
 authenticate authCode wrapMsg =
-    ("{\"auth_code\": \"" ++ authCode ++ "\"}")
-        |> Api.Util.requestPost tokenEndpoint
-        |> JsonApi.Extra.withHeader "Content-Type" "application/json"
-        |> Api.Util.sendDefJson decodeToken
-        |> Task.perform AuthFailed GotAccessToken
+    tokenEndpoint
+        |> HttpBuilder.post
+        |> HttpBuilder.withJsonBody
+            (Encode.object [ ( "auth_code", Encode.string authCode ) ])
+        |> HttpBuilder.withExpect (Http.expectJson decodeToken)
+        |> HttpBuilder.toTask
+        |> Api.Util.attempt AuthFailed GotAccessToken
         |> Cmd.map wrapMsg
 
 
 getMe : String -> (Msg -> a) -> Cmd a
 getMe accessToken wrapMsg =
     meEndpoint
-        |> Api.Util.requestGet
+        |> HttpBuilder.get
         |> Api.Util.withAccessToken accessToken
-        |> Api.Util.sendDefJsonApi assembleMe
-        |> Task.perform AuthFailed GotMe
+        |> Api.Util.withExpectJsonApi assembleMe
+        |> HttpBuilder.toTask
+        |> Api.Util.attempt AuthFailed GotMe
         |> Cmd.map wrapMsg
 
 
 createProposal : NewProposal -> String -> (Msg -> a) -> Cmd a
 createProposal proposalInput accessToken wrapMsg =
-    encodeProposalInput proposalInput
-        |> Api.Util.requestPost newProposalEndpoint
+    newProposalEndpoint
+        |> HttpBuilder.post
+        |> Api.Util.withJsonApiBody (encodeProposalInput proposalInput)
         |> Api.Util.withAccessToken accessToken
-        |> Api.Util.sendDefJsonApi assembleProposal
-        |> Task.perform ProposalCreationFailed ProposalCreated
+        |> Api.Util.withExpectJsonApi assembleProposal
+        |> HttpBuilder.toTask
+        |> Api.Util.attempt ProposalCreationFailed ProposalCreated
         |> Cmd.map wrapMsg
 
 
 supportProposal : String -> Bool -> String -> (Msg -> a) -> Cmd a
 supportProposal id newState accessToken wrapMsg =
     -- ToDo: Send DELETE request to remove support (if newState == False)
-    encodeSupportProposal id
-        |> Api.Util.requestPost supportProposalEndpoint
+    supportProposalEndpoint
+        |> HttpBuilder.post
+        |> Api.Util.withJsonApiBody (encodeSupportProposal id)
         |> Api.Util.withAccessToken accessToken
-        |> Api.Util.sendDefJsonApi assembleSupport
-        |> Task.perform SupportProposalFailed ProposalSupported
+        |> Api.Util.withExpectJsonApi assembleSupport
+        |> HttpBuilder.toTask
+        |> Api.Util.attempt SupportProposalFailed ProposalSupported
         |> Cmd.map wrapMsg
 
 
 getProposal : String -> String -> (Msg -> a) -> Cmd a
 getProposal id accessToken wrapMsg =
     getProposalEndpoint id
-        |> Api.Util.requestGet
+        |> HttpBuilder.get
         |> Api.Util.withAccessToken accessToken
-        |> Api.Util.sendDefJsonApi assembleProposal
-        |> Task.perform GettingProposalFailed GotProposal
+        |> Api.Util.withExpectJsonApi assembleProposal
+        |> HttpBuilder.toTask
+        |> Api.Util.attempt GettingProposalFailed GotProposal
         |> Cmd.map wrapMsg
 
 
 getProposalList : String -> (Msg -> a) -> Cmd a
 getProposalList accessToken wrapMsg =
     getProposalListEndpoint
-        |> Api.Util.requestGet
+        |> HttpBuilder.get
         |> Api.Util.withAccessToken accessToken
-        |> Api.Util.sendDefJsonApi assembleProposalList
-        |> Task.perform GettingProposalListFailed GotProposalList
+        |> Api.Util.withExpectJsonApi assembleProposalList
+        |> HttpBuilder.toTask
+        |> Api.Util.attempt GettingProposalListFailed GotProposalList
         |> Cmd.map wrapMsg

src/Api/Util.elm

@@ -1,68 +1,68 @@
 module Api.Util exposing (..)
 
+import Result.Extra
 import Task exposing (Task)
+import Json.Encode as Encode
 import Json.Decode as Decode
 import Http
+import HttpBuilder
 import JsonApi
-import JsonApi.Extra
+import JsonApi.Decode
 
 
 {-| Infix notation for Result.andThen. Makes andThen-chains look nicer.
 -}
 infixl 0 :>
 (:>) : Result x a -> (a -> Result x b) -> Result x b
 (:>) =
-    Result.andThen
+    flip Result.andThen
 
 
-{-| Insert accessToken into Http header
+{-| Convenience version of `Task.attempt` that performs Tasks that may fail.
+That's the same as in `elm-lang/core 4.x` (Elm 0.17)
 -}
-withAccessToken : String -> Http.Request -> Http.Request
-withAccessToken accessToken =
-    JsonApi.Extra.withHeader "Authorization" ("Bearer " ++ accessToken)
+attempt : (e -> msg) -> (a -> msg) -> Task e a -> Cmd msg
+attempt errorTagger successTagger task =
+    Task.attempt (Result.Extra.unpack errorTagger successTagger) task
 
 
-{-| Build a GET request
+{-| Insert accessToken into Http header
 -}
-requestGet : String -> Http.Request
-requestGet url =
-    { verb = "GET"
-    , headers = []
-    , url = url
-    , body = Http.empty
-    }
+withAccessToken : String -> HttpBuilder.RequestBuilder a -> HttpBuilder.RequestBuilder a
+withAccessToken accessToken =
+    HttpBuilder.withHeader "Authorization" ("Bearer " ++ accessToken)
 
 
-{-| Build a POST request
+{-| Insert a JSON value as the body of a RequestBuilder.
+This will set the `Content-Type: application/vnd.api+json` header,
+as required by JSON API standard.
 -}
-requestPost : String -> String -> Http.Request
-requestPost url body =
-    { verb = "POST"
-    , headers = []
-    , url = url
-    , body = Http.string body
-    }
+withJsonApiBody : Encode.Value -> HttpBuilder.RequestBuilder a -> HttpBuilder.RequestBuilder a
+withJsonApiBody jsonValue =
+    HttpBuilder.withBody <|
+        Http.stringBody "application/vnd.api+json" (Encode.encode 0 jsonValue)
 
 
-{-| Send a Http request with default settings
-and decode the response from a JSON API document
+{-| Expect the response body to be a JsonApi Document.
 -}
-sendDefJsonApi :
+withExpectJsonApi :
     (JsonApi.Document -> Result String a)
-    -> Http.Request
-    -> Task Http.Error a
-sendDefJsonApi assembleResponse request =
-    JsonApi.Extra.sendJsonApi assembleResponse Http.defaultSettings request
-
+    -> HttpBuilder.RequestBuilder ()
+    -> HttpBuilder.RequestBuilder a
+withExpectJsonApi assembleResponse requestBuilder =
+    requestBuilder
+        |> HttpBuilder.withHeader "Accept" "application/vnd.api+json"
+        |> HttpBuilder.withExpect
+            (Http.expectJson
+                (JsonApi.Decode.document
+                    |> Decode.andThen
+                        (\document ->
+                            case assembleResponse document of
+                                Ok successValue ->
+                                    Decode.succeed successValue
 
-{-| Send a Http request with default settings
-and decode the response from JSON
--}
-sendDefJson :
-    Decode.Decoder a
-    -> Http.Request
-    -> Task Http.Error a
-sendDefJson decodeResponse request =
-    request
-        |> Http.send Http.defaultSettings
-        |> Http.fromJson decodeResponse
+                                Err errorMessage ->
+                                    Decode.fail errorMessage
+                        )
+                )
+            )

src/Config_heroku.elm

@@ -1,21 +1,21 @@
 module Config exposing (..)
 
 
+baseRoot : String
 baseRoot =
     "https://participateapp.github.io"
 
 
-basePath =
-    ""
-
-
+facebookRedirectPath : String
 facebookRedirectPath =
     "facebook_redirect"
 
 
+facebookClientId : String
 facebookClientId =
     "1583083548592686"
 
 
+apiUrl : String
 apiUrl =
     "https://participate-api.herokuapp.com"

src/Config_local.elm

@@ -1,24 +1,21 @@
 module Config exposing (..)
 
 
+baseRoot : String
 baseRoot =
-    -- "https://oliverbarnes.github.io"
     "http://localhost:3000"
 
 
-basePath =
-    -- "/participate"
-    ""
-
-
+facebookRedirectPath : String
 facebookRedirectPath =
     "facebook_redirect"
 
 
+facebookClientId : String
 facebookClientId =
     "1583083701926004"
 
 
+apiUrl : String
 apiUrl =
-    -- "https://participate-api.herokuapp.com"
     "http://localhost:4000"