jdl_tictactoe 0.0.5 → 0.0.6

data/lib/jdl_tictactoe/board.rb

@@ -1,95 +1,97 @@
-class JdlTictactoe::Game::Board
-
-  attr_reader :size, :squares
-
-  def initialize(size=3)
-    @size = size
-    @squares = initialize_squares(size)
-  end
-
-  def mark_square(square_index, marker)
-    row, column = translate_index(square_index)
-    squares[row][column] = marker
-  end
-
-  def undo_move(square_index)
-    row, column = translate_index(square_index)
-    squares[row][column] = nil
-  end
-
-  def value_at(square_index)
-    row, column = translate_index(square_index)
-    squares[row][column]
-  end
-
-  def winner?(mark)
-    horizontal_winner?(mark) || vertical_winner?(mark) || first_diagonal_winner?(mark) || second_diagonal_winner?(mark)
-  end
-
-  def draw?(player)
-    return true if empty_squares.length == 0 && ( !winner?(player.mark) || !winner?(player.opponent.mark) )
-  end
-
-  def empty_squares
-    @squares.flatten.each_with_index.collect { |sq, i| i+1 if sq == nil}.compact
-  end
-
-  def score(player)
-    return 1 if winner?(player.mark)
-    return -1 if winner?(player.opponent.mark)
-    return 0 if draw?(player)
-  end
-
-  private
-
-  def first_diagonal_winner?(mark)
-    diagonal = []
-    size.times do |row|
-      diagonal << squares[row][row]
-    end
-    winner_in_collection?(diagonal, mark)
-  end
-
-  def second_diagonal_winner?(mark)
-    diagonal = []
-    size.times do |row|
-      diagonal << squares[row][size - row - 1]
-    end
-    winner_in_collection?(diagonal, mark)
-  end
-
-  def vertical_winner?(mark)
-    size.times do |index|
-      column = []
-      size.times do |row|
-        column << squares[row][index]
-      end
-      return true if winner_in_collection?(column, mark)
-    end
-    false
-  end
-
-  def horizontal_winner?(mark)
-    squares.reduce(false) do |winner, row|
-      winner || winner_in_collection?(row, mark)
-    end
-  end
-
-  def winner_in_collection?(collection, mark)
-    !collection.include?(nil) && collection.uniq.size == 1 && collection.include?(mark)
-  end
-
-  def initialize_squares(size)
-    squares = []
-    size.times { squares << ([nil]*size) }
-    return squares
-  end
-
-  def translate_index(square_index)
-    square_index -= 1
-    row = square_index / size
-    column = square_index % size
-    return row, column
-  end
-
+module JdlTicTacToe
+	class Board
+
+		attr_reader :size, :squares
+
+		def initialize(size=3)
+			@size = size
+			@squares = initialize_squares(size)
+		end
+
+		def mark_square(square_index, marker)
+			row, column = translate_index(square_index)
+			squares[row][column] = marker
+		end
+
+		def undo_move(square_index)
+			row, column = translate_index(square_index)
+			squares[row][column] = nil
+		end
+
+		def value_at(square_index)
+			row, column = translate_index(square_index)
+			squares[row][column]
+		end
+
+		def winner?(mark)
+			horizontal_winner?(mark) || vertical_winner?(mark) || first_diagonal_winner?(mark) || second_diagonal_winner?(mark)
+		end
+
+		def draw?(player)
+			return true if empty_squares.length == 0 && ( !winner?(player.mark) || !winner?(player.opponent.mark) )
+		end
+
+		def empty_squares
+			@squares.flatten.each_with_index.collect { |sq, i| i+1 if sq == nil}.compact
+		end
+
+		def score(player)
+			return 1 if winner?(player.mark)
+			return -1 if winner?(player.opponent.mark)
+			return 0 if draw?(player)
+		end
+
+		private
+
+		def first_diagonal_winner?(mark)
+			diagonal = []
+			size.times do |row|
+				diagonal << squares[row][row]
+			end
+			winner_in_collection?(diagonal, mark)
+		end
+
+		def second_diagonal_winner?(mark)
+			diagonal = []
+			size.times do |row|
+				diagonal << squares[row][size - row - 1]
+			end
+			winner_in_collection?(diagonal, mark)
+		end
+
+		def vertical_winner?(mark)
+			size.times do |index|
+				column = []
+				size.times do |row|
+					column << squares[row][index]
+				end
+				return true if winner_in_collection?(column, mark)
+			end
+			false
+		end
+
+		def horizontal_winner?(mark)
+			squares.reduce(false) do |winner, row|
+				winner || winner_in_collection?(row, mark)
+			end
+		end
+
+		def winner_in_collection?(collection, mark)
+			!collection.include?(nil) && collection.uniq.size == 1 && collection.include?(mark)
+		end
+
+		def initialize_squares(size)
+			squares = []
+			size.times { squares << ([nil]*size) }
+			return squares
+		end
+
+		def translate_index(square_index)
+			square_index -= 1
+			row = square_index / size
+			column = square_index % size
+			return row, column
+		end
+
+	end
 end

data/lib/jdl_tictactoe/game.rb

@@ -1,39 +1,41 @@
-class JdlTictactoe::Game
+module JdlTicTacToe
+	class Game
 
-	attr_accessor :player1, :player2, :turn, :board
+		attr_accessor :player1, :player2, :turn, :board
 
-	def initialize(player1, player2, size=3)
-		@player1 = player1
-		@player2 = player2
-		@turn = :player1
-		@board = Board.new(size)
-		set_opponents(@player1, @player2)
-	end
+		def initialize(player1, player2, size=3)
+			@player1 = player1
+			@player2 = player2
+			@turn = :player1
+			@board = Board.new(size)
+			set_opponents(@player1, @player2)
+		end
 
-	def switch_turn(turn)
-		@turn = :player2 if turn == :player1
-		@turn = :player1 if turn == :player2
-		return @turn
-	end
+		def switch_turn(turn)
+			@turn = :player2 if turn == :player1
+			@turn = :player1 if turn == :player2
+			return @turn
+		end
 
-	def over?
-		return true if winner?(@player1.mark) || winner?(@player2.mark) || empty_squares.count == 0
-	end
+		def over?
+			return true if winner?(@player1.mark) || winner?(@player2.mark) || empty_squares.count == 0
+		end
 
-	private
+		private
 
-	def set_opponents(player1, player2)
-		player1.opponent = player2
-		player2.opponent = player1
-	end
+		def set_opponents(player1, player2)
+			player1.opponent = player2
+			player2.opponent = player1
+		end
 
-	def method_missing(method_name, *args)
-		delegated_methods = [:empty_squares, :winner?, :mark_square, :undo_move]
-		if delegated_methods.include?(method_name)
-			self.board.send(method_name, *args)
-		else
-			raise NoMethodError.new("Undefined method #{method_name} called on Game")
+		def method_missing(method_name, *args)
+			delegated_methods = [:empty_squares, :winner?, :mark_square, :undo_move]
+			if delegated_methods.include?(method_name)
+				self.board.send(method_name, *args)
+			else
+				raise NoMethodError.new("Undefined method #{method_name} called on Game")
+			end
 		end
-	end
 
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jdl_tictactoe
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors: