Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-09-22 05:50:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename RecurringTodo#has_next_todo to continues_recurring?

Browse source 
This clarifies the intent of the method.
This commit is contained in:
Matt Rogers 2013-04-26 16:30:12 -05:00
parent 036c34f266
commit 88e7798db6
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/todos_controller.rb
View file

@ -1142,7 +1142,7 @@ class TodosController < ApplicationController
# if both due and show_from are nil, check for a next todo from now
date_to_check = Time.zone.now if date_to_check.nil?
if recurring_todo.active? && recurring_todo.has_next_todo(date_to_check)
if recurring_todo.active? && recurring_todo.continues_recurring?(date_to_check)
# shift the reference date to yesterday if date_to_check is furher in
# the past. This is to make sure we do not get older todos for overdue

4
app/models/recurring_todo.rb
View file

@ -658,7 +658,7 @@ class RecurringTodo < ActiveRecord::Base
return nil
end
def has_next_todo(previous)
def continues_recurring?(previous)
return self.occurences_count < self.number_of_occurences unless self.number_of_occurences.nil?
return true if self.end_date.nil? || self.ends_on == 'no_end_date'
@ -673,7 +673,7 @@ class RecurringTodo < ActiveRecord::Base
end
def done?(end_date)
!has_next_todo(end_date)
!continues_recurring?(end_date)
end
def toggle_completion!

16
test/unit/recurring_todo_test.rb
View file

@ -87,11 +87,11 @@ class RecurringTodoTest < ActiveSupport::TestCase
end
def test_end_date_on_recurring_todo
assert_equal true, @every_day.has_next_todo(@in_three_days)
assert_equal true, @every_day.has_next_todo(@in_four_days)
assert_equal true, @every_day.continues_recurring?(@in_three_days)
assert_equal true, @every_day.continues_recurring?(@in_four_days)
@every_day.end_date = @in_four_days
@every_day.ends_on = 'ends_on_end_date'
assert_equal false, @every_day.has_next_todo(@in_four_days)
assert_equal false, @every_day.continues_recurring?(@in_four_days)
end
def test_weekly_every_day_setters
@ -118,7 +118,7 @@ class RecurringTodoTest < ActiveSupport::TestCase
end
def test_weekly_pattern
assert_equal true, @weekly_every_day.has_next_todo(nil)
assert_equal true, @weekly_every_day.continues_recurring?(nil)
due_date = @weekly_every_day.get_due_date(@sunday)
assert_equal @monday, due_date
@ -303,11 +303,11 @@ class RecurringTodoTest < ActiveSupport::TestCase
def test_occurence_count
@every_day.number_of_occurences = 2
assert_equal true, @every_day.has_next_todo(@in_three_days)
assert_equal true, @every_day.continues_recurring?(@in_three_days)
@every_day.increment_occurrences
assert_equal true, @every_day.has_next_todo(@in_three_days)
assert_equal true, @every_day.continues_recurring?(@in_three_days)
@every_day.increment_occurrences
assert_equal false, @every_day.has_next_todo(@in_three_days)
assert_equal false, @every_day.continues_recurring?(@in_three_days)
# after completion, when you reactivate the recurring todo, the occurences
# count should be reset
@ -315,7 +315,7 @@ class RecurringTodoTest < ActiveSupport::TestCase
assert @every_day.toggle_completion!
assert @every_day.toggle_completion!
assert_equal true, @every_day.has_next_todo(@in_three_days)
assert_equal true, @every_day.continues_recurring?(@in_three_days)
assert_equal 0, @every_day.occurences_count
end