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
33 changes: 3 additions & 30 deletions elm-todo/Todo.elm
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ type alias Model =
type alias Entry =
{ description : String
, completed : Bool
, editing : Bool
, id : Int
}

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

Expand All @@ -76,7 +74,6 @@ to them.
-}
type Msg
= UpdateNewEntryField String
| EditingEntry Int Bool
| UpdateEntry Int String
| Add
| Delete Int
Expand All @@ -102,19 +99,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 +213,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 +224,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,8 +287,7 @@ viewControlsClear entriesCompleted =
infoFooter : Html msg
infoFooter =
footer [ class "info" ]
[ p [] [ text "Double-click to edit a todo" ]
, p []
[ p []
[ text "Written by "
, a [ href "https://github.com/evancz" ] [ text "Evan Czaplicki" ]
]
Expand Down
6 changes: 6 additions & 0 deletions ruby-todo/.idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ruby-todo/lib/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ def self.run(*args)

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

class Add
def apply_to(model)
new_entries = [] + model.entries
new_model = Model.new(entries: new_entries,
new_entry_field: "",
next_id: model.next_id+1)
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 = ""
new_model
end
end

Expand All @@ -20,7 +23,9 @@ def initialize(str)
attr_reader :str

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

Expand All @@ -29,14 +34,22 @@ def initialize(id, is_completed)
@id, @is_completed = id, is_completed
end

attr_reader :id, :is_completed
attr_reader :id, :is_completed

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

Expand All @@ -45,16 +58,22 @@ def initialize(id)
@id = id
end

attr_reader :id
attr_reader :id

def apply_to(model)
model.entries.reject! { |e| e.id == id }
new_entries = model.entries.reject{ |e| e.id == id }
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.reject(&:completed)
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
Loading