Update a ton of things

part7/ElmHub.elm

@@ -1,189 +1,141 @@
-module ElmHub (..) where
+module ElmHub exposing (..)
 
 import Auth
 import Html exposing (..)
-import Html.Attributes exposing (class, target, href, property)
+import Html.Attributes exposing (class, target, href, property, defaultValue)
 import Html.Events exposing (..)
 import Http
 import Task exposing (Task)
-import Effects exposing (Effects)
-import Json.Decode exposing (Decoder, (:=))
+import Json.Decode exposing (Decoder)
 import Json.Decode.Pipeline exposing (..)
-import Json.Encode
-import Signal exposing (Address)
 
 
-searchFeed : String -> Effects Action
+searchFeed : String -> Cmd Msg
 searchFeed query =
-  let
-    url =
-      "https://api.github.com/search/repositories?access_token="
-        ++ Auth.token
-        ++ "&q="
-        ++ query
-        ++ "+language:elm&sort=stars&order=desc"
-
-    task =
-      performAction
-        (\response -> HandleSearchResponse response)
-        (\error -> HandleSearchError error)
-        (Http.get responseDecoder url)
-  in
-    Effects.task task
+    let
+        url =
+            "https://api.github.com/search/repositories?access_token="
+                ++ Auth.token
+                ++ "&q="
+                ++ query
+                ++ "+language:elm&sort=stars&order=desc"
+    in
+        Task.perform HandleSearchError HandleSearchResponse (Http.get responseDecoder url)
 
 
 responseDecoder : Decoder (List SearchResult)
 responseDecoder =
-  "items" := Json.Decode.list searchResultDecoder
+    Json.Decode.at [ "items" ] (Json.Decode.list searchResultDecoder)
 
 
 searchResultDecoder : Decoder SearchResult
 searchResultDecoder =
-  decode SearchResult
-    |> required "id" Json.Decode.int
-    |> required "full_name" Json.Decode.string
-    |> required "stargazers_count" Json.Decode.int
-
-
-{-| Note: this will be a standard function in the next release of Elm.
-
-Example:
-
-
-type Action =
-  HandleResponse String | HandleError Http.Error
-
-
-performAction
-  (\responseString -> HandleResponse responseString)
-  (\httpError -> HandleError httpError)
-  (Http.getString "https://google.com?q=something")
-
--}
-performAction : (a -> b) -> (y -> b) -> Task y a -> Task x b
-performAction successToAction errorToAction task =
-  let
-    successTask =
-      Task.map successToAction task
-  in
-    Task.onError successTask (\err -> Task.succeed (errorToAction err))
+    decode SearchResult
+        |> required "id" Json.Decode.int
+        |> required "full_name" Json.Decode.string
+        |> required "stargazers_count" Json.Decode.int
 
 
 type alias Model =
-  { query : String
-  , results : List SearchResult
-  , errorMessage : Maybe String
-  }
+    { query : String
+    , results : List SearchResult
+    , errorMessage : Maybe String
+    }
 
 
 type alias SearchResult =
-  { id : ResultId
-  , name : String
-  , stars : Int
-  }
+    { id : ResultId
+    , name : String
+    , stars : Int
+    }
 
 
 type alias ResultId =
-  Int
+    Int
 
 
 initialModel : Model
 initialModel =
-  { query = "tutorial"
-  , results = []
-  , errorMessage = Nothing
-  }
+    { query = "tutorial"
+    , results = []
+    , errorMessage = Nothing
+    }
 
 
-view : Address Action -> Model -> Html
-view address model =
-  div
-    [ class "content" ]
-    [ header
-        []
-        [ h1 [] [ text "ElmHub" ]
-        , span [ class "tagline" ] [ text "“Like GitHub, but for Elm things.”" ]
+view : Model -> Html Msg
+view model =
+    div [ class "content" ]
+        [ header []
+            [ h1 [] [ text "ElmHub" ]
+            , span [ class "tagline" ] [ text "“Like GitHub, but for Elm things.”" ]
+            ]
+        , input [ class "search-query", onInput SetQuery, defaultValue model.query ] []
+        , button [ class "search-button", onClick Search ] [ text "Search" ]
+        , viewErrorMessage model.errorMessage
+        , ul [ class "results" ] (List.map viewSearchResult model.results)
         ]
-    , input [ class "search-query", onInput address SetQuery, defaultValue model.query ] []
-    , button [ class "search-button", onClick address Search ] [ text "Search" ]
-    , viewErrorMessage model.errorMessage
-    , ul
-        [ class "results" ]
-        (List.map (viewSearchResult address) model.results)
-    ]
 
 
-viewErrorMessage : Maybe String -> Html
+viewErrorMessage : Maybe String -> Html a
 viewErrorMessage errorMessage =
-  case errorMessage of
-    Just message ->
-      div [ class "error" ] [ text message ]
+    case errorMessage of
+        Just message ->
+            div [ class "error" ] [ text message ]
 
-    Nothing ->
-      text ""
+        Nothing ->
+            text ""
 
 
-onInput address wrap =
-  on "input" targetValue (\val -> Signal.message address (wrap val))
+viewSearchResult : SearchResult -> Html Msg
+viewSearchResult result =
+    li []
+        [ span [ class "star-count" ] [ text (toString result.stars) ]
+        , a [ href ("https://github.com/" ++ result.name), target "_blank" ]
+            [ text result.name ]
+        , button [ class "hide-result", onClick (DeleteById result.id) ]
+            [ text "X" ]
+        ]
 
 
-defaultValue str =
-  property "defaultValue" (Json.Encode.string str)
+type Msg
+    = Search
+    | SetQuery String
+    | DeleteById ResultId
+    | HandleSearchResponse (List SearchResult)
+    | HandleSearchError Http.Error
 
 
-viewSearchResult : Address Action -> SearchResult -> Html
-viewSearchResult address result =
-  li
-    []
-    [ span [ class "star-count" ] [ text (toString result.stars) ]
-    , a
-        [ href ("https://github.com/" ++ result.name), target "_blank" ]
-        [ text result.name ]
-    , button
-        [ class "hide-result", onClick address (DeleteById result.id) ]
-        [ text "X" ]
-    ]
+update : Msg -> Model -> ( Model, Cmd Msg )
+update msg model =
+    case msg of
+        Search ->
+            ( model, searchFeed model.query )
 
+        HandleSearchResponse results ->
+            ( { model | results = results }, Cmd.none )
 
-type Action
-  = Search
-  | SetQuery String
-  | DeleteById ResultId
-  | HandleSearchResponse (List SearchResult)
-  | HandleSearchError Http.Error
+        HandleSearchError error ->
+            let
+                errorMessage =
+                    case error of
+                        Http.UnexpectedPayload message ->
+                            Just message
 
+                        _ ->
+                            Nothing
+            in
+                ( { model | errorMessage = errorMessage }, Cmd.none )
 
-update : Action -> Model -> ( Model, Effects Action )
-update action model =
-  case action of
-    Search ->
-      ( model, searchFeed model.query )
+        SetQuery query ->
+            ( { model | query = query }, Cmd.none )
 
-    HandleSearchResponse results ->
-      ( { model | results = results }, Effects.none )
+        DeleteById idToHide ->
+            let
+                newResults =
+                    model.results
+                        |> List.filter (\{ id } -> id /= idToHide)
 
-    HandleSearchError error ->
-      let
-        errorMessage =
-          case error of
-            Http.UnexpectedPayload message ->
-              Just message
-
-            _ ->
-              Nothing
-      in
-        ( { model | errorMessage = errorMessage }, Effects.none )
-
-    SetQuery query ->
-      ( { model | query = query }, Effects.none )
-
-    DeleteById idToHide ->
-      let
-        newResults =
-          model.results
-            |> List.filter (\{ id } -> id /= idToHide)
-
-        newModel =
-          { model | results = newResults }
-      in
-        ( newModel, Effects.none )
+                newModel =
+                    { model | results = newResults }
+            in
+                ( newModel, Cmd.none )

part7/Main.elm

@@ -1,27 +1,13 @@
-module Main (..) where
+module Main exposing (..)
 
-import StartApp
 import ElmHub exposing (..)
-import Effects exposing (Effects)
-import Task exposing (Task)
-import Html exposing (Html)
 
 
-main : Signal Html
+main : Program Never
 main =
-  app.html
-
-
-app : StartApp.App Model
-app =
-  StartApp.start
-    { view = view
-    , update = update
-    , init = ( initialModel, searchFeed initialModel.query )
-    , inputs = []
-    }
-
-
-port tasks : Signal (Task Effects.Never ())
-port tasks =
-  app.tasks
+    Html.App.program
+        { view = view
+        , update = update
+        , init = ( initialModel, searchFeed initialModel.query )
+        , inputs = []
+        }

part7/README.md

@@ -4,23 +4,23 @@ Part 7
 ## Installation
 
 ```bash
-elm package install
+elm-package install
 ```
 
 (Answer `y` at the prompt. In rare cases a known issue can cause the download
-to fail; in that case, just run `elm package install` again.)
+to fail; in that case, just run `elm-package install` again.)
 
 ## Building
 
 ```bash
-elm live Main.elm --open -- --output=elm.js
+elm-live Main.elm --open -- --output=elm.js
 ```
 
 ## Running Tests
 
 ```bash
 cd test
-elm package install
+elm-package install
 elm test TestRunner.elm
 ```
 

part7/elm-package.json

@@ -10,11 +10,9 @@
     "exposed-modules": [],
     "dependencies": {
         "NoRedInk/elm-decode-pipeline": "1.0.0 <= v < 2.0.0",
-        "elm-lang/core": "3.0.0 <= v < 4.0.0",
-        "evancz/elm-effects": "2.0.0 <= v < 3.0.0",
-        "evancz/elm-html": "4.0.0 <= v < 5.0.0",
-        "evancz/elm-http": "3.0.0 <= v < 4.0.0",
-        "evancz/start-app": "2.0.0 <= v < 3.0.0"
+        "elm-lang/core": "4.0.1 <= v < 5.0.0",
+        "elm-lang/html": "1.0.0 <= v < 2.0.0",
+        "evancz/elm-http": "3.0.1 <= v < 4.0.0"
     },
-    "elm-version": "0.16.0 <= v < 0.17.0"
+    "elm-version": "0.17.0 <= v < 0.18.0"
 }

part7/test/elm-package.json

@@ -9,14 +9,10 @@
     ],
     "exposed-modules": [],
     "dependencies": {
-        "deadfoxygrandpa/elm-test": "3.1.1 <= v < 4.0.0",
         "NoRedInk/elm-decode-pipeline": "1.0.0 <= v < 2.0.0",
-        "elm-lang/core": "3.0.0 <= v < 4.0.0",
-        "evancz/elm-effects": "2.0.0 <= v < 3.0.0",
-        "evancz/elm-html": "4.0.0 <= v < 5.0.0",
-        "evancz/elm-http": "3.0.0 <= v < 4.0.0",
-        "evancz/start-app": "2.0.0 <= v < 3.0.0",
-        "laszlopandy/elm-console": "1.0.3 <= v < 2.0.0"
+        "elm-lang/core": "4.0.1 <= v < 5.0.0",
+        "elm-lang/html": "1.0.0 <= v < 2.0.0",
+        "evancz/elm-http": "3.0.1 <= v < 4.0.0"
     },
-    "elm-version": "0.16.0 <= v < 0.17.0"
+    "elm-version": "0.17.0 <= v < 0.18.0"
 }