Merge pull request #2 from rofrol/master

More cleaning and simplifying

Author: afcastano

.editorconfig

@@ -0,0 +1,13 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.elm]
+indent_size = 4

src/Counter.elm

@@ -1,48 +1,59 @@
-module Counter exposing (Model, update, init, view, Msg(SetNum), getValue)
+module Counter exposing (Model, update, init, view, Msg(SetNum), getNum)
 
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick)
 
+
 (=>) : a -> b -> ( a, b )
-(=>) = (,)
+(=>) =
+    (,)
+
 
 type alias Model =
-  { num : Int
-  , btnClicks : Int
-  }
+    { num : Int
+    , btnClicks : Int
+    }
+
 
 init : Int -> Model
 init num =
-  Model num 0
+    Model num 0
+
 
 view : String -> Model -> Html Msg
 view color model =
-  div [ style ["display" => "inline-block", "margin-right" => "1rem"] ]
-    [ button [ onClick Increment ] [ text "+" ]
-    , div [ style ["color" => color]] [ text <| toString model.num ]
-    , button [ onClick Decrement ] [ text "-" ]
-    , div [ ] [ text <| "btn click: " ++ (toString model.btnClicks) ]
-    ]
+    div [ style [ "display" => "inline-block", "margin-right" => "1rem" ] ]
+        [ button [ onClick Increment ] [ text "+" ]
+        , div [ style [ "color" => color ] ] [ text <| toString model.num ]
+        , button [ onClick Decrement ] [ text "-" ]
+        , div [] [ text <| "btn click: " ++ (toString model.btnClicks) ]
+        ]
+
 
 type Msg
-  = Increment
-  | Decrement
-  | SetNum Int
+    = Increment
+    | Decrement
+    | SetNum Int
+
 
 update : Msg -> Model -> Model
 update msg model =
-  case msg of
-    Increment ->
-      { model | num = model.num + 1, btnClicks = model.btnClicks + 1 }
+    case msg of
+        Increment ->
+            Model (model.num + 1) (model.btnClicks + 1)
+
+        Decrement ->
+            Model (model.num - 1) (model.btnClicks + 1)
+
+        SetNum num ->
+            { model | num = num }
 
-    Decrement ->
-      { model | num = model.num - 1, btnClicks = model.btnClicks + 1 }
 
-    SetNum num ->
-      {model | num = num}
 
 ------- INTEFACE HELPERS
-getValue : Model -> Int
-getValue model =
-  model.num
+
+
+getNum : Model -> Int
+getNum model =
+    model.num

src/Main.elm

@@ -1,53 +1,71 @@
+module Main exposing (..)
+
 import Pair
 import Totals
-
 import Html exposing (..)
 import Html.App as App exposing (beginnerProgram)
 
+
 main : Program Never
 main =
-  beginnerProgram { model = init, view = view, update = update }
+    beginnerProgram { model = init, view = view, update = update }
+
 
 type alias Model =
-  { pair1 : Pair.Model
-  , pair2 : Pair.Model
-  , totals: Totals.Model
-  }
+    { pair1 : Pair.Model
+    , pair2 : Pair.Model
+    , totals : Totals.Model
+    }
+
 
 init : Model
-init = Model Pair.init Pair.init Totals.init
+init =
+    Model Pair.init Pair.init Totals.init
+
 
 view : Model -> Html Msg
 view model =
-  div []
-    [ App.map (always NoOp) (Totals.view model.totals)
-    , App.map Pair1 (Pair.view model.pair1)
-    , App.map Pair2 (Pair.view model.pair2)
-    ]
+    div []
+        [ App.map (always NoOp) (Totals.view model.totals)
+        , App.map Pair1 (Pair.view model.pair1)
+        , App.map Pair2 (Pair.view model.pair2)
+        ]
+
 
 type Msg
-  = NoOp
-  | Pair1 Pair.Msg
-  | Pair2 Pair.Msg
+    = NoOp
+    | Pair1 Pair.Msg
+    | Pair2 Pair.Msg
+
 
 update : Msg -> Model -> Model
 update msg model =
-  case msg of
-    NoOp ->
-      model
-
-    Pair1 sub ->
-      let
-        (pair1, redVal, greenVal) = Pair.update sub model.pair1
-        totals = Totals.update (Totals.UpdateRed redVal) model.totals
-        pair2 = Pair.manualUpdate Pair.Red redVal model.pair2
-      in
-        { model | pair1 = pair1, totals = totals, pair2 = pair2 }
-
-    Pair2 sub ->
-      let
-        (pair2, redVal, greenVal) = Pair.update sub model.pair2
-        totals = Totals.update (Totals.UpdateRed redVal) model.totals
-        pair1 = Pair.manualUpdate Pair.Red redVal model.pair1
-      in
-        { model | pair1 = pair1, totals = totals, pair2 = pair2 }
+    case msg of
+        NoOp ->
+            model
+
+        Pair1 subMsg ->
+            let
+                pair1 =
+                    Pair.update subMsg model.pair1
+
+                totals =
+                    Totals.update (Totals.UpdateRed <| Pair.getRedNum pair1) model.totals
+
+                pair2 =
+                    Pair.update (Pair.UpdateRed <| Pair.getRedNum pair1) model.pair2
+            in
+                Model pair1 pair2 totals
+
+        Pair2 subMsg ->
+            let
+                pair2 =
+                    Pair.update subMsg model.pair2
+
+                totals =
+                    Totals.update (Totals.UpdateRed <| Pair.getRedNum pair2) model.totals
+
+                pair1 =
+                    Pair.update (Pair.UpdateRed <| Pair.getRedNum pair2) model.pair1
+            in
+                Model pair1 pair2 totals

src/Pair.elm

@@ -1,66 +1,60 @@
-module Pair exposing (Model, init, view, Msg, update, ManualUpdateMsg(Red), manualUpdate)
+module Pair exposing (Model, init, view, Msg(UpdateRed), update, getRedNum)
 
 import Counter
-
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.App as App
 
+
 (=>) : a -> b -> ( a, b )
-(=>) = (,)
+(=>) =
+    (,)
+
 
 type alias Model =
-  { greenCounter : Counter.Model
-  , redCounter : Counter.Model
-  , totalClickCount : Int
-  }
+    { greenCounter : Counter.Model
+    , redCounter : Counter.Model
+    , totalClickCount : Int
+    }
+
 
 init : Model
 init =
-  Model (Counter.init 0) (Counter.init 0) 0
+    Model (Counter.init 0) (Counter.init 0) 0
+
 
 view : Model -> Html Msg
 view model =
-  div [ style ["background-color" => "lightgray", "margin-bottom" => "1rem"] ]
-    [ div [][text <| "Total click count " ++ (toString model.totalClickCount)]
-    , App.map PairGreen (Counter.view "green" model.greenCounter)
-    , App.map PairRed (Counter.view "red" model.redCounter)
-    ]
+    div [ style [ "background-color" => "lightgray", "margin-bottom" => "1rem" ] ]
+        [ div [] [ text <| "Total click count " ++ (toString model.totalClickCount) ]
+        , App.map PairGreen (Counter.view "green" model.greenCounter)
+        , App.map PairRed (Counter.view "red" model.redCounter)
+        ]
+
 
 type Msg
-  = PairRed Counter.Msg
-  | PairGreen Counter.Msg
+    = PairRed Counter.Msg
+    | PairGreen Counter.Msg
+    | UpdateRed Int
 
-type alias RedVal = Int
-type alias GreenVal = Int
 
-update : Msg -> Model -> (Model, RedVal, GreenVal)
+update : Msg -> Model -> Model
 update msg model =
-  case msg of
-    PairGreen sub ->
-      let
-        greenCounter = Counter.update sub model.greenCounter
-        model' = { model | greenCounter = greenCounter, totalClickCount = model.totalClickCount + 1 }
-      in
-        (model', Counter.getValue model'.redCounter, Counter.getValue model'.greenCounter)
-
-    PairRed sub ->
-      let
-        redCounter = Counter.update sub model.redCounter
-        model' = { model | redCounter = redCounter, totalClickCount = model.totalClickCount + 1 }
-      in
-        (model', Counter.getValue model'.redCounter, Counter.getValue model'.greenCounter)
-
------ Interface helper
-
-type ManualUpdateMsg
-  = Red
-
-manualUpdate: ManualUpdateMsg -> Int -> Model -> Model
-manualUpdate msg value model =
-  case msg of
-    Red ->
-      let
-        redCounter = Counter.update (Counter.SetNum value) model.redCounter
-      in
-        { model | redCounter = redCounter }
+    case msg of
+        PairGreen subMsg ->
+            { model | greenCounter = Counter.update subMsg model.greenCounter, totalClickCount = model.totalClickCount + 1 }
+
+        PairRed subMsg ->
+            { model | redCounter = Counter.update subMsg model.redCounter, totalClickCount = model.totalClickCount + 1 }
+
+        UpdateRed value ->
+            { model | redCounter = Counter.update (Counter.SetNum value) model.redCounter }
+
+
+
+------- INTEFACE HELPERS
+
+
+getRedNum : Model -> Int
+getRedNum model =
+    Counter.getNum model.redCounter

src/Totals.elm

@@ -3,25 +3,33 @@ module Totals exposing (Model, init, view, Msg(UpdateRed), update)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 
+
 (=>) : a -> b -> ( a, b )
-(=>) = (,)
+(=>) =
+    (,)
+
 
 type alias Model =
-  { redNum : Int
-  }
+    { redNum : Int
+    }
+
 
 init : Model
 init =
-  Model 0
+    Model 0
+
 
 view : Model -> Html Msg
 view model =
-  div [style ["color" => "red"]][text <| "Red val: " ++ (toString model.redNum)]
+    div [ style [ "color" => "red" ] ] [ text <| "Red val: " ++ (toString model.redNum) ]
+
+
+type Msg
+    = UpdateRed Int
 
-type Msg = UpdateRed Int
 
 update : Msg -> Model -> Model
 update msg model =
-  case msg of
-    UpdateRed redNum ->
-      { model | redNum = redNum }
+    case msg of
+        UpdateRed redNum ->
+            Model redNum