Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 5 additions & 34 deletions elm-todo/Todo.elm
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
port module Todo exposing (..)

{-| TodoMVC implemented in Elm, using plain HTML and CSS for rendering.

This application is broken up into three key parts:

1. Model - a full definition of the application's state
2. Update - a way to step the application state forward
3. View - a way to visualize our application state with HTML

This clean division of concerns is a core part of Elm. You can read more about
this in <http://guide.elm-lang.org/architecture/index.html>
-}
Expand Down Expand Up @@ -45,7 +42,6 @@ type alias Model =
type alias Entry =
{ description : String
, completed : Bool
, editing : Bool
, id : Int
}

Expand All @@ -62,7 +58,6 @@ newEntry : String -> Int -> Entry
newEntry desc id =
{ description = desc
, completed = False
, editing = False
, id = id
}

Expand All @@ -76,7 +71,6 @@ to them.
-}
type Msg
= UpdateNewEntryField String
| EditingEntry Int Bool
| UpdateEntry Int String
| Add
| Delete Int
Expand All @@ -102,19 +96,6 @@ update msg model =
UpdateNewEntryField str ->
{ model | newEntryField = str }

EditingEntry id isEditing ->
let
updateEntry t =
if t.id == id then
{ t | editing = isEditing }
else
t

focus =
Dom.focus ("todo-" ++ toString id)
in
{ model | entries = List.map updateEntry model.entries }

UpdateEntry id task ->
let
updateEntry t =
Expand Down Expand Up @@ -229,7 +210,7 @@ viewKeyedEntry todo =
viewEntry : Entry -> Html Msg
viewEntry todo =
li
[ classList [ ( "completed", todo.completed ), ( "editing", todo.editing ) ] ]
[ classList [ ( "completed", todo.completed ) ] ]
[ div
[ class "view" ]
[ input
Expand All @@ -240,24 +221,14 @@ viewEntry todo =
]
[]
, label
[ onDoubleClick (EditingEntry todo.id True) ]
[]
[ text todo.description ]
, button
[ class "destroy"
, onClick (Delete todo.id)
]
[]
]
, input
[ class "edit"
, value todo.description
, name "title"
, id ("todo-" ++ toString todo.id)
, onInput (UpdateEntry todo.id)
, onBlur (EditingEntry todo.id False)
, onEnter (EditingEntry todo.id False)
]
[]
]
]


Expand Down Expand Up @@ -313,7 +284,7 @@ viewControlsClear entriesCompleted =
infoFooter : Html msg
infoFooter =
footer [ class "info" ]
[ p [] [ text "Double-click to edit a todo" ]
[ p [] [ text "Double-clicking won't save you now!" ]
, p []
[ text "Written by "
, a [ href "https://github.com/evancz" ] [ text "Evan Czaplicki" ]
Expand All @@ -322,4 +293,4 @@ infoFooter =
[ text "Part of "
, a [ href "http://todomvc.com" ] [ text "TodoMVC" ]
]
]
]
5 changes: 2 additions & 3 deletions ruby-todo/lib/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ def self.run(*args)
end

def self.run_with_history(model, messages)
messages.map do |msg|
msg.apply_to(model)
model
messages.map do |msg|
model = msg.apply_to(model)
end
end
end
42 changes: 34 additions & 8 deletions ruby-todo/lib/messages.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@ module Msg

class Add
def apply_to(model)
new_entries = model.entries.dup
new_id = model.next_id
unless model.new_entry_field.blank?
model.entries << Entry.new(
new_entries << Entry.new(
description: model.new_entry_field,
id: model.next_id)
end
model.next_id += 1
model.new_entry_field = ""
return Model.new(
entries: new_entries,
new_entry_field: "",
next_id: new_id += 1)
end
end

Expand All @@ -20,7 +24,10 @@ def initialize(str)
attr_reader :str

def apply_to(model)
model.new_entry_field = str
return Model.new(
entries: model.entries.dup,
new_entry_field: str,
next_id: model.next_id)
end
end

Expand All @@ -32,11 +39,20 @@ def initialize(id, is_completed)
attr_reader :id, :is_completed

def apply_to(model)
model.entries.each do |entry|
new_entries = model.entries.dup
new_entries.each do |entry|
if entry.id == id
entry.completed = is_completed
updated_entry = Entry.new(
description: entry.description,
completed: is_completed,
id: entry.id)
new_entries[new_entries.index(entry)] = updated_entry
end
end
return Model.new(
entries: new_entries,
new_entry_field: model.new_entry_field,
next_id: model.next_id)
end
end

Expand All @@ -48,13 +64,23 @@ def initialize(id)
attr_reader :id

def apply_to(model)
model.entries.reject! { |e| e.id == id }
new_entries = model.entries.dup
new_entries.reject! { |e| e.id == id }
return Model.new(
entries: new_entries,
new_entry_field: model.new_entry_field,
next_id: model.next_id)
end
end

class DeleteAllCompleted
def apply_to(model)
model.entries.reject!(&:completed)
new_entries = model.entries.dup
new_entries.reject!(&:completed)
return Model.new(
entries: new_entries,
new_entry_field: model.new_entry_field,
next_id: model.next_id)
end
end

Expand Down
4 changes: 2 additions & 2 deletions ruby-todo/lib/model.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ def initialize(entries: [], new_entry_field: "", next_id: nil)
(entries.lazy.map(&:id).max || -1) + 1
end

attr_accessor :entries, :new_entry_field, :next_id
attr_reader :entries, :new_entry_field, :next_id

def ==(other)
!other.nil? &&
Expand All @@ -20,7 +20,7 @@ def initialize(id:, description:, completed: false)
@description, @id, @completed = description, id, completed
end

attr_accessor :description, :completed, :id
attr_reader :description, :completed, :id

def ==(other)
!other.nil? &&
Expand Down
2 changes: 1 addition & 1 deletion ruby-todo/test/todo_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
end

it "supports time travel" do
skip "Mutable model does not support time travel"
# skip "Mutable model does not support time travel"

actual_history = Engine.run_with_history(Model.new, [
Msg::UpdateNewEntryField.new("go forward in time"),
Expand Down
5 changes: 3 additions & 2 deletions swift-todo/Sources/Todo/Engine.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ struct Engine {
}

static func runWithHistory(on model: Model, applying messages: [Message]) -> [Model] {
var newModel = model
return messages.map { message in
message.apply(to: model)
return model
newModel = message.apply(to: newModel)
return newModel
}
}
}
60 changes: 36 additions & 24 deletions swift-todo/Sources/Todo/Message.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
//
// Created by Paul on 2018/4/4.
//

import Foundation

enum Message {
Expand All @@ -13,31 +12,44 @@ enum Message {
case check(Int, Bool)
case delete(Int)
case deleteAllCompleted

func apply(to model: Model) {
func apply(to model: Model) -> Model {
switch(self) {
case .add:
if !model.newEntryField.isBlank() {
model.entries.append(Entry(id: model.nextID, description: model.newEntryField))
case .add:
var newModel = model
if !model.newEntryField.isBlank() {
newModel.entries.append(Entry(id: model.nextID, description: model.newEntryField))
}
newModel.nextID += 1
newModel.newEntryField = ""
return newModel

case .updateNewEntryField(let str):
var newModel = model
newModel.newEntryField = str
return newModel

case .check(let id, let isCompleted):
var newModel = model
for i in model.entries.indices {
if(model.entries[i].id == id) {
var newEntry = model.entries[i]
newEntry.completed = isCompleted
newModel.entries[i] = newEntry
break
}
model.nextID += 1
model.newEntryField = ""

case .updateNewEntryField(let str):
model.newEntryField = str

case .check(let id, let isCompleted):
for entry in model.entries {
if(entry.id == id) {
entry.completed = isCompleted
}
}

case .delete(let id):
model.entries.remove { $0.id == id }

case .deleteAllCompleted:
model.entries.remove { $0.completed }
}
return newModel

case .delete(let id):
var newModel = model
newModel.entries.remove { $0.id == id }
return newModel

case .deleteAllCompleted:
var newModel = model
newModel.entries.remove { $0.completed }
return newModel
}
}
}
4 changes: 2 additions & 2 deletions swift-todo/Sources/Todo/Model.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class Model {
struct Model {
var entries: [Entry]
var newEntryField: String
var nextID: Int
Expand All @@ -11,7 +11,7 @@ class Model {
}
}

class Entry {
struct Entry {
var id: Int
var description: String
var completed: Bool
Expand Down
4 changes: 1 addition & 3 deletions swift-todo/Tests/TodoTests/TodoTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class TodoTests: XCTestCase {
XCTAssertEqual([11], newModel.entries.map { $0.id })
}

/*

func testTimeTravel() {
let actualHistory = Engine.runWithHistory(on: Model(), applying: [
.updateNewEntryField("go forward in time"),
Expand Down Expand Up @@ -145,6 +145,4 @@ class TodoTests: XCTestCase {
XCTAssertEqual(expected, actual, "History mismatch at step \(index)")
}
}
*/

}