lib/tennis.rb in tennis-0.1.2 vs lib/tennis.rb in tennis-0.1.3

- old
+ new

@@ -44,20 +44,20 @@ # returns who won the match # :incomplete_match (bad input/incomplete match) # :error (bad input for sure) # 1 (player-1 won) # 2 (player-2 won) - def result + def winner return @result if @result != :default return @result = (@scores.length == 4) ? two_sets : three_sets end # returns an array of points # returns (points_player_1 , points_player_2) # returns (0,0) for bad input def points - @result = self.result + @result = winner (return [0, 0]) if @result == :error return (complete_match_points if @result == 1 || @result == 2) || incomplete_match_points end private @@ -99,10 +99,10 @@ end # helper method: called by POINTS for complete matches def complete_match_points points = [0, 0] - @result = self.result + @result = winner points[@result - 1] = (@scores.length == 6) ? 12 : 14 runner_up = (@result == 1) ? 2 : 1 runner_up_points = player_points(runner_up) points[runner_up - 1] = runner_up_points < 8 ? runner_up_points : 8 return points