Update a ton of things

part13/ElmHub.elm

@@ -1,4 +1,4 @@
-module ElmHub (..) where
+module ElmHub exposing (..)
 
 import Html exposing (..)
 import Html.Attributes exposing (..)
@@ -7,133 +7,118 @@ import Html.Lazy exposing (..)
 import Http
 import Auth
 import Task exposing (Task)
-import Effects exposing (Effects)
-import Json.Decode exposing (Decoder, (:=))
+import Json.Decode exposing (Decoder)
 import Json.Encode
-import Signal exposing (Address)
 import Dict exposing (Dict)
 import SearchResult exposing (ResultId)
 
 
-searchFeed : String -> Task x Action
+searchFeed : String -> Task x 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"
+    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 []))
+        task =
+            Http.get responseDecoder url
+                |> Task.map SetResults
+    in
+        Task.onError task (\_ -> Task.succeed (SetResults []))
 
 
 responseDecoder : Decoder (List SearchResult.Model)
 responseDecoder =
-  "items" := Json.Decode.list SearchResult.decoder
+    "items" := Json.Decode.list SearchResult.decoder
 
 
 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 ResultId SearchResult.Model -> List Html
-viewSearchResults address results =
-  results
-    |> Dict.values
-    |> List.sortBy (.stars >> negate)
-    |> List.map (viewSearchResult address)
+viewSearchResults : Dict ResultId SearchResult.Model -> List Html
+viewSearchResults results =
+    results
+        |> Dict.values
+        |> List.sortBy (.stars >> negate)
+        |> List.map (viewSearchResult address)
 
 
 viewSearchResult : Address Action -> SearchResult.Model -> Html
-viewSearchResult address result =
-  SearchResult.view
-    (Signal.forwardTo address (UpdateSearchResult result.id))
-    result
+viewSearchResult result =
+    SearchResult.view (Signal.forwardTo address (UpdateSearchResult result.id))
+        result
 
 
-onInput address wrap =
-  on "input" targetValue (\val -> Signal.message address (wrap val))
+type Msg
+    = Search
+    | SetQuery String
+    | SetResults (List SearchResult.Model)
+    | UpdateSearchResult ResultId SearchResult.Action
 
 
-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
-  | SetResults (List SearchResult.Model)
-  | UpdateSearchResult ResultId SearchResult.Action
-
-
-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 )
-
-    UpdateSearchResult id childAction ->
-      let
-        updated =
-          model.results
-            |> Dict.get id
-            |> Maybe.map (SearchResult.update childAction)
-      in
-        case updated of
-          Nothing ->
-            ( model, Effects.none )
-
-          Just ( newChildModel, childEffects ) ->
+        SetResults results ->
             let
-              effects =
-                Effects.map (UpdateSearchResult id) childEffects
-
-              newResults =
-                Dict.insert id newChildModel model.results
+                resultsById : Dict SearchResult.ResultId SearchResult.Model
+                resultsById =
+                    results
+                        |> List.map (\result -> ( result.id, result ))
+                        |> Dict.fromList
             in
-              ( { model | results = newResults }, effects )
+                ( { model | results = resultsById }, Cmd.none )
+
+        UpdateSearchResult id childAction ->
+            let
+                updated =
+                    model.results
+                        |> Dict.get id
+                        |> Maybe.map (SearchResult.update childAction)
+            in
+                case updated of
+                    Nothing ->
+                        ( model, Cmd.none )
+
+                    Just ( newChildModel, childEffects ) ->
+                        let
+                            effects =
+                                Effects.map (UpdateSearchResult id) childEffects
+
+                            newResults =
+                                Dict.insert id newChildModel model.results
+                        in
+                            ( { model | results = newResults }, effects )