tournament 3.1.0 → 3.1.1

data/History.txt

@@ -1,3 +1,8 @@
+== 3.1.1 / 2009-03-13
+* Bugfixes for showing add entry links.  Makes sure participants can
+  add entries once the teams are set.
+* Verbiage for pools that are over.
+
 == 3.1.0 / 2009-03-12
 * Account for multiple pools when saving/loading possibility yaml file.
 * Update restful_authentication to latest version.

data/lib/tournament.rb

@@ -7,7 +7,7 @@ unless defined? Tournament
 module Tournament
 
   # :stopdoc:
-  VERSION = '3.1.0'
+  VERSION = '3.1.1'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/webgui/app/controllers/teams_controller.rb

@@ -68,7 +68,7 @@ class TeamsController < ApplicationController
       end
       @pool.save!
       end
-      if @pool.ready?
+      if @pool.teams_set?
         @pool.initialize_tournament_pool
         @pool.save
       end

data/webgui/app/controllers/users_controller.rb

@@ -69,7 +69,7 @@ class UsersController < ApplicationController
           UserMailer.deliver_password_reset_notification(user, reset_password_path(:reset_code => user.password_reset_code, :only_path => false))
         end
         flash[:notice] = "Reset code sent to #{params[:user][:email]}"
-        redirect_back_or_default('/')
+        redirect_back_or_default(root_path)
       else
         flash[:error] = "Please enter a valid email address"
       end
@@ -92,7 +92,7 @@ class UsersController < ApplicationController
         #self.current_user = @user
         @user.delete_password_reset_code
         flash[:notice] = "Password updated successfully for #{@user.email} - You may now log in using your new password."
-        redirect_back_or_default('/')
+        redirect_back_or_default(root_path)
       else
         render :action => :reset_password
       end

data/webgui/app/models/pool.rb

@@ -36,10 +36,30 @@ class Pool < ActiveRecord::Base
   end
 
   # True if the number of teams in the pool is 64
-  def ready?
+  def teams_set?
     return teams.size == 64
   end
 
+  # True if the pool has started
+  def started?
+    return Time.now > starts_at
+  end
+
+  # True if the teams have been set and the start time
+  # has not been reached
+  def accepting_entries?
+    teams_set? && !started?
+  end
+
+  # True if this pool is over, ie, the champion is known
+  def completed?
+    begin
+      self.pool.tournament_entry.picks.teams_left == 1
+    rescue Exception => e
+      false
+    end
+  end
+
   def region_seedings
     reg_ret = self.regions.inject([]) do |arr, r|
       arr[r.position] = [r.name, Array.new(16)]
@@ -60,7 +80,7 @@ class Pool < ActiveRecord::Base
   end
 
   def initialize_tournament_pool
-    if self.ready?
+    if self.teams_set?
       @pool = Tournament::Pool.new
       @pool.scoring_strategy = FormObject.class_get(@scoring_strategy || 'Tournament::ScoringStrategy::Basic').new
       region_counter = 0
@@ -137,10 +157,6 @@ class Pool < ActiveRecord::Base
     @payouts << PayoutData.new
   end
 
-  def accepting_entries?
-    return ready? && Time.now < starts_at
-  end
-
   def self.active_pools
     Pool.find(:all, :conditions => ['active = ?', true]).reverse
   end

data/webgui/app/views/entry/index.html.erb

@@ -15,8 +15,11 @@ You have no entries.
 <p>
 <%= link_to 'Create a new entry', :action => 'new', :id => @pool.id %>
 </p>
-<% elsif !@pool.ready? -%>
-<i>This pool is not yet ready.  The pool starts in <%= distance_of_time_in_words(@pool.starts_at, Time.now) %>.  After it starts, you can make entries.</i>
-<% else -%>
+<% elsif !@pool.started? -%>
+<i>This pool is not yet ready.  The pool starts in <%= distance_of_time_in_words(@pool.starts_at, Time.now) %>.  Once all the teams in the tournament have 
+been selected, you will be able to create entries.</i>
+<% elsif @pool.started? && !@pool.completed? -%>
 <i>This pool is not accepting any more entries.</i>
+<% elsif @pool.completed? -%>
+<i>This pool is over.</i>
 <% end -%>

data/webgui/app/views/layouts/default.html.erb

@@ -44,7 +44,7 @@
 <% if @pool -%>
 <li> <%= link_to 'Pool', :controller => 'admin', :action => 'pool', :id => @pool.id %></li>
 <li> <%= link_to 'Teams', :controller => 'teams', :action => 'choose', :id => @pool.id %></li>
-<% if @pool.ready? %>
+<% if @pool.teams_set? %>
 <li> <%= link_to 'Tournament Bracket', :controller => 'admin', :action => 'bracket', :id => @pool.id %></li>
 <li> <%= link_to 'All Entries', :controller => 'admin', :action => 'entries', :id => @pool.id%></li>
 <li> <%= link_to 'Reports', :controller => 'reports', :action => 'show', :id => @pool.id%></li>

data/webgui/app/views/reports/show.html.erb

@@ -2,7 +2,7 @@
 <ul>
 <li><%= link_to 'Region', :report => 'region'%></li>
 <li><%= link_to 'Entries', :report => 'entry'%></li>
-<% if @pool.ready? -%>
+<% if @pool.started? -%>
 <li><%= link_to 'Score', :report => 'score'%></li>
 <li><%= link_to 'Leader', :report => 'leader'%></li>
 <% if @pool.pool.tournament_entry.picks.teams_left <= 16 %>

data/webgui/config/environments/development.rb

@@ -21,7 +21,7 @@ ActionMailer::Base.smtp_settings = {
   :port  => 25, 
   :domain  => "comcast.net",
   :user_name  => 'doug.seifert@comcast.net',
-  :password  => "cfamn2nan",
+  :password  => "ccSBBatl1",
   :authentication  => :login
 } 
 

data/webgui/test/test_helper.rb

@@ -2,7 +2,7 @@ ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
 require 'test_help'
 
-class Test::Unit::TestCase
+class ActiveSupport::TestCase
   # Transactional fixtures accelerate your tests by wrapping each test method
   # in a transaction that's rolled back on completion.  This ensures that the
   # test database remains unchanged so your fixtures don't have to be reloaded

data/webgui/test/unit/pool_test.rb

@@ -1,8 +1,24 @@
 require 'test_helper'
 
 class PoolTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
+  test "new pool is not completed" do
+    p = Pool.new
+    assert !p.completed?, "new pool should not be completed"
+  end
+  test "new pool does not have teams set" do
+    p = Pool.new
+    assert !p.teams_set?, "new pool should not have teams set"
+  end
+  test "pool that has not started is accepting entries" do
+    p = Pool.new
+    p.teams = [Team.new] * 64
+    p.starts_at = Time.now + 2.days
+    assert p.accepting_entries?, "Pool with all teams that starts in future should except entries"
+  end
+  test "pool that has started is not accepting entries" do
+    p = Pool.new
+    p.teams = [Team.new] * 64
+    p.starts_at = Time.now - 2.days
+    assert !p.accepting_entries?, "Pool with all teams that starts in past should not except entries"
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 1
-  - 0
-  version: 3.1.0
+  - 1
+  version: 3.1.1
 platform: ruby
 authors: 
 - Douglas A. Seifert
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-12 00:00:00 -08:00
+date: 2010-03-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency