From 5973e81504178068f5bdaf4b8a36819b5a55c9e8 Mon Sep 17 00:00:00 2001 From: Sebastian Bachmann Date: Sun, 18 Nov 2012 12:16:12 +0100 Subject: [PATCH 1/5] Assignment 1 - Panda Level: Changed the to_s method to show Q5 instead of 5-queen --- blackjack.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/blackjack.rb b/blackjack.rb index b6dcda9..86d3afa 100644 --- a/blackjack.rb +++ b/blackjack.rb @@ -14,7 +14,8 @@ def value end def to_s - "#{@value}-#{suit}" + # "#{@value}-#{suit}" + "#{suit[0].upcase}#{@value}" end end From fa2c9829a93029dab91d39cff409243be44c743c Mon Sep 17 00:00:00 2001 From: Sebastian Bachmann Date: Sun, 18 Nov 2012 12:45:44 +0100 Subject: [PATCH 2/5] code cleanup --- blackjack.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/blackjack.rb b/blackjack.rb index 86d3afa..eefb506 100644 --- a/blackjack.rb +++ b/blackjack.rb @@ -14,7 +14,6 @@ def value end def to_s - # "#{@value}-#{suit}" "#{suit[0].upcase}#{@value}" end From a37b183a22cdadabae0d5089f63912fcc5710429 Mon Sep 17 00:00:00 2001 From: Sebastian Bachmann Date: Sun, 18 Nov 2012 13:13:32 +0100 Subject: [PATCH 3/5] test changed --- blackjack.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/blackjack.rb b/blackjack.rb index eefb506..d5d3fa7 100644 --- a/blackjack.rb +++ b/blackjack.rb @@ -75,6 +75,9 @@ def initialize def hit @player_hand.hit!(@deck) + if @player_hand.value > 21 + self.stand + end end def stand @@ -135,7 +138,7 @@ def inspect it "should be formatted nicely" do card = Card.new(:diamonds, "A") - card.to_s.should eq("A-diamonds") + card.to_s.should eq("DA") end end From 8c2ae91e026f52a9a19b44e50a5e42cdf4d34b7c Mon Sep 17 00:00:00 2001 From: Sebastian Bachmann Date: Sun, 18 Nov 2012 13:35:23 +0100 Subject: [PATCH 4/5] Assignment 2 - Tiger Level done. --- blackjack.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/blackjack.rb b/blackjack.rb index d5d3fa7..c13d624 100644 --- a/blackjack.rb +++ b/blackjack.rb @@ -228,6 +228,14 @@ def inspect game.status[:winner].should_not be_nil end + it "should #stand if the player busts" do + game = Game.new + unless game.status[:player_value] < 21 + game.hit + end + game.status[:winner].should_not nil + end + describe "#determine_winner" do it "should have dealer win when player busts" do Game.new.determine_winner(22, 15).should eq(:dealer) From 15961a6a1fdd3e6a79fee60409a0f8f2f41c8d04 Mon Sep 17 00:00:00 2001 From: Sebastian Bachmann Date: Sun, 18 Nov 2012 13:39:57 +0100 Subject: [PATCH 5/5] fixed typo --- blackjack.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blackjack.rb b/blackjack.rb index c13d624..1ff5041 100644 --- a/blackjack.rb +++ b/blackjack.rb @@ -228,7 +228,7 @@ def inspect game.status[:winner].should_not be_nil end - it "should #stand if the player busts" do + it "should stand if the player busts" do game = Game.new unless game.status[:player_value] < 21 game.hit