Merge branch 'clean2'

Conflicts:
	app/controllers/alerts_controller.rb
	app/controllers/application_controller.rb
	app/controllers/matches_controller.rb
	app/controllers/servers_controller.rb
	app/controllers/sessions_controller.rb
	app/controllers/tournaments_controller.rb
	app/controllers/users_controller.rb
	app/models/match.rb
	app/models/team.rb
	app/models/tournament.rb
	app/views/sessions/_form.html.erb
	app/views/sessions/index.html.erb
	app/views/sessions/index.json.jbuilder
	app/views/sessions/show.html.erb
	app/views/sessions/show.json.jbuilder
	app/views/tournaments/index.html.erb
	config/routes.rb
	generate.sh

21 files changed, 24 insertions, 14 deletions

diff --git a/db/migrate/20140401215809_add_hidden_attrs_to_user.rb b/db/migrate/20140401215809_add_hidden_attrs_to_user.rb
deleted file mode 100644
index 2f1b0b2..0000000
--- a/db/migrate/20140401215809_add_hidden_attrs_to_user.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class AddHiddenAttrsToUser < ActiveRecord::Migration
-  def change
-    add_column :users, :password_digest, :string
-    add_column :users, :remember_token, :string
-    add_index :users, :remember_token, unique: true
-    add_column :users, :groups, :integer
-  end
-end
diff --git a/db/migrate/20140401215718_create_servers.rb b/db/migrate/20140403155007_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140401215718_create_servers.rb
+++ b/db/migrate/20140403155007_create_servers.rb
diff --git a/db/migrate/20140401215720_create_matches.rb b/db/migrate/20140403155008_create_matches.rb
index 31eea12..31eea12 100644
--- a/db/migrate/20140401215720_create_matches.rb
+++ b/db/migrate/20140403155008_create_matches.rb
diff --git a/db/migrate/20140401215723_create_teams.rb b/db/migrate/20140403155011_create_teams.rb
index fdf9a68..fdf9a68 100644
--- a/db/migrate/20140401215723_create_teams.rb
+++ b/db/migrate/20140403155011_create_teams.rb
diff --git a/db/migrate/20140401215725_create_alerts.rb b/db/migrate/20140403155012_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140401215725_create_alerts.rb
+++ b/db/migrate/20140403155012_create_alerts.rb
diff --git a/db/migrate/20140401215728_create_pms.rb b/db/migrate/20140403155014_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140401215728_create_pms.rb
+++ b/db/migrate/20140403155014_create_pms.rb
diff --git a/db/migrate/20140401215730_create_tournaments.rb b/db/migrate/20140403155017_create_tournaments.rb
index 55f76a3..c0d8929 100644
--- a/db/migrate/20140401215730_create_tournaments.rb
+++ b/db/migrate/20140403155017_create_tournaments.rb
@@ -4,6 +4,11 @@ class CreateTournaments < ActiveRecord::Migration
       t.string :name
       t.references :game, index: true
       t.integer :status
+      t.integer :min_players_per_team
+      t.integer :max_players_per_team
+      t.integer :min_teams_per_match
+      t.integer :max_teams_per_match
+      t.integer :set_rounds
       t.boolean :randomized_teams
 
       t.timestamps
diff --git a/db/migrate/20140401215733_create_games.rb b/db/migrate/20140403155019_create_games.rb
index 5e4f56f..5e4f56f 100644
--- a/db/migrate/20140401215733_create_games.rb
+++ b/db/migrate/20140403155019_create_games.rb
diff --git a/db/migrate/20140401215735_create_users.rb b/db/migrate/20140403155020_create_users.rb
index 8032870..8032870 100644
--- a/db/migrate/20140401215735_create_users.rb
+++ b/db/migrate/20140403155020_create_users.rb
diff --git a/db/migrate/20140401215738_create_sessions.rb b/db/migrate/20140403155022_create_sessions.rb
index fe25bf2..f667f1e 100644
--- a/db/migrate/20140401215738_create_sessions.rb
+++ b/db/migrate/20140403155022_create_sessions.rb
@@ -2,8 +2,10 @@ class CreateSessions < ActiveRecord::Migration
   def change
     create_table :sessions do |t|
       t.references :user, index: true
+      t.string :token
 
       t.timestamps
     end
+    add_index :sessions, :token, unique: true
   end
 end
diff --git a/db/migrate/20140401215750_create_remote_usernames.rb b/db/migrate/20140403155024_create_remote_usernames.rb
index e265985..b837e53 100644
--- a/db/migrate/20140401215750_create_remote_usernames.rb
+++ b/db/migrate/20140403155024_create_remote_usernames.rb
@@ -3,7 +3,7 @@ class CreateRemoteUsernames < ActiveRecord::Migration
     create_table :remote_usernames do |t|
       t.references :game, index: true
       t.references :user, index: true
-      t.text :json_value
+      t.string :user_name
 
       t.timestamps
     end
diff --git a/db/migrate/20140401215740_create_server_settings.rb b/db/migrate/20140403155026_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140401215740_create_server_settings.rb
+++ b/db/migrate/20140403155026_create_server_settings.rb
diff --git a/db/migrate/20140401215743_create_game_settings.rb b/db/migrate/20140403155029_create_game_settings.rb
index 0ebbf18..0ebbf18 100644
--- a/db/migrate/20140401215743_create_game_settings.rb
+++ b/db/migrate/20140403155029_create_game_settings.rb
diff --git a/db/migrate/20140401215745_create_tournament_preferences.rb b/db/migrate/20140403155030_create_tournament_preferences.rb
index 991d659..991d659 100644
--- a/db/migrate/20140401215745_create_tournament_preferences.rb
+++ b/db/migrate/20140403155030_create_tournament_preferences.rb
diff --git a/db/migrate/20140401215747_create_scores.rb b/db/migrate/20140403155032_create_scores.rb
index 4ca0b0b..4ca0b0b 100644
--- a/db/migrate/20140401215747_create_scores.rb
+++ b/db/migrate/20140403155032_create_scores.rb
diff --git a/db/migrate/20140401215752_create_tournament_players_join_table.rb b/db/migrate/20140403155035_create_tournament_players_join_table.rb
index be240e8..be240e8 100644
--- a/db/migrate/20140401215752_create_tournament_players_join_table.rb
+++ b/db/migrate/20140403155035_create_tournament_players_join_table.rb
diff --git a/db/migrate/20140401215755_create_tournament_hosts_join_table.rb b/db/migrate/20140403155038_create_tournament_hosts_join_table.rb
index 7521d89..7521d89 100644
--- a/db/migrate/20140401215755_create_tournament_hosts_join_table.rb
+++ b/db/migrate/20140403155038_create_tournament_hosts_join_table.rb
diff --git a/db/migrate/20140401215757_create_team_user_join_table.rb b/db/migrate/20140403155039_create_team_user_join_table.rb
index f3b57fc..f3b57fc 100644
--- a/db/migrate/20140401215757_create_team_user_join_table.rb
+++ b/db/migrate/20140403155039_create_team_user_join_table.rb
diff --git a/db/migrate/20140401215800_create_match_team_join_table.rb b/db/migrate/20140403155042_create_match_team_join_table.rb
index c2ed1b7..c2ed1b7 100644
--- a/db/migrate/20140401215800_create_match_team_join_table.rb
+++ b/db/migrate/20140403155042_create_match_team_join_table.rb
diff --git a/db/migrate/20140403155049_add_hidden_attrs_to_user.rb b/db/migrate/20140403155049_add_hidden_attrs_to_user.rb
new file mode 100644
index 0000000..9b5c505
--- /dev/null
+++ b/db/migrate/20140403155049_add_hidden_attrs_to_user.rb
@@ -0,0 +1,6 @@
+class AddHiddenAttrsToUser < ActiveRecord::Migration
+  def change
+    add_column :users, :password_digest, :string
+    add_column :users, :permissions, :integer
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index c3be661..113f16d 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: 20140401215809) do
+ActiveRecord::Schema.define(version: 20140403155049) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -90,7 +90,7 @@ ActiveRecord::Schema.define(version: 20140401215809) do
   create_table "remote_usernames", force: true do |t|
     t.integer  "game_id"
     t.integer  "user_id"
-    t.text     "json_value"
+    t.string   "user_name"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -121,10 +121,12 @@ ActiveRecord::Schema.define(version: 20140401215809) do
 
   create_table "sessions", force: true do |t|
     t.integer  "user_id"
+    t.string   "token"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
+  add_index "sessions", ["token"], name: "index_sessions_on_token", unique: true
   add_index "sessions", ["user_id"], name: "index_sessions_on_user_id"
 
   create_table "teams", force: true do |t|
@@ -155,6 +157,11 @@ ActiveRecord::Schema.define(version: 20140401215809) do
     t.string   "name"
     t.integer  "game_id"
     t.integer  "status"
+    t.integer  "min_players_per_team"
+    t.integer  "max_players_per_team"
+    t.integer  "min_teams_per_match"
+    t.integer  "max_teams_per_match"
+    t.integer  "set_rounds"
     t.boolean  "randomized_teams"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -169,12 +176,10 @@ ActiveRecord::Schema.define(version: 20140401215809) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "password_digest"
-    t.string   "remember_token"
-    t.integer  "groups"
+    t.integer  "permissions"
   end
 
   add_index "users", ["email"], name: "index_users_on_email", unique: true
-  add_index "users", ["remember_token"], name: "index_users_on_remember_token", unique: true
   add_index "users", ["user_name"], name: "index_users_on_user_name", unique: true
 
 end