tournament 3.2.0 → 3.2.1

data/History.txt

@@ -1,3 +1,7 @@
+== 3.2.1 / 2009-03-14
+* Fix teams selection controller to not care about the order of
+  input seedings.
+
 == 3.2.0 / 2009-03-14
 * Fix team selection page to not jump around when using arrow keys
   with the autocomplete pop ups.

data/lib/tournament.rb

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

data/webgui/app/controllers/teams_controller.rb

@@ -47,24 +47,13 @@ class TeamsController < ApplicationController
           logger.debug("SAVING NEW TEAM for region #{region_idx}, seed: #{seeding_hash[:seed]}, name: #{team.name}, short: #{team.short_name}")
           team.save!
         end
-        existing_region = @pool.region_seedings.find{|rn, rs| rn == region_name}
-        existing_team = nil
-        if existing_region
-          existing_team = existing_region[1][seeding_hash[:seed].to_i - 1]
+        logger.debug "Finding Seeding for region #{region.name}, seed #{seeding_hash[:seed]}"
+        existing_seeding = @pool.seedings.find_or_create_by_region_and_seed(region.name, seeding_hash[:seed])
+        if existing_seeding.team_id != team.id
+          logger.debug "  ==> TEAMS ARE DIFF, CHANGING SEEDING: #{existing_seeding.inspect}"
+          existing_seeding.team_id = team.id
+          existing_seeding.save!
         end
-        if existing_team
-          logger.debug "COMPARING existing team #{existing_team.inspect} with new team #{team.inspect}"
-          if existing_team != team
-            # Change team ...
-            existing_seeding = @pool.seedings.find(:first, :conditions => {:team_id => existing_team.id, :region => region_name})
-            logger.debug "  ==> TEAMS ARE DIFF, CHANGING SEEDING: #{existing_seeding.inspect}"
-            existing_seeding.team_id = team.id
-            existing_seeding.save!
-          end
-        else
-          logger.debug("SAVING NEW SEEDING for region #{region_idx}, seed: #{seeding_hash[:seed]}, team name: #{team.name}, short: #{team.short_name}, team id: #{team.id}")
-          @pool.seedings.create(:team_id => team.id, :region => region_name, :seed => seeding_hash[:seed])
-        end 
       end
       @pool.save!
       end

data/webgui/app/views/teams/choose.html.erb

@@ -50,8 +50,8 @@ Region Name: <input type="text" name="region<%=index%>[name]" value="<%=region_n
     :after_update_element => 'function(element, value) {name_id = element.id.replace("short_name", "team_name"); $(name_id).value = value.readAttribute("name")}'
 %>
 </td>
-</tr>
 <input type="hidden" name="region<%=index%>[seedings][][seed]" value="<%=seed_idx + 1%>">
+</tr>
 <% end -%>
 </table>
 </div>

data/webgui/test/functional/teams_controller_test.rb

@@ -298,4 +298,37 @@ class TeamsControllerTest < ActionController::TestCase
     assert_equal 64, team_list.size, "OOPS! There should be 64 teams."
     assert_equal 64, pool.teams.size, "OOPS! There should be 64 teams."
   end
+
+  # Test that completely reording the world works
+  test "reorder entire region" do
+    input = {"id" => 1, "region0"=>{"name"=>"West",
+     "seedings"=>[{"name"=>"UCLA", "seed"=>"1", "short_name"=>"ULA"},
+     {"name"=>"Duke", "seed"=>"2", "short_name"=>"Duk"},
+     {"name"=>"Xavier", "seed"=>"3", "short_name"=>"Xav"},
+     {"name"=>"Connecticut", "seed"=>"4", "short_name"=>"Con"},
+     {"name"=>"Drake", "seed"=>"5", "short_name"=>"Dra"},
+     {"name"=>"Purdue", "seed"=>"6", "short_name"=>"Pur"},
+     {"name"=>"West Virginia", "seed"=>"7", "short_name"=>"WVa"},
+     {"name"=>"BYU", "seed"=>"8", "short_name"=>"BYU"},
+     {"name"=>"Texas A&M", "seed"=>"9", "short_name"=>"A&M"},
+     {"name"=>"Arizona", "seed"=>"10", "short_name"=>"UA"},
+     {"name"=>"Baylor", "seed"=>"11", "short_name"=>"Bay"},
+     {"name"=>"W. Kentucky", "seed"=>"12", "short_name"=>"WKy"},
+     {"name"=>"San Diego", "seed"=>"13", "short_name"=>"SD"},
+     {"name"=>"Georgia", "seed"=>"14", "short_name"=>"UG"},
+     {"name"=>"Belmont", "seed"=>"15", "short_name"=>"Bel"},
+     {"name"=>"Mis. Valley St", "seed"=>"16", "short_name"=>"MVS"}]}}
+    login_as :admin
+    post :change, input
+    pool = Pool.find(1)
+    assert_equal 16, pool.region_seedings[0][1].uniq.size, "OOPS! There are dupe teams in region 0 teams list"
+    assert_equal input["region0"]["seedings"].map {|h| h["short_name"]}, pool.region_seedings[0][1].uniq.map{|t| t.short_name}, "Teams are out of order or otherwise not equal"
+
+    input["region0"]["seedings"] = input["region0"]["seedings"].sort_by { rand }
+    input["region0"]["seedings"].each_with_index {|s, idx| s["seed"] = idx + 1}
+    post :change, input
+    pool = Pool.find(1)
+    assert_equal 16, pool.region_seedings[0][1].uniq.size, "OOPS! There are dupe teams in region 0 teams list"
+    assert_equal input["region0"]["seedings"].map {|h| h["short_name"]}, pool.region_seedings[0][1].uniq.map{|t| t.short_name}, "Teams are out of order or otherwise not equal"
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 2
-  - 0
-  version: 3.2.0
+  - 1
+  version: 3.2.1
 platform: ruby
 authors: 
 - Douglas A. Seifert