From 9158c4341c9356e5f2f0d231ee792f29f3b46e95 Mon Sep 17 00:00:00 2001 From: lukemelia Date: Fri, 4 Aug 2006 22:20:08 +0000 Subject: [PATCH] A slight modification to my last refactor: using singleton methods instead of a mix-in. git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@304 a4c988fc-2ded-0310-b66e-134b36920a42 --- tracks/app/models/todo.rb | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/tracks/app/models/todo.rb b/tracks/app/models/todo.rb index 0c28b0e5..be206ce5 100644 --- a/tracks/app/models/todo.rb +++ b/tracks/app/models/todo.rb @@ -21,19 +21,17 @@ class Todo < ActiveRecord::Base :conditions => ['todos.user_id = ? and todos.done = ? and todos.completed is not null', user_id, true], :order => 'todos.completed DESC', :include => [ :project, :context ]) - done.extend(CompletedToDosByDate) + + def done.completed_within( date ) + reject { |x| x.completed < date } + end + + def done.completed_more_than( date ) + reject { |x| x.completed > date } + end + + done + end end - -module CompletedToDosByDate - - def completed_within( date ) - self.reject { |x| x.completed < date } - end - - def completed_more_than( date ) - self.reject { |x| x.completed > date } - end - -end