ruby_ttt 0.1.0 → 0.1.1

data/lib/game_setup.rb

@@ -36,11 +36,15 @@ class GameSetup
   end
 
   def get_difficulty_level
-    return nil unless player_one.player_type == COMPUTER_PLAYER || player_two.player_type == COMPUTER_PLAYER
+    return nil unless computer_player_selected?
     level = ui.request_difficulty_level
     validate_level(level) ? ui.level_assigned_message(level) : invalid_level(level)
   end
 
+  def computer_player_selected?
+    (player_one.player_type == COMPUTER_PLAYER) || (player_two.player_type == COMPUTER_PLAYER)
+  end
+
   def validate_type(type, player)
     (type == HUMAN_PLAYER) || (type == COMPUTER_PLAYER)
   end
@@ -73,4 +77,9 @@ class GameSetup
     ui.first_move_message(player)
   end
 
+  def set_player_types(player_one_type, player_two_type)
+    player_one.player_type = player_one_type
+    player_two.player_type = player_two_type
+  end
+
 end

data/lib/ruby_ttt.rb

@@ -18,20 +18,32 @@ class Game
     until board.game_over?
       ui.display_board
       move = get_next_move
-      board.available_cell?(move) ? advance_game(move, current_player) : invalid_move(move)
+      advance_game if verify_move(move)
     end
     exit_game
   end
 
+  def verify_move(cell)
+    if board.available_cell?(cell)
+      board.add_marker(current_player.marker, cell)
+      true
+    else
+      invalid_move(cell)
+    end
+  end
+
   def get_next_move
-    return ui.request_human_move if current_player.player_type == HUMAN_PLAYER
+    return ui.request_human_move if !computer_move?
     difficulty_level == HARD_LEVEL ? ai.computer_move(board, current_player) : board.random_cell
   end
 
-  def advance_game(cell, player)
-    board.add_marker(player.marker, cell)
+  def computer_move?
+    current_player.player_type == COMPUTER_PLAYER
+  end
+
+  def advance_game
     game_status_check
-    player.next_player_turn
+    current_player.next_player_turn
     ui.next_move_message(current_player) unless board.game_over?
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ttt
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec