From 584fdf2d342f4a4ec7f8faaac9491cc87c7f5b8d Mon Sep 17 00:00:00 2001
From: lukemelia <lukemelia@a4c988fc-2ded-0310-b66e-134b36920a42>
Date: Mon, 26 Nov 2007 03:05:37 +0000
Subject: [PATCH] Eliminated unnecessary double UPDATE on each todo when
 activating deferred Todos.

git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@659 a4c988fc-2ded-0310-b66e-134b36920a42
---
 tracks/app/models/todo.rb     | 5 -----
 tracks/app/models/user.rb     | 2 +-
 tracks/test/unit/todo_test.rb | 4 ++--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/tracks/app/models/todo.rb b/tracks/app/models/todo.rb
index 7fae09b6..feab3068 100644
--- a/tracks/app/models/todo.rb
+++ b/tracks/app/models/todo.rb
@@ -60,11 +60,6 @@ class Todo < ActiveRecord::Base
     return saved
   end
   
-  def activate_and_save!
-    activate!
-    save!
-  end
-
   def show_from
     self[:show_from]
   end
diff --git a/tracks/app/models/user.rb b/tracks/app/models/user.rb
index af0608be..c7fc7a26 100644
--- a/tracks/app/models/user.rb
+++ b/tracks/app/models/user.rb
@@ -60,7 +60,7 @@ class User < ActiveRecord::Base
            :conditions => [ 'state = ?', 'deferred' ],
            :order => 'show_from ASC, todos.created_at DESC' do
               def find_and_activate_ready
-                find(:all, :conditions => ['show_from <= ?', proxy_owner.time ]).collect { |t| t.activate_and_save! }
+                find(:all, :conditions => ['show_from <= ?', proxy_owner.time ]).collect { |t| t.activate! }
               end
            end
   has_many :completed_todos,
diff --git a/tracks/test/unit/todo_test.rb b/tracks/test/unit/todo_test.rb
index a6ea3090..9288cd16 100644
--- a/tracks/test/unit/todo_test.rb
+++ b/tracks/test/unit/todo_test.rb
@@ -107,13 +107,13 @@ class TodoTest < Test::Rails::TestCase
     assert_equal :active, t.current_state
   end
 
-  def test_activate_and_save
+  def test_activate_also_saves
     t = @not_completed1
     t.show_from = 1.week.from_now.to_date
     t.save!
     assert t.deferred?
     t.reload
-    t.activate_and_save!
+    t.activate!
     assert t.active?
     t.reload
     assert t.active?