From 63fc460c00477b3c45922e4f81fefd357f1d05e0 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Tue, 12 Mar 2013 14:21:12 -0500
Subject: [PATCH] Refactor the empty message criteria into its own method.

Removes plenty of duplication in the code
---
 app/helpers/todos_helper.rb | 41 ++++++++++++-------------------------
 1 file changed, 13 insertions(+), 28 deletions(-)

diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index 2efdb27e..437eef07 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -362,44 +362,20 @@ module TodosHelper
 
     source_view do |page|
       page.project  {
-        return "tickler-empty-nd" if
-          @todo_was_deferred_from_active_state ||
-          @todo_was_blocked_from_active_state ||
-          @todo_was_destroyed_from_deferred_state ||
-          @todo_was_created_deferred ||
-          @todo_was_blocked_from_completed_state ||
-          @todo_was_created_blocked
+        return "tickler-empty-nd" if empty_criteria_met
         return "p#{todo.project_id}empty-nd"
       }
       page.tag {
-        return "tickler-empty-nd" if
-          @todo_was_deferred_from_active_state ||
-          @todo_was_blocked_from_active_state ||
-          @todo_was_destroyed_from_deferred_state ||
-          @todo_was_created_deferred ||
-          @todo_was_blocked_from_completed_state ||
-          @todo_was_created_blocked
+        return "tickler-empty-nd" if empty_criteria_met
         return "hidden-empty-nd" if @todo.hidden?
         return "c#{todo.context_id}empty-nd"
       }
       page.calendar {
-        return "tickler-empty-nd" if
-          @todo_was_deferred_from_active_state ||
-          @todo_was_blocked_from_active_state ||
-          @todo_was_destroyed_from_deferred_state ||
-          @todo_was_created_deferred ||
-          @todo_was_blocked_from_completed_state ||
-          @todo_was_created_blocked
+        return "tickler-empty-nd" if empty_criteria_met
         return "empty_#{@new_due_id}"
       }
       page.context {
-        return "tickler-empty-nd" if
-          @todo_was_deferred_from_active_state ||
-          @todo_was_blocked_from_active_state ||
-          @todo_was_destroyed_from_deferred_state ||
-          @todo_was_created_deferred ||
-          @todo_was_blocked_from_completed_state ||
-          @todo_was_created_blocked
+        return "tickler-empty-nd" if empty_criteria_met
         return "c#{todo.context_id}empty-nd"
       }
     end
@@ -407,6 +383,15 @@ module TodosHelper
     return "c#{todo.context_id}empty-nd"
   end
 
+  def empty_criteria_met
+    @todo_was_deferred_from_active_state ||
+      @todo_was_blocked_from_active_state ||
+      @todo_was_destroyed_from_deferred_state ||
+      @todo_was_created_deferred ||
+      @todo_was_blocked_from_completed_state ||
+      @todo_was_created_blocked
+  end
+
   def todo_was_removed_from_deferred_or_blocked_container
     return @todo_was_activated_from_deferred_state ||
            @todo_was_activated_from_pending_state ||