From a2de6b22a720671b796c88c694db905665fda142 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Tue, 1 Apr 2014 18:01:53 -0400 Subject: oops, removed ger --- app/controllers/tournaments_controller.rb | 2 +- app/views/tournaments/_form.html.erb | 4 ---- app/views/tournaments/index.html.erb | 2 -- app/views/tournaments/index.json.jbuilder | 2 +- app/views/tournaments/show.html.erb | 5 ----- app/views/tournaments/show.json.jbuilder | 2 +- db/migrate/20140401205355_create_servers.rb | 8 -------- db/migrate/20140401205357_create_matches.rb | 13 ------------- db/migrate/20140401205400_create_teams.rb | 9 --------- db/migrate/20140401205402_create_alerts.rb | 10 ---------- db/migrate/20140401205405_create_pms.rb | 11 ----------- db/migrate/20140401205407_create_tournaments.rb | 13 ------------- db/migrate/20140401205410_create_games.rb | 15 --------------- db/migrate/20140401205412_create_users.rb | 13 ------------- db/migrate/20140401205415_create_sessions.rb | 9 --------- db/migrate/20140401205417_create_server_settings.rb | 8 -------- db/migrate/20140401205420_create_game_settings.rb | 15 --------------- .../20140401205422_create_tournament_preferences.rb | 12 ------------ db/migrate/20140401205424_create_scores.rb | 11 ----------- db/migrate/20140401205427_create_remote_usernames.rb | 11 ----------- ...20140401205429_create_tournament_players_join_table.rb | 8 -------- .../20140401205432_create_tournament_hosts_join_table.rb | 8 -------- db/migrate/20140401205434_create_team_user_join_table.rb | 8 -------- db/migrate/20140401205437_create_match_team_join_table.rb | 8 -------- db/migrate/20140401205446_add_hidden_attrs_to_user.rb | 8 -------- db/migrate/20140401215718_create_servers.rb | 8 ++++++++ db/migrate/20140401215720_create_matches.rb | 13 +++++++++++++ db/migrate/20140401215723_create_teams.rb | 9 +++++++++ db/migrate/20140401215725_create_alerts.rb | 10 ++++++++++ db/migrate/20140401215728_create_pms.rb | 11 +++++++++++ db/migrate/20140401215730_create_tournaments.rb | 12 ++++++++++++ db/migrate/20140401215733_create_games.rb | 15 +++++++++++++++ db/migrate/20140401215735_create_users.rb | 13 +++++++++++++ db/migrate/20140401215738_create_sessions.rb | 9 +++++++++ db/migrate/20140401215740_create_server_settings.rb | 8 ++++++++ db/migrate/20140401215743_create_game_settings.rb | 15 +++++++++++++++ .../20140401215745_create_tournament_preferences.rb | 12 ++++++++++++ db/migrate/20140401215747_create_scores.rb | 11 +++++++++++ db/migrate/20140401215750_create_remote_usernames.rb | 11 +++++++++++ ...20140401215752_create_tournament_players_join_table.rb | 8 ++++++++ .../20140401215755_create_tournament_hosts_join_table.rb | 8 ++++++++ db/migrate/20140401215757_create_team_user_join_table.rb | 8 ++++++++ db/migrate/20140401215800_create_match_team_join_table.rb | 8 ++++++++ db/migrate/20140401215809_add_hidden_attrs_to_user.rb | 8 ++++++++ db/schema.rb | 3 +-- generate.sh | 2 +- test/controllers/tournaments_controller_test.rb | 4 ++-- test/fixtures/tournaments.yml | 2 -- 48 files changed, 204 insertions(+), 219 deletions(-) delete mode 100644 db/migrate/20140401205355_create_servers.rb delete mode 100644 db/migrate/20140401205357_create_matches.rb delete mode 100644 db/migrate/20140401205400_create_teams.rb delete mode 100644 db/migrate/20140401205402_create_alerts.rb delete mode 100644 db/migrate/20140401205405_create_pms.rb delete mode 100644 db/migrate/20140401205407_create_tournaments.rb delete mode 100644 db/migrate/20140401205410_create_games.rb delete mode 100644 db/migrate/20140401205412_create_users.rb delete mode 100644 db/migrate/20140401205415_create_sessions.rb delete mode 100644 db/migrate/20140401205417_create_server_settings.rb delete mode 100644 db/migrate/20140401205420_create_game_settings.rb delete mode 100644 db/migrate/20140401205422_create_tournament_preferences.rb delete mode 100644 db/migrate/20140401205424_create_scores.rb delete mode 100644 db/migrate/20140401205427_create_remote_usernames.rb delete mode 100644 db/migrate/20140401205429_create_tournament_players_join_table.rb delete mode 100644 db/migrate/20140401205432_create_tournament_hosts_join_table.rb delete mode 100644 db/migrate/20140401205434_create_team_user_join_table.rb delete mode 100644 db/migrate/20140401205437_create_match_team_join_table.rb delete mode 100644 db/migrate/20140401205446_add_hidden_attrs_to_user.rb create mode 100644 db/migrate/20140401215718_create_servers.rb create mode 100644 db/migrate/20140401215720_create_matches.rb create mode 100644 db/migrate/20140401215723_create_teams.rb create mode 100644 db/migrate/20140401215725_create_alerts.rb create mode 100644 db/migrate/20140401215728_create_pms.rb create mode 100644 db/migrate/20140401215730_create_tournaments.rb create mode 100644 db/migrate/20140401215733_create_games.rb create mode 100644 db/migrate/20140401215735_create_users.rb create mode 100644 db/migrate/20140401215738_create_sessions.rb create mode 100644 db/migrate/20140401215740_create_server_settings.rb create mode 100644 db/migrate/20140401215743_create_game_settings.rb create mode 100644 db/migrate/20140401215745_create_tournament_preferences.rb create mode 100644 db/migrate/20140401215747_create_scores.rb create mode 100644 db/migrate/20140401215750_create_remote_usernames.rb create mode 100644 db/migrate/20140401215752_create_tournament_players_join_table.rb create mode 100644 db/migrate/20140401215755_create_tournament_hosts_join_table.rb create mode 100644 db/migrate/20140401215757_create_team_user_join_table.rb create mode 100644 db/migrate/20140401215800_create_match_team_join_table.rb create mode 100644 db/migrate/20140401215809_add_hidden_attrs_to_user.rb diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index 2565577..c4c41ab 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -69,6 +69,6 @@ class TournamentsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def tournament_params - params.require(:tournament).permit(:name, :game_id, :status, :ger, :randomized_teams) + params.require(:tournament).permit(:name, :game_id, :status, :randomized_teams) end end diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb index fe92318..3dadbf7 100644 --- a/app/views/tournaments/_form.html.erb +++ b/app/views/tournaments/_form.html.erb @@ -23,10 +23,6 @@ <%= f.label :status %>
<%= f.number_field :status %> -
- <%= f.label :ger %>
- <%= f.text_field :ger %> -
<%= f.label :randomized_teams %>
<%= f.check_box :randomized_teams %> diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb index 96bb5ba..4c1d0ff 100644 --- a/app/views/tournaments/index.html.erb +++ b/app/views/tournaments/index.html.erb @@ -6,7 +6,6 @@ Name Game Status - Ger Randomized teams @@ -20,7 +19,6 @@ <%= tournament.name %> <%= tournament.game %> <%= tournament.status %> - <%= tournament.ger %> <%= tournament.randomized_teams %> <%= link_to 'Show', tournament %> <%= link_to 'Edit', edit_tournament_path(tournament) %> diff --git a/app/views/tournaments/index.json.jbuilder b/app/views/tournaments/index.json.jbuilder index 653442f..32587df 100644 --- a/app/views/tournaments/index.json.jbuilder +++ b/app/views/tournaments/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@tournaments) do |tournament| - json.extract! tournament, :id, :name, :game_id, :status, :ger, :randomized_teams + json.extract! tournament, :id, :name, :game_id, :status, :randomized_teams json.url tournament_url(tournament, format: :json) end diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb index 3657871..d58452b 100644 --- a/app/views/tournaments/show.html.erb +++ b/app/views/tournaments/show.html.erb @@ -15,11 +15,6 @@ <%= @tournament.status %>

-

- Ger: - <%= @tournament.ger %> -

-

Randomized teams: <%= @tournament.randomized_teams %> diff --git a/app/views/tournaments/show.json.jbuilder b/app/views/tournaments/show.json.jbuilder index d70a27a..d543c76 100644 --- a/app/views/tournaments/show.json.jbuilder +++ b/app/views/tournaments/show.json.jbuilder @@ -1 +1 @@ -json.extract! @tournament, :id, :name, :game_id, :status, :ger, :randomized_teams, :created_at, :updated_at +json.extract! @tournament, :id, :name, :game_id, :status, :randomized_teams, :created_at, :updated_at diff --git a/db/migrate/20140401205355_create_servers.rb b/db/migrate/20140401205355_create_servers.rb deleted file mode 100644 index f33241a..0000000 --- a/db/migrate/20140401205355_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/20140401205357_create_matches.rb b/db/migrate/20140401205357_create_matches.rb deleted file mode 100644 index 31eea12..0000000 --- a/db/migrate/20140401205357_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/20140401205400_create_teams.rb b/db/migrate/20140401205400_create_teams.rb deleted file mode 100644 index fdf9a68..0000000 --- a/db/migrate/20140401205400_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/20140401205402_create_alerts.rb b/db/migrate/20140401205402_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140401205402_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/20140401205405_create_pms.rb b/db/migrate/20140401205405_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140401205405_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/20140401205407_create_tournaments.rb b/db/migrate/20140401205407_create_tournaments.rb deleted file mode 100644 index 3e36441..0000000 --- a/db/migrate/20140401205407_create_tournaments.rb +++ /dev/null @@ -1,13 +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.string :ger - t.boolean :randomized_teams - - t.timestamps - end - end -end diff --git a/db/migrate/20140401205410_create_games.rb b/db/migrate/20140401205410_create_games.rb deleted file mode 100644 index 5e4f56f..0000000 --- a/db/migrate/20140401205410_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/20140401205412_create_users.rb b/db/migrate/20140401205412_create_users.rb deleted file mode 100644 index 8032870..0000000 --- a/db/migrate/20140401205412_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/20140401205415_create_sessions.rb b/db/migrate/20140401205415_create_sessions.rb deleted file mode 100644 index fe25bf2..0000000 --- a/db/migrate/20140401205415_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/20140401205417_create_server_settings.rb b/db/migrate/20140401205417_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140401205417_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/20140401205420_create_game_settings.rb b/db/migrate/20140401205420_create_game_settings.rb deleted file mode 100644 index 0ebbf18..0000000 --- a/db/migrate/20140401205420_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/20140401205422_create_tournament_preferences.rb b/db/migrate/20140401205422_create_tournament_preferences.rb deleted file mode 100644 index 991d659..0000000 --- a/db/migrate/20140401205422_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/20140401205424_create_scores.rb b/db/migrate/20140401205424_create_scores.rb deleted file mode 100644 index 4ca0b0b..0000000 --- a/db/migrate/20140401205424_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/20140401205427_create_remote_usernames.rb b/db/migrate/20140401205427_create_remote_usernames.rb deleted file mode 100644 index e265985..0000000 --- a/db/migrate/20140401205427_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.text :json_value - - t.timestamps - end - end -end diff --git a/db/migrate/20140401205429_create_tournament_players_join_table.rb b/db/migrate/20140401205429_create_tournament_players_join_table.rb deleted file mode 100644 index be240e8..0000000 --- a/db/migrate/20140401205429_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/20140401205432_create_tournament_hosts_join_table.rb b/db/migrate/20140401205432_create_tournament_hosts_join_table.rb deleted file mode 100644 index 7521d89..0000000 --- a/db/migrate/20140401205432_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/20140401205434_create_team_user_join_table.rb b/db/migrate/20140401205434_create_team_user_join_table.rb deleted file mode 100644 index f3b57fc..0000000 --- a/db/migrate/20140401205434_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/20140401205437_create_match_team_join_table.rb b/db/migrate/20140401205437_create_match_team_join_table.rb deleted file mode 100644 index c2ed1b7..0000000 --- a/db/migrate/20140401205437_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/20140401205446_add_hidden_attrs_to_user.rb b/db/migrate/20140401205446_add_hidden_attrs_to_user.rb deleted file mode 100644 index 2f1b0b2..0000000 --- a/db/migrate/20140401205446_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/20140401215718_create_servers.rb new file mode 100644 index 0000000..f33241a --- /dev/null +++ b/db/migrate/20140401215718_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/20140401215720_create_matches.rb b/db/migrate/20140401215720_create_matches.rb new file mode 100644 index 0000000..31eea12 --- /dev/null +++ b/db/migrate/20140401215720_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/20140401215723_create_teams.rb b/db/migrate/20140401215723_create_teams.rb new file mode 100644 index 0000000..fdf9a68 --- /dev/null +++ b/db/migrate/20140401215723_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/20140401215725_create_alerts.rb b/db/migrate/20140401215725_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140401215725_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/20140401215728_create_pms.rb b/db/migrate/20140401215728_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140401215728_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/20140401215730_create_tournaments.rb b/db/migrate/20140401215730_create_tournaments.rb new file mode 100644 index 0000000..55f76a3 --- /dev/null +++ b/db/migrate/20140401215730_create_tournaments.rb @@ -0,0 +1,12 @@ +class CreateTournaments < ActiveRecord::Migration + def change + create_table :tournaments do |t| + t.string :name + t.references :game, index: true + t.integer :status + t.boolean :randomized_teams + + t.timestamps + end + end +end diff --git a/db/migrate/20140401215733_create_games.rb b/db/migrate/20140401215733_create_games.rb new file mode 100644 index 0000000..5e4f56f --- /dev/null +++ b/db/migrate/20140401215733_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/20140401215735_create_users.rb b/db/migrate/20140401215735_create_users.rb new file mode 100644 index 0000000..8032870 --- /dev/null +++ b/db/migrate/20140401215735_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/20140401215738_create_sessions.rb b/db/migrate/20140401215738_create_sessions.rb new file mode 100644 index 0000000..fe25bf2 --- /dev/null +++ b/db/migrate/20140401215738_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/20140401215740_create_server_settings.rb b/db/migrate/20140401215740_create_server_settings.rb new file mode 100644 index 0000000..dfdd91b --- /dev/null +++ b/db/migrate/20140401215740_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/20140401215743_create_game_settings.rb b/db/migrate/20140401215743_create_game_settings.rb new file mode 100644 index 0000000..0ebbf18 --- /dev/null +++ b/db/migrate/20140401215743_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/20140401215745_create_tournament_preferences.rb b/db/migrate/20140401215745_create_tournament_preferences.rb new file mode 100644 index 0000000..991d659 --- /dev/null +++ b/db/migrate/20140401215745_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/20140401215747_create_scores.rb b/db/migrate/20140401215747_create_scores.rb new file mode 100644 index 0000000..4ca0b0b --- /dev/null +++ b/db/migrate/20140401215747_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/20140401215750_create_remote_usernames.rb b/db/migrate/20140401215750_create_remote_usernames.rb new file mode 100644 index 0000000..e265985 --- /dev/null +++ b/db/migrate/20140401215750_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.text :json_value + + t.timestamps + end + end +end diff --git a/db/migrate/20140401215752_create_tournament_players_join_table.rb b/db/migrate/20140401215752_create_tournament_players_join_table.rb new file mode 100644 index 0000000..be240e8 --- /dev/null +++ b/db/migrate/20140401215752_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/20140401215755_create_tournament_hosts_join_table.rb b/db/migrate/20140401215755_create_tournament_hosts_join_table.rb new file mode 100644 index 0000000..7521d89 --- /dev/null +++ b/db/migrate/20140401215755_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/20140401215757_create_team_user_join_table.rb b/db/migrate/20140401215757_create_team_user_join_table.rb new file mode 100644 index 0000000..f3b57fc --- /dev/null +++ b/db/migrate/20140401215757_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/20140401215800_create_match_team_join_table.rb b/db/migrate/20140401215800_create_match_team_join_table.rb new file mode 100644 index 0000000..c2ed1b7 --- /dev/null +++ b/db/migrate/20140401215800_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/20140401215809_add_hidden_attrs_to_user.rb b/db/migrate/20140401215809_add_hidden_attrs_to_user.rb new file mode 100644 index 0000000..2f1b0b2 --- /dev/null +++ b/db/migrate/20140401215809_add_hidden_attrs_to_user.rb @@ -0,0 +1,8 @@ +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/schema.rb b/db/schema.rb index eda2839..c3be661 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: 20140401205446) do +ActiveRecord::Schema.define(version: 20140401215809) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -155,7 +155,6 @@ ActiveRecord::Schema.define(version: 20140401205446) do t.string "name" t.integer "game_id" t.integer "status" - t.string "ger" t.boolean "randomized_teams" t.datetime "created_at" t.datetime "updated_at" diff --git a/generate.sh b/generate.sh index 261392f..9db2b07 100755 --- a/generate.sh +++ b/generate.sh @@ -22,7 +22,7 @@ bundle exec rails generate scaffold match status:integer tournament:references n bundle exec rails generate scaffold team match:references $NOTEST 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 tournament name:string:unique game:references status:integer ger randomized_teams:boolean +bundle exec rails generate scaffold tournament name:string:unique game:references status:integer randomized_teams:boolean bundle exec rails generate scaffold game \ name:text \ min_players_per_team:integer max_players_per_team:integer \ diff --git a/test/controllers/tournaments_controller_test.rb b/test/controllers/tournaments_controller_test.rb index 775288c..0c1ff60 100644 --- a/test/controllers/tournaments_controller_test.rb +++ b/test/controllers/tournaments_controller_test.rb @@ -18,7 +18,7 @@ class TournamentsControllerTest < ActionController::TestCase test "should create tournament" do assert_difference('Tournament.count') do - post :create, tournament: { game_id: @tournament.game_id, ger: @tournament.ger, name: @tournament.name, randomized_teams: @tournament.randomized_teams, status: @tournament.status } + post :create, tournament: { game_id: @tournament.game_id, name: @tournament.name, randomized_teams: @tournament.randomized_teams, status: @tournament.status } end assert_redirected_to tournament_path(assigns(:tournament)) @@ -35,7 +35,7 @@ class TournamentsControllerTest < ActionController::TestCase end test "should update tournament" do - patch :update, id: @tournament, tournament: { game_id: @tournament.game_id, ger: @tournament.ger, name: @tournament.name, randomized_teams: @tournament.randomized_teams, status: @tournament.status } + patch :update, id: @tournament, tournament: { game_id: @tournament.game_id, name: @tournament.name, randomized_teams: @tournament.randomized_teams, status: @tournament.status } assert_redirected_to tournament_path(assigns(:tournament)) end diff --git a/test/fixtures/tournaments.yml b/test/fixtures/tournaments.yml index 25bb065..d5a4366 100644 --- a/test/fixtures/tournaments.yml +++ b/test/fixtures/tournaments.yml @@ -4,12 +4,10 @@ one: name: MyString game_id: status: 1 - ger: MyString randomized_teams: false two: name: MyString game_id: status: 1 - ger: MyString randomized_teams: false -- cgit v1.2.3