tennis 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd583e116bb97ed17c1e2fcd2f3226740f9e5ae2
-  data.tar.gz: 0de701c7fc9ef68b462653297f2c6c4353440b2c
+  metadata.gz: 071d8da8d7b39b88163c917635cff96a913bafcd
+  data.tar.gz: 63252be0e608ee1d0f597d36c0333d24b8256606
 SHA512:
-  metadata.gz: 65df88626e25f108eb082aff044b5bbf4a3f680cc0d6500cc05a70f250c47a547febf8411cdbf07483244515c4063b8cc394d7fa8786bc6652f36e153ded4a86
-  data.tar.gz: 2364bb158a00d34af3932050351a452a1ce17934ace29c55f3d9dcdc23f4537c49378e9f136755bcabb27d6e387daef55fc73d72e51fb258132eabac25c86670
+  metadata.gz: e9a0401551a28c70dd2cd3106196c3ec3d8723ff603ed5ef7250c077e3d76c41f74747a698594fb58929c41c154cdfdb92c880b08814b639569732b4457e2d67
+  data.tar.gz: 66c54ec51b6a0f6520d4caa602c3eacdd950eb43736c749da85a4f294cbca106b820cf8c35a4f9d0faa209be8cd24d2d5337f369b5ac61cc59186b4198986399

data/Makefile

@@ -1,5 +1,5 @@
 
-VERSION=0.5.7
+VERSION=0.1.6
 
 all:
 	rake spec

data/lib/tennis/version.rb

@@ -1,3 +1,3 @@
 class Tennis
-	VERSION = "0.1.6"
+	VERSION = "0.1.7"
 end

data/lib/tennis.rb

@@ -45,15 +45,15 @@ class Tennis
       scores_string
     else
       # check blank input ''
-      validation_1 = set_scores.any? {|score| score.nil?}
+      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}
+      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} }
+      set_scores.each_slice(2).each { |r| validation_4 = true if r.any? { |score| score == 7 } && !r.any? { |score| score == 6 || score == 5 } }
       @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
@@ -75,7 +75,7 @@ class Tennis
   # returns (0,0) for bad input
   def match_points
     return [0, 0] if @winner == :error
-    return [@scores == 'dfh' ? 12 : 0 , @scores == 'dfa' ? 12 : 0] if @scores.is_a? String
+    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
 

data/spec/tennis_spec.rb

@@ -67,6 +67,10 @@ describe Tennis, "#scores" do
 		expect(score.winner).to eq :error
 	end
 
+	it "finds the winner properly in scores with 7-5" do
+		score = Tennis.new("3-6,5-7")
+		expect(score.winner).to eq 1
+	end
 end
 
 describe Tennis, "#points" do
@@ -104,6 +108,11 @@ describe Tennis, "#points" do
 		score = Tennis.new("")
 		expect(score.points).to eq [0,0]
 	end
+
+	it "finds the points properly in scores with 7-5" do
+		score = Tennis.new("3-6,5-7")
+		expect(score.points).to eq [8,14]
+	end
 end
 
 describe Tennis, "#as_string" do

metadata

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