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

@@ -9,33 +9,37 @@
       @result = :error if @scores.any? { |score| score.nil? || score == 0 }
       # 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 
+      # to check if one of the input is 7 and the other is not 6
       # bad tie break input
-      validation_3 = false 
+      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
     end
   end
 
-  # getter method for the original score string 
-  def get_result
-    return self.result.to_s
+  # to_s
+  # return the score in string format
+  def to_s
+    score = []
+    ([e-mail]).step(2).each do |i|
+      score << [@scores[i], @scores[i+1]].join('-')
+    end
+    score.join(', ')
   end
 
   # flip score ( P1-P2 to P2-P1)
   # returns the flipped score in string
-  def flip
-    flipped_score = ''
+  def flipped
+    flipped_score = []
     ([e-mail]).step(2).each do |i|
-      flipped_score = flipped_score + @scores[i+1].to_s + '-' + @scores[i].to_s
-      flipped_score = flipped_score + ',' if !(i == @scores.length-2)
+      flipped_score << [@scores[i+1], @scores[i]].join('-')
     end
-    return flipped_score
+    flipped_score.join(', ')
   end
 
   # returns who won the match
   # :incomplete_match (bad input/incomplete match)
   # :error (bad input for sure)