tennis 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cae2bc8246ef286862dcaf50932dc0c6163fabb
-  data.tar.gz: 1a45d035f3c072e9e81ba11c55c235205dc0d74b
+  metadata.gz: a4965dfe7cf8388b7e4fd98dcca47d60f970fe61
+  data.tar.gz: 0cbe367e8353bfd785c806c699dea34afd7952ce
 SHA512:
-  metadata.gz: 9be5f61f35b63d700bab8a3a5460326b8c7b5aaa22599b10db2385166d0b67bfa4d7a968de09f577d26f64e4776011bb7a43ae8c04dd16878fb12bc230775c7f
-  data.tar.gz: 9d4f9ac6eef4d75d9982e6ce9af31f029ae1acc13e4a1051d0c40f000d48b374b59adca29cd40caf62c450b6ce181bdee9ec5cd388995bc5914cfc8ad5a81450
+  metadata.gz: e7df702d79a93dc6cef85d1a016d9c4049e4eb6d0d9e94ee168e75ec3e47feeb0c37066ef04c9ba15388d9b65347633aa32b282b3c4ec4c2ea38c1519ae44bea
+  data.tar.gz: 3468b6ba2e86653b1414ba007a6a2b163d336f2c8231a57fc9f4ba24a355d6cac85ec910cb08025950ea3ecde14555351b35351fb40adb8013e325637bb3844e

data/Makefile

@@ -1,15 +1,16 @@
 
-VERSION=0.3.0
+# NOTE: this needs to be changed in lib/tennis/version.rb at the same time!
+VERSION=0.4.0
 
 all:
-	rake spec
+	bundle exec rake spec
 
 build:
-	gem build tennis.gemspec
+	bundle exec gem build tennis.gemspec
 
 irb:
-	irb -Ilib -rtennis
+	bundle exec irb -Ilib -rtennis
 
 # to push to rubygems
 push:
-	gem push tennis-$(VERSION).gem
+	bundle exec gem push tennis-$(VERSION).gem

data/lib/tennis.rb

@@ -7,28 +7,67 @@ class Tennis
   # sets_won/lost is an array: [sets won/lost by 0, sets won/lost by 1]
   # games_won/lost is an array: [games won/lost by 0, games won/lost by 1]
 
+  # representation of defaults:
+  #
+  # p0-<reason> means player 0 won, e.g. p0-win-by-forfeit
+  # p1-<reason> means player 1 won
+  #
+  # the reason is ignored for the purposes of this gem.
+  # possible reason fields are: win-by-forfeit, win-by-retired, win-by-no-show
+  #
+
   attr_reader :winner, :sets_won, :sets_lost, :games_won, :games_lost
 
   def initialize(score)
-    # dfh -> default win for home player(0)
-    # dfa -> default win for away player(1)
+    # check if it's a default first:
+    if score =~ /^p/
+      process_default(score)
+      @default = true
+      return
+    end
+    @default = false
     process_score(score)
   end
 
   # to_s
   # return the score in string format
   def to_s
-    @score.map{|set| set.join('-') }.join(', ')
+    @default ? "Default" : @score.map{|set| set.join('-') }.join(', ')
   end
 
   # flip score ( P1-P2 to P2-P1)
   # returns the flipped score as a string
   def flipped
-    @score.map{|set| set.reverse.join('-') }.join(', ')
+    @default ? "Default" : @score.map{|set| set.reverse.join('-') }.join(', ')
+  end
+
+  def score
+    @default ? "Default" : @score
+  end
+
+  def default?
+    @default
   end
 
   private
 
+  def process_default(default)
+    @score = default
+    if default =~ /p0-win/
+      # process as 6-0, 6-0
+      @winner = 0
+      @sets_won, @sets_lost = [[2, 0], [0, 2]]
+      @games_won, @games_lost = [[12, 0], [0, 12]]
+    elsif default =~ /p1-win/
+      # process as 0-6, 0-6
+      @winner = 1
+      @sets_won, @sets_lost = [[0, 2], [2, 0]]
+      @games_won, @games_lost = [[0, 12], [12, 0]]
+    else
+      raise "Invalid default score report: '#{default}'"
+    end
+  end
+
   def process_score(score, best_of=3)
     begin
       sets = score.split(/,/)

data/lib/tennis/version.rb

@@ -1,3 +1,4 @@
 class Tennis
-	VERSION = "0.3.0"
+	# NOTE: this needs to be changed in the Makefile at the same time!
+	VERSION = "0.4.0"
 end

data/spec/tennis_spec.rb

@@ -32,10 +32,24 @@ describe Tennis, "#scores" do
 		expect(score.winner).to eq 0
 	end
 
+	it "finds the winner properly in three sets with last set to 7-5" do
+		score = Tennis.new("6-4, 6-7, 7-5")
+		expect(score.winner).to eq 0
+	end
+
+	it "finds the winner properly in three sets with last set to 8-6" do
+		score = Tennis.new("6-4, 6-7, 8-6")
+		expect(score.winner).to eq 0
+	end
+
 	it "report error is the last set is off by more than 2" do
 		expect { Tennis.new("6-4, 6-7, 18-15") }.to raise_error
 	end
 
+	it "report error is the last set is off by more than 2" do
+		expect { Tennis.new("6-4, 6-7, 8-7") }.to raise_error
+	end
+
 	it "reports incomplete match score (set 1-1)" do
 		expect { Tennis.new("6-4,4-6") }.to raise_error
 	end
@@ -118,3 +132,26 @@ describe Tennis, "#games_lost" do
 		end
 	end
 end
+
+describe Tennis, "#defaults" do
+	it "finds the winner properly in a default" do
+		score = Tennis.new("p0-win-by-something")
+		expect(score.winner).to eq 0
+		expect(score.sets_won).to eq [2, 0]
+		expect(score.games_won).to eq [12, 0]
+		expect(score.to_s).to eq "Default"
+	end
+
+	it "finds the winner properly in a default" do
+		score = Tennis.new("p1-win-by-something")
+		expect(score.winner).to eq 1
+		expect(score.sets_won).to eq [0, 2]
+		expect(score.games_won).to eq [0, 12]
+		expect(score.to_s).to eq "Default"
+	end
+
+	it "reports some error in a bad default" do
+		expect { Tennis.new("p2-blah") }.to raise_error
+	end
+
+end

metadata

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