clean up lib/scoring (a bit)

1 files changed, 6 insertions, 5 deletions

diff --git a/lib/scoring/fibonacci_peer_with_blowout.rb b/lib/scoring/fibonacci_peer_with_blowout.rb
index 8043fb7..21ffab1 100644
--- a/lib/scoring/fibonacci_peer_with_blowout.rb
+++ b/lib/scoring/fibonacci_peer_with_blowout.rb
@@ -1,19 +1,20 @@
 module Scoring
 	module FibonacciPeerWithBlowout
-		def stats_needed
+		def self.stats_needed
 			return [:votes]
 		end
 
-		def score(match, interface)
+		def self.score(match)
 			scores = {}
 			match.players.each do |player|
-				scores[player.user_name] = score_user(interface.get_statistic(match, player, :votes), match.win?(player), match.blowout)
+				scores[player] = self.score_user(match.statistics.where(user: player, name: :votes).first, match.win?(player), match.blowout)
 			end
 			scores
 		end
 
-		private
-		def score_user(votes, win, blowout)
+		protected
+
+		def self.score_user(votes, win, blowout)
 			fibonacci = Hash.new { |h,k| h[k] = k < 2 ? k : h[k-1] + h[k-2] }
 			fibonacci[votes+3] + (win ? blowout ? 12 : 10 : blowout ? 5 : 7)
 		end