tic_tac_toe_nhu 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ce848a6a1b98e49fe1ed21d164699803a9b4833
-  data.tar.gz: 59ec4617389b657d7cfb61c494af0aacf3efeefe
+  metadata.gz: 8f1770dfd1f3fd4f446e2d8ccb4d31e023ef4986
+  data.tar.gz: d3d62e4b846be464fcf0343e7d3decc94c6afeca
 SHA512:
-  metadata.gz: e7a2aeda27b4a5aec06a1103bb11a3d09a013266fcd4feabb27f8a3b10a734e6e6c0492a9196fd1dfe6d4ac8508e79c191ffbfe8d4a9954217fd09e3d2f834bd
-  data.tar.gz: 874c77c1609da0cc49cf0d46cc12b056f46ae89d5a4400d88962e60d2daece1d12f70f5b079ab9cea5c73d48835b13cd6d3e0e3ef2668b1eb937ac26793444a5
+  metadata.gz: ad5258407ba0594a5988b1bbdb9a25ba0341da84746d61444ef0e906d913e98775ff3f7c20092e675d96ee86ba9b98fc938ce149c1d26ee2443959ef4532d667
+  data.tar.gz: 90f0131d85e62ef241ca81aafb2e65d50288e80b2f7765c6124a7b7c4cee7e6a0eabfdd50f509433c7786b3e3a0b123fe8d339071cead8e343dfc8606810e519

data/bin/tic_tac_toe

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 $LOAD_PATH << File.expand_path('../../lib', __FILE__)
-require 'tic_tac_toe/main'
+require 'tic_tac_toe/game'
 
-game = TicTacToe::Main.new
+game = TicTacToe::Game.new
 game.start

data/coverage/.last_run.json

@@ -1,5 +1,5 @@
 {
   "result": {
-    "covered_percent": 100.0
+    "covered_percent": 91.14
   }
 }

data/coverage/.resultset.json

@@ -1,234 +1,149 @@
 {
   "RSpec": {
     "coverage": {
-      "/Users/nhunguyen/Documents/Ruby/tictactoe/lib/tic_tac_toe/game_factory.rb": [
+      "/Users/nhunguyen/Documents/Ruby/tictactoe/lib/tic_tac_toe/rules.rb": [
         1,
         1,
         1,
-        null,
-        1,
-        1,
-        1,
-        13,
+        30,
         null,
         null,
         1,
-        6,
+        8,
+        3,
+        3,
         null,
         null,
         1,
-        6,
+        4,
         null,
-        2,
         null,
         1,
+        77,
         null,
-        1,
         null,
         1,
-        null,
         1,
+        47,
+        734,
         null,
         null,
         null,
         1,
-        1,
-        1,
-        null,
-        null,
-        1,
-        2,
-        null,
-        null,
-        1,
-        1,
-        null,
-        null,
-        1,
-        1,
-        null,
-        null,
-        1,
-        5,
+        47,
         null,
         null,
         null
       ],
-      "/Users/nhunguyen/Documents/Ruby/tictactoe/lib/tic_tac_toe/game.rb": [
-        1,
-        null,
+      "/Users/nhunguyen/Documents/Ruby/tictactoe/lib/tic_tac_toe/board.rb": [
         1,
         1,
-        1,
-        null,
-        1,
-        16,
-        16,
-        16,
-        16,
         null,
         null,
         1,
-        4,
-        4,
-        2,
-        2,
-        null,
-        null,
-        null,
         1,
-        4,
-        null,
         null,
         1,
-        3,
+        30,
+        30,
         null,
         null,
         1,
-        1,
-        2,
+        30,
+        30,
+        30,
         null,
         null,
         1,
-        3,
-        2,
+        107,
+        107,
+        107,
         null,
+        0,
         null,
         null,
-        null
-      ],
-      "/Users/nhunguyen/Documents/Ruby/tictactoe/lib/tic_tac_toe/main.rb": [
-        1,
-        1,
-        1,
         null,
         1,
-        1,
-        1,
+        0,
         null,
-        1,
-        12,
-        12,
-        12,
         null,
-        null,
-        1,
-        12,
-        12,
-        12,
-        12,
-        12,
-        null,
-        null,
-        1,
-        1,
-        13,
-        13,
-        13,
         1,
-        1,
-        null,
+        5,
         null,
         null,
         1,
-        7,
-        7,
-        7,
-        7,
-        7,
-        1,
-        1,
-        null,
+        0,
         null,
         null,
         1,
-        12,
-        12,
-        11,
+        47,
+        141,
         null,
-        1,
-        null,
-        null,
-        null,
-        null,
-        null
-      ],
-      "/Users/nhunguyen/Documents/Ruby/tictactoe/lib/tic_tac_toe/ui/console.rb": [
-        1,
         null,
-        1,
-        1,
         null,
         1,
-        14,
-        14,
+        47,
+        47,
         null,
+        1269,
+        141,
         null,
-        1,
-        1,
+        47,
         null,
         null,
         1,
-        4,
+        47,
+        47,
+        47,
         null,
         null,
         1,
         5,
         5,
-        5,
-        5,
-        4,
-        null,
-        1,
+        45,
         null,
+        5,
         null,
         null,
         1,
-        1,
-        null,
+        0,
+        0,
+        0,
         null,
-        1,
-        1,
+        0,
         null,
         null,
         1,
         1,
+        152,
+        152,
         null,
-        null,
-        1,
-        1,
+        134,
         null,
         null,
         1,
-        1,
-        4,
-        4,
-        21,
-        21,
-        null,
-        4,
+        152,
+        152,
         null,
         null,
         1,
-        5,
-        5,
-        20,
-        null,
-        5,
+        152,
         null,
         null,
         1,
-        20,
+        47,
+        423,
+        null,
+        47,
         null,
         null,
         1,
-        40,
-        20,
+        470,
         null,
         null,
         null
       ]
     },
-    "timestamp": 1374084056
+    "timestamp": 1375217786
   }
 }

data/lib/tic_tac_toe/game.rb

@@ -1,41 +1,62 @@
-require 'tic_tac_toe/rules'
+require 'tic_tac_toe/ui/console'
+require 'tic_tac_toe/game_state_factory'
+require 'tic_tac_toe/board'
 
 module TicTacToe
   class Game
-    attr_reader :current_player, :board
 
-    def initialize(board, player1, player2)
-      @board = board
-      @current_player = @player1 = player1
-      @player2 = player2
-      @rules = TicTacToe::Rules.new(@board)
+    def initialize(ui = TicTacToe::Console.new, game_state_factory = TicTacToe::GameStateFactory.new)
+      @ui = ui
+      @game_state_factory = game_state_factory
     end
 
-    def make_move
-      player_move = @current_player.move
-      if player_move
-        @board.mark(player_move, @current_player.value)
-        change_player
-      end
+    def start
+      ui.display_welcome_message
+      @game_state = create_game_state
+      play until game_state.game_over?
+      ui.display_board(board)
+      display_result
     end
 
-    def over?
-      @rules.game_over?
+    private
+    attr_reader :ui, :game_state, :game_state_factory
+
+    def create_game_state
+      game_type = ui.game_type
+      begin
+        game_state_factory.create(game_type)
+      rescue ArgumentError
+        create_game_state
+      end
     end
 
-    def winner
-      player(@rules.winner)
+    def play
+      ui.display_board(board)
+      player = game_state.current_player
+      ui.display_player_turn(player)
+      make_move(player)
+      game_state.change_player
     end
 
-    private
-    def change_player
-      @current_player = (@current_player == @player1) ? @player2 : @player1
+    def make_move(player)
+      begin
+        player.move(board)
+      rescue MoveNotAvailableError
+        make_move(player)
+      end
     end
 
-    def player(mark)
-      return @player1 if mark == @player1.value
-      return @player2 if mark == @player2.value
+    def display_result
+      winner = game_state.winner
+      if winner
+        ui.display_winner(winner)
+      else
+        ui.display_tied_game
+      end
     end
 
+    def board
+      game_state.board
+    end
   end
 end

data/lib/tic_tac_toe/game_state.rb

@@ -0,0 +1,35 @@
+require 'tic_tac_toe/board'
+require 'tic_tac_toe/rules'
+
+module TicTacToe
+  class GameState
+    attr_reader :board, :current_player
+
+    def initialize(players, board = TicTacToe::Board.new)
+      @board = board
+      @players = players
+      @current_player = players[0]
+    end
+
+    def change_player
+      @current_player = (@players[0] == @current_player)? @players[1] : @players[0]
+    end
+
+    def game_over?
+      rules.game_over?
+    end
+
+    def winner
+      player(rules.winner)
+    end
+
+    private
+    def rules
+      TicTacToe::Rules.new(board)
+    end
+
+    def player(value)
+      @players.detect {|p| p.value == value}
+    end
+  end
+end

data/lib/tic_tac_toe/game_state_factory.rb

@@ -0,0 +1,56 @@
+require 'tic_tac_toe/game_state'
+require 'tic_tac_toe/board'
+require 'tic_tac_toe/player_factory'
+require 'tic_tac_toe/values'
+
+module TicTacToe
+  class GameStateFactory
+    def initialize(player_factory = TicTacToe::PlayerFactory.new)
+      @player_factory = player_factory
+    end
+
+    def types
+      [[:human, :computer], [:computer, :human], [:human, :human], [:computer, :computer]]
+    end
+
+    def create(game_type)
+      case game_type
+      when 1
+        human_computer_game
+      when 2
+        computer_human_game
+      when 3
+        human_human_game
+      when 4
+        computer_computer_game
+      else
+        raise ArgumentError, "Type #{game_type} does not exist. Please select a number corresponding to the game type."
+      end
+    end
+
+    private
+    def computer_human_game
+      create_game(@player_factory.computer, @player_factory.human)
+    end
+
+    def human_computer_game
+      create_game(@player_factory.human, @player_factory.computer)
+    end
+
+    def human_human_game
+      player1 = @player_factory.human
+      player2 = @player_factory.human("Friend", TicTacToe::Values.opponent(player1.value))
+      create_game(player1, player2)
+    end
+
+    def computer_computer_game
+      computer1 = @player_factory.computer(TicTacToe::VALUES[0])
+      computer2 = @player_factory.computer(TicTacToe::Values.opponent(computer1.value))
+      create_game(computer1, computer2)
+    end
+
+    def create_game(player1, player2)
+      TicTacToe::GameState.new([player1, player2])
+    end
+  end
+end

data/lib/tic_tac_toe/player.rb

@@ -8,8 +8,8 @@ module TicTacToe
       @strategy = strategy
     end
 
-    def move
-      @strategy.move
+    def move(board)
+      board.mark(strategy.move(board), value)
     end
   end
 end

data/lib/tic_tac_toe/player_factory.rb

@@ -5,12 +5,12 @@ require 'tic_tac_toe/player'
 module TicTacToe
   class PlayerFactory
 
-    def human(name = "User", value = "X")
+    def human(name = "User", value = TicTacToe::VALUES[0])
       TicTacToe::Player.new(name, value, TicTacToe::Strategy::ConsoleUser.new)
     end
 
-    def computer(board, value = "O", opponent_value = "X")
-      ai = TicTacToe::Strategy::Minimax.new(board, value, opponent_value)
+    def computer(value = TicTacToe::VALUES[1])
+      ai = TicTacToe::Strategy::Minimax.new(value)
       TicTacToe::Player.new("Computer", value, ai)
     end
   end

data/lib/tic_tac_toe/rules.rb

@@ -29,4 +29,4 @@ module TicTacToe
       @board.rows + @board.columns + @board.diagonals
     end
   end
-end
+end

data/lib/tic_tac_toe/strategy/console_user.rb

@@ -7,7 +7,7 @@ module TicTacToe
         @output = output
       end
 
-      def move
+      def move(*board)
         move = nil
 
         until move =~ NUMBER

data/lib/tic_tac_toe/strategy/minimax.rb

@@ -1,33 +1,35 @@
 require 'tic_tac_toe/rules'
+require 'tic_tac_toe/values'
 
 module TicTacToe
   module Strategy
     class Minimax
-      def initialize(board, player, opponent)
-        @board = board
-        @player = player
-        @opponent = opponent
+      WINNING_SCORE = 1
+      LOSING_SCORE = -1
+      TIE = 0
+      MIDDLE_SQUARE = 4
+
+      def initialize(player_value)
+        @player_value = player_value
+        @opponent_value = TicTacToe::Values.opponent(@player_value)
       end
 
-      def move
-        return first_move if first_move?
-        move = minimax(@player, @board)
+      def move(board)
+        return first_move(board) if first_move?(board)
+        move = minimax(player_value, board)
         move.move
       end
 
       private
-      WINNING_SCORE = 1
-      LOSING_SCORE = -1
-      TIE = 0
-      MIDDLE_SQUARE = 4
+      attr_reader :player_value, :opponent_value
 
-      def first_move?
-        moves_count = @board.number_of_moves
+      def first_move?(board)
+        moves_count = board.number_of_moves
         moves_count == 0 || moves_count == 1
       end
 
-      def first_move
-        return MIDDLE_SQUARE if @board.available_moves.include?(MIDDLE_SQUARE)
+      def first_move(board)
+        return MIDDLE_SQUARE if board.available_moves.include?(MIDDLE_SQUARE)
         0
       end
 
@@ -63,7 +65,7 @@ module TicTacToe
       end
 
       def opponent(player)
-        (player == @player) ? @opponent : @player
+        (player == player_value) ? opponent_value : player_value
       end
 
       def best_move(moves)

data/lib/tic_tac_toe/ui/console.rb

@@ -1,4 +1,4 @@
-require 'tic_tac_toe/game_factory'
+require 'tic_tac_toe/game_state_factory'
 
 module TicTacToe
   class Console
@@ -28,7 +28,7 @@ module TicTacToe
     end
 
     def display_winner(winner)
-      @output.puts("#{winner.name}(#{winner.value}) win!")
+      @output.puts("#{winner.name}(#{winner.value}) wins!")
     end
 
     def display_tied_game
@@ -55,7 +55,7 @@ module TicTacToe
 
     def game_type_list
       result = ""
-      TicTacToe::GameFactory.new.types.each_with_index do |value, index|
+      TicTacToe::GameStateFactory.new.types.each_with_index.map do |value, index|
         result << "#{index + 1} - #{game_type_values(value)}\n"
       end
       result

data/lib/tic_tac_toe/values.rb

@@ -0,0 +1,10 @@
+module TicTacToe
+  VALUES = ["X", "O"]
+
+  class Values
+    def self.opponent(value)
+      return VALUES[1] if value == VALUES[0]
+      VALUES[0]
+    end
+  end
+end

data/spec/integration/tictactoe/unbeatable_computer_spec.rb

@@ -26,8 +26,8 @@ describe "Unbeatable computer", :slow_test => true  do
   end
 
   def make_computer_move(clone_board)
-    computer = TicTacToe::PlayerFactory.new.computer(clone_board)
-    clone_board.mark(computer.move, computer.value)
+    computer = TicTacToe::PlayerFactory.new.computer
+    computer.move(clone_board)
     clone_board
   end
 
@@ -50,7 +50,7 @@ describe "Unbeatable computer", :slow_test => true  do
 
   def make_players_move(board, move_history, move)
     move_history << move
-    board.mark(move, "X")
+    board.mark(move, @human_value)
     make_computer_move(board) if !rules(board).game_over?
     play_game_for_each_available_move(board, move_history)
   end

data/spec/mocks/game_state.rb

@@ -0,0 +1,18 @@
+require 'surrogate/rspec'
+require 'tic_tac_toe/game_state'
+
+class MockGameState
+  Surrogate.endow(self)
+  define_reader :board
+  define_reader :current_player
+
+  define :winner
+  define :change_player
+  define(:game_over?){true}
+end
+
+describe TicTacToe::GameState do
+  it "checks MockGameState" do
+    MockGameState.should be_substitutable_for(TicTacToe::GameState)
+  end
+end

data/spec/mocks/game_state_factory.rb

@@ -0,0 +1,14 @@
+require 'surrogate/rspec'
+
+class MockGameStateFactory
+  Surrogate.endow(self)
+  define(:initialize) {|player_factory|}
+  define :types
+  define(:create) {|type|}
+end
+
+describe TicTacToe::GameStateFactory do
+  it "checks game factory" do
+    MockGameStateFactory.should be_substitutable_for(TicTacToe::GameStateFactory)
+  end
+end