From 4a4dfde8bb2d63ee1ce107feeb215b08c442c641 Mon Sep 17 00:00:00 2001 From: Jacob Cody Wimer Date: Tue, 15 Dec 2015 08:30:13 -0500 Subject: [PATCH] Fixed model names --- app/models/generates_tournament_matches.rb | 2 +- app/models/{pooladvance.rb => pool_advance.rb} | 2 +- app/models/{poolbracket.rb => pool_bracket.rb} | 2 +- ...ketplacementpoints.rb => pool_bracket_placement_points.rb} | 4 ++-- app/models/{poolorder.rb => pool_order.rb} | 4 ++-- app/models/weight.rb | 2 +- app/models/wrestler.rb | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) rename app/models/{pooladvance.rb => pool_advance.rb} (99%) rename app/models/{poolbracket.rb => pool_bracket.rb} (99%) rename app/models/{poolbracketplacementpoints.rb => pool_bracket_placement_points.rb} (98%) rename app/models/{poolorder.rb => pool_order.rb} (99%) diff --git a/app/models/generates_tournament_matches.rb b/app/models/generates_tournament_matches.rb index 6e71bbf..6ac7f95 100644 --- a/app/models/generates_tournament_matches.rb +++ b/app/models/generates_tournament_matches.rb @@ -16,7 +16,7 @@ module GeneratesTournamentMatches Pool.new(weight).generatePools() last_match = matches.where(weight: weight).order(round: :desc).limit(1).first highest_round = last_match.round - Poolbracket.new(weight, highest_round).generateBracketMatches() + PoolBracket.new(weight, highest_round).generateBracketMatches() end end diff --git a/app/models/pooladvance.rb b/app/models/pool_advance.rb similarity index 99% rename from app/models/pooladvance.rb rename to app/models/pool_advance.rb index bc10af2..bc49607 100644 --- a/app/models/pooladvance.rb +++ b/app/models/pool_advance.rb @@ -1,4 +1,4 @@ -class Pooladvance +class PoolAdvance def initialize(wrestler) @wrestler = wrestler diff --git a/app/models/poolbracket.rb b/app/models/pool_bracket.rb similarity index 99% rename from app/models/poolbracket.rb rename to app/models/pool_bracket.rb index cdfc969..26be9f4 100644 --- a/app/models/poolbracket.rb +++ b/app/models/pool_bracket.rb @@ -1,4 +1,4 @@ -class Poolbracket +class PoolBracket def initialize(weight, highest_round) @weight = weight diff --git a/app/models/poolbracketplacementpoints.rb b/app/models/pool_bracket_placement_points.rb similarity index 98% rename from app/models/poolbracketplacementpoints.rb rename to app/models/pool_bracket_placement_points.rb index 6594e38..26ea080 100644 --- a/app/models/poolbracketplacementpoints.rb +++ b/app/models/pool_bracket_placement_points.rb @@ -1,4 +1,4 @@ -class Poolbracketplacementpoints +class PoolBracketPlacementPoints def initialize(wrestler) @wrestler = wrestler @bracket = wrestler.weight.pool_bracket_type @@ -122,4 +122,4 @@ class Poolbracketplacementpoints def eighthPlace 3 end -end \ No newline at end of file +end diff --git a/app/models/poolorder.rb b/app/models/pool_order.rb similarity index 99% rename from app/models/poolorder.rb rename to app/models/pool_order.rb index 5e89385..2568026 100644 --- a/app/models/poolorder.rb +++ b/app/models/pool_order.rb @@ -1,4 +1,4 @@ -class Poolorder +class PoolOrder def initialize(wrestlers) @wrestlers = wrestlers end @@ -144,4 +144,4 @@ class Poolorder addPointsToWrestlersAhead(wrestler) addPoints(wrestler) end -end \ No newline at end of file +end diff --git a/app/models/weight.rb b/app/models/weight.rb index 5720dfb..c793d6f 100644 --- a/app/models/weight.rb +++ b/app/models/weight.rb @@ -139,6 +139,6 @@ class Weight < ActiveRecord::Base end def poolOrder(pool) - Poolorder.new(wrestlersForPool(pool)).getPoolOrder + PoolOrder.new(wrestlersForPool(pool)).getPoolOrder end end diff --git a/app/models/wrestler.rb b/app/models/wrestler.rb index 063ad95..de8f792 100644 --- a/app/models/wrestler.rb +++ b/app/models/wrestler.rb @@ -24,7 +24,7 @@ class Wrestler < ActiveRecord::Base end def placementPoints - Poolbracketplacementpoints.new(self).calcPoints + PoolBracketPlacementPoints.new(self).calcPoints end def totalDeductedPoints @@ -172,6 +172,6 @@ class Wrestler < ActiveRecord::Base end def advanceInBracket - Pooladvance.new(self).advanceWrestler + PoolAdvance.new(self).advanceWrestler end end