Added game setup validation to controller

lisahamm · Feb 26, 2015 · bd513c7 · bd513c7
1 parent e02a99b
commit bd513c7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 36 deletions.
diff --git a/tic_tac_toe_controller.rb b/tic_tac_toe_controller.rb
@@ -11,16 +11,15 @@ class TicTacToeController < Sinatra::Base
   end
 
   post '/setup' do
-
-    if !setup_valid?(params)
-      @invalid_input_messages = error_messages
+    @setup = GameSetup.new(params)
+    if @setup.invalid?
       erb :index
+    else
+      session[:mark] = params[:player_mark]
+      session[:opponent] = params[:opponent]
+      session[:player_order] = params[:player_order]
+      redirect to('/game')
     end
-
-    session[:mark] = params[:player_mark]
-    session[:opponent] = params[:opponent]
-    session[:player_order] = params[:player_order]
-    redirect to('/game')
   end
 
   get '/game' do

diff --git a/tic_tac_toe_controller_spec.rb b/tic_tac_toe_controller_spec.rb