From 9d78cd52d250f5a8ff839fdf9ef7bd640a0217fe Mon Sep 17 00:00:00 2001
From: RJ Osborne <rjo1970@gmail.com>
Date: Sat, 23 May 2015 05:24:18 -0400
Subject: [PATCH] Composed the poolToBracket method.  It should simply read as
 an outline of how to do its job.

---
 app/models/tournamentmatchgen.rb | 33 +++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/app/models/tournamentmatchgen.rb b/app/models/tournamentmatchgen.rb
index 4f8428d..a44b1a2 100644
--- a/app/models/tournamentmatchgen.rb
+++ b/app/models/tournamentmatchgen.rb
@@ -13,12 +13,9 @@ class Tournamentmatchgen
   end
 
   def poolToBracket
-    destroyMatches()
-    @tournament.weights.sort_by{|x|[x.max]}.each do |w|
-      buildTournamentWeights(w)
-    end
-    @matches = Boutgen.new.assignBouts(@matches,@tournament.weights)
-    @matches = Losernamegen.new.assignLoserNames(@matches,@tournament.weights)
+    destroyMatches
+    buildTournamentWeights
+    generateMatches
     saveMatches
     return @matches
   end
@@ -28,13 +25,22 @@ class Tournamentmatchgen
     @matches = []
   end
 
-  def buildTournamentWeights(weight)
-    @wrestlers = weight.wrestlers
-    @matches = Pool.new.generatePools(weight, @tournament.id, @matches)
-    @weight_matches = @matches.select{|m| m.weight_id == weight.id }
-    @last_match = @weight_matches.sort_by{|m| m.round}.last
-    @highest_round = @last_match.round
-    @matches = Poolbracket.new.generateBracketMatches(@matches, weight, @highest_round)
+  def buildTournamentWeights
+    @tournament.weights.sort_by{|x|[x.max]}.each do |weight|
+      @wrestlers = weight.wrestlers
+      @matches = Pool.new.generatePools(weight, @tournament.id, @matches)
+      @weight_matches = @matches.select{|m| m.weight_id == weight.id }
+      @last_match = @weight_matches.sort_by{|m| m.round}.last
+      @highest_round = @last_match.round
+      @matches = Poolbracket.new.generateBracketMatches(@matches, weight, @highest_round)
+    end
+  end
+
+  def generateMatches
+    @matches =
+      Losernamegen.new.assignLoserNames(
+        Boutgen.new.assignBouts(@matches, @tournament.weights),
+        @tournament.weights)
   end
 
   def saveMatches
@@ -43,4 +49,5 @@ class Tournamentmatchgen
       m.save
     end
   end
+
 end