tournament 3.2.2 → 3.3.0

data/History.txt

@@ -1,3 +1,8 @@
+== 3.3.0 / 2009-03-16
+* Final 2010 bracket.
+* Fix permissions issue making tournament bracket seem editable to all.
+* Show login name in leader board.
+
 == 3.2.2 / 2009-03-14
 * Fix initialization of tournament entry.
 

data/README.rdoc

@@ -1,5 +1,5 @@
 tournament
-    by Douglas A. Seifert (doug+rubyforge at dseifert dot net)
+    by Douglas A. Seifert (doug at dseifert dot net)
     http://www.dseifert.net/code/tournament
     http://github.org/seifertd/tournament
     http://rubygems.org/gems/tournament

data/Rakefile

@@ -17,7 +17,7 @@ Bones {
 
   name 'tournament'
   authors 'Douglas A. Seifert'
-  email 'doug+rubyforge@dseifert.net'
+  email 'doug@dseifert.net'
   url 'http://www.dseifert.net/code/tournament'
   rubyforge.name 'tournament'
   readme_file 'README.rdoc'

data/lib/tournament.rb

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

data/lib/tournament/pool.rb

@@ -278,6 +278,96 @@ class Tournament::Pool
     return pool
   end
  
+  # Creates a Pool object for the 2010 NCAA tournament
+  def self.ncaa_2010
+    pool = Tournament::Pool.new
+    pool.add_region("Midwest",
+      [
+        Tournament::Team.new('Kansas', 'Kan', 1),
+        Tournament::Team.new('Lehigh', 'Leh', 16),
+        Tournament::Team.new('UNLV', 'ULV', 8),
+        Tournament::Team.new('Northern Iowa', 'NIo', 9),
+        Tournament::Team.new('Michigan St.', 'MSU', 5),
+        Tournament::Team.new('New Mexico State', 'NMS', 12),
+        Tournament::Team.new('Maryland', 'Mry', 4),
+        Tournament::Team.new('Houston', 'Hou', 13),
+        Tournament::Team.new('Tennessee', 'Ten', 6),
+        Tournament::Team.new('San Diego State', 'SDS', 11),
+        Tournament::Team.new('Georgetown', 'GT', 3),
+        Tournament::Team.new('Ohio', 'Ohi', 14),
+        Tournament::Team.new('Oklahoma State', 'OkS', 7),
+        Tournament::Team.new('Georgia Tech', 'GTc', 10),
+        Tournament::Team.new('Ohio State', 'OSU', 2),
+        Tournament::Team.new('UC Santa Barbara', 'SB', 15)
+      ],
+      0
+    )
+    pool.add_region("West",
+      [
+        Tournament::Team.new('Syracuse', 'Syr', 1),
+        Tournament::Team.new('Vermont', 'Ver', 16),
+        Tournament::Team.new('Gonzaga', 'Gon', 8),
+        Tournament::Team.new('Florida State', 'FSU', 9),
+        Tournament::Team.new('Butler', 'But', 5),
+        Tournament::Team.new('UTEP', 'UTP', 12),
+        Tournament::Team.new('Vanderbilt', 'Van', 4),
+        Tournament::Team.new('Murray State', 'Mur', 13),
+        Tournament::Team.new('Xavier', 'Xav', 6),
+        Tournament::Team.new('Minnesota', 'Min', 11),
+        Tournament::Team.new('Pittsburgh', 'Pit', 3),
+        Tournament::Team.new('Oakland', 'Oak', 14),
+        Tournament::Team.new('BYU', 'BYU', 7),
+        Tournament::Team.new('Florida', 'Fla', 10),
+        Tournament::Team.new('Kansas St.', 'KSU', 2),
+        Tournament::Team.new('Nort Texas', 'NTx', 15)
+      ],
+      1
+    )
+    pool.add_region("East",
+      [
+        Tournament::Team.new('Kentucky', 'Ken', 1),
+        Tournament::Team.new('East Tennessee State', 'ETS', 16),
+        Tournament::Team.new('Texas', 'Tex', 8),
+        Tournament::Team.new('Wake Forest', 'WkF', 9),
+        Tournament::Team.new('Temple', 'Tem', 5),
+        Tournament::Team.new('Cornell', 'Cor', 12),
+        Tournament::Team.new('Wisconsin', 'Wis', 4),
+        Tournament::Team.new('Wofford', 'Wof', 13),
+        Tournament::Team.new('Marquette', 'Mar', 6),
+        Tournament::Team.new('Washington', 'Was', 11),
+        Tournament::Team.new('New Mexico', 'NMx', 3),
+        Tournament::Team.new('Montana', 'Mon', 14),
+        Tournament::Team.new('Clemson', 'Clm', 7),
+        Tournament::Team.new('Missouri', 'Msr', 10),
+        Tournament::Team.new('West Virginia', 'WVa', 2),
+        Tournament::Team.new('Morgan State', 'MgS', 15)
+      ],
+      2
+    )
+    pool.add_region("South",
+      [
+        Tournament::Team.new('Duke', 'Duk', 1),
+        Tournament::Team.new('Arkansa-Pine Bluff', 'APB', 16),
+        Tournament::Team.new('California', 'Cal', 8),
+        Tournament::Team.new('Louisville', 'Lou', 9),
+        Tournament::Team.new('Texas A&M', 'A&M', 5),
+        Tournament::Team.new('Utah State', 'USt', 12),
+        Tournament::Team.new('Purdue', 'Pur', 4),
+        Tournament::Team.new('Siena', 'Sie', 13),
+        Tournament::Team.new('Notre Dame', 'ND', 6),
+        Tournament::Team.new('Old Dominion', 'OD', 11),
+        Tournament::Team.new('Baylor', 'Bay', 3),
+        Tournament::Team.new('Sam Houston State', 'SHS', 14),
+        Tournament::Team.new('Richmond', 'Rch', 7),
+        Tournament::Team.new("St. Mary's", 'StM', 10),
+        Tournament::Team.new('Villanova', 'Vil', 2),
+        Tournament::Team.new('Robert Morris', 'RbM', 15)
+      ],
+      3
+    )
+    return pool
+  end
+ 
   # Run a test pool with random entries and a random outcome.
   def self.test(num_picks = 20)
     pool = ncaa_2008

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

@@ -21,6 +21,7 @@
 <td rowspan="2">Current<br/>Score</td>
 <td rowspan="2">Max Score</td>
 <td rowspan="2">Entry Name</td>
+<td rowspan="2">By</td>
 <td rowspan="2">Champ<br/>Alive?</td>
 <td rowspan="2">Tie<br/>Break</td>
 <td colspan="6">Round Scores</td>
@@ -36,7 +37,7 @@
 </thead>
 <tbody>
 <%
-  db_entry_ids = @pool.user_entries.inject({}) {|h,e| h[e.name] = e.id; h}
+  db_entries = @pool.user_entries.inject({}) {|h,e| h[e.name] = e; h}
   pool.entries.sort do |e1, e2|
     s1 = e1.picks.score_against(pool.tournament_entry.picks, pool.scoring_strategy)
     s2 = e2.picks.score_against(pool.tournament_entry.picks, pool.scoring_strategy)
@@ -44,6 +45,10 @@
       s1 = 0 - (e1.tie_breaker - pool.tournament_entry.tie_breaker).abs
       s2 = 0 - (e2.tie_breaker - pool.tournament_entry.tie_breaker).abs
     end
+    if s1 == s2
+      s1 = e1.max_score
+      s2 = e2.max_score
+    end
     s2 <=> s1
   end.inject(nil) do |last_entry, entry|
     total = entry.picks.score_against(pool.tournament_entry.picks, pool.scoring_strategy)
@@ -65,7 +70,8 @@
 <td><%=rank_display%></td>
 <td><%=total%></td>
 <td><%=max%></td>
-<td><%=link_to entry.name, :controller => 'entry', :action => 'show', :id => db_entry_ids[entry.name]%></td>
+<td><%=link_to entry.name, :controller => 'entry', :action => 'show', :id => db_entries[entry.name].id%></td>
+<td><%=db_entries[entry.name].user.login%></td>
 <td><%=champ.short_name%> <%=pool.tournament_entry.picks.still_alive?(champ) ? 'Y' : 'N'%></td>
 <td><%=entry.tie_breaker || '-'%></td>
 <% round_scores.each do |rs| %>

data/webgui/app/views/shared/_bracket.html.erb

@@ -1,5 +1,5 @@
 <%
-is_editable = defined?(editable) ? editable : (current_user.has_role?(:admin) || Time.now < @entry.pool.starts_at)
+is_editable = defined?(editable) ? editable : (current_user.has_role?(:admin) || (@entry.pool.accepting_entries? && @entry.user == current_user ) )
 classes = {}
 ids = {}
 onclicks = {}

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 3
-  - 2
-  - 2
-  version: 3.2.2
+  - 3
+  - 0
+  version: 3.3.0
 platform: ruby
 authors: 
 - Douglas A. Seifert
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-13 23:00:00 -08:00
+date: 2010-03-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,7 +76,7 @@ dependencies:
 description: |-
   Small library, command line program and Rails web GUI for managing a NCAA
   basketball tournament pool.
-email: doug+rubyforge@dseifert.net
+email: doug@dseifert.net
 executables: 
 - benchmark_pool
 - gui.rb