tournament 2.1.0 → 2.1.1

data/History.txt

@@ -1,8 +1,14 @@
+== 2.1.1 / 2009-03-16
+* Fix bug when changing entry name after it has been completed
+  and therefore added to the backing Tournament::Pool object
+* Another release forthcoming when play-in game is decided.
+
 == 2.1.0 / 2009-03-15
 * Update for 2009 NCAA tournament seedings
+* Update for 2009 NCAA tournament seedings
 * Leader board report is HTML instead of text
 * Minor formatting changes for main page
-* 2.1.1 release when play-in game is decided.
+* Another release forthcoming when play-in game is decided.
 
 == 2.0.0 / 2009-03-12
 * Release Rails GUI for self-service entries and admin
@@ -14,7 +20,7 @@
   http://blogs.tnr.com/tnr/blogs/the_plank/archive/2008/03/27/ncaa-pool-scoring-system-rant.aspx
   for details.
 * Many library improvements and refactorings.
-* 2.0.1 release with final 2009 NCAA tournament seedings forthcoming
+* Another release forthcoming with final 2009 NCAA tournament seedings forthcoming
 
 == 1.1.1 / 2008-07-07
 * Update rake tasks to bones-2.0.2

data/README.txt

@@ -211,6 +211,22 @@ name, "email" for the administrators email address, "name" for the
 admin user's name (eg, "Joe Admin"), and "password" for the desired
 admin account password
 
+=== UPDATING THE WEB GUI:
+
+If the tournament gem is updated, you can pull in the changes as follows:
+
+ 1. Update your tournament gem
+
+    sudo gem update tournament
+
+ 2. Rerun the same pool install_webgui command you used to install originally
+
+ 3. Pull in any released db migrations:
+
+    cd $install_dir; RAILS_ENV=production rake db:migrate
+
+ 4. Reload your web server configuration (nginx, apache, etc.)
+
 === USING THE WEB GUI:
 
 Load the entry page in your brower.  Log in as the admin user you 

data/Rakefile

@@ -20,7 +20,7 @@ PROJ.authors = 'Douglas A. Seifert'
 PROJ.email = 'doug+rubyforge@dseifert.net'
 PROJ.url = 'http://www.dseifert.net/code/tournament'
 PROJ.rubyforge.name = 'tournament'
-PROJ.version = '2.1.0'
+PROJ.version = '2.1.1'
 PROJ.group_id = 5863
 
 PROJ.spec.opts << '--color'

data/webgui/app/models/entry.rb

@@ -4,6 +4,7 @@ class Entry < ActiveRecord::Base
   validates_uniqueness_of :name
   validates_presence_of :tie_break
   validates_presence_of :user_id
+  attr_accessor :old_name
 
   # Override bracket to resolve the db blob to an object
   def bracket
@@ -30,11 +31,24 @@ class Entry < ActiveRecord::Base
 
   def after_save
     if self.bracket.complete? && self.user_id != self.pool.user_id
+      if self.old_name
+        # We changed entry names, so pull the old one out of the
+        # backing pool
+        self.pool.pool.entries.delete_if{|e| self.old_name == e.name}
+      end
       self.pool.pool.update_entry(self.tournament_entry)
       self.pool.save!
     end
   end
 
+  # Override name= to record name changes
+  def name=(new_name)
+    if new_name != self.name
+      self.old_name = self.name
+      self.write_attribute(:name, new_name)
+    end
+  end
+
   def tournament_entry
     @tournament_entry ||= Tournament::Entry.new(self.name, self.bracket, self.tie_break)
   end

data/webgui/test/functional/entry_controller_test.rb

@@ -24,4 +24,31 @@ class EntryControllerTest < ActionController::TestCase
     assert_redirected_to :action => 'show'
     assert_equal "You can't make changes to your entry, the pool has already started.", flash[:error]
   end
+
+  test "entry can change name" do
+    login_as :quentin
+    pool = Pool.find(2)
+    # SHould have 1 pending entry 
+    assert_equal 1, pool.pending_entries.size, "Should have 1 pending entry"
+    assert_equal 1, pool.user_entries.size, "Should have 1 user entry"
+    post(:edit, {:picks => "111222222222222222222222222222222222222222222222222222222222222",
+      :id => 1, :entry => {:name => 'Test', :tie_break => 42}, :pool_id => 2})
+    # Should have 1 completed entry
+    pool = Pool.find(2)
+    assert_equal 0, pool.pending_entries.size, "Should have 0 pending entries."
+    assert_equal 1, pool.user_entries.size, "Should have 1 user entry."
+    assert_equal pool.user_entries.size, pool.pool.entries.size, "AR and backing pool should have same number of entries"
+    assert_equal ['Test'], pool.user_entries.map{|e| e.name}
+    assert_equal ['Test'], pool.pool.entries.map{|e| e.name}
+
+    # Change entry name
+    post(:edit, {:picks => "111222222222222222222222222211111222222222222222222222222222222",
+      :id => 1, :entry => {:name => 'New Name', :tie_break => 42}, :pool_id => 2})
+    pool = Pool.find(2)
+    assert_equal 0, pool.pending_entries.size, "Should have 0 pending entries."
+    assert_equal 1, pool.user_entries.size, "AR pool should have 1 user entry."
+    assert_equal 1, pool.pool.entries.size, "Backing pool should have 1 user entry."
+    assert_equal ['New Name'], pool.user_entries.map{|e| e.name}
+    assert_equal ['New Name'], pool.pool.entries.map{|e| e.name}
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tournament
 version: !ruby/object:Gem::Version 
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors: 
 - Douglas A. Seifert
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-15 00:00:00 -07:00
+date: 2009-03-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency