Merge branch 'master' of https://github.com/LukeShu/leaguer

4 files changed, 23 insertions, 17 deletions

diff --git a/lib/seeding/README.md b/lib/seeding/README.md
index 67fc19b..d323b6d 100644
--- a/lib/seeding/README.md
+++ b/lib/seeding/README.md
@@ -1,4 +1,10 @@
-Files in this directory should implement the following interface:
+Seeding interface
+=================
 
-- seed_matches(tournament)
-	take the matches of a tournament and the players in a tournament, assign players to teams, and teams to matches (all must exist)
\ No newline at end of file
+Files in this directory should be _modules_ implement the following
+interface:
+
+ - `seed(TournamentStage)`
+
+   Take a tournament stage, assign players to teams and teams to
+   matches (matches must exist).
diff --git a/lib/seeding/early_bird_seeding.rb b/lib/seeding/early_bird_seeding.rb
index 30e15fc..488a1a2 100644
--- a/lib/seeding/early_bird_seeding.rb
+++ b/lib/seeding/early_bird_seeding.rb
@@ -1,6 +1,6 @@
 module Seeding
-	class EarlyBirdSeeding
-		def seed_matches(tournament)
+	module EarlyBirdSeeding
+		def self.seed(tournament_stage)
 			matches = tournament.current_stage.matches
 			match = matches.first
 			match_num = 0
@@ -17,4 +17,4 @@ module Seeding
 			end
 		end
 	end
-end
\ No newline at end of file
+end
diff --git a/lib/seeding/fair_ranked_seeding.rb b/lib/seeding/fair_ranked_seeding.rb
index 4eb8c26..f56d648 100644
--- a/lib/seeding/fair_ranked_seeding.rb
+++ b/lib/seeding/fair_ranked_seeding.rb
@@ -1,6 +1,6 @@
 module Seeding
-	class FairRankedSeeding
-		def seed_matches(tournament)
+	module FairRankedSeeding
+		def self.seed(tournament_stage)
 			matches = tournament.current_stage.matches
 			match = matches.first
 			match_num = 0
@@ -19,17 +19,17 @@ module Seeding
 		end
 
 		private
-		def best_first(tournament)
+		def self.best_first(tournament)
 			tournament.players.sort {|a, b| better(a, b, tournament) }
 		end
 
-		def better(player1, player2, tournament)
-			ps1 = previousScore(player1, tournament)
-			ps2 = previousScore(player2, tournament)
+		def self.better(player1, player2, tournament)
+			ps1 = previous_score(player1, tournament)
+			ps2 = previous_score(player2, tournament)
 			ps1 <=> ps2
 		end
 
-		def previousScore(player, tournament)
+		def self.previous_score(player, tournament)
 			score = tournament.statistics.getStatistic(player.matches.last, player, :score)
 			if score.nil?
 				return 0
@@ -37,4 +37,4 @@ module Seeding
 			score
 		end
 	end
-end
\ No newline at end of file
+end
diff --git a/lib/seeding/random_seeding.rb b/lib/seeding/random_seeding.rb
index ec39e61..723d70e 100644
--- a/lib/seeding/random_seeding.rb
+++ b/lib/seeding/random_seeding.rb
@@ -1,6 +1,6 @@
 module Seeding
-	class RandomSeeding
-		def seed_matches(tournament)
+	module RandomSeeding
+		def self.seed(tournament_stage)
 			matches = tournament.current_stage.matches
 			match = matches.first
 			match_num = 0
@@ -17,4 +17,4 @@ module Seeding
 			end
 		end
 	end
-end
\ No newline at end of file
+end