lib/migrations/005_create_tournaments.rb lib/obs_tournament.rb lib/obs_tournament_participation.rb @@ -1,11 +1,6 @@ Infrastructure + * Rename Tournament -> Event * Rename Tournament Participation -> Registration * Rename RaceParticipation -> Performance - * windows packaging - * OSX packaging - -Tournaments - * add specific racers to a match - -Race Edit - * add a racer directly in the race edit + * Windows Packaging + * OSX Packaging TODO @@ -3,7 +3,7 @@ class ObsRace property :id, Serial property :raced, Boolean, :default => false has n, :obs_race_participations - belongs_to :tournament, :nullable => true + belongs_to :obs_tournament, :nullable => true def racers obs_race_participations.map(&:obs_racer) @@ -14,7 +14,7 @@ class ObsRace end def next_race - (tournament.obs_races.all(:raced => false) - [self]).first + (obs_tournament.obs_races.all(:raced => false) - [self]).first end def winner lib/obs_race.rb @@ -5,8 +5,8 @@ class ObsRacer has n, :obs_race_participations # has n, :races, :through => :race_participations - has n, :tournament_participations - has n, :tournaments, :through => :tournament_participations + has n, :obs_tournament_participations + has n, :obs_tournaments, :through => :obs_tournament_participations has n, :obs_categorizations def categories lib/obs_racer.rb @@ -1,6 +1,7 @@ class Race < Sequel::Model one_to_many :race_participations many_to_many :racers, :join_table => :race_participations + many_to_one :tournament def finished? race_participations.all?(&:finish_time) lib/race.rb @@ -144,17 +144,19 @@ else Sequel::Migrator.apply(DB, 'lib/migrations/') end require 'lib/obs_race_participation' -require 'lib/tournament_participation' +require 'lib/obs_tournament_participation' require 'lib/obs_racer' require 'lib/obs_race' require 'lib/obs_categorization' require 'lib/obs_category' +require 'lib/obs_tournament' require 'lib/category' -require 'lib/tournament' require 'lib/racer' require 'lib/race' require 'lib/race_participation' require 'lib/categorization' +require 'lib/tournament' +require 'lib/tournament_participation' require "lib/race_windows/#{options['track']}" if(first_time||!defined? Shoes) DataMapper.auto_migrate! lib/setup.rb @@ -1,49 +1,34 @@ -class Tournament - include DataMapper::Resource - property :id, Serial - property :name, String - has n, :obs_races +class Tournament < Sequel::Model + one_to_many :tournament_participations + many_to_many :racers, :join_table => :tournament_participations + one_to_many :races - has n, :tournament_participations - has n, :obs_racers, :through => :tournament_participations, :mutable => true - - def racers - tournament_participations.map(&:obs_racer) + #TODO: optimize + def unregistered_racers + Racer.all - self.racers end def autofill(racer_list=nil) racer_list ||= reload.unmatched_racers.to_a racer_list.each_slice($BIKES.length) { |a| - obs_races.create(:obs_race_participations => a.map{|r| {:obs_racer => r}}) + race = Race.create(:tournament => self) + a.map{|r| RaceParticipation.create(:racer => r, :race => race)} } end def unmatched_racers - racers - matched_racers - tournament_participations.all(:eliminated => true).obs_racers - end - - def never_raced_and_not_eliminated - matched = [] - obs_races.each { |race| - race.obs_race_participations.each {|rp| - matched << rp.obs_racer - } - } - racers - matched - tournament_participations.all(:eliminated => true).obs_racers - end - - def unregistered_racers - ObsRacer.all - racers + racers - matched_racers - tournament_participations.select{|tp|tp.eliminated}.map{|tp|tp.racer} end def matched_racers matched = [] - matches = self.obs_races.select{|race| race.unraced? } + matches = self.races.select{|race| race.unraced? } matches.each { |race| - race.obs_race_participations.each {|rp| - matched << rp.obs_racer + race.race_participations.each {|rp| + matched << rp.racer } } matched end + end lib/tournament.rb @@ -1,34 +1,25 @@ -class TournamentParticipation - include DataMapper::Resource - property :id, Serial - property :eliminated, Boolean - - belongs_to :obs_racer - belongs_to :tournament +class TournamentParticipation < Sequel::Model + many_to_one :racer + many_to_one :tournament def best_time - best = ObsRaceParticipation.first("obs_race.tournament_id" => tournament.id, - :obs_racer_id => obs_racer.id, - :order => [:finish_time.asc] - ) - best.finish_time if best + best = DB[:race_participations].filter(:racer_id => racer.id).join(:races, :tournament_id => tournament.id).order(:finish_time).select(:finish_time).first + + best[:finish_time] if best end + #TODO: optimize / convert to sequel def rank - standings = self.tournament.tournament_participations.sort_by{|tp|[tp.best_time||Infinity]} + standings = self.tournament.tournament_participations.sort_by{|tp|tp.best_time||Infinity} standings.index(self)+1 end def losses - (ObsRaceParticipation.all(:obs_racer_id => self.obs_racer_id, "obs_race.tournament_id" => self.tournament_id).select {|rp| rp.obs_race.winner != rp }).length - end - - def race_participations - ObsRaceParticipation.all("obs_race.tournament_id" => tournament.id, - :obs_racer => obs_racer) + RaceParticipation.filter(:racer_id => racer.id).join(:races, :tournament_id => tournament.id).group(:id).all.select{|rp|rp.race.winner.racer.pk != self.racer.pk}.length end def eliminate - self.update_attributes(:eliminated => true) + self.update(:eliminated => true) end + end lib/tournament_participation.rb @@ -26,7 +26,7 @@ ObsCategory.create(:name => "Women") ObsCategory.create(:name => "Men") Category.create(:name => "Women") Category.create(:name => "Men") -t = Tournament.create(:name => "December Series") +t = obs_Tournament.create(:name => "December Series") ObsRacer.all.each{|r| - t.tournament_participations.create(:obs_racer => r) + t.obs_tournament_participations.create(:obs_racer => r) } test/fixtures.rb @@ -77,17 +77,17 @@ describe 'An obsolete race' do describe 'next race' do it 'should be the next one after this one' do - t = Tournament.create - r1 = ObsRace.create(:tournament => t) - r2 = ObsRace.create(:tournament => t) + t = ObsTournament.create + r1 = ObsRace.create(:obs_tournament => t) + r2 = ObsRace.create(:obs_tournament => t) r1.next_race.should==(r2) end it 'should only show the next unraced race' do - t = Tournament.create - r1 = ObsRace.create(:tournament => t) - r2 = ObsRace.create(:tournament => t, :raced => true) - r3 = ObsRace.create(:tournament => t) + t = ObsTournament.create + r1 = ObsRace.create(:obs_tournament => t) + r2 = ObsRace.create(:obs_tournament => t, :raced => true) + r3 = ObsRace.create(:obs_tournament => t) r1.next_race.should==(r3) end end test/test_race.rb @@ -1,14 +1,14 @@ require 'lib/setup.rb' require 'bacon' -describe 'A tournament' do +describe 'An obsolete tournament' do before do - @tournament = Tournament.new + @tournament = ObsTournament.new $BIKES = ["red", "blue"] end it 'should have some racers' do - 3.times { @tournament.tournament_participations.build(:obs_racer => ObsRacer.new) } + 3.times { @tournament.obs_tournament_participations.build(:obs_racer => ObsRacer.new) } @tournament.racers.length.should==3 end @@ -24,9 +24,9 @@ describe 'A tournament' do it 'should know the unregistered racers' do ObsRacer.all.destroy! - @tournament = Tournament.new + @tournament = ObsTournament.new 6.times do - @tournament.tournament_participations.build({:obs_racer => ObsRacer.create}) + @tournament.obs_tournament_participations.build({:obs_racer => ObsRacer.create}) end unregistered_racer = ObsRacer.create @tournament.unregistered_racers.should==([unregistered_racer]) @@ -37,12 +37,12 @@ describe 'A tournament' do @tournament.save racers = ["Steve", "Joe"].map {|racer| ObsRacer.create(:name => racer) } racers.each {|racer| - @tournament.tournament_participations.create({:obs_racer => racer}) + @tournament.obs_tournament_participations.create({:obs_racer => racer}) } @tournament.unmatched_racers.should ==(racers) sheila = ObsRacer.create(:name => "Sheila") @tournament.autofill - @tournament.tournament_participations.create({:obs_racer => sheila}) + @tournament.obs_tournament_participations.create({:obs_racer => sheila}) @tournament.unmatched_racers.should ==([sheila]) end @@ -50,13 +50,13 @@ describe 'A tournament' do @tournament.save racers = ["Steve", "Joe"].map {|racer| ObsRacer.create(:name => racer) } racers.each {|racer| - @tournament.tournament_participations.create({:obs_racer => racer}) + @tournament.obs_tournament_participations.create({:obs_racer => racer}) } @tournament.unmatched_racers.should ==(racers) sheila = ObsRacer.create(:name => "Sheila") @tournament.autofill @tournament.obs_races.each{|r|r.update_attributes(:raced => true)} - @tournament.tournament_participations.create({:obs_racer => sheila}) + @tournament.obs_tournament_participations.create({:obs_racer => sheila}) @tournament.unmatched_racers.length.should==(3) end @@ -65,23 +65,175 @@ describe 'A tournament' do @tournament.save racers = ["Steve", "Joe"].map {|racer| ObsRacer.create(:name => racer) } racers.each {|racer| - @tournament.tournament_participations.create({:obs_racer => racer}) + @tournament.obs_tournament_participations.create({:obs_racer => racer}) } @tournament.unmatched_racers.should ==(racers) sheila = ObsRacer.create(:name => "Sheila") @tournament.autofill @tournament.obs_races.each{|r|r.update_attributes(:raced => true)} - @tournament.tournament_participations.each{|tp|tp.update_attributes(:eliminated => true)} - @tournament.tournament_participations.create({:obs_racer => sheila}) + @tournament.obs_tournament_participations.each{|tp|tp.update_attributes(:eliminated => true)} + @tournament.obs_tournament_participations.create({:obs_racer => sheila}) @tournament.unmatched_racers.should==([sheila]) end end describe 'autofill' do it 'should result in all the racers being matched' do - @tournament = Tournament.new + @tournament = ObsTournament.new + 6.times do + @tournament.obs_tournament_participations.build({:obs_racer => ObsRacer.create}) + end + @tournament.save + @tournament.reload + @tournament.obs_races.length.should == 0 + @tournament.autofill + @tournament.obs_races.length.should == 3 + @tournament.save + end + + it 'should match only unmatched racers' do + @tournament = ObsTournament.new + 6.times do + @tournament.obs_tournament_participations.build({:obs_racer => ObsRacer.create}) + end + @tournament.save + @tournament.reload + @tournament.obs_races.length.should == 0 + @tournament.autofill + @tournament.obs_races.length.should == 3 + @tournament.save + 6.times do + @tournament.obs_tournament_participations.build({:obs_racer => ObsRacer.create}) + end + @tournament.save + @tournament.reload + @tournament.autofill + @tournament.obs_races.length.should == 6 + end + + it 'should make races with as many riders as there are bikes' do + @tournament = ObsTournament.new + $BIKES = ["red","blue","yellow"] + 6.times do + @tournament.obs_tournament_participations.build({:obs_racer => ObsRacer.create}) + end + @tournament.save + @tournament.reload + @tournament.obs_races.length.should == 0 + @tournament.autofill + @tournament.obs_races.length.should == 2 + @tournament.save + end + + it 'should accept a list of racers' do + @tournament = ObsTournament.new + 6.times do + @tournament.obs_tournament_participations.build({:obs_racer => ObsRacer.create}) + end + @tournament.save + @tournament.reload + @tournament.obs_races.length.should == 0 + @tournament.autofill(@tournament.obs_tournament_participations.obs_racers[0..2]) + @tournament.obs_races.length.should == 2 + @tournament.obs_races.first.racers.length.should == 2 + end + end +end + +describe 'A tournament' do + before do + @tournament = Tournament.create + $BIKES = ["red", "blue"] + end + + it 'should have some racers' do + 3.times do + racer = Racer.create + tp = TournamentParticipation.create(:racer => racer, + :tournament => @tournament) + end + @tournament.racers.length.should==3 + end + + it 'should have some races' do + 3.times do + Race.create(:tournament => @tournament) + end + @tournament.races.length.should==3 + end + + it 'should have a name' do + @tournament.name = "foo" + @tournament.name.should == "foo" + end + + it 'should know the unregistered racers' do + Racer.all.each{|r|r.destroy} + @tournament = Tournament.create + 6.times do + TournamentParticipation.create(:racer => Racer.create, + :tournament => @tournament) + end + unregistered_racer = Racer.create + @tournament.unregistered_racers.should==([unregistered_racer]) + end + + describe 'unmatched_racers' do + it 'should contain racers not in a match' do + @tournament.save + racers = ["Steve", "Joe"].map {|racer| Racer.create(:name => racer) } + racers.each {|racer| + TournamentParticipation.create(:racer => racer, + :tournament => @tournament) + } + @tournament.unmatched_racers.should ==(racers) + sheila = Racer.create(:name => "Sheila") + @tournament.autofill + TournamentParticipation.create(:racer => sheila, + :tournament => @tournament) + @tournament.reload.unmatched_racers.should ==([sheila]) + end + + it 'should contain racers in a completed match.' do + @tournament.save + racers = ["Steve", "Joe"].map {|racer| Racer.create(:name => racer) } + racers.each {|racer| + TournamentParticipation.create(:racer => racer, + :tournament => @tournament) + } + @tournament.unmatched_racers.should ==(racers) + sheila = Racer.create(:name => "Sheila") + @tournament.autofill + @tournament.races.each{|r|r.raced = true; r.save} + TournamentParticipation.create(:racer => sheila, + :tournament => @tournament) + @tournament.reload.unmatched_racers.length.should==(3) + end + + it 'should not contain eliminated racers' do + @tournament.save + racers = ["Steve", "Joe"].map {|racer| Racer.create(:name => racer) } + racers.each {|racer| + TournamentParticipation.create(:racer => racer, + :tournament => @tournament) + } + @tournament.unmatched_racers.should ==(racers) + + sheila = Racer.create(:name => "Sheila") + @tournament.autofill + @tournament.races.each{|r|r.raced = true; r.save} + @tournament.tournament_participations.each{|tp|tp.eliminated = true; tp.save} + TournamentParticipation.create(:racer => sheila, + :tournament => @tournament) + @tournament.reload.unmatched_racers.should==([sheila]) + end + end + + describe 'autofill' do + it 'should result in all the racers being matched' do + @tournament = ObsTournament.new 6.times do - @tournament.tournament_participations.build({:obs_racer => ObsRacer.create}) + @tournament.obs_tournament_participations.build({:obs_racer => ObsRacer.create}) end @tournament.save @tournament.reload @@ -92,9 +244,9 @@ describe 'A tournament' do end it 'should match only unmatched racers' do - @tournament = Tournament.new + @tournament = ObsTournament.new 6.times do - @tournament.tournament_participations.build({:obs_racer => ObsRacer.create}) + @tournament.obs_tournament_participations.build({:obs_racer => ObsRacer.create}) end @tournament.save @tournament.reload @@ -103,7 +255,7 @@ describe 'A tournament' do @tournament.obs_races.length.should == 3 @tournament.save 6.times do - @tournament.tournament_participations.build({:obs_racer => ObsRacer.create}) + @tournament.obs_tournament_participations.build({:obs_racer => ObsRacer.create}) end @tournament.save @tournament.reload @@ -112,10 +264,10 @@ describe 'A tournament' do end it 'should make races with as many riders as there are bikes' do - @tournament = Tournament.new + @tournament = ObsTournament.new $BIKES = ["red","blue","yellow"] 6.times do - @tournament.tournament_participations.build({:obs_racer => ObsRacer.create}) + @tournament.obs_tournament_participations.build({:obs_racer => ObsRacer.create}) end @tournament.save @tournament.reload @@ -126,14 +278,14 @@ describe 'A tournament' do end it 'should accept a list of racers' do - @tournament = Tournament.new + @tournament = ObsTournament.new 6.times do - @tournament.tournament_participations.build({:obs_racer => ObsRacer.create}) + @tournament.obs_tournament_participations.build({:obs_racer => ObsRacer.create}) end @tournament.save @tournament.reload @tournament.obs_races.length.should == 0 - @tournament.autofill(@tournament.tournament_participations.obs_racers[0..2]) + @tournament.autofill(@tournament.obs_tournament_participations.obs_racers[0..2]) @tournament.obs_races.length.should == 2 @tournament.obs_races.first.racers.length.should == 2 end test/test_tournament.rb @@ -1,22 +1,22 @@ require 'lib/setup.rb' require 'bacon' -describe 'A tournament participation' do +describe 'An obsolete tournament participation' do before do - @tournament = Tournament.create(:name => "December") + @tournament = ObsTournament.create(:name => "December") @racer = ObsRacer.create(:name => "winston") - @tournament_participation = TournamentParticipation.create(:obs_racer => @racer, :tournament => @tournament) + @tournament_participation = ObsTournamentParticipation.create(:obs_racer => @racer, :obs_tournament => @tournament) [4.2, 5.3, 3.0, 6.1].each do |time| - r = ObsRace.create(:tournament => @tournament) + r = ObsRace.create(:obs_tournament => @tournament) r.obs_race_participations.create(:obs_racer => @racer, :finish_time => time) end @racer2 = ObsRacer.create(:name => "winston") - @tournament_participation2 = TournamentParticipation.create(:obs_racer => @racer2, :tournament => @tournament) + @tournament_participation2 = ObsTournamentParticipation.create(:obs_racer => @racer2, :obs_tournament => @tournament) @racer3 = ObsRacer.create(:name => "winston") - @tournament_participation3 = TournamentParticipation.create(:obs_racer => @racer3, :tournament => @tournament) - r = ObsRace.create(:tournament => @tournament) + @tournament_participation3 = ObsTournamentParticipation.create(:obs_racer => @racer3, :obs_tournament => @tournament) + r = ObsRace.create(:obs_tournament => @tournament) r.obs_race_participations.create(:obs_racer => @racer3, :finish_time => [10.0]) r.obs_race_participations.create(:obs_racer => @racer, :finish_time => [5.0]) end @@ -44,3 +44,47 @@ describe 'A tournament participation' do end +describe 'A tournament participation' do + before do + @tournament = Tournament.create(:name => "December") + @racer = Racer.create(:name => "winston") + @tournament_participation = TournamentParticipation.create(:racer => @racer, :tournament => @tournament) + [4.2, 5.3, 3.0, 6.1].each do |time| + r = Race.create(:tournament => @tournament) + RaceParticipation.create(:racer => @racer, :race => r, + :finish_time => time) + end + + @racer2 = Racer.create(:name => "winston") + @tournament_participation2 = TournamentParticipation.create(:racer => @racer2, :tournament => @tournament) + + @racer3 = Racer.create(:name => "winston") + @tournament_participation3 = TournamentParticipation.create(:racer => @racer3, :tournament => @tournament) + r = Race.create(:tournament => @tournament) + RaceParticipation.create(:racer => @racer3, :race => r, + :finish_time => 10.0) + RaceParticipation.create(:racer => @racer, :race => r, + :finish_time => 5.0) + end + + + it 'should have a best time' do + @tournament_participation.best_time.should==(3.0) + end + it 'should not have a best time if the racer has not raced' do + @tournament_participation2.best_time.should==(nil) + end + + it 'should have a relative rank' do + @tournament_participation.rank.should==(1) + @tournament_participation2.rank.should==(3) + @tournament_participation3.rank.should==(2) + end + + it 'should have a number of losses for eliminaton' do + @tournament_participation.losses.should==(0) + @tournament_participation2.losses.should==(0) + @tournament_participation3.losses.should==(1) + end + +end test/test_tournament_participation.rb 4f5c869f724acfd7f89fd2fb5c1787e79041b750 Evan Farrar evanfarrar@gmail.com http://github.com/evanfarrar/opensprints/commit/45bc3326a4346f8ffe6abe7926e4c8733ddf15ed 45bc3326a4346f8ffe6abe7926e4c8733ddf15ed 2009-10-06T13:42:08-07:00 2009-10-06T13:42:08-07:00 Migrated tournament to sequel (the last model). b59903131f85b31473c9eeac372905039a36cef9 Evan Farrar evanfarrar@gmail.com