Merge pull request #14 from ilasorsa/master

Add player class, draft specs for it, add two error classes and refactor project directory structure

Author: JackAWatt

lib/errors/column_full_error.rb

@@ -0,0 +1,3 @@
+module RubyConnect
+  class ColumnFullError < StandardError; end
+end

lib/errors/game_over_error.rb

@@ -0,0 +1,3 @@
+module RubyConnect
+  class GameOverError < StandardError; end
+end

lib/game.rb

@@ -1,3 +1,5 @@
+require 'errors/column_full_error'
+
 module RubyConnect
   class Board
     attr_reader :grid
@@ -16,6 +18,10 @@ def full?
       slots.all?
     end
 
+    def moves_done
+      slots.compact.count
+    end
+
     def insert_into_column(column, color)
       column -= 1
       row = first_open_slot column
@@ -25,7 +31,7 @@ def insert_into_column(column, color)
     private
 
     def first_open_slot(column)
-      grid[column].index(nil) || raise(ArgumentError, "Column full")
+      grid[column].index(nil) || raise(ColumnFullError, "Column full")
     end
 
     def slots

lib/board.rb renamed to lib/models/board.rb

@@ -0,0 +1,24 @@
+require 'errors/game_over_error'
+
+module RubyConnect
+  class Game
+    attr_accessor :board, :winning_move
+
+    def initialize(player1, player2)
+      @board = Board.new
+      @winning_move = false
+      @player1 = player1
+      @player2 = player2
+    end
+
+    def done?
+      board.full? || winning_move
+    end
+
+    def make_move(column, color)
+      raise GameOverError if done?
+      board.insert_into_column column, color
+      winning_move = false # TODO: winning_move?
+    end
+  end
+end

lib/models/game.rb

@@ -0,0 +1,16 @@
+module RubyConnect
+  class Player
+    attr_reader :game, :color
+
+    def initialize(info = {})
+      @name         = info[:name]
+      @phone_number = info[:phone_number]
+      @color        = info[:color]
+      @game         = info[:game]
+    end
+
+    def make_move(column)
+      game.make_move(column, color)
+    end
+  end
+end

lib/models/player.rb

@@ -1,4 +1,4 @@
-require 'board'
+require 'models/board'
 
 module RubyConnect
   describe Board do
@@ -31,7 +31,7 @@ module RubyConnect
       end
 
       it 'raises an error if you try to select a column' do
-        expect{ full_board.insert_into_column 1, :red }.to raise_error(ArgumentError)
+        expect{ full_board.insert_into_column 1, :red }.to raise_error(ColumnFullError)
       end
     end
   end

spec/game_spec.rb

@@ -0,0 +1,33 @@
+require 'models/game'
+require 'models/board'
+
+module RubyConnect
+  describe Game do
+    let(:player1) { Player.new }
+    let(:player2) { Player.new }
+    let(:game) { Game.new(player1, player2) }
+
+    it 'can add one piece to the board' do
+      expect{ game.make_move(1, :red) }.to change{ game.board.moves_done }.from(0).to(1)
+    end
+
+    context 'when the grid is full' do
+      before do
+        (1..Board::COLUMNS).each do |column|
+          Board::ROWS.times { game.make_move column, :red }
+        end
+      end
+
+      it 'then the game is done' do
+        expect(game).to be_done
+      end
+    end
+
+    it 'switches player turns after one move'
+
+    describe '#winning_move?' do
+      it 'in a vertical direction'
+      it 'in a horizontal direction'
+    end
+  end
+end

spec/board_spec.rb renamed to spec/models/board_spec.rb

@@ -0,0 +1,11 @@
+require 'models/player'
+
+module RubyConnect
+  describe Player do
+    let(:player) { Player.new color: :red, name: "John", game: 1 }
+
+    describe '#make_move' do
+      
+    end
+  end
+end