ang_ttt_gem 1.0.0 → 1.0.1

data/lib/ang_ttt_gem/ai.rb

@@ -2,28 +2,26 @@ require "scoring"
 require "board"
 
 class Ai
-  
+
   def initialize(player, board)
     @board = board
     @scoring = Scoring.new
     @max_mark = player.mark
   end
-  
+
   def find_opponent_mark
     state = @board.current_state
-    min_mark = state.reject {|c| c =~ /^#{@max_mark}|\s{1}$/ }
-    @min_mark = min_mark[0]
+    @min_mark = state.reject {|c| c =~ /^#{@max_mark}|\s{1}$/ }.first
   end
-  
+
   def select_optimal_start_move
-    start_moves = [0, 2, 4, 6, 8]
-    best_move = start_moves.sample
+     [0, 2, 4, 6, 8].sample
   end
-  
+
   def random_move
-    move =  @board.available_spaces.sample
+    @board.available_spaces.sample
   end
-    
+
   def find_best_move
     if @board.available_spaces.count == 9
       best_move = select_optimal_start_move
@@ -34,7 +32,7 @@ class Ai
     end
     best_move
   end
-      
+
   def max_move
     best_move = nil
     best_score = nil
@@ -53,7 +51,7 @@ class Ai
     end
     return best_move, best_score
   end
-  
+
   def min_move
     best_move = nil
     best_score = nil
@@ -72,11 +70,11 @@ class Ai
     end
     return best_move, best_score
   end
-  
+
   def state_is_terminal?
     @scoring.winner?(@board) || @scoring.draw?(@board)
   end
-  
+
   def evaluate_the_board
     decision = nil
     decision = 1 if @scoring.winner?(@board) && @scoring.winning_mark(@board) == @max_mark

data/lib/ang_ttt_gem/board.rb

@@ -1,64 +1,64 @@
 class Board
-  
+
   def initialize
     @cells = Array.new(9) {" "}
   end
-  
+
   def get(cell_number)
     @cells[cell_number]
   end
-  
+
   def set(cell_number, mark) 
     @cells[cell_number] = mark
   end
-  
+
   def undo_move(cell_number)
     @cells[cell_number] = " "
   end
-  
+
   def available_spaces
     available_spaces = @cells.each_with_index.select { |i, idx| i =~ / / }
     available_spaces = available_spaces.map{|i| i[1] }
     available_spaces
   end
-  
+
   def cell_occupied?(cell_number)
      get(cell_number.to_i - 1) != " "
   end
-  
+
   def current_state
     current_state = @cells.map {|c| c}
   end
-  
+
   def clear_all_spaces
     mark = " "
     @cells.each_with_index do |cell, index|
       set(index, mark)
     end
   end
-    
+
   def rows
      [ @cells[0..2],
      @cells[3..5],
      @cells[6..8] ]
   end
-  
+
   def columns
     rows.transpose
   end
-  
+
   def diagonal_forward
     [ @cells[2],
     @cells[4],
     @cells[6] ]
   end
-  
+
   def diagonal_back
     [ @cells[0],
     @cells[4],
     @cells[8] ]
   end
-  
+
   def possible_winning_combinations
     possible_winning_combinations = []
     rows.collect{|row| possible_winning_combinations << row }

data/lib/ang_ttt_gem/computer_player.rb

@@ -3,13 +3,13 @@ require "ai"
 require "board"
 
 class ComputerPlayer < Player
-  
+
   attr_accessor :ai
-  
+
   def initialize(mark)
     self.set_mark(mark)
   end
-  
+
   def get_move(board)
     ai = Ai.new(self, board)
     cell_number = ai.find_best_move

data/lib/ang_ttt_gem/game.rb

@@ -5,33 +5,33 @@ require "human_player"
 require "computer_player"
 
 class Game
-  
+
   attr_reader :players, :board
-  
+
   def initialize
     @board = Board.new
     @scoring = Scoring.new
     @validate = Validate.new
     @players = []
   end
-  
+
   def create_computer_player(mark)
     @players << ComputerPlayer.new(mark)
   end
-    
+
    def create_human_player(mark)
      @players << HumanPlayer.new(mark)
    end
-   
+
    def get_player_move(player)
      index = player - 1
      @players[index].get_move(@board)
    end
-   
+
    def move_valid?(move)
      (0..8).include?(move)
    end
-   
+
    def make_move_player(player, move)
      index = player - 1
      mark = @players[index].mark
@@ -39,28 +39,21 @@ class Game
      @board.set(move, mark)
      prepare_display_state
    end
-   
+
    def square_taken?(cell_number)
       @board.cell_occupied?(cell_number)
    end
-   
+
    def prepare_display_state
-     board_display_state = []
-     current_state = @board.current_state
-     cell_numbers = ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
-     index = 0
-     current_state.each do |cell|
-       board_display_state << cell_numbers[index] if cell == " "
-       board_display_state << current_state[index] unless cell == " "
-       index += 1
+     @board.current_state.each_with_index.map do |cell, index|
+       cell == " " ? (index + 1).to_s : cell
      end
-     board_display_state
    end
-   
+
    def is_over?
     @scoring.winner?(@board) || @scoring.draw?(@board)
    end
-  
+
    def result
      message_key = :draw
      @players.each_with_index do |player, i|

data/lib/ang_ttt_gem/human_player.rb

@@ -3,11 +3,11 @@ require "validate"
 require "board"
 
 class HumanPlayer < Player
-  
+
   def initialize(mark)
     self.set_mark(mark)
   end
-  
+
   def get_move(board)
     return false
   end

data/lib/ang_ttt_gem/message.rb

@@ -1,25 +1,25 @@
 class Message
-  
+
   def initialize
-    
+
     @message = {
-       welcome: "Welcome to Tic Tac Toe! You will create 2 players. The first player you create will go first.\n",
-       create_player: "Create a player.\n",
-       determine_player_type: "Do you want the player to be human or computer? (H/C)\n",
-       select_player_mark: "Please select a single letter to represent the player.\n",
-       invalid_selection: "That is an invalid selection, please make a valid selection.\n",
-       select_square: "Please select an open square.\n",
-       player_1_win: "Player 1 is the winner!\n",
-       player_2_win: "Player 2 is the winner!\n",
-       draw: "It's a draw.\n",
-       play_again?: "Would you like to play again? (Y/N)\n",
+       welcome: "Welcome to Tic Tac Toe! You will create 2 players. The first player you create will go first.",
+       create_player: "Create a player.",
+       determine_player_type: "Do you want the player to be human or computer? (H/C)",
+       select_player_mark: "Please select a single letter to represent the player.",
+       invalid_selection: "That is an invalid selection, please make a valid selection.",
+       select_square: "Please select an open square.",
+       player_1_win: "Player 1 is the winner!",
+       player_2_win: "Player 2 is the winner!",
+       draw: "It's a draw.",
+       play_again?: "Would you like to play again? (Y/N)",
     }
   end
-  
+
   def passed(*keys)
     message = String.new
     keys.each do |key|
-      message << @message[key]
+      message << @message[key] + "\n"
     end
     message
   end

data/lib/ang_ttt_gem/player.rb

@@ -1,5 +1,5 @@
 class Player
-  
+
   def set_mark(mark)
     @mark = mark
   end

data/lib/ang_ttt_gem/scoring.rb

@@ -1,7 +1,7 @@
 require "board"
 
 class Scoring
-  
+
   def winner?(board)
      winner = false
      board.possible_winning_combinations.each do |combo|
@@ -11,7 +11,7 @@ class Scoring
      end
      winner
   end
-  
+
   def winning_mark(board)
     board.possible_winning_combinations.each do |combo|
       if combo.uniq.length == 1 && combo[0] != " "
@@ -19,7 +19,7 @@ class Scoring
       end
     end
   end
-  
+
   def draw?(board)
     winner?(board) == false && board.available_spaces.count == 0
   end

data/lib/ang_ttt_gem/validate.rb

@@ -1,10 +1,10 @@
 class Validate
-  
+
   def player_input(input)
      return false unless input =~ /[Hh,Cc]/
      return true
   end
-  
+
   def mark_input(input)
     return false unless input =~ /[a-zA-Z]/
     return true
@@ -14,7 +14,7 @@ class Validate
     return false unless input =~ /[1-9]/
     return true
   end
-  
+
   def play_again_input(input)
     return false unless input =~ /[Nn,Yy]/
     return true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ang_ttt_gem
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors: