tennis 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92920cd754c3ac7a92528a35692060e8ed472dbe
-  data.tar.gz: 8e91f9f5b0a4c2f4902b4eba2b1bc53204cb50bb
+  metadata.gz: ab97c6b1bdde123d2b06a05e91db465b8d55dd35
+  data.tar.gz: 4fae93c7c709ee1dcf9a38bae35585a93caff9a5
 SHA512:
-  metadata.gz: 0eaffb4274e0b704fe739ef00127b8084ae5b8f7dacdd31f3f38eae002b42b64c6a9036d0c1039ed47f7da715e36fe9157a70c4502f8137af33a785c21dc02a1
-  data.tar.gz: 0ecc8a77bf85c347177ade9930aa863882c4f11a14dadee09b013ad60663da176d841c5c0c529c3c6a7c3959d27d3a46cabb35cfb24304cbc3ba074f5ae4b283
+  metadata.gz: 98b611d18f1758c632f6686d092d4f42d9845875cfa25c731b47339bc7c592141f45101ffcce3cd946251a01031eef7ed4a11335c18766c90a45b8424259db97
+  data.tar.gz: fb611bd4896d45f25290f857f55afeea4f3b85c284c80df1363d0aba782822865027e28ad6c9172521381b2fd53557cf66b8fa4f66f0aa3f670b0fdb25da8832

data/.gitignore

@@ -13,3 +13,4 @@
 *.a
 mkmf.log
 *.gem
+.idea

data/lib/tennis/version.rb

@@ -1,3 +1,3 @@
 class Tennis
-	VERSION = "0.1.4"
+	VERSION = "0.1.5"
 end

data/lib/tennis.rb

@@ -1,23 +1,24 @@
 require "tennis/version"
 
 class Tennis
+  # player 1 is the home player(0) , player 2 is the away player(1)
+  # winner is either 0 or 1
+  # points is an array: [points for 0 , points for 1]
+  # set_count is an array: [sets won by 0, sets won by 1]
+  # game_count is an array: [games won by 0, games won by 1]
+
+  attr_reader :winner, :points, :set_count, :game_count
+
   def initialize(scores)
-    @scores = scores != 'default-1' && scores != 'default-2' ? scores.split(/[-,,]/).map(&:to_i) : scores
-    @result = (1 if scores == 'default-1') || (2 if scores == 'default-2') || :default
-    if @result == :default
-      # check blank input ''
-      @result = :error if @scores.any? { |score| score.nil? }
-      # to check if score for only 1 set has been input
-      validation_1 = @scores.length == 2
-      # to check if any input > 7
-      validation_2 = @scores.any? { |score| score > 7 }
-      # to check if one of the input is 7 and the other is not 6
-      # bad tie break input
-      validation_3 = false
-      @scores.each_slice(2).each {|r| validation_3 = true if r.any? {|score| score == 7} && !r.any? {|score| score == 6} }
-      @result = :error if validation_1 || validation_2 || validation_3
-      # if set score is not complete eg: 4-6,7-6,4-1
-      @scores.each_slice(2).each {|r| @result = :incomplete_match if r[0] < 6 && r[1] < 6 } if @result != :error
+    # dfh -> default win for home player(0)
+    # dfa -> default win for away player(1)
+    @winner = :default
+    @scores = validate_score(scores)
+    @winner = match_winner if @winner == :default
+    @points = match_points
+    unless @scores.is_a? String
+      @set_count = sets_won
+      @game_count = games_won
     end
   end
 
@@ -33,38 +34,81 @@ class Tennis
     (0...@scores.length).step(2).map{ |i| [@scores[i+1], @scores[i]].join('-') }.join(', ')
   end
 
+  private
+
+  # helper method: to check score validation
+  def validate_score(scores_string)
+    set_scores = scores_string.split(/[-,,]/).map(&:to_i)
+    if set_scores == [0]
+      # checks bad default string value reported
+      @winner = (0 if scores == 'dfh') || (1 if scores == 'dfa') || :error
+      scores_string
+    else
+      # check blank input ''
+      validation_1 = set_scores.any? {|score| score.nil?}
+      # to check if score for only 1 set has been input
+      validation_2 = set_scores.length == 2
+      # to check if any input > 7
+      validation_3 = set_scores.any? {|score| score > 7}
+      # to check if one of the input is 7 and the other is not 6
+      # bad tie break input
+      validation_4 = false
+      set_scores.each_slice(2).each {|r| validation_4 = true if r.any? {|score| score == 7} && !r.any? {|score| score == 6} }
+      @winner = :error if validation_1 || validation_2 || validation_3 || validation_4
+      # if set score is not complete eg: 4-6,7-6,4-1
+      set_scores.each_slice(2).each {|r| @winner = :incomplete_match if r[0] < 6 && r[1] < 6 } unless @winner == :error
+      set_scores
+    end
+  end
+
   # 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 winner
-    return @result if @result != :default
-    @result = (@scores.length == 4) ? two_sets : three_sets
+  # 0 (player-1 won)
+  # 1 (player-2 won)
+  def match_winner
+    @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 = winner
-    (return [0, 0]) if @result == :error
-    (complete_match_points if @result == 1 || @result == 2) || incomplete_match_points
+  def match_points
+    return [0, 0] if @winner == :error
+    return [@scores == 'dfh' ? 12 : 0 , @scores == 'dfa' ? 12 : 0] if @scores.is_a? String
+    @winner == 0 || @winner == 1 ? complete_match_points : incomplete_match_points
   end
 
-  private
+  # returns the number of sets won by the given player (0 or 1)
+  def sets_won
+    sets = [0, 0]
+    (0...@scores.length).step(2).each do |i|
+      @scores[0 + i] > @scores[1 + i] ? sets[0] += 1 : sets[1] += 1
+    end
+    sets
+  end
+
+  # returns the number of  won by the given player (0 or 1)
+  def games_won
+    games = [0, 0]
+    (0...@scores.length).step(2).each do |i|
+      games[0] += @scores[0 + i]
+      games[1] += @scores[1 + i]
+    end
+    games
+  end
 
   # helper method: called by RESULT method for valid matches with 2 sets
   def two_sets
     set_results = []
     (0...@scores.length).step(2).each do |i|
       # tie breaker (assuming a 7 point tie breaker) or a 7-5 scores
-      if @scores[i] == 7 || @scores[i+1] == 7
-        set_results << (@scores[i] == 7 ? 1 : 2)
+      if @scores[i] == 7 || @scores[i + 1] == 7
+        set_results << (@scores[i] == 7 ? 0 : 1)
         # regular set victory - 6 games with a margin of 2
       else
         return :incomplete_match if ( @scores[i] - @scores[i + 1] ).abs < 2
-        set_results << (@scores[i] == 6 ? 1 : 2)
+        set_results << (@scores[i] == 6 ? 0 : 1)
       end
     end
     # incomplete match e.g: 6-4,5-3
@@ -77,35 +121,34 @@ class Tennis
     (0...@scores.length).step(2).each do |i|
       # tie breaker (assuming a 7 point tie breaker) or a 7-5 score
       if @scores[i] == 7 || @scores[i + 1] == 7
-        set_results << (@scores[i] == 7 ? 1 : 2)
+        set_results << (@scores[i] == 7 ? 0 : 1)
         # regular set victory - 6 games with a margin of 2
       else
         return :incomplete_match if (@scores[i] - @scores[i + 1]).abs < 2
-        set_results << (@scores[i] == 6 ? 1 : 2)
+        set_results << (@scores[i] == 6 ? 0 : 1)
       end
     end
     # checks if the result has been decided in the first 2 sets
     # but the 3rd set is also present in the input
     return :error if set_results[0] == set_results[1]
-    set_results.count(1) == 2 ? 1 : 2
+    set_results.count(0) == 2 ? 0 : 1
   end
 
   # helper method: called by POINTS for complete matches
   def complete_match_points
     points = [0, 0]
-    @result = winner
-    points[@result - 1] = (@scores.length == 6) ? 12 : 14
-    runner_up = (@result == 1) ? 2 : 1
+    points[@winner] = (@scores.length == 6) ? 12 : 14
+    runner_up = 1 - @winner
     runner_up_points = player_points(runner_up)
-    points[runner_up - 1] = runner_up_points < 8 ? runner_up_points : 8
+    points[runner_up] = runner_up_points < 8 ? runner_up_points : 8
     points
   end
 
   # helper method: called by POINTS for incomplete matches
   def incomplete_match_points
     points = [0, 0]
-    player_1_points = player_points(1)
-    player_2_points = player_points(2)
+    player_1_points = player_points(0)
+    player_2_points = player_points(1)
     points[0] = player_1_points < 10 ? player_1_points : 10
     points[1] = player_2_points < 10 ? player_2_points : 10
     points
@@ -114,7 +157,7 @@ class Tennis
   # helper method: returns the POINTS of a player given the player number
   def player_points(player)
     player_scores = []
-    @scores.each_with_index { |score, index| (player_scores << score; player +=2) if index == (player - 1) }
+    @scores.each_with_index { |score, index| (player_scores << score; player += 2) if index == (player) }
     player_scores = player_scores.sort! { |x, y| y <=> x }
     player_scores[0] + player_scores[1]
   end

data/spec/tennis_spec.rb

@@ -9,22 +9,22 @@ end
 describe Tennis, "#scores" do
 	it "finds the winner properly in two sets" do
 		score = Tennis.new("6-4, 6-4")
-		expect(score.winner).to eq 1
+		expect(score.winner).to eq 0
 	end
 
 	it "finds the winner properly in three sets" do
 		score = Tennis.new("4-6, 6-2, 3-6")
-		expect(score.winner).to eq 2
+		expect(score.winner).to eq 1
 	end
 
 	it "finds the winner properly in two sets with tie break" do
 		score = Tennis.new("6-4, 7-6")
-		expect(score.winner).to eq 1
+		expect(score.winner).to eq 0
 	end
 
 	it "finds the winner properly in three sets with tie break" do
 		score = Tennis.new("6-4, 6-7, 7-6")
-		expect(score.winner).to eq 1
+		expect(score.winner).to eq 0
 	end
 
 	it "reports incomplete match score (set 1-1)" do
@@ -126,3 +126,23 @@ describe Tennis, "#flipped" do
 		end
 	end
 end
+
+describe Tennis, "#set_count" do
+	it "returns the sets won by each player" do
+		scores = [["6-4, 4-6, 6-4", [2,1]],["6-2,6-1", [2,0]], ["7-6,4-6,6-4", [2,1]], ["6-4", [1,0]]]
+		scores.each do |s|
+			ts = Tennis.new(s[0])
+			expect(ts.set_count).to eq s[1]
+		end
+	end
+end
+
+describe Tennis, "#game_count" do
+	it "returns the games won by each player" do
+		scores = [["6-4, 4-6, 6-4", [16,14]],["6-2,6-1", [12,3]], ["7-6,4-6,6-4", [17,16]], ["6-4", [6,4]]]
+		scores.each do |s|
+			ts = Tennis.new(s[0])
+			expect(ts.game_count).to eq s[1]
+		end
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tennis
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Rohan Katyal
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler