BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
e167f285
Commit
e167f285
authored
Apr 29, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Taskable to use TaskList
parent
ce29e5cd
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
48 deletions
+23
-48
taskable.rb
app/models/concerns/taskable.rb
+14
-29
taskable_shared_examples.rb
spec/support/taskable_shared_examples.rb
+9
-19
No files found.
app/models/concerns/taskable.rb
View file @
e167f285
require
'task_list'
# Contains functionality for objects that can have task lists in their
# Contains functionality for objects that can have task lists in their
# descriptions. Task list items can be added with Markdown like "* [x] Fix
# descriptions. Task list items can be added with Markdown like "* [x] Fix
# bugs".
# bugs".
#
#
# Used by MergeRequest and Issue
# Used by MergeRequest and Issue
module
Taskable
module
Taskable
TASK_PATTERN_MD
=
/^(?<bullet> *[*-] *)\[(?<checked>[ xX])\]/
.
freeze
# Called by `TaskList::Summary`
TASK_PATTERN_HTML
=
/^<li>(?<p_tag>\s*<p>)?\[(?<checked>[ xX])\]/
.
freeze
def
task_list_items
return
[]
if
description
.
blank?
# Change the state of a task list item for this Taskable. Edit the object's
# description by finding the nth task item and changing its checkbox
# placeholder to "[x]" if +checked+ is true, or "[ ]" if it's false.
# Note: task numbering starts with 1
def
update_nth_task
(
n
,
checked
)
index
=
0
check_char
=
checked
?
'x'
:
' '
# Do this instead of using #gsub! so that ActiveRecord detects that a field
@task_list_items
||=
description
.
scan
(
TaskList
::
Filter
::
ItemPattern
).
collect
do
|
item
|
# has changed.
# ItemPattern strips out the hyphen, but Item requires it. Rabble rabble.
self
.
description
=
self
.
description
.
gsub
(
TASK_PATTERN_MD
)
do
|
match
|
TaskList
::
Item
.
new
(
"-
#{
item
}
"
)
index
+=
1
case
index
when
n
then
"
#{
$LAST_MATCH_INFO
[
:bullet
]
}
[
#{
check_char
}
]"
else
match
end
end
end
end
save
def
tasks
@tasks
||=
TaskList
.
new
(
self
)
end
end
# Return true if this object's description has any task list items.
# Return true if this object's description has any task list items.
def
tasks?
def
tasks?
description
&&
description
.
match
(
TASK_PATTERN_MD
)
tasks
.
summary
.
items?
end
end
# Return a string that describes the current state of this Taskable's task
# Return a string that describes the current state of this Taskable's task
# list items, e.g. "20 tasks (12 done, 8 unfinished)"
# list items, e.g. "20 tasks (12 done, 8 unfinished)"
def
task_status
def
task_status
return
nil
unless
description
return
''
if
description
.
blank?
num_tasks
=
0
num_done
=
0
description
.
scan
(
TASK_PATTERN_MD
)
do
num_tasks
+=
1
num_done
+=
1
unless
$LAST_MATCH_INFO
[
:checked
]
==
' '
end
"
#{
num_tasks
}
tasks (
#{
num_done
}
done,
#{
num_tasks
-
num_done
}
unfinished)"
sum
=
tasks
.
summary
"
#{
sum
.
item_count
}
tasks (
#{
sum
.
complete_count
}
done,
#{
sum
.
incomplete_count
}
unfinished)"
end
end
end
end
spec/support/taskable_shared_examples.rb
View file @
e167f285
...
@@ -4,27 +4,13 @@
...
@@ -4,27 +4,13 @@
# subject { Issue or MergeRequest }
# subject { Issue or MergeRequest }
shared_examples
'a Taskable'
do
shared_examples
'a Taskable'
do
before
do
before
do
subject
.
description
=
<<
EOT
.
gsub
(
/ {6}/
,
''
)
subject
.
description
=
<<
-
EOT
.
strip_heredoc
* [ ] Task 1
* [ ] Task 1
* [x] Task 2
* [x] Task 2
* [x] Task 3
* [x] Task 3
* [ ] Task 4
* [ ] Task 4
* [ ] Task 5
* [ ] Task 5
EOT
EOT
end
it
'updates the Nth task correctly'
do
subject
.
update_nth_task
(
1
,
true
)
expect
(
subject
.
description
).
to
match
(
/\[x\] Task 1/
)
subject
.
update_nth_task
(
2
,
true
)
expect
(
subject
.
description
).
to
match
(
'\[x\] Task 2'
)
subject
.
update_nth_task
(
3
,
false
)
expect
(
subject
.
description
).
to
match
(
'\[ \] Task 3'
)
subject
.
update_nth_task
(
4
,
false
)
expect
(
subject
.
description
).
to
match
(
'\[ \] Task 4'
)
end
end
it
'returns the correct task status'
do
it
'returns the correct task status'
do
...
@@ -33,10 +19,14 @@ EOT
...
@@ -33,10 +19,14 @@ EOT
expect
(
subject
.
task_status
).
to
match
(
'3 unfinished'
)
expect
(
subject
.
task_status
).
to
match
(
'3 unfinished'
)
end
end
it
'knows if it has tasks'
do
describe
'#tasks?'
do
expect
(
subject
.
tasks?
).
to
be_truthy
it
'returns true when object has tasks'
do
expect
(
subject
.
tasks?
).
to
eq
true
end
it
'returns false when object has no tasks'
do
subject
.
description
=
'Now I have no tasks'
subject
.
description
=
'Now I have no tasks'
expect
(
subject
.
tasks?
).
to
be_falsey
expect
(
subject
.
tasks?
).
to
eq
false
end
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment