tennis 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 712dd151385311975555e7760f34efc56cc15bf8
-  data.tar.gz: 300917e8388e055dc66ccf962bade908d432fc63
+  metadata.gz: 92920cd754c3ac7a92528a35692060e8ed472dbe
+  data.tar.gz: 8e91f9f5b0a4c2f4902b4eba2b1bc53204cb50bb
 SHA512:
-  metadata.gz: bc7af490abc900a2b70b236b8f55e28464d4afd1eb12491d325cb371210656f8c6333553df5820962fd191489c81fc47f3319bf025d8b3700e6be7ea4fadd4a0
-  data.tar.gz: bda423a9b124c72699ef9cb59d12e20a9dcc1fd9d7748a9a75cd350cb191c50e59cd3a610d11816a85e1ad737b59c251012f6eb2317e9a60c4b161a67eca4658
+  metadata.gz: 0eaffb4274e0b704fe739ef00127b8084ae5b8f7dacdd31f3f38eae002b42b64c6a9036d0c1039ed47f7da715e36fe9157a70c4502f8137af33a785c21dc02a1
+  data.tar.gz: 0ecc8a77bf85c347177ade9930aa863882c4f11a14dadee09b013ad60663da176d841c5c0c529c3c6a7c3959d27d3a46cabb35cfb24304cbc3ba074f5ae4b283

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in tennis.gemspec
 gemspec
+
+gem "codeclimate-test-reporter", group: :test, require: nil

data/Makefile

@@ -5,5 +5,8 @@ all:
 build:
 	gem build tennis.gemspec
 
+irb:
+	irb -Ilib -rtennis
+
 # to push to rubygems
 #	gem push tennis-0.1.1.gem

data/README.md

@@ -1,6 +1,6 @@
 # Tennis
 
-[![Gem Version](https://badge.fury.io/rb/tennis.svg)](http://badge.fury.io/rb/tennis) [![Build Status](https://travis-ci.org/racketlogger/tennis.svg)](https://travis-ci.org/racketlogger/tennis)
+[![Gem Version](https://badge.fury.io/rb/tennis.svg)](http://badge.fury.io/rb/tennis) [![Build Status](https://travis-ci.org/racketlogger/tennis.svg)](https://travis-ci.org/racketlogger/tennis) [![Code Climate](https://codeclimate.com/github/racketlogger/tennis/badges/gpa.svg)](https://codeclimate.com/github/racketlogger/tennis) [![Test Coverage](https://codeclimate.com/github/racketlogger/tennis/badges/coverage.svg)](https://codeclimate.com/github/racketlogger/tennis)
 
 Ruby gem with utilities to manage, print and validate tennis scores
 

data/lib/tennis/version.rb

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

data/lib/tennis.rb

@@ -6,7 +6,7 @@ class Tennis
     @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? || score == 0 }
+      @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
@@ -24,21 +24,13 @@ class Tennis
   # to_s
   # return the score in string format
   def to_s
-    score = []
-    (0...@scores.length).step(2).each do |i|
-      score << [@scores[i], @scores[i+1]].join('-')
-    end
-    score.join(', ')
+    (0...@scores.length).step(2).map{ |i| [@scores[i], @scores[i+1]].join('-') }.join(', ')
   end
 
   # flip score ( P1-P2 to P2-P1)
-  # returns the flipped score in string
+  # returns the flipped score as a string
   def flipped
-    flipped_score = []
-    (0...@scores.length).step(2).each do |i|
-      flipped_score << [@scores[i+1], @scores[i]].join('-')
-    end
-    flipped_score.join(', ')
+    (0...@scores.length).step(2).map{ |i| [@scores[i+1], @scores[i]].join('-') }.join(', ')
   end
 
   # returns who won the match
@@ -48,7 +40,7 @@ class Tennis
   # 2 (player-2 won)
   def winner
     return @result if @result != :default
-    return @result = (@scores.length == 4) ? two_sets : three_sets
+    @result = (@scores.length == 4) ? two_sets : three_sets
   end
 
   # returns an array of points
@@ -57,7 +49,7 @@ class Tennis
   def points
     @result = winner
     (return [0, 0]) if @result == :error
-    return (complete_match_points if @result == 1 || @result == 2) || incomplete_match_points
+    (complete_match_points if @result == 1 || @result == 2) || incomplete_match_points
   end
 
   private
@@ -76,7 +68,7 @@ class Tennis
       end
     end
     # incomplete match e.g: 6-4,5-3
-    return (set_results[0] if set_results[0] == set_results[1]) || :incomplete_match
+    (set_results[0] if set_results[0] == set_results[1]) || :incomplete_match
   end
 
   # helper method: called by RESULT method for valid matches with 3 sets
@@ -95,7 +87,7 @@ class Tennis
     # 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]
-    return  set_results.count(1) == 2 ? 1 : 2
+    set_results.count(1) == 2 ? 1 : 2
   end
 
   # helper method: called by POINTS for complete matches
@@ -106,7 +98,7 @@ class Tennis
     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
+    points
   end
 
   # helper method: called by POINTS for incomplete matches
@@ -116,7 +108,7 @@ class Tennis
     player_2_points = player_points(2)
     points[0] = player_1_points < 10 ? player_1_points : 10
     points[1] = player_2_points < 10 ? player_2_points : 10
-    return points
+    points
   end
 
   # helper method: returns the POINTS of a player given the player number
@@ -124,6 +116,6 @@ class Tennis
     player_scores = []
     @scores.each_with_index { |score, index| (player_scores << score; player +=2) if index == (player - 1) }
     player_scores = player_scores.sort! { |x, y| y <=> x }
-    return player_scores[0] + player_scores[1]
+    player_scores[0] + player_scores[1]
   end
 end

data/spec/spec_helper.rb

@@ -17,6 +17,10 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
+
+
 require 'bundler/setup'
 Bundler.setup
 require 'tennis'

data/spec/tennis_spec.rb

@@ -101,9 +101,28 @@ describe Tennis, "#points" do
 	end
 
 	it "checks invalid score: blank score '' " do
-		pending
 		score = Tennis.new("")
-		expect(score.points).to eq :error
+		expect(score.points).to eq [0,0]
+	end
+end
+
+describe Tennis, "#as_string" do
+	it "normalizes scores to a string properly formatted" do
+		scores = [["6-4,4-6, 6-4", "6-4, 4-6, 6-4"], [" 4-6,     4-6 ", "4-6, 4-6"],
+		 	[" 4 -6,     4- 6 ", "4-6, 4-6"], [" 0 - 6,     6    - 0,  3 -   6 ", "0-6, 6-0, 3-6"]]
+		scores.each do |s|
+			ts = Tennis.new(s[0])
+			expect(ts.to_s).to eq s[1]
+		end
 	end
+end
 
+describe Tennis, "#flipped" do
+	it "returns a normalized scores, but flipped" do
+		scores = [["6-4, 4-6, 6-4", "4-6, 6-4, 4-6"], ["6-4, 7-6", "4-6, 6-7"]]
+		scores.each do |s|
+			ts = Tennis.new(s[0])
+			expect(ts.flipped).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.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Rohan Katyal
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler