tic_tac_doh 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e10b90e82af068949f73309b6aae63a73c6aaeb3
-  data.tar.gz: 017cf3cb2aecf5387686e96eb808ab08a95fbf9f
+  metadata.gz: b924772e319fc4d5374b71f0e6fe6914787bcf57
+  data.tar.gz: 83f9604b459ffd185bb9fbc74b9dfc3d053b7cc5
 SHA512:
-  metadata.gz: 166d06be2f90a69f1d0a340399e3d3feb39d3c89817c3dde01f2d86c1a5566d0fdb167b4dd1021dc80bc877750e75c4453931146d6a3df138bbb93feca29167a
-  data.tar.gz: 8526283be5f20ed301f73c03c2a57103a7b10956bb8bdeb68220571776f8c673d646c9d45fa16771b70a5e4cb72b2f000af9b31b3286ecc77ea06a5dab72efe6
+  metadata.gz: 96686ecba3a7f20821f0b0775ad44f69b03773d60ac5ed7c7fda4fbf31d3a31478b884b2bc92a740fb3b3014283a753283cabfc8a0bd31cc3968cc419277c8a9
+  data.tar.gz: 71f905f7011e7b38a098ab0d1291d33ac92c3e7d7b75a02fd14de7e77659918cb7edfb8baf6466c46be6445604056983c3442e076a2ba63aada62825d663fbdd

data/lib/tic_tac_doh.rb

@@ -2,60 +2,84 @@ require 'tic_tac_doh/version'
 
 module TicTacDoh
   class Game
-    # X starts
-    # Previous winner starts new game
-    #   or which turn would have followed if draw
 
-    attr_reader :players, :grid, :turn
-    attr_accessor :players
+    attr_reader :players, :grid
 
     def initialize(args={})
       @players = []
-      @turn = 1
-      # @players << args[:player1] << args[:player2]
+      @turn = 0
       args.fetch(:board_size, 3).times do
         @grid = Array.new(3) {}
       end
     end
 
+    def reset
+      prepare_grid
+      @turn = rand(0..players.count)
+    end
+
+    def next_turn(cell_position)
+      insert_player_move_in_grid(calculate_cell(cell_position))
+    end
+
+    def who_is_next
+      { nickname: players[player_turn].nickname, mark: players[player_turn].mark }
+    end
+
+    def player_turn
+      @turn % players.count
+    end
+
     def set_board_size(size)
       prepare_grid(size)
     end
 
-    def play
-      # puts grid.length
-      # puts players.count
-      prepare_grid
-      player_turn ||= 0
-      until game_over
-        clear_screen
-        print_grid
-        # puts "turn: #{@turn}"
-        turn(players[player_turn])
-        player_turn = player_turn == (players.count - 1) ? 0 : player_turn + 1
-        @turn = @turn + 1 unless game_over
+    def scoreboard
+      scoreboard = []
+      players.each do |player|
+        scoreboard << { nickname: player.nickname, score: player.score }
       end
-      clear_screen
-      print_grid
-      puts  "Game Over"
-      # puts @turn
+      scoreboard
     end
 
-    def add_player(mark)
-      if game_over && valid_mark
-        players << Player.new(mark: mark)
+    def add_player(args)
+      if valid_mark(args[:mark])
+        players << Player.new(args)
         true
       else
         false
       end
     end
 
+    def game_over?
+      # Winner
+      if symbol_winner?
+        return true
+      end
+      return false unless free_cells?
+      true
+    end
+
+    def free_cells?
+      @grid.each do |row|
+        row.each do |cell|
+          return false if cell.is_a? Numeric
+        end
+      end
+      true
+    end
+
+    def winner
+      return find_player_by(mark: symbol_winner?) if symbol_winner?
+      false
+    end
+
     private
 
     def valid_mark(mark)
-      players.each |player| do
+      players.each do |player|
         if player.mark == mark[0]
-          false
+          return false
         end
       end
       true
@@ -73,22 +97,6 @@ module TicTacDoh
       end
     end
 
-    def game_over
-      # Winner
-      if symbol_winner?
-        return true
-      end
-      # No more free cells
-      @grid.each do |row|
-        row.each do |cell|
-          return false if cell.is_a? Numeric
-        end
-      end
-      clear_screen
-      print_grid
-      true
-    end
-
     def symbol_winner?
       winner_mark = nil
       grid.length.times do |n|
@@ -102,8 +110,13 @@ module TicTacDoh
       return winner_mark
     end
 
+    def find_player_by(args={})
+      players.each { |player| return { nickname: player.nickname, mark: player.mark } if player.mark == args[:mark] }
+      false
+    end
+
     def secuential_mark(mark, row, col, row_step, col_step, counter=1)
-      return nil unless in_range?(row, col)
+      return nil unless within_grid_range?(row, col)
       if grid[row][col] == mark
         return grid[row][col] if counter == 3
         return secuential_mark(mark, row + row_step, col + col_step, row_step, col_step, counter+1)
@@ -112,7 +125,7 @@ module TicTacDoh
       end
     end
 
-    def in_range? (arg, col)
+    def within_grid_range? (arg, col)
       if arg.is_a? Hash
         return true if arg[:row] < grid.length && arg[:col] < grid.length if arg[:row] >= 0 && arg[:col] >= 0
       else
@@ -121,28 +134,6 @@ module TicTacDoh
       false
     end
 
-    def print_grid
-      grid.each do |row|
-        puts row.join('|')
-      end
-    end
-
-    def turn(player)
-      player_action player
-    end
-
-    def player_action (player)
-      valid_move = false
-      until valid_move == true do
-        position = calculate_cell(player_move player)
-        valid_move = insert_player_move_in_grid(position, player_mark(player))
-      end
-    end
-
-    def clear_screen
-      # system 'clear' or system 'cls'
-    end
-
     def calculate_cell(cell_number)
       row = 0
       for n in 0..cell_number
@@ -152,26 +143,18 @@ module TicTacDoh
       {row: row, column: column}
     end
 
-    def insert_player_move_in_grid(position, mark)
+    def insert_player_move_in_grid(position)
       return false unless valid_move? position
-      @grid[position[:row]][position[:column]] = mark
+      @grid[position[:row]][position[:column]] = who_is_next[:mark]
+      @turn += 1
       true
     end
 
     def valid_move?(position)
-      return false if position[:row] < 0 || position[:row] > (@grid.length) -1
-      return false if position[:column] < 0 || position[:column] > (@grid.length) -1
+      return false if position[:row] < 0 || position[:row] > (@grid.length) - 1
+      return false if position[:column] < 0 || position[:column] > (@grid.length) - 1
       return false unless @grid[position[:row]][position[:column]].is_a? Numeric
       true
-
-    end
-
-    def player_move(player)
-      player.move()
-    end
-
-    def player_mark(player)
-      player.mark
     end
   end
 
@@ -184,12 +167,6 @@ module TicTacDoh
       @mark = args[:mark]
     end
 
-    def move()
-      puts "#{self.mark} turn "
-      puts "Pick a position"
-      gets.chomp.to_i
-    end
-
     def add_to_score(score)
       @score += score
     end

data/lib/tic_tac_doh/version.rb

@@ -1,3 +1,3 @@
 module TicTacDoh
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tic_tac_doh
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - David Cuadra Quevedo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-26 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler