From ef22599880973aae8464bacb82e3a04d6277bc43 Mon Sep 17 00:00:00 2001 From: shumakl Date: Thu, 3 Apr 2014 11:19:10 -0400 Subject: Move things around between users and sessions --- app/controllers/sessions_controller.rb | 2 +- app/views/sessions/_form.html.erb | 4 ++++ app/views/sessions/index.html.erb | 2 ++ app/views/sessions/index.json.jbuilder | 2 +- app/views/sessions/show.html.erb | 5 +++++ app/views/sessions/show.json.jbuilder | 2 +- db/migrate/20140402152830_create_servers.rb | 8 -------- db/migrate/20140402152832_create_matches.rb | 13 ------------- db/migrate/20140402152835_create_teams.rb | 9 --------- db/migrate/20140402152837_create_alerts.rb | 10 ---------- db/migrate/20140402152840_create_pms.rb | 11 ----------- db/migrate/20140402152842_create_tournaments.rb | 17 ----------------- db/migrate/20140402152845_create_games.rb | 15 --------------- db/migrate/20140402152847_create_users.rb | 13 ------------- db/migrate/20140402152850_create_sessions.rb | 9 --------- db/migrate/20140402152852_create_remote_usernames.rb | 11 ----------- db/migrate/20140402152855_create_server_settings.rb | 8 -------- db/migrate/20140402152857_create_game_settings.rb | 15 --------------- .../20140402152900_create_tournament_preferences.rb | 12 ------------ db/migrate/20140402152902_create_scores.rb | 11 ----------- ...140402152907_create_tournament_players_join_table.rb | 8 -------- ...20140402152909_create_tournament_hosts_join_table.rb | 8 -------- .../20140402152912_create_team_user_join_table.rb | 8 -------- .../20140402152914_create_match_team_join_table.rb | 8 -------- db/migrate/20140402152924_add_hidden_attrs_to_user.rb | 8 -------- db/migrate/20140403151738_create_servers.rb | 8 ++++++++ db/migrate/20140403151741_create_matches.rb | 13 +++++++++++++ db/migrate/20140403151743_create_teams.rb | 9 +++++++++ db/migrate/20140403151746_create_alerts.rb | 10 ++++++++++ db/migrate/20140403151749_create_pms.rb | 11 +++++++++++ db/migrate/20140403151751_create_tournaments.rb | 17 +++++++++++++++++ db/migrate/20140403151753_create_games.rb | 15 +++++++++++++++ db/migrate/20140403151756_create_users.rb | 13 +++++++++++++ db/migrate/20140403151758_create_sessions.rb | 11 +++++++++++ db/migrate/20140403151801_create_remote_usernames.rb | 11 +++++++++++ db/migrate/20140403151803_create_server_settings.rb | 8 ++++++++ db/migrate/20140403151806_create_game_settings.rb | 15 +++++++++++++++ .../20140403151808_create_tournament_preferences.rb | 12 ++++++++++++ db/migrate/20140403151811_create_scores.rb | 11 +++++++++++ ...140403151815_create_tournament_players_join_table.rb | 8 ++++++++ ...20140403151818_create_tournament_hosts_join_table.rb | 8 ++++++++ .../20140403151820_create_team_user_join_table.rb | 8 ++++++++ .../20140403151823_create_match_team_join_table.rb | 8 ++++++++ db/migrate/20140403151832_add_hidden_attrs_to_user.rb | 6 ++++++ db/schema.rb | 8 ++++---- generate.sh | 4 ++-- test/controllers/sessions_controller_test.rb | 4 ++-- test/fixtures/sessions.yml | 2 ++ 48 files changed, 226 insertions(+), 213 deletions(-) delete mode 100644 db/migrate/20140402152830_create_servers.rb delete mode 100644 db/migrate/20140402152832_create_matches.rb delete mode 100644 db/migrate/20140402152835_create_teams.rb delete mode 100644 db/migrate/20140402152837_create_alerts.rb delete mode 100644 db/migrate/20140402152840_create_pms.rb delete mode 100644 db/migrate/20140402152842_create_tournaments.rb delete mode 100644 db/migrate/20140402152845_create_games.rb delete mode 100644 db/migrate/20140402152847_create_users.rb delete mode 100644 db/migrate/20140402152850_create_sessions.rb delete mode 100644 db/migrate/20140402152852_create_remote_usernames.rb delete mode 100644 db/migrate/20140402152855_create_server_settings.rb delete mode 100644 db/migrate/20140402152857_create_game_settings.rb delete mode 100644 db/migrate/20140402152900_create_tournament_preferences.rb delete mode 100644 db/migrate/20140402152902_create_scores.rb delete mode 100644 db/migrate/20140402152907_create_tournament_players_join_table.rb delete mode 100644 db/migrate/20140402152909_create_tournament_hosts_join_table.rb delete mode 100644 db/migrate/20140402152912_create_team_user_join_table.rb delete mode 100644 db/migrate/20140402152914_create_match_team_join_table.rb delete mode 100644 db/migrate/20140402152924_add_hidden_attrs_to_user.rb create mode 100644 db/migrate/20140403151738_create_servers.rb create mode 100644 db/migrate/20140403151741_create_matches.rb create mode 100644 db/migrate/20140403151743_create_teams.rb create mode 100644 db/migrate/20140403151746_create_alerts.rb create mode 100644 db/migrate/20140403151749_create_pms.rb create mode 100644 db/migrate/20140403151751_create_tournaments.rb create mode 100644 db/migrate/20140403151753_create_games.rb create mode 100644 db/migrate/20140403151756_create_users.rb create mode 100644 db/migrate/20140403151758_create_sessions.rb create mode 100644 db/migrate/20140403151801_create_remote_usernames.rb create mode 100644 db/migrate/20140403151803_create_server_settings.rb create mode 100644 db/migrate/20140403151806_create_game_settings.rb create mode 100644 db/migrate/20140403151808_create_tournament_preferences.rb create mode 100644 db/migrate/20140403151811_create_scores.rb create mode 100644 db/migrate/20140403151815_create_tournament_players_join_table.rb create mode 100644 db/migrate/20140403151818_create_tournament_hosts_join_table.rb create mode 100644 db/migrate/20140403151820_create_team_user_join_table.rb create mode 100644 db/migrate/20140403151823_create_match_team_join_table.rb create mode 100644 db/migrate/20140403151832_add_hidden_attrs_to_user.rb diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 2f72bf7..7df8a9a 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -69,6 +69,6 @@ class SessionsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def session_params - params.require(:session).permit(:user_id) + params.require(:session).permit(:user_id, :token) end end diff --git a/app/views/sessions/_form.html.erb b/app/views/sessions/_form.html.erb index 1b94e77..90ad0ad 100644 --- a/app/views/sessions/_form.html.erb +++ b/app/views/sessions/_form.html.erb @@ -15,6 +15,10 @@ <%= f.label :user_id %>
<%= f.text_field :user_id %> +
+ <%= f.label :token %>
+ <%= f.text_field :token %> +
<%= f.submit %>
diff --git a/app/views/sessions/index.html.erb b/app/views/sessions/index.html.erb index 707a47d..43a7e1f 100644 --- a/app/views/sessions/index.html.erb +++ b/app/views/sessions/index.html.erb @@ -4,6 +4,7 @@ User + Token @@ -14,6 +15,7 @@ <% @sessions.each do |session| %> <%= session.user %> + <%= session.token %> <%= link_to 'Show', session %> <%= link_to 'Edit', edit_session_path(session) %> <%= link_to 'Destroy', session, method: :delete, data: { confirm: 'Are you sure?' } %> diff --git a/app/views/sessions/index.json.jbuilder b/app/views/sessions/index.json.jbuilder index 18fd4fa..5205ede 100644 --- a/app/views/sessions/index.json.jbuilder +++ b/app/views/sessions/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@sessions) do |session| - json.extract! session, :id, :user_id + json.extract! session, :id, :user_id, :token json.url session_url(session, format: :json) end diff --git a/app/views/sessions/show.html.erb b/app/views/sessions/show.html.erb index 5176869..230e6bd 100644 --- a/app/views/sessions/show.html.erb +++ b/app/views/sessions/show.html.erb @@ -5,5 +5,10 @@ <%= @session.user %>

+

+ Token: + <%= @session.token %> +

+ <%= link_to 'Edit', edit_session_path(@session) %> | <%= link_to 'Back', sessions_path %> diff --git a/app/views/sessions/show.json.jbuilder b/app/views/sessions/show.json.jbuilder index 4ebf936..c9efd3b 100644 --- a/app/views/sessions/show.json.jbuilder +++ b/app/views/sessions/show.json.jbuilder @@ -1 +1 @@ -json.extract! @session, :id, :user_id, :created_at, :updated_at +json.extract! @session, :id, :user_id, :token, :created_at, :updated_at diff --git a/db/migrate/20140402152830_create_servers.rb b/db/migrate/20140402152830_create_servers.rb deleted file mode 100644 index f33241a..0000000 --- a/db/migrate/20140402152830_create_servers.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateServers < ActiveRecord::Migration - def change - create_table :servers do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140402152832_create_matches.rb b/db/migrate/20140402152832_create_matches.rb deleted file mode 100644 index 31eea12..0000000 --- a/db/migrate/20140402152832_create_matches.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateMatches < ActiveRecord::Migration - def change - create_table :matches do |t| - t.integer :status - t.references :tournament, index: true - t.string :name - t.references :winner, index: true - t.string :remote_id - - t.timestamps - end - end -end diff --git a/db/migrate/20140402152835_create_teams.rb b/db/migrate/20140402152835_create_teams.rb deleted file mode 100644 index fdf9a68..0000000 --- a/db/migrate/20140402152835_create_teams.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateTeams < ActiveRecord::Migration - def change - create_table :teams do |t| - t.references :match, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140402152837_create_alerts.rb b/db/migrate/20140402152837_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140402152837_create_alerts.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateAlerts < ActiveRecord::Migration - def change - create_table :alerts do |t| - t.references :author, index: true - t.text :message - - t.timestamps - end - end -end diff --git a/db/migrate/20140402152840_create_pms.rb b/db/migrate/20140402152840_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140402152840_create_pms.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreatePms < ActiveRecord::Migration - def change - create_table :pms do |t| - t.references :author, index: true - t.references :recipient, index: true - t.text :message - - t.timestamps - end - end -end diff --git a/db/migrate/20140402152842_create_tournaments.rb b/db/migrate/20140402152842_create_tournaments.rb deleted file mode 100644 index c0d8929..0000000 --- a/db/migrate/20140402152842_create_tournaments.rb +++ /dev/null @@ -1,17 +0,0 @@ -class CreateTournaments < ActiveRecord::Migration - def change - create_table :tournaments do |t| - 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 - end - end -end diff --git a/db/migrate/20140402152845_create_games.rb b/db/migrate/20140402152845_create_games.rb deleted file mode 100644 index 5e4f56f..0000000 --- a/db/migrate/20140402152845_create_games.rb +++ /dev/null @@ -1,15 +0,0 @@ -class CreateGames < ActiveRecord::Migration - def change - create_table :games do |t| - t.text :name - 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 - end - end -end diff --git a/db/migrate/20140402152847_create_users.rb b/db/migrate/20140402152847_create_users.rb deleted file mode 100644 index 8032870..0000000 --- a/db/migrate/20140402152847_create_users.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateUsers < ActiveRecord::Migration - def change - create_table :users do |t| - t.string :name - t.string :email - t.string :user_name - - t.timestamps - end - add_index :users, :email, unique: true - add_index :users, :user_name, unique: true - end -end diff --git a/db/migrate/20140402152850_create_sessions.rb b/db/migrate/20140402152850_create_sessions.rb deleted file mode 100644 index fe25bf2..0000000 --- a/db/migrate/20140402152850_create_sessions.rb +++ /dev/null @@ -1,9 +0,0 @@ -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/20140402152852_create_remote_usernames.rb b/db/migrate/20140402152852_create_remote_usernames.rb deleted file mode 100644 index b837e53..0000000 --- a/db/migrate/20140402152852_create_remote_usernames.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateRemoteUsernames < ActiveRecord::Migration - def change - create_table :remote_usernames do |t| - t.references :game, index: true - t.references :user, index: true - t.string :user_name - - t.timestamps - end - end -end diff --git a/db/migrate/20140402152855_create_server_settings.rb b/db/migrate/20140402152855_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140402152855_create_server_settings.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateServerSettings < ActiveRecord::Migration - def change - create_table :server_settings do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140402152857_create_game_settings.rb b/db/migrate/20140402152857_create_game_settings.rb deleted file mode 100644 index 0ebbf18..0000000 --- a/db/migrate/20140402152857_create_game_settings.rb +++ /dev/null @@ -1,15 +0,0 @@ -class CreateGameSettings < ActiveRecord::Migration - def change - create_table :game_settings do |t| - t.references :game, index: true - t.integer :type - t.string :name - t.text :default - t.text :discription - t.text :type_opt - t.integer :display_order - - t.timestamps - end - end -end diff --git a/db/migrate/20140402152900_create_tournament_preferences.rb b/db/migrate/20140402152900_create_tournament_preferences.rb deleted file mode 100644 index 991d659..0000000 --- a/db/migrate/20140402152900_create_tournament_preferences.rb +++ /dev/null @@ -1,12 +0,0 @@ -class CreateTournamentPreferences < ActiveRecord::Migration - def change - create_table :tournament_preferences do |t| - t.references :tournament, index: true - t.integer :vartype - t.string :name - t.text :value - - t.timestamps - end - end -end diff --git a/db/migrate/20140402152902_create_scores.rb b/db/migrate/20140402152902_create_scores.rb deleted file mode 100644 index 4ca0b0b..0000000 --- a/db/migrate/20140402152902_create_scores.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateScores < ActiveRecord::Migration - def change - create_table :scores do |t| - t.references :user, index: true - t.references :match, index: true - t.integer :value - - t.timestamps - end - end -end diff --git a/db/migrate/20140402152907_create_tournament_players_join_table.rb b/db/migrate/20140402152907_create_tournament_players_join_table.rb deleted file mode 100644 index be240e8..0000000 --- a/db/migrate/20140402152907_create_tournament_players_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTournamentPlayersJoinTable < ActiveRecord::Migration - def change - create_join_table :players, :tournaments do |t| - # t.index [:player_id, :tournament_id] - # t.index [:tournament_id, :player_id] - end - end -end diff --git a/db/migrate/20140402152909_create_tournament_hosts_join_table.rb b/db/migrate/20140402152909_create_tournament_hosts_join_table.rb deleted file mode 100644 index 7521d89..0000000 --- a/db/migrate/20140402152909_create_tournament_hosts_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTournamentHostsJoinTable < ActiveRecord::Migration - def change - create_join_table :hosts, :tournaments do |t| - # t.index [:host_id, :tournament_id] - # t.index [:tournament_id, :host_id] - end - end -end diff --git a/db/migrate/20140402152912_create_team_user_join_table.rb b/db/migrate/20140402152912_create_team_user_join_table.rb deleted file mode 100644 index f3b57fc..0000000 --- a/db/migrate/20140402152912_create_team_user_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTeamUserJoinTable < ActiveRecord::Migration - def change - create_join_table :teams, :users do |t| - # t.index [:team_id, :user_id] - # t.index [:user_id, :team_id] - end - end -end diff --git a/db/migrate/20140402152914_create_match_team_join_table.rb b/db/migrate/20140402152914_create_match_team_join_table.rb deleted file mode 100644 index c2ed1b7..0000000 --- a/db/migrate/20140402152914_create_match_team_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateMatchTeamJoinTable < ActiveRecord::Migration - def change - create_join_table :matches, :teams do |t| - # t.index [:match_id, :team_id] - # t.index [:team_id, :match_id] - end - end -end diff --git a/db/migrate/20140402152924_add_hidden_attrs_to_user.rb b/db/migrate/20140402152924_add_hidden_attrs_to_user.rb deleted file mode 100644 index 2f1b0b2..0000000 --- a/db/migrate/20140402152924_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/20140403151738_create_servers.rb b/db/migrate/20140403151738_create_servers.rb new file mode 100644 index 0000000..f33241a --- /dev/null +++ b/db/migrate/20140403151738_create_servers.rb @@ -0,0 +1,8 @@ +class CreateServers < ActiveRecord::Migration + def change + create_table :servers do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140403151741_create_matches.rb b/db/migrate/20140403151741_create_matches.rb new file mode 100644 index 0000000..31eea12 --- /dev/null +++ b/db/migrate/20140403151741_create_matches.rb @@ -0,0 +1,13 @@ +class CreateMatches < ActiveRecord::Migration + def change + create_table :matches do |t| + t.integer :status + t.references :tournament, index: true + t.string :name + t.references :winner, index: true + t.string :remote_id + + t.timestamps + end + end +end diff --git a/db/migrate/20140403151743_create_teams.rb b/db/migrate/20140403151743_create_teams.rb new file mode 100644 index 0000000..fdf9a68 --- /dev/null +++ b/db/migrate/20140403151743_create_teams.rb @@ -0,0 +1,9 @@ +class CreateTeams < ActiveRecord::Migration + def change + create_table :teams do |t| + t.references :match, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140403151746_create_alerts.rb b/db/migrate/20140403151746_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140403151746_create_alerts.rb @@ -0,0 +1,10 @@ +class CreateAlerts < ActiveRecord::Migration + def change + create_table :alerts do |t| + t.references :author, index: true + t.text :message + + t.timestamps + end + end +end diff --git a/db/migrate/20140403151749_create_pms.rb b/db/migrate/20140403151749_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140403151749_create_pms.rb @@ -0,0 +1,11 @@ +class CreatePms < ActiveRecord::Migration + def change + create_table :pms do |t| + t.references :author, index: true + t.references :recipient, index: true + t.text :message + + t.timestamps + end + end +end diff --git a/db/migrate/20140403151751_create_tournaments.rb b/db/migrate/20140403151751_create_tournaments.rb new file mode 100644 index 0000000..c0d8929 --- /dev/null +++ b/db/migrate/20140403151751_create_tournaments.rb @@ -0,0 +1,17 @@ +class CreateTournaments < ActiveRecord::Migration + def change + create_table :tournaments do |t| + 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 + end + end +end diff --git a/db/migrate/20140403151753_create_games.rb b/db/migrate/20140403151753_create_games.rb new file mode 100644 index 0000000..5e4f56f --- /dev/null +++ b/db/migrate/20140403151753_create_games.rb @@ -0,0 +1,15 @@ +class CreateGames < ActiveRecord::Migration + def change + create_table :games do |t| + t.text :name + 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 + end + end +end diff --git a/db/migrate/20140403151756_create_users.rb b/db/migrate/20140403151756_create_users.rb new file mode 100644 index 0000000..8032870 --- /dev/null +++ b/db/migrate/20140403151756_create_users.rb @@ -0,0 +1,13 @@ +class CreateUsers < ActiveRecord::Migration + def change + create_table :users do |t| + t.string :name + t.string :email + t.string :user_name + + t.timestamps + end + add_index :users, :email, unique: true + add_index :users, :user_name, unique: true + end +end diff --git a/db/migrate/20140403151758_create_sessions.rb b/db/migrate/20140403151758_create_sessions.rb new file mode 100644 index 0000000..f667f1e --- /dev/null +++ b/db/migrate/20140403151758_create_sessions.rb @@ -0,0 +1,11 @@ +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/20140403151801_create_remote_usernames.rb b/db/migrate/20140403151801_create_remote_usernames.rb new file mode 100644 index 0000000..b837e53 --- /dev/null +++ b/db/migrate/20140403151801_create_remote_usernames.rb @@ -0,0 +1,11 @@ +class CreateRemoteUsernames < ActiveRecord::Migration + def change + create_table :remote_usernames do |t| + t.references :game, index: true + t.references :user, index: true + t.string :user_name + + t.timestamps + end + end +end diff --git a/db/migrate/20140403151803_create_server_settings.rb b/db/migrate/20140403151803_create_server_settings.rb new file mode 100644 index 0000000..dfdd91b --- /dev/null +++ b/db/migrate/20140403151803_create_server_settings.rb @@ -0,0 +1,8 @@ +class CreateServerSettings < ActiveRecord::Migration + def change + create_table :server_settings do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140403151806_create_game_settings.rb b/db/migrate/20140403151806_create_game_settings.rb new file mode 100644 index 0000000..0ebbf18 --- /dev/null +++ b/db/migrate/20140403151806_create_game_settings.rb @@ -0,0 +1,15 @@ +class CreateGameSettings < ActiveRecord::Migration + def change + create_table :game_settings do |t| + t.references :game, index: true + t.integer :type + t.string :name + t.text :default + t.text :discription + t.text :type_opt + t.integer :display_order + + t.timestamps + end + end +end diff --git a/db/migrate/20140403151808_create_tournament_preferences.rb b/db/migrate/20140403151808_create_tournament_preferences.rb new file mode 100644 index 0000000..991d659 --- /dev/null +++ b/db/migrate/20140403151808_create_tournament_preferences.rb @@ -0,0 +1,12 @@ +class CreateTournamentPreferences < ActiveRecord::Migration + def change + create_table :tournament_preferences do |t| + t.references :tournament, index: true + t.integer :vartype + t.string :name + t.text :value + + t.timestamps + end + end +end diff --git a/db/migrate/20140403151811_create_scores.rb b/db/migrate/20140403151811_create_scores.rb new file mode 100644 index 0000000..4ca0b0b --- /dev/null +++ b/db/migrate/20140403151811_create_scores.rb @@ -0,0 +1,11 @@ +class CreateScores < ActiveRecord::Migration + def change + create_table :scores do |t| + t.references :user, index: true + t.references :match, index: true + t.integer :value + + t.timestamps + end + end +end diff --git a/db/migrate/20140403151815_create_tournament_players_join_table.rb b/db/migrate/20140403151815_create_tournament_players_join_table.rb new file mode 100644 index 0000000..be240e8 --- /dev/null +++ b/db/migrate/20140403151815_create_tournament_players_join_table.rb @@ -0,0 +1,8 @@ +class CreateTournamentPlayersJoinTable < ActiveRecord::Migration + def change + create_join_table :players, :tournaments do |t| + # t.index [:player_id, :tournament_id] + # t.index [:tournament_id, :player_id] + end + end +end diff --git a/db/migrate/20140403151818_create_tournament_hosts_join_table.rb b/db/migrate/20140403151818_create_tournament_hosts_join_table.rb new file mode 100644 index 0000000..7521d89 --- /dev/null +++ b/db/migrate/20140403151818_create_tournament_hosts_join_table.rb @@ -0,0 +1,8 @@ +class CreateTournamentHostsJoinTable < ActiveRecord::Migration + def change + create_join_table :hosts, :tournaments do |t| + # t.index [:host_id, :tournament_id] + # t.index [:tournament_id, :host_id] + end + end +end diff --git a/db/migrate/20140403151820_create_team_user_join_table.rb b/db/migrate/20140403151820_create_team_user_join_table.rb new file mode 100644 index 0000000..f3b57fc --- /dev/null +++ b/db/migrate/20140403151820_create_team_user_join_table.rb @@ -0,0 +1,8 @@ +class CreateTeamUserJoinTable < ActiveRecord::Migration + def change + create_join_table :teams, :users do |t| + # t.index [:team_id, :user_id] + # t.index [:user_id, :team_id] + end + end +end diff --git a/db/migrate/20140403151823_create_match_team_join_table.rb b/db/migrate/20140403151823_create_match_team_join_table.rb new file mode 100644 index 0000000..c2ed1b7 --- /dev/null +++ b/db/migrate/20140403151823_create_match_team_join_table.rb @@ -0,0 +1,8 @@ +class CreateMatchTeamJoinTable < ActiveRecord::Migration + def change + create_join_table :matches, :teams do |t| + # t.index [:match_id, :team_id] + # t.index [:team_id, :match_id] + end + end +end diff --git a/db/migrate/20140403151832_add_hidden_attrs_to_user.rb b/db/migrate/20140403151832_add_hidden_attrs_to_user.rb new file mode 100644 index 0000000..9b5c505 --- /dev/null +++ b/db/migrate/20140403151832_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 846d2e6..3a87bad 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: 20140402152924) do +ActiveRecord::Schema.define(version: 20140403151832) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -121,10 +121,12 @@ ActiveRecord::Schema.define(version: 20140402152924) 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| @@ -174,12 +176,10 @@ ActiveRecord::Schema.define(version: 20140402152924) 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 diff --git a/generate.sh b/generate.sh index 8fc3368..d960a56 100755 --- a/generate.sh +++ b/generate.sh @@ -32,7 +32,7 @@ bundle exec rails generate scaffold game \ min_teams_per_match:integer max_teams_per_match:integer \ set_rounds:integer randomized_teams:boolean bundle exec rails generate scaffold user name:string email:string:uniq user_name:string:uniq -bundle exec rails generate scaffold session user:references +bundle exec rails generate scaffold session user:references token:string:uniq bundle exec rails generate scaffold remote_username game:references user:references user_name:string # Just models @@ -56,7 +56,7 @@ bundle exec rails generate controller static $NOTEST # Migrations # By having these separate from the original 'generate', it makes it # not stick these in the views or anything. -bundle exec rails generate migration AddHiddenAttrsToUser password_digest:string remember_token:string:uniq groups:integer +bundle exec rails generate migration AddHiddenAttrsToUser password_digest:string permissions:integer #for the tournament controller to generate options #bundle exec rails generate scaffold diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb index a5cc8cb..a144bf8 100644 --- a/test/controllers/sessions_controller_test.rb +++ b/test/controllers/sessions_controller_test.rb @@ -18,7 +18,7 @@ class SessionsControllerTest < ActionController::TestCase test "should create session" do assert_difference('Session.count') do - post :create, session: { user_id: @session.user_id } + post :create, session: { token: @session.token, user_id: @session.user_id } end assert_redirected_to session_path(assigns(:session)) @@ -35,7 +35,7 @@ class SessionsControllerTest < ActionController::TestCase end test "should update session" do - patch :update, id: @session, session: { user_id: @session.user_id } + patch :update, id: @session, session: { token: @session.token, user_id: @session.user_id } assert_redirected_to session_path(assigns(:session)) end diff --git a/test/fixtures/sessions.yml b/test/fixtures/sessions.yml index d9098d9..aea4379 100644 --- a/test/fixtures/sessions.yml +++ b/test/fixtures/sessions.yml @@ -2,6 +2,8 @@ one: user_id: + token: MyString two: user_id: + token: MyString -- cgit v1.1-4-g5e80