Update a ton of things

part10/ElmHub.elm

@@ -1,119 +1,100 @@
-module ElmHub (..) where
+module ElmHub exposing (..)
 
 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 Html.Lazy exposing (..)
 import Http
 import Auth
 import Task exposing (Task)
-import Effects exposing (Effects)
-import Json.Decode exposing (Decoder, (:=))
-import Json.Encode
-import Signal exposing (Address)
+import Json.Decode exposing (Decoder)
 import Dict exposing (Dict)
 import SearchResult
 
 
-searchFeed : String -> Task x Action
+searchFeed : String -> Cmd Msg
 searchFeed query =
-  let
-    -- See https://developer.github.com/v3/search/#example for how to customize!
-    url =
-      "https://api.github.com/search/repositories?access_token="
-        ++ Auth.token
-        ++ "&q="
-        ++ query
-        ++ "+language:elm&sort=stars&order=desc"
-
-    task =
-      Http.get responseDecoder url
-        |> Task.map SetResults
-  in
-    Task.onError task (\_ -> Task.succeed (SetResults []))
+    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.Model)
 responseDecoder =
-  -- TODO make use of SearchResult's decoder
-  Json.Decode.succeed []
+    -- TODO make use of SearchResult's decoder
+    Json.Decode.succeed []
 
 
 type alias Model =
-  { query : String
-  , results : Dict SearchResult.ResultId SearchResult.Model
-  }
+    { query : String
+    , results : Dict SearchResult.ResultId SearchResult.Model
+    }
 
 
 initialModel : Model
 initialModel =
-  { query = "tutorial"
-  , results = Dict.empty
-  }
+    { query = "tutorial"
+    , results = Dict.empty
+    }
 
 
-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" ]
+        , ul [ class "results" ] (viewSearchResults model.results)
         ]
-    , input [ class "search-query", onInput address SetQuery, defaultValue model.query ] []
-    , button [ class "search-button", onClick address Search ] [ text "Search" ]
-    , ul
-        [ class "results" ]
-        (viewSearchResults address model.results)
-    ]
 
 
-viewSearchResults : Address Action -> Dict SearchResult.ResultId SearchResult.Model -> List Html
-viewSearchResults address results =
-  results
-    |> Dict.values
-    |> List.sortBy (.stars >> negate)
-    |> List.map (\_ -> div [] [ text "TODO replace this line with view logic from SearchResult" ])
+viewSearchResults : Dict SearchResult.ResultId SearchResult.Model -> List (Html a)
+viewSearchResults results =
+    results
+        |> Dict.values
+        |> List.sortBy (.stars >> negate)
+        |> List.map (\_ -> div [] [ text "TODO replace this line with view logic from SearchResult" ])
 
 
-onInput address wrap =
-  on "input" targetValue (\val -> Signal.message address (wrap val))
+type Msg
+    = Search
+    | SetQuery String
+    | DeleteById SearchResult.ResultId
+    | SetResults (List SearchResult.Model)
+    | HandleSearchResponse (List SearchResult.Model)
+    | HandleSearchError Http.Error
 
 
-defaultValue str =
-  property "defaultValue" (Json.Encode.string str)
+update : Msg -> Model -> ( Model, Cmd Msg )
+update msg model =
+    case msg of
+        Search ->
+            ( model, searchFeed model.query )
 
+        SetQuery query ->
+            ( { model | query = query }, Cmd.none )
 
-type Action
-  = Search
-  | SetQuery String
-  | DeleteById SearchResult.ResultId
-  | SetResults (List SearchResult.Model)
+        SetResults results ->
+            let
+                resultsById : Dict SearchResult.ResultId SearchResult.Model
+                resultsById =
+                    results
+                        |> List.map (\result -> ( result.id, result ))
+                        |> Dict.fromList
+            in
+                ( { model | results = resultsById }, Cmd.none )
 
-
-update : Action -> Model -> ( Model, Effects Action )
-update action model =
-  case action of
-    Search ->
-      ( model, Effects.task (searchFeed model.query) )
-
-    SetQuery query ->
-      ( { model | query = query }, Effects.none )
-
-    SetResults results ->
-      let
-        resultsById : Dict SearchResult.ResultId SearchResult.Model
-        resultsById =
-          results
-            |> List.map (\result -> ( result.id, result ))
-            |> Dict.fromList
-      in
-        ( { model | results = resultsById }, Effects.none )
-
-    DeleteById id ->
-      let
-        newModel =
-          { model | results = Dict.remove id model.results }
-      in
-        ( newModel, Effects.none )
+        DeleteById id ->
+            let
+                newModel =
+                    { model | results = Dict.remove id model.results }
+            in
+                ( newModel, Cmd.none )

part10/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, Effects.task (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 = []
+        }

part10/README.md

@@ -4,14 +4,14 @@ Part 10
 ## 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
 ```

part10/SearchResult.elm

@@ -1,45 +1,41 @@
-module SearchResult (..) where
+module SearchResult exposing (..)
 
 import Html exposing (..)
-import Html.Attributes exposing (class, target, href, property)
-import Html.Events exposing (..)
-import Json.Decode exposing (Decoder, (:=))
+import Html.Attributes exposing (class, target, href, property, defaultValue)
+import Json.Decode exposing (Decoder)
 import Json.Decode.Pipeline exposing (..)
-import Signal exposing (Address)
-import Dict exposing (Dict)
 
 
 type alias ResultId =
-  Int
+    Int
 
 
 type alias Model =
-  { id : ResultId
-  , name : String
-  , stars : Int
-  }
+    { id : ResultId
+    , name : String
+    , stars : Int
+    }
 
 
 decoder : Decoder Model
 decoder =
-  decode Model
-    |> required "id" Json.Decode.int
-    |> required "full_name" Json.Decode.string
-    |> required "stargazers_count" Json.Decode.int
+    decode Model
+        |> required "id" Json.Decode.int
+        |> required "full_name" Json.Decode.string
+        |> required "stargazers_count" Json.Decode.int
 
 
-view : Address a -> Model -> Html
-view address result =
-  li
-    []
-    [ span [ class "star-count" ] [ text (toString result.stars) ]
-    , a
-        [ href ("https://github.com/" ++ result.name)
-        , target "_blank"
+view : Model -> Html a
+view result =
+    li []
+        [ span [ class "star-count" ] [ text (toString result.stars) ]
+        , a
+            [ href ("https://github.com/" ++ result.name)
+            , target "_blank"
+            ]
+            [ text result.name ]
+        , button
+            -- TODO onClick, send a delete action to the address
+            [ class "hide-result" ]
+            [ text "X" ]
         ]
-        [ text result.name ]
-    , button
-        -- TODO onClick, send a delete action to the address
-        [ class "hide-result" ]
-        [ text "X" ]
-    ]

part10/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"
+}

part10/test/elm-package.json

@@ -9,13 +9,10 @@
     ],
     "exposed-modules": [],
     "dependencies": {
-        "deadfoxygrandpa/elm-test": "3.1.1 <= v < 4.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"
+        "NoRedInk/elm-decode-pipeline": "1.0.0 <= 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"
 }