tic_tac_toe_nhu 0.0.5 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f1770dfd1f3fd4f446e2d8ccb4d31e023ef4986
-  data.tar.gz: d3d62e4b846be464fcf0343e7d3decc94c6afeca
+  metadata.gz: 47abe0e371c9ceb90b20c8aab57c555578eb85d2
+  data.tar.gz: 83d834d4f04337e278a19bea6114e582ade53a38
 SHA512:
-  metadata.gz: ad5258407ba0594a5988b1bbdb9a25ba0341da84746d61444ef0e906d913e98775ff3f7c20092e675d96ee86ba9b98fc938ce149c1d26ee2443959ef4532d667
-  data.tar.gz: 90f0131d85e62ef241ca81aafb2e65d50288e80b2f7765c6124a7b7c4cee7e6a0eabfdd50f509433c7786b3e3a0b123fe8d339071cead8e343dfc8606810e519
+  metadata.gz: 42ec301ab22138675081262882b8f95ba77a77dd4be6a62b0f65475288d63a5f8982993adc0c1f7e914afe114cac08922776e38c8f92e5d455b3f0c116eeb290
+  data.tar.gz: fa35df90dabda57091a2eae86e637c05334c953af8430cc47bda707e33c2e54297ddf11c2163729eea1ba2ed8af8f90178f94c69ee8c7c74acb82454d86bae99

data/bin/tic_tac_toe

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

data/coverage/.last_run.json

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

data/coverage/.resultset.json

@@ -1,149 +1,233 @@
 {
   "RSpec": {
     "coverage": {
-      "/Users/nhunguyen/Documents/Ruby/tictactoe/lib/tic_tac_toe/rules.rb": [
+      "/Users/nhunguyen/Documents/Ruby/tictactoe/lib/tic_tac_toe/game_factory.rb": [
         1,
         1,
         1,
-        30,
+        null,
+        1,
+        1,
+        1,
+        13,
         null,
         null,
         1,
-        8,
-        3,
-        3,
+        6,
         null,
         null,
         1,
-        4,
+        6,
         null,
+        2,
         null,
         1,
-        77,
         null,
+        1,
         null,
         1,
+        null,
         1,
-        47,
-        734,
         null,
         null,
         null,
         1,
-        47,
+        1,
+        1,
+        null,
+        null,
+        1,
+        2,
+        null,
+        null,
+        1,
+        1,
+        null,
+        null,
+        1,
+        1,
+        null,
+        null,
+        1,
+        5,
         null,
         null,
         null
       ],
-      "/Users/nhunguyen/Documents/Ruby/tictactoe/lib/tic_tac_toe/board.rb": [
+      "/Users/nhunguyen/Documents/Ruby/tictactoe/lib/tic_tac_toe/game.rb": [
+        1,
+        null,
         1,
         1,
+        1,
+        null,
+        1,
+        19,
+        19,
+        19,
+        19,
         null,
         null,
         1,
+        7,
+        7,
+        5,
+        5,
+        null,
+        null,
+        null,
         1,
+        4,
+        null,
         null,
         1,
-        30,
-        30,
+        3,
         null,
         null,
         1,
-        30,
-        30,
-        30,
+        1,
+        5,
         null,
         null,
         1,
-        107,
-        107,
-        107,
+        3,
+        2,
         null,
-        0,
         null,
         null,
+        null
+      ],
+      "/Users/nhunguyen/Documents/Ruby/tictactoe/lib/tic_tac_toe/runner.rb": [
+        1,
+        1,
+        1,
         null,
         1,
-        0,
+        1,
+        1,
+        1,
+        12,
+        12,
+        12,
         null,
         null,
         1,
-        5,
+        12,
+        12,
+        12,
+        12,
+        12,
+        null,
+        null,
+        1,
+        1,
+        13,
+        13,
+        13,
+        1,
+        1,
+        null,
         null,
         null,
         1,
-        0,
+        7,
+        7,
+        7,
+        7,
+        7,
+        1,
+        1,
+        null,
         null,
         null,
         1,
-        47,
-        141,
+        12,
+        12,
+        11,
         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,
-        47,
-        47,
+        14,
+        14,
         null,
-        1269,
-        141,
         null,
-        47,
+        1,
+        1,
         null,
         null,
         1,
-        47,
-        47,
-        47,
+        4,
         null,
         null,
         1,
         5,
         5,
-        45,
-        null,
         5,
-        null,
+        5,
+        4,
         null,
         1,
-        0,
-        0,
-        0,
         null,
-        0,
         null,
         null,
         1,
         1,
-        152,
-        152,
         null,
-        134,
+        null,
+        1,
+        1,
+        null,
+        null,
+        1,
+        1,
         null,
         null,
         1,
-        152,
-        152,
+        1,
         null,
         null,
         1,
-        152,
+        1,
+        4,
+        4,
+        21,
+        21,
+        null,
+        4,
         null,
         null,
         1,
-        47,
-        423,
+        5,
+        5,
+        20,
+        null,
+        5,
+        null,
         null,
-        47,
+        1,
+        20,
         null,
         null,
         1,
-        470,
+        40,
+        20,
         null,
         null,
         null
       ]
     },
-    "timestamp": 1375217786
+    "timestamp": 1375736808
   }
 }

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) % 3 == 0
+          (col - i) % size == 0
         end)
       end
       result

data/lib/tic_tac_toe/game.rb

@@ -1,62 +1,41 @@
-require 'tic_tac_toe/ui/console'
-require 'tic_tac_toe/game_state_factory'
-require 'tic_tac_toe/board'
+require 'tic_tac_toe/rules'
 
 module TicTacToe
   class Game
+    attr_reader :current_player, :board
 
-    def initialize(ui = TicTacToe::Console.new, game_state_factory = TicTacToe::GameStateFactory.new)
-      @ui = ui
-      @game_state_factory = game_state_factory
+    def initialize(board, player1, player2)
+      @board = board
+      @current_player = @player1 = player1
+      @player2 = player2
+      @rules = TicTacToe::Rules.new(@board)
     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
-
-    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
+    def make_move(*move) #rename to make player move
+      player_move = move[0] || @current_player.move
+      if player_move
+        @board.mark(player_move, @current_player.value)
+        change_player
       end
     end
 
-    def play
-      ui.display_board(board)
-      player = game_state.current_player
-      ui.display_player_turn(player)
-      make_move(player)
-      game_state.change_player
+    def over?
+      @rules.game_over?
     end
 
-    def make_move(player)
-      begin
-        player.move(board)
-      rescue MoveNotAvailableError
-        make_move(player)
-      end
+    def winner
+      player(@rules.winner)
     end
 
-    def display_result
-      winner = game_state.winner
-      if winner
-        ui.display_winner(winner)
-      else
-        ui.display_tied_game
-      end
+    private
+    def change_player
+      @current_player = (@current_player == @player1) ? @player2 : @player1
     end
 
-    def board
-      game_state.board
+    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

@@ -0,0 +1,51 @@
+require 'tic_tac_toe/game'
+require 'tic_tac_toe/board'
+require 'tic_tac_toe/player_factory'
+
+module TicTacToe
+  class GameFactory
+    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(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)
+      else
+        raise ArgumentError, "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(board)
-      board.mark(strategy.move(board), value)
+    def move
+      @strategy.move
     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 = TicTacToe::VALUES[0])
+    def human(name = "User", value = "X")
       TicTacToe::Player.new(name, value, TicTacToe::Strategy::ConsoleUser.new)
     end
 
-    def computer(value = TicTacToe::VALUES[1])
-      ai = TicTacToe::Strategy::Minimax.new(value)
+    def computer(board, value = "O", opponent_value = "X")
+      ai = TicTacToe::Strategy::Minimax.new(board, value, opponent_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

@@ -0,0 +1,53 @@
+require 'tic_tac_toe/ui/console'
+require 'tic_tac_toe/game_factory'
+require 'tic_tac_toe/board'
+
+module TicTacToe
+  class Runner
+    attr_reader :board
+    def initialize(ui = TicTacToe::Console.new, game_factory = TicTacToe::GameFactory.new)
+      @ui = ui
+      @board = TicTacToe::Board.new
+      @game_factory = game_factory
+    end
+
+    def start
+      @ui.display_welcome_message
+      @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
+      @ui.display_player_turn(player)
+      begin
+        @game.make_move
+      rescue MoveNotAvailableError
+        @ui.display_square_not_available
+      end
+    end
+
+    def display_result
+      winner = @game.winner
+      if winner
+        @ui.display_winner(winner)
+      else
+        @ui.display_tied_game
+      end
+    end
+
+  end
+end

data/lib/tic_tac_toe/strategy/console_user.rb

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

data/lib/tic_tac_toe/strategy/minimax.rb

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

data/lib/tic_tac_toe/ui/console.rb

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

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
-    computer.move(clone_board)
+    computer = TicTacToe::PlayerFactory.new.computer(clone_board)
+    clone_board.mark(computer.move, computer.value)
     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, @human_value)
+    board.mark(move, "X")
     make_computer_move(board) if !rules(board).game_over?
     play_game_for_each_available_move(board, move_history)
   end

data/spec/mocks/game.rb

@@ -5,7 +5,7 @@ class MockGame
   define_reader :board
   define_reader :current_player
 
-  define :make_move
+  define(:make_move) {|*value| }
   define :winner
   define(:over?){true}
 end

data/spec/mocks/game_factory.rb

@@ -0,0 +1,14 @@
+require 'surrogate/rspec'
+
+class MockGameFactory
+  Surrogate.endow(self)
+  define(:initialize) {|player_factory|}
+  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