25 files changed, 108 insertions, 7 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 9e539ac..b5ea29b 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -1,19 +1,24 @@
 class SessionsController < ApplicationController
+	before_action :set_session, only: [:destroy]
 
 	# GET /sessions/new
 	def new
 		@user = User.new
+		#@session = Session.new
 	end
 	
 	# POST /sessions
+	# POST /sessions.json
 	def create
 		# find the user...
 		@user = User.find_by(email: params[:session][:email].downcase)
+		#@session = Session.new(@user)
 		# ... and create a new session
 		respond_to do |format|
 			if @user && @user.authenticate(params[:session][:password])
 				sign_in @user
 				format.html { redirect_to root_path }
+				#format.json { #TODO }
 			else
 				format.html { render action: 'new' }
 				format.json { render json: @user.errors, status: :unprocessable_entity }
@@ -21,9 +26,26 @@ class SessionsController < ApplicationController
 		end
 	end
 
-	# DELETE /sessions/current
+	# DELETE /sessions/1
+	# DELETE /sessions/1.json
 	def destroy
+		#@session.destroy
 		sign_out
-		redirect_to root_path
+		respond_to do |format|
+			format.html { redirect_to root_path }
+			format.json { head :no_content }
+		end
+	end
+
+	private
+
+	# Use callbacks to share common setup or constraints between actions.
+	def set_session
+		#@session = Session.find(cookies[:remember_token])
+	end
+
+	# Never trust parameters from the scary internet, only allow the white list through.
+	def session_params
+		params.require(:session).permit(:session_email, :session_password)
 	end
 end
diff --git a/app/models/session.rb b/app/models/session.rb
new file mode 100644
index 0000000..c66afec
--- /dev/null
+++ b/app/models/session.rb
@@ -0,0 +1,3 @@
+class Session < ActiveRecord::Base
+  belongs_to :user
+end
diff --git a/db/migrate/20140304043618_create_servers.rb b/db/migrate/20140306014047_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140304043618_create_servers.rb
+++ b/db/migrate/20140306014047_create_servers.rb
diff --git a/db/migrate/20140304043620_create_tournaments.rb b/db/migrate/20140306014050_create_tournaments.rb
index 36fcf7e..36fcf7e 100644
--- a/db/migrate/20140304043620_create_tournaments.rb
+++ b/db/migrate/20140306014050_create_tournaments.rb
diff --git a/db/migrate/20140304043622_create_matches.rb b/db/migrate/20140306014052_create_matches.rb
index 325863d..325863d 100644
--- a/db/migrate/20140304043622_create_matches.rb
+++ b/db/migrate/20140306014052_create_matches.rb
diff --git a/db/migrate/20140304043624_create_teams.rb b/db/migrate/20140306014054_create_teams.rb
index dd8397d..dd8397d 100644
--- a/db/migrate/20140304043624_create_teams.rb
+++ b/db/migrate/20140306014054_create_teams.rb
diff --git a/db/migrate/20140304043626_create_alerts.rb b/db/migrate/20140306014056_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140304043626_create_alerts.rb
+++ b/db/migrate/20140306014056_create_alerts.rb
diff --git a/db/migrate/20140304043629_create_pms.rb b/db/migrate/20140306014059_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140304043629_create_pms.rb
+++ b/db/migrate/20140306014059_create_pms.rb
diff --git a/db/migrate/20140304043631_create_games.rb b/db/migrate/20140306014101_create_games.rb
index 59d4ef0..59d4ef0 100644
--- a/db/migrate/20140304043631_create_games.rb
+++ b/db/migrate/20140306014101_create_games.rb
diff --git a/db/migrate/20140304043633_create_users.rb b/db/migrate/20140306014103_create_users.rb
index f0986d4..f0986d4 100644
--- a/db/migrate/20140304043633_create_users.rb
+++ b/db/migrate/20140306014103_create_users.rb
diff --git a/db/migrate/20140306014106_create_sessions.rb b/db/migrate/20140306014106_create_sessions.rb
new file mode 100644
index 0000000..fe25bf2
--- /dev/null
+++ b/db/migrate/20140306014106_create_sessions.rb
@@ -0,0 +1,9 @@
+class CreateSessions < ActiveRecord::Migration
+  def change
+    create_table :sessions do |t|
+      t.references :user, index: true
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20140304043635_create_game_attributes.rb b/db/migrate/20140306014108_create_game_attributes.rb
index b63f134..b63f134 100644
--- a/db/migrate/20140304043635_create_game_attributes.rb
+++ b/db/migrate/20140306014108_create_game_attributes.rb
diff --git a/db/migrate/20140304043637_create_server_settings.rb b/db/migrate/20140306014110_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140304043637_create_server_settings.rb
+++ b/db/migrate/20140306014110_create_server_settings.rb
diff --git a/db/migrate/20140304043639_create_user_team_pairs.rb b/db/migrate/20140306014112_create_user_team_pairs.rb
index 2c492ac..2c492ac 100644
--- a/db/migrate/20140304043639_create_user_team_pairs.rb
+++ b/db/migrate/20140306014112_create_user_team_pairs.rb
diff --git a/db/migrate/20140304043642_create_team_match_pairs.rb b/db/migrate/20140306014114_create_team_match_pairs.rb
index 8fac07e..8fac07e 100644
--- a/db/migrate/20140304043642_create_team_match_pairs.rb
+++ b/db/migrate/20140306014114_create_team_match_pairs.rb
diff --git a/db/migrate/20140304043652_add_index_to_users_email.rb b/db/migrate/20140306014123_add_index_to_users_email.rb
index 934d23b..934d23b 100644
--- a/db/migrate/20140304043652_add_index_to_users_email.rb
+++ b/db/migrate/20140306014123_add_index_to_users_email.rb
diff --git a/db/migrate/20140304043654_add_index_to_users_user_name.rb b/db/migrate/20140306014125_add_index_to_users_user_name.rb
index 22ca8c3..22ca8c3 100644
--- a/db/migrate/20140304043654_add_index_to_users_user_name.rb
+++ b/db/migrate/20140306014125_add_index_to_users_user_name.rb
diff --git a/db/migrate/20140304043656_add_password_digest_to_users.rb b/db/migrate/20140306014128_add_password_digest_to_users.rb
index 7ad1f62..7ad1f62 100644
--- a/db/migrate/20140304043656_add_password_digest_to_users.rb
+++ b/db/migrate/20140306014128_add_password_digest_to_users.rb
diff --git a/db/migrate/20140304043658_add_remember_token_to_users.rb b/db/migrate/20140306014130_add_remember_token_to_users.rb
index 6d84942..6d84942 100644
--- a/db/migrate/20140304043658_add_remember_token_to_users.rb
+++ b/db/migrate/20140306014130_add_remember_token_to_users.rb
diff --git a/db/migrate/20140304043700_create_tournament_options.rb b/db/migrate/20140306014132_create_tournament_options.rb
index d2df22e..d2df22e 100644
--- a/db/migrate/20140304043700_create_tournament_options.rb
+++ b/db/migrate/20140306014132_create_tournament_options.rb
diff --git a/db/schema.rb b/db/schema.rb
index 494fb09..f2e9136 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140304043700) do
+ActiveRecord::Schema.define(version: 20140306014132) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -72,6 +72,14 @@ ActiveRecord::Schema.define(version: 20140304043700) do
     t.datetime "updated_at"
   end
 
+  create_table "sessions", force: true do |t|
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "sessions", ["user_id"], name: "index_sessions_on_user_id"
+
   create_table "team_match_pairs", force: true do |t|
     t.integer  "team_id"
     t.integer  "match_id"
diff --git a/generate.sh b/generate.sh
index f0db78e..0d07743 100755
--- a/generate.sh
+++ b/generate.sh
@@ -16,6 +16,7 @@ set -x
 git rm -rf app test config/routes.rb db/migrate
 git checkout clean-start -- app test config/routes.rb
 
+# The whole shebang, models, views, and controllers
 bundle exec rails generate scaffold server --force $NOTEST
 bundle exec rails generate scaffold tournament game:references $NOTEST
 bundle exec rails generate scaffold match tournament:references name:string --force $NOTEST
@@ -24,16 +25,18 @@ bundle exec rails generate scaffold alert author:references message:text $NOTEST
 bundle exec rails generate scaffold pm author:references recipient:references message:text $NOTEST
 bundle exec rails generate scaffold game name:text players_per_team:integer teams_per_match:integer set_rounds:integer randomized_teams:integer --force $NOTEST
 bundle exec rails generate scaffold user name:string email:string user_name:string $NOTEST
+bundle exec rails generate scaffold session user:references
 
+# Just models
 bundle exec rails generate model game_attribute game:references key:text type:integer $NOTEST
 bundle exec rails generate model server_settings $NOTEST
 bundle exec rails generate model user_team_pair user:references team:references $NOTEST
 bundle exec rails generate model team_match_pair team:references match:references $NOTEST
 
+# Just controllers
 bundle exec rails generate controller search $NOTEST
 bundle exec rails generate controller main $NOTEST
 bundle exec rails generate controller static $NOTEST
-bundle exec rails generate controller sessions
 
 #added some stuff to the database
 
diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb
index d30ebc3..a5cc8cb 100644
--- a/test/controllers/sessions_controller_test.rb
+++ b/test/controllers/sessions_controller_test.rb
@@ -1,7 +1,49 @@
 require 'test_helper'
 
 class SessionsControllerTest < ActionController::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
+  setup do
+    @session = sessions(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:sessions)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create session" do
+    assert_difference('Session.count') do
+      post :create, session: { user_id: @session.user_id }
+    end
+
+    assert_redirected_to session_path(assigns(:session))
+  end
+
+  test "should show session" do
+    get :show, id: @session
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @session
+    assert_response :success
+  end
+
+  test "should update session" do
+    patch :update, id: @session, session: { user_id: @session.user_id }
+    assert_redirected_to session_path(assigns(:session))
+  end
+
+  test "should destroy session" do
+    assert_difference('Session.count', -1) do
+      delete :destroy, id: @session
+    end
+
+    assert_redirected_to sessions_path
+  end
 end
diff --git a/test/fixtures/sessions.yml b/test/fixtures/sessions.yml
new file mode 100644
index 0000000..d9098d9
--- /dev/null
+++ b/test/fixtures/sessions.yml
@@ -0,0 +1,7 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  user_id: 
+
+two:
+  user_id: 
diff --git a/test/models/session_test.rb b/test/models/session_test.rb
new file mode 100644
index 0000000..2d1bc1b
--- /dev/null
+++ b/test/models/session_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class SessionTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end