tic_tac_toe_nhu 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9d9d16f137592a3f7a289e6438f7f6da7cf3058
-  data.tar.gz: 127b37245247e3bddbb54ac8f4470fa837041797
+  metadata.gz: ad5f41218a6c0fbe21ea418aae195ede891e00c8
+  data.tar.gz: 72979a92b1f8ffc400aa6ccd1d587c386ec3f4c6
 SHA512:
-  metadata.gz: 7616a935a87c09b5b3031ed5e9de4f48c5cd949a088f881efdb51b0ae880600a4ccf63ef055302e46f1eab2896368a5dacfff50401f9a5da6d98e43921416de0
-  data.tar.gz: 7f2886491f0f0acec8094d466120fddedfb202835052df2cbcf9ed1d82a688a4eb0bfdaaca10c5a6670ecfa7de93608dd5034c3627f01b1a4a922734294b60b8
+  metadata.gz: 96b3da857ffaf1e25cb8b76c62f547aebee2f5effbc5cc801649494b9aeb951f97efc83733cff092f6400002ed2b39d0c583fc419741b50a6931559801545251
+  data.tar.gz: fdc55c56a5a3c22da80712bcbb852f24806ffec263e37c8590b44957b87139ef0afd5dce96abf97762f763943eaae64e7dbdd1e3fbeeb421af04a498f795030b

data/coverage/.resultset.json

@@ -1,107 +1,6 @@
 {
   "RSpec": {
     "coverage": {
-      "/Users/nhunguyen/Documents/Ruby/tictactoe/lib/tic_tac_toe/board.rb": [
-        1,
-        1,
-        null,
-        null,
-        1,
-        1,
-        null,
-        1,
-        119,
-        119,
-        null,
-        null,
-        1,
-        120,
-        120,
-        120,
-        null,
-        null,
-        1,
-        3380,
-        3377,
-        3377,
-        null,
-        3,
-        null,
-        null,
-        null,
-        1,
-        3070,
-        null,
-        null,
-        1,
-        2244,
-        null,
-        null,
-        1,
-        26,
-        null,
-        null,
-        1,
-        8643,
-        25929,
-        null,
-        null,
-        null,
-        1,
-        8640,
-        8640,
-        null,
-        233280,
-        25920,
-        null,
-        8640,
-        null,
-        null,
-        1,
-        8640,
-        8640,
-        8640,
-        null,
-        null,
-        1,
-        3898,
-        3898,
-        35082,
-        null,
-        3898,
-        null,
-        null,
-        1,
-        1,
-        38462,
-        38460,
-        null,
-        9667,
-        null,
-        null,
-        1,
-        38462,
-        38461,
-        38460,
-        null,
-        null,
-        1,
-        38460,
-        null,
-        null,
-        1,
-        8640,
-        77760,
-        null,
-        8640,
-        null,
-        null,
-        1,
-        86400,
-        null,
-        null,
-        null
-      ],
       "/Users/nhunguyen/Documents/Ruby/tictactoe/lib/tic_tac_toe/game_factory.rb": [
         1,
         1,
@@ -110,11 +9,11 @@
         1,
         1,
         1,
-        11,
+        13,
         null,
         null,
         1,
-        4,
+        6,
         null,
         null,
         1,
@@ -135,26 +34,22 @@
         1,
         1,
         1,
-        1,
-        1,
         null,
         null,
         1,
         2,
-        2,
-        2,
         null,
         null,
         1,
         1,
-        1,
-        1,
         null,
         null,
         1,
         1,
+        null,
+        null,
         1,
-        1,
+        5,
         null,
         null,
         null
@@ -202,216 +97,40 @@
         null,
         null
       ],
-      "/Users/nhunguyen/Documents/Ruby/tictactoe/lib/tic_tac_toe/rules.rb": [
-        1,
-        1,
-        1,
-        73,
-        null,
-        null,
-        1,
-        3080,
-        1922,
-        1605,
-        null,
-        null,
-        1,
-        321,
-        null,
-        null,
-        1,
-        13528,
-        null,
-        null,
-        1,
-        1,
-        8638,
-        164366,
-        null,
-        null,
-        null,
-        1,
-        8638,
-        null,
-        null,
-        null
-      ],
-      "/Users/nhunguyen/Documents/Ruby/tictactoe/lib/tic_tac_toe/player_factory.rb": [
-        1,
-        1,
-        1,
-        null,
-        1,
-        1,
-        null,
-        1,
-        4,
-        null,
-        null,
-        1,
-        4,
-        4,
-        null,
-        null,
-        null
-      ],
-      "/Users/nhunguyen/Documents/Ruby/tictactoe/lib/tic_tac_toe/strategy/minimax.rb": [
-        1,
-        null,
-        1,
-        1,
-        1,
-        1,
-        27,
-        27,
-        27,
-        27,
-        null,
-        null,
-        1,
-        23,
-        3,
-        null,
-        20,
-        20,
-        null,
-        null,
-        null,
-        1,
-        1,
-        1,
-        1,
-        1,
-        null,
-        1,
-        23,
-        23,
-        null,
-        null,
-        1,
-        3,
-        1,
-        null,
-        null,
-        1,
-        1620,
-        1620,
-        3068,
-        3068,
-        3068,
-        3068,
-        null,
-        1620,
-        null,
-        null,
-        1,
-        3068,
-        1468,
-        null,
-        1600,
-        1600,
-        null,
-        null,
-        null,
-        1,
-        3068,
-        null,
-        null,
-        1,
-        1468,
-        1468,
-        320,
-        317,
-        null,
-        null,
-        null,
-        null,
-        1,
-        1920,
-        null,
-        null,
-        1,
-        3227,
-        4688,
-        null,
-        null,
-        null,
-        1,
-        null,
-        null
-      ],
-      "/Users/nhunguyen/Documents/Ruby/tictactoe/lib/tic_tac_toe/strategy/console_user.rb": [
-        1,
-        1,
-        1,
-        null,
-        1,
-        7,
-        7,
-        null,
-        null,
+      "/Users/nhunguyen/Documents/Ruby/tictactoe/lib/tic_tac_toe/main.rb": [
         1,
-        3,
-        null,
-        3,
-        5,
-        5,
-        null,
-        null,
-        3,
-        null,
-        null,
         1,
         1,
         null,
-        null,
-        null,
-        null
-      ],
-      "/Users/nhunguyen/Documents/Ruby/tictactoe/lib/tic_tac_toe/player.rb": [
         1,
         1,
         1,
         null,
         1,
-        50,
-        50,
-        50,
+        12,
+        12,
+        12,
         null,
         null,
         1,
-        5,
+        12,
+        12,
+        12,
+        12,
+        12,
         null,
         null,
-        null
-      ],
-      "/Users/nhunguyen/Documents/Ruby/tictactoe/lib/tic_tac_toe/main.rb": [
-        1,
-        1,
-        1,
-        null,
         1,
         1,
+        13,
+        13,
+        13,
         1,
-        null,
-        1,
-        14,
-        14,
-        14,
-        null,
-        null,
         1,
-        11,
-        11,
-        11,
         null,
-        11,
-        11,
-        11,
         null,
         null,
         1,
-        1,
         7,
         7,
         7,
@@ -423,9 +142,9 @@
         null,
         null,
         1,
+        12,
+        12,
         11,
-        11,
-        10,
         null,
         1,
         null,
@@ -441,8 +160,8 @@
         1,
         null,
         1,
-        13,
-        13,
+        14,
+        14,
         null,
         null,
         1,
@@ -454,10 +173,14 @@
         null,
         null,
         1,
-        3,
-        3,
-        3,
-        3,
+        5,
+        5,
+        5,
+        5,
+        4,
+        null,
+        1,
+        null,
         null,
         null,
         1,
@@ -487,16 +210,25 @@
         null,
         null,
         1,
-        3,
-        3,
-        12,
+        5,
+        5,
+        20,
         null,
-        3,
+        5,
+        null,
+        null,
+        1,
+        20,
+        null,
+        null,
+        1,
+        40,
+        20,
         null,
         null,
         null
       ]
     },
-    "timestamp": 1372702698
+    "timestamp": 1374084056
   }
 }

data/lib/tic_tac_toe/board.rb

@@ -21,7 +21,7 @@ module TicTacToe
         squares[move] = value
         @unique_marked_values << value if !@unique_marked_values.include?(value)
       else
-        raise MoveNotAvailableError
+        raise MoveNotAvailableError.new("#{value} is trying to move at #{move}. available_moves: #{available_moves.inspect}")
       end
     end
 
@@ -67,6 +67,14 @@ module TicTacToe
       result
     end
 
+    def clone
+      board_copy = self.class.new
+      squares.each_with_index do |value, index|
+        board_copy.mark(index, value) if value
+      end
+      board_copy
+    end
+
     private
     def move_available?(move)
       return false if out_of_range?(move)
@@ -78,7 +86,6 @@ module TicTacToe
     def out_of_range?(move)
       return true if move < 0
       return true if move >= squares.size
-      return false
     end
 
     def marked?(move)

data/lib/tic_tac_toe/game_factory.rb

@@ -9,7 +9,7 @@ module TicTacToe
     end
 
     def types
-      ["You vs Computer", "Computer vs You", "You vs Friend", "Computer vs Computer"]
+      [[:human, :computer], [:computer, :human], [:human, :human], [:computer, :computer]]
     end
 
     def create(type_index, board)
@@ -29,27 +29,23 @@ module TicTacToe
 
     private
     def computer_human_game(board)
-      computer = @player_factory.computer(board)
-      human = @player_factory.human
-      TicTacToe::Game.new(board, computer, human)
+      create_game(board, @player_factory.computer(board), @player_factory.human)
     end
 
     def human_computer_game(board)
-      computer = @player_factory.computer(board)
-      human = @player_factory.human
-      TicTacToe::Game.new(board, human, computer)
+      create_game(board, @player_factory.human, @player_factory.computer(board))
     end
 
     def human_human_game(board)
-      human1 = @player_factory.human
-      human2 = @player_factory.human("Friend", "O")
-      TicTacToe::Game.new(board, human1, human2)
+      create_game(board, @player_factory.human, @player_factory.human("Friend", "O"))
     end
 
     def computer_computer_game(board)
-      computer1 = @player_factory.computer(board, "X", "O")
-      computer2 = @player_factory.computer(board, "O", "X")
-      TicTacToe::Game.new(board, computer1, computer2)
+      create_game(board, @player_factory.computer(board, "X", "O"), @player_factory.computer(board, "O", "X"))
+    end
+
+    def create_game(board, player1, player2)
+      TicTacToe::Game.new(board, player1, player2)
     end
   end
 end

data/lib/tic_tac_toe/main.rb

@@ -14,15 +14,22 @@ module TicTacToe
 
     def start
       @ui.display_welcome_message
-      game_type = @ui.game_type
-      @game = @game_factory.create(game_type, @board)
-
+      @game = create_game
       play until @game.over?
       @ui.display_board(@board)
       display_result
     end
 
     private
+    def create_game
+      game_type = @ui.game_type
+      begin
+        @game_factory.create(game_type, @board)
+      rescue ArgumentError
+        create_game
+      end
+    end
+
     def play
       @ui.display_board(@board)
       player = @game.current_player

data/lib/tic_tac_toe/strategy/minimax.rb

@@ -7,16 +7,12 @@ module TicTacToe
         @board = board
         @player = player
         @opponent = opponent
-        @rules = TicTacToe::Rules.new(@board)
       end
 
       def move
-        if first_move?
-          first_move
-        else
-          move = minimax(@player)
-          move.move
-        end
+        return first_move if first_move?
+        move = minimax(@player, @board)
+        move.move
       end
 
       private
@@ -35,22 +31,22 @@ module TicTacToe
         0
       end
 
-      def minimax(player)
+      def minimax(player, board)
         moves = []
-        @board.available_moves.each do |move|
-          @board.mark(move, player)
-          moves << player_move(player, move)
-          @board.clear(move)
+        board.available_moves.each do |move|
+          clone_board = board.clone
+          clone_board.mark(move, player)
+          moves << player_move(player, move, clone_board)
           found_best_move?(moves[-1])
         end
         best_move(moves)
       end
 
-      def player_move(player, move)
-        if @rules.game_over?
-          PlayerMove.new(move, score(player), 0)
+      def player_move(player, move, board)
+        if rules(board).game_over?
+          PlayerMove.new(move, score(player, board), 0)
         else
-          child_move = minimax(opponent(player))
+          child_move = minimax(opponent(player), board)
           PlayerMove.new(move, -child_move.score, child_move.depth += 1)
         end
       end
@@ -59,13 +55,11 @@ module TicTacToe
         move.score == WINNING_SCORE and move.depth == 0
       end
 
-      def score(player)
-        winner = @rules.winner
+      def score(player, board)
+        winner = rules(board).winner
         return WINNING_SCORE if winner == player
         return LOSING_SCORE if winner == opponent(player)
-        return TIE if @rules.tied?
-
-        nil
+        return TIE if rules(board).tied?
       end
 
       def opponent(player)
@@ -76,6 +70,10 @@ module TicTacToe
         sorted_moves = moves.sort{ |a, b| [a.score, a.depth] <=> [b.score, b.depth]}
         sorted_moves.max_by {|m| m.score}
       end
+
+      def rules(board)
+        TicTacToe::Rules.new(board)
+      end
     end
 
     PlayerMove = Struct.new(:move, :score, :depth)

data/lib/tic_tac_toe/ui/console.rb

@@ -17,10 +17,14 @@ module TicTacToe
     end
 
     def game_type
-      @output.puts("Please select a game type.")
+      @output.puts("Please enter a game type from the list.")
       @output.puts(game_type_list)
       type = @input.gets
-      type.to_i
+      if type =~ /\d/
+        type.to_i
+      else
+        game_type
+      end
     end
 
     def display_winner(winner)
@@ -28,7 +32,7 @@ module TicTacToe
     end
 
     def display_tied_game
-      @output.puts("It's a tied!")
+      @output.puts("Tied!")
     end
 
     def display_square_not_available
@@ -52,9 +56,18 @@ module TicTacToe
     def game_type_list
       result = ""
       TicTacToe::GameFactory.new.types.each_with_index do |value, index|
-        result << "#{index + 1} - #{value}\n"
+        result << "#{index + 1} - #{game_type_values(value)}\n"
       end
       result
     end
+
+    def game_type_values(types)
+      "#{player_type(types[0])} vs #{player_type(types[1])}"
+    end
+
+    def player_type(type)
+      return "Human" if type == :human
+      return "Computer" if type == :computer
+    end
   end
 end

data/spec/integration/tictactoe/tic_tac_toe.rb

@@ -1,7 +1,4 @@
-$LOAD_PATH << File.expand_path('../../lib', __FILE__)
-require 'tic_tac_toe'
-require 'tic_tac_toe/mock/player'
+describe "all situations" do
 
-player = MockPlayer.new([8, 6, 3])
-game = TicTacToe::GameFactory.computer_user_game
-game.start
+
+end

data/spec/integration/tictactoe/unbeatable_computer_spec.rb

@@ -0,0 +1,58 @@
+require 'tic_tac_toe/board'
+require 'tic_tac_toe/rules'
+require 'tic_tac_toe/player_factory'
+
+class SimpleStrategy
+  attr_accessor :next_move
+
+  def move
+    next_move
+  end
+end
+
+describe "Unbeatable computer", :slow_test => true  do
+  before(:each) do
+    @board = TicTacToe::Board.new
+    @human_value = "X"
+  end
+
+  it "wins all game when computer goes first" do
+    make_computer_move(@board)
+    make_move(@board, [])
+  end
+
+  it "wins all game when human goes first" do
+    make_move(@board, [])
+  end
+
+  def make_computer_move(clone_board)
+    computer = TicTacToe::PlayerFactory.new.computer(clone_board)
+    clone_board.mark(computer.move, computer.value)
+    clone_board
+  end
+
+  def rules(board)
+    TicTacToe::Rules.new(board)
+  end
+
+  def make_move(board, move_history)
+    if rules(board).game_over?
+      print "."
+      if rules(board).winner == @human_value
+        print move_history
+        raise "Human wins."
+      end
+    else
+      board.available_moves.each do |move|
+        move_history << move
+        cloned_board = board.clone
+        cloned_board.mark(move, "X")
+        make_computer_move(cloned_board) if !rules(cloned_board).game_over?
+        make_move(cloned_board, move_history)
+        move_history.delete(move)
+      end
+    end
+  end
+
+
+end

data/spec/mocks/game.rb

@@ -9,3 +9,9 @@ class MockGame
   define :winner
   define(:over?){true}
 end
+
+describe TicTacToe::Game do
+  it "checks MockGame" do
+    MockGame.should be_substitutable_for(TicTacToe::Game)
+  end
+end

data/spec/mocks/game_factory.rb

@@ -6,3 +6,9 @@ class MockGameFactory
   define :types
   define(:create) {|type, board|}
 end
+
+describe TicTacToe::GameFactory do
+  it "checks game factory" do
+    MockGameFactory.should be_substitutable_for(TicTacToe::GameFactory)
+  end
+end

data/spec/mocks/player_factory.rb

@@ -6,3 +6,9 @@ class MockPlayerFactory
   define(:human) {|name = "Sue", value = "X"|}
   define(:computer) {|board, value = "X", opponent="O"|}
 end
+
+describe TicTacToe::PlayerFactory do
+  it "checks mock player" do
+    MockPlayerFactory.should be_substitutable_for(TicTacToe::PlayerFactory)
+  end
+end

data/spec/mocks/rules.rb

@@ -7,3 +7,9 @@ class MockRules
   define(:tied?)
   define(:winner)
 end
+
+describe TicTacToe::Rules do
+  it "checks if mock rules is substitutable" do
+    MockRules.should be_substitutable_for(TicTacToe::Rules)
+  end
+end

data/spec/mocks/ui/console.rb

@@ -13,3 +13,9 @@ class MockConsole
   define :display_square_not_available
   define(:display_player_turn) {|player|}
 end
+
+describe TicTacToe::Console do
+  it "checks console" do
+    MockConsole.should be_substitutable_for(TicTacToe::Console)
+  end
+end

data/spec/tic_tac_toe/board_spec.rb

@@ -165,7 +165,7 @@ describe TicTacToe::Board do
     it "returns two marks when two user marks the board" do
       @board.mark(4, "X")
       @board.mark(0, "O")
-      @board.unique_marked_values.should == ["X", "O"]
+      @board.unique_marked_values.should =~ ["X", "O"]
     end
 
     it "returns one mark even though user marks the board twice" do
@@ -176,6 +176,30 @@ describe TicTacToe::Board do
 
   end
 
+  describe "creating a copy of the board" do
+    it "is marked on the copy when the original is marked" do
+      @board.mark(4, "X")
+      board_copy = @board.clone
+
+      board_copy.available_moves.should_not include(4)
+    end
+
+    it "is unaffected by changes to the original" do
+      @board.mark(4, "X")
+      board_copy = @board.clone
+      @board.mark(5, "O")
+
+      board_copy.available_moves.should include(5)
+    end
+
+    it "marks the actual value" do
+      @board.mark(4, "X")
+      board_copy = @board.clone
+
+      board_copy.unique_marked_values.should == ["X"]
+    end
+  end
+
   def mark_all_squares
     (0...@size**2).each {|position| @board.mark(position, @player)}
   end

data/spec/tic_tac_toe/game_spec.rb

@@ -8,38 +8,38 @@ describe TicTacToe::Game do
   before(:each) do
     @board = TicTacToe::Board.new
 
-    @todd_strategy = MockDynamicStrategy.new
-    @todd = TicTacToe::Player.new("Todd", "X", @todd_strategy)
+    @player1_strategy = MockDynamicStrategy.new
+    @player1 = TicTacToe::Player.new("Todd", "X", @player1_strategy)
 
-    @john_strategy = MockDynamicStrategy.new
-    @john = TicTacToe::Player.new("John", "O", @john_strategy)
+    @player2_strategy = MockDynamicStrategy.new
+    @player2 = TicTacToe::Player.new("John", "O", @player2_strategy)
 
-    @game = TicTacToe::Game.new(@board, @todd, @john)
+    @game = TicTacToe::Game.new(@board, @player1, @player2)
   end
 
   context "marking board" do
     it "mark the board with user input" do
-      @todd_strategy.add_move(1)
+      @player1_strategy.add_move(1)
       @game.make_move
-      @board.unique_marked_values.should include(@todd.value)
+      @board.unique_marked_values.should include(@player1.value)
     end
 
     it "does not mark the board if user doesn't return an input" do
-      @todd_strategy.add_move(nil)
+      @player1_strategy.add_move(nil)
       @game.make_move
-      @board.unique_marked_values.should_not include(@todd.value)
+      @board.unique_marked_values.should_not include(@player1.value)
     end
   end
 
   describe "return winner player based on the value return from rules" do
     it "is Todd when value is X" do
-      mark_board([0, 1, 2], @todd.value)
-      @game.winner.should == @todd
+      mark_board([0, 1, 2], @player1.value)
+      @game.winner.should == @player1
     end
 
     it "is John when it is O" do
-      mark_board([0, 1, 2], @john.value)
-      @game.winner.should == @john
+      mark_board([0, 1, 2], @player2.value)
+      @game.winner.should == @player2
     end
 
     it "is nil when no one wins" do
@@ -49,25 +49,25 @@ describe TicTacToe::Game do
 
   describe "changes player" do
     it "doesn't change player if player 1 doesn't return a move" do
-      @game.current_player.should == @todd
-      @todd_strategy.add_move(nil)
+      @game.current_player.should == @player1
+      @player1_strategy.add_move(nil)
 
       @game.make_move
-      @game.current_player.should == @todd
+      @game.current_player.should == @player1
     end
 
     it "changes to player 2 after player 1 moves" do
-      @game.current_player.should == @todd
-      @todd_strategy.add_move(1)
+      @game.current_player.should == @player1
+      @player1_strategy.add_move(1)
 
       @game.make_move
-      @game.current_player.should == @john
+      @game.current_player.should == @player2
     end
   end
 
   describe "game over" do
     it "is over when there is a winner" do
-      mark_board([0, 1, 2], @john.value)
+      mark_board([0, 1, 2], @player2.value)
       @game.should be_over
     end
 
@@ -81,11 +81,42 @@ describe TicTacToe::Game do
     end
 
     it "is not over when there is no winner or a tied" do
-      mark_board([1, 2], @todd.value)
+      mark_board([1, 2], @player1.value)
       @game.should_not be_over
     end
   end
 
+  # describe "a copy of the game" do
+  #   it "has the same current player" do
+  #     @player1_strategy.add_move(1)
+  #     @game.make_move
+  #     @game.clone.current_player.should == @game.current_player
+  #   end
+  #
+  #   it "has the same moves previously made" do
+  #     @player1_strategy.add_move(1)
+  #     @game.make_move
+  #     @game.clone.board.available_moves.should_not include(1)
+  #   end
+  #
+  #   it "has the current player unaffected by changes to the original game" do
+  #     clone_game = @game.clone
+  #     @player1_strategy.add_move(1)
+  #     @game.make_move
+  #
+  #     clone_game.current_player.should == @player1
+  #     @game.current_player.should == @player2
+  #   end
+  #
+  #   it "clones the board" do
+  #     clone_game = @game.clone
+  #     @player1_strategy.add_move(1)
+  #     @game.make_move
+  #
+  #     @game.board.available_moves.should_not include(1)
+  #     clone_game.board.available_moves.should include(1)
+  #   end
+  # end
   def mark_board(moves, value)
     moves.each do |m|
       @board.mark(m, value)

data/spec/tic_tac_toe/main_spec.rb

@@ -19,20 +19,6 @@ describe TicTacToe::Main do
     @controller = TicTacToe::Main.new(@ui, @game_factory)
   end
 
-  context "ensure mock class has the same interface" do
-    it "checks MockGame" do
-      MockGame.should be_substitutable_for(TicTacToe::Game)
-    end
-
-    it "checks console" do
-      MockConsole.should be_substitutable_for(TicTacToe::Console)
-    end
-
-    it "checks game factory" do
-      MockGameFactory.should be_substitutable_for(TicTacToe::GameFactory)
-    end
-  end
-
   describe "starts game" do
     it "displays welcome message" do
       @controller.start
@@ -48,6 +34,11 @@ describe TicTacToe::Main do
       @controller.start
       @game_factory.was told_to(:create)
     end
+
+    it "asks ui for game type again if the input is incorrect" do
+      @game_factory.will_create ArgumentError.new, @game
+      @controller.start
+    end
   end
 
   describe "play game" do

data/spec/tic_tac_toe/player_spec.rb

@@ -1,6 +1,6 @@
 require 'tic_tac_toe/spec_helper'
 require 'tic_tac_toe/player'
-require 'tic_tac_toe/strategy/mock'
+require 'mocks/strategy/dynamic'
 
 describe TicTacToe::Player do
 
@@ -18,13 +18,13 @@ describe TicTacToe::Player do
 
   it "gets player's move" do
     move = 4
-    strategy = MockStrategy.new([4])
+    strategy = MockDynamicStrategy.new([4])
     player = TicTacToe::Player.new(nil, nil, strategy)
     player.move.should == move
   end
 
   it "gets strategy" do
-    strategy = MockStrategy.new([4])
+    strategy = MockDynamicStrategy.new([4])
     player = TicTacToe::Player.new(nil, nil, strategy)
     player.strategy.should == strategy
 

data/spec/tic_tac_toe/ui/console_spec.rb

@@ -50,14 +50,14 @@ describe TicTacToe::Console do
 
   context "reading user input for game type" do
     it "displays a list of game type" do
-      expected_display = "1 - You vs Computer\n2 - Computer vs You\n3 - You vs Friend"
+      expected_display = "1 - Human vs Computer\n2 - Computer vs Human\n3 - Human vs Human\n4 - Computer vs Computer"
       @input.string = "1"
       @console.game_type
       @output.string.should match expected_display
     end
 
     it "displays a message asking user to select a game type" do
-      expected_display = "Please select a game type."
+      expected_display = "Please enter a game type from the list."
       @input.string = "1"
       @console.game_type
       @output.string.should match expected_display
@@ -67,6 +67,13 @@ describe TicTacToe::Console do
       @input.string = "1"
       @console.game_type.should == 1
     end
+
+    it "asks for user input again when user enter a character" do
+      expected_display = "Please enter a game type from the list."
+      @input.should_receive(:gets).twice.and_return("a", "1")
+      @console.game_type
+      @output.string.should match expected_display
+    end
   end
 
   it "displays winner" do
@@ -77,7 +84,7 @@ describe TicTacToe::Console do
 
   it "display tied game" do
     @console.display_tied_game
-    @output.string.should == "It's a tied!\n"
+    @output.string.should == "Tied!\n"
   end
 
   it "displays square is not available" do

data/tic_tac_toe_nhu.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'tic_tac_toe_nhu'
-  s.version     = '0.0.2'
+  s.version     = '0.0.3'
   s.date        = '2013-06-11'
   s.summary     = "Tic Tac Toe"
   s.description = "A simple tic tac toe game with AI"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tic_tac_toe_nhu
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nhu Nguyen
@@ -40,6 +40,7 @@ files:
 - lib/tic_tac_toe/strategy/minimax.rb
 - lib/tic_tac_toe/ui/console.rb
 - spec/integration/tictactoe/tic_tac_toe.rb
+- spec/integration/tictactoe/unbeatable_computer_spec.rb
 - spec/mocks/game.rb
 - spec/mocks/game_factory.rb
 - spec/mocks/player_factory.rb
@@ -57,7 +58,6 @@ files:
 - spec/tic_tac_toe/spec_helper.rb
 - spec/tic_tac_toe/strategy/console_user_spec.rb
 - spec/tic_tac_toe/strategy/minimax_spec.rb
-- spec/tic_tac_toe/strategy/mock.rb
 - spec/tic_tac_toe/ui/console_spec.rb
 - tic_tac_toe_nhu.gemspec
 homepage: http://rubygems.org/gems/tic_tac_toe_nhu

data/spec/tic_tac_toe/strategy/mock.rb

@@ -1,19 +0,0 @@
-class MockStrategy
-  attr_accessor :moves
-
-  def initialize(moves = [])
-    @moves = moves
-  end
-
-  def add_move(move)
-    @moves << move
-  end
-
-  def move
-    @moves.shift
-  end
-
-  def needs_input?
-    true
-  end
-end