tic_tac_toe_nhu 0.0.11 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47abe0e371c9ceb90b20c8aab57c555578eb85d2
-  data.tar.gz: 83d834d4f04337e278a19bea6114e582ade53a38
+  metadata.gz: 76f4600254a71f4f37fe5efa7f74a8000b5d7b35
+  data.tar.gz: 81f2f459fa5e1a867e053d42f5dfdfe2ae4dc27f
 SHA512:
-  metadata.gz: 42ec301ab22138675081262882b8f95ba77a77dd4be6a62b0f65475288d63a5f8982993adc0c1f7e914afe114cac08922776e38c8f92e5d455b3f0c116eeb290
-  data.tar.gz: fa35df90dabda57091a2eae86e637c05334c953af8430cc47bda707e33c2e54297ddf11c2163729eea1ba2ed8af8f90178f94c69ee8c7c74acb82454d86bae99
+  metadata.gz: 5eae5eeee50f815eaac5fb338c1aba07e9d54ad669cd179f6a333ef4b693aa333145b12825f61696eab943103b1934f4ca101e10f7bff4c10f9e702bc54a3912
+  data.tar.gz: b9e661172ad637011bd6b36e7a0ce4cb5a56bf17f114277b9e1da7ad57bc4d03f29269e6c7328d8fd8d147b44fc39b3b7feae7d9bd8cbe7004ee8f8a4665ca98

data/bin/tic_tac_toe

@@ -2,5 +2,5 @@
 $LOAD_PATH << File.expand_path('../../lib', __FILE__)
 require 'tic_tac_toe/runner'
 
-runner = TicTacToe::Runner.new
-runner.start
+game = TicTacToe::Runner.new
+game.start

data/coverage/.resultset.json

@@ -5,56 +5,35 @@
         1,
         1,
         1,
-        null,
-        1,
-        1,
-        1,
-        13,
-        null,
-        null,
-        1,
-        6,
-        null,
-        null,
-        1,
-        6,
-        null,
-        2,
-        null,
-        1,
-        null,
-        1,
-        null,
-        1,
-        null,
         1,
         null,
-        null,
-        null,
         1,
         1,
         1,
+        11,
         null,
         null,
         1,
-        2,
+        11,
+        11,
         null,
         null,
         1,
-        1,
+        5,
         null,
+        5,
+        4,
+        4,
+        4,
         null,
         1,
-        1,
         null,
         null,
-        1,
-        5,
-        null,
         null,
         null
       ],
       "/Users/nhunguyen/Documents/Ruby/tictactoe/lib/tic_tac_toe/game.rb": [
+        1,
         1,
         null,
         1,
@@ -62,26 +41,25 @@
         1,
         null,
         1,
-        19,
-        19,
-        19,
-        19,
+        17,
+        17,
+        17,
         null,
         null,
         1,
-        7,
-        7,
-        5,
-        5,
-        null,
+        2,
         null,
         null,
         1,
-        4,
+        3,
         null,
         null,
         1,
-        3,
+        11,
+        11,
+        9,
+        9,
+        null,
         null,
         null,
         1,
@@ -90,9 +68,11 @@
         null,
         null,
         1,
-        3,
-        2,
+        8,
+        null,
         null,
+        1,
+        9,
         null,
         null,
         null
@@ -104,52 +84,59 @@
         null,
         1,
         1,
+        null,
         1,
-        1,
-        12,
-        12,
-        12,
+        10,
+        10,
         null,
         null,
         1,
-        12,
-        12,
-        12,
-        12,
-        12,
+        10,
+        10,
+        10,
+        10,
+        10,
         null,
         null,
         1,
         1,
-        13,
-        13,
-        13,
+        null,
         1,
+        11,
+        11,
+        11,
         1,
+        1,
+        null,
         null,
         null,
+        1,
+        3,
+        3,
+        3,
+        null,
         null,
         1,
-        7,
-        7,
-        7,
-        7,
-        7,
+        4,
+        4,
         1,
         1,
         null,
         null,
         null,
         1,
-        12,
-        12,
-        11,
-        null,
+        10,
+        10,
         1,
         null,
+        9,
         null,
         null,
         null,
+        1,
+        13,
+        null,
+        null,
         null
       ],
       "/Users/nhunguyen/Documents/Ruby/tictactoe/lib/tic_tac_toe/ui/console.rb": [
@@ -228,6 +215,6 @@
         null
       ]
     },
-    "timestamp": 1375736808
+    "timestamp": 1376342502
   }
 }

data/lib/tic_tac_toe/board.rb

@@ -47,7 +47,7 @@ module TicTacToe
       result = []
       (0...size).each do |col|
         result << squares.values_at(* squares.each_index.select do |i|
-          (col - i) % size == 0
+          (col - i) % 3 == 0
         end)
       end
       result

data/lib/tic_tac_toe/game.rb

@@ -1,41 +1,43 @@
+require 'tic_tac_toe/board'
 require 'tic_tac_toe/rules'
 
 module TicTacToe
   class Game
-    attr_reader :current_player, :board
+    attr_reader :board, :current_player
 
-    def initialize(board, player1, player2)
+    def initialize(players, board = TicTacToe::Board.new)
       @board = board
-      @current_player = @player1 = player1
-      @player2 = player2
-      @rules = TicTacToe::Rules.new(@board)
+      @players = players
+      @current_player = players[0]
     end
 
-    def make_move(*move) #rename to make player move
-      player_move = move[0] || @current_player.move
+    def game_over?
+      rules.game_over?
+    end
+
+    def winner
+      player(rules.winner)
+    end
+
+    def make_player_move(*move)
+      player_move = move[0] || @current_player.move(board)
       if player_move
         @board.mark(player_move, @current_player.value)
         change_player
       end
     end
 
-    def over?
-      @rules.game_over?
+    private
+    def rules
+      @rules ||= TicTacToe::Rules.new(board)
     end
 
-    def winner
-      player(@rules.winner)
+    def player(value)
+      @players.detect {|p| p.value == value}
     end
 
-    private
     def change_player
-      @current_player = (@current_player == @player1) ? @player2 : @player1
+      @current_player = (@players[0] == @current_player)? @players[1] : @players[0]
     end
-
-    def player(mark)
-      return @player1 if mark == @player1.value
-      return @player2 if mark == @player2.value
-    end
-
   end
 end

data/lib/tic_tac_toe/game_factory.rb

@@ -1,6 +1,7 @@
 require 'tic_tac_toe/game'
 require 'tic_tac_toe/board'
 require 'tic_tac_toe/player_factory'
+require 'tic_tac_toe/values'
 
 module TicTacToe
   class GameFactory
@@ -9,43 +10,20 @@ module TicTacToe
     end
 
     def types
-      [[:human, :computer], [:computer, :human], [:human, :human], [:computer, :computer]]
+      player_types = @player_factory.types
+      player_types.product player_types
     end
 
-    def create(type_index, board)
-      case type_index
-      when 1
-        human_computer_game(board)
-      when 2
-        computer_human_game(board)
-      when 3
-        human_human_game(board)
-      when 4
-        computer_computer_game(board)
+    def create(game_type)
+      player_types = types[game_type-1]
+
+      if player_types
+        player1 = @player_factory.create(player_types[0], TicTacToe::VALUES[0])
+        player2 = @player_factory.create(player_types[1], TicTacToe::VALUES[1])
+        TicTacToe::Game.new([player1, player2])
       else
-        raise ArgumentError, "Type does not exist. Please select a number corresponding to the game type."
+        raise ArgumentError, "Type #{game_type} does not exist. Please select a number corresponding to the game type."
       end
     end
-
-    private
-    def computer_human_game(board)
-      create_game(board, @player_factory.computer(board), @player_factory.human)
-    end
-
-    def human_computer_game(board)
-      create_game(board, @player_factory.human, @player_factory.computer(board))
-    end
-
-    def human_human_game(board)
-      create_game(board, @player_factory.human, @player_factory.human("Friend", "O"))
-    end
-
-    def computer_computer_game(board)
-      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/player.rb

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

data/lib/tic_tac_toe/player_factory.rb

@@ -1,16 +1,31 @@
 require 'tic_tac_toe/strategy/minimax'
 require 'tic_tac_toe/strategy/console_user'
 require 'tic_tac_toe/player'
+require 'tic_tac_toe/values'
 
 module TicTacToe
   class PlayerFactory
 
-    def human(name = "User", value = "X")
-      TicTacToe::Player.new(name, value, TicTacToe::Strategy::ConsoleUser.new)
+    def types
+      [:human, :computer]
     end
 
-    def computer(board, value = "O", opponent_value = "X")
-      ai = TicTacToe::Strategy::Minimax.new(board, value, opponent_value)
+    def create(player_type, value)
+      case player_type
+      when :human
+        human(value)
+      when :computer
+        computer(value)
+      end
+    end
+
+    private
+    def human(value)
+      TicTacToe::Player.new("User", value, TicTacToe::Strategy::ConsoleUser.new)
+    end
+
+    def computer(value)
+      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/runner.rb

@@ -4,50 +4,57 @@ require 'tic_tac_toe/board'
 
 module TicTacToe
   class Runner
-    attr_reader :board
-    def initialize(ui = TicTacToe::Console.new, game_factory = TicTacToe::GameFactory.new)
+
+    def initialize(ui = TicTacToe::Console.new, game_state_factory = TicTacToe::GameFactory.new)
       @ui = ui
-      @board = TicTacToe::Board.new
-      @game_factory = game_factory
+      @game_state_factory = game_state_factory
     end
 
     def start
-      @ui.display_welcome_message
-      @game = create_game
-      play until @game.over?
-      @ui.display_board(@board)
+      ui.display_welcome_message
+      @game_state = create_game_state
+      play until game_state.game_over?
+      ui.display_board(board)
       display_result
     end
 
     private
-    def create_game
-      game_type = @ui.game_type
+    attr_reader :ui, :game_state, :game_state_factory
+
+    def create_game_state
+      game_type = ui.game_type
       begin
-        @game_factory.create(game_type, @board)
+        game_state_factory.create(game_type)
       rescue ArgumentError
-        create_game
+        create_game_state
       end
     end
 
     def play
-      @ui.display_board(@board)
-      player = @game.current_player
-      @ui.display_player_turn(player)
+      ui.display_board(board)
+      ui.display_player_turn(game_state.current_player)
+      make_player_move
+    end
+
+    def make_player_move
       begin
-        @game.make_move
+        game_state.make_player_move
       rescue MoveNotAvailableError
-        @ui.display_square_not_available
+        make_player_move
       end
     end
 
     def display_result
-      winner = @game.winner
+      winner = game_state.winner
       if winner
-        @ui.display_winner(winner)
+        ui.display_winner(winner)
       else
-        @ui.display_tied_game
+        ui.display_tied_game
       end
     end
 
+    def board
+      game_state.board
+    end
   end
 end