From c927cd7c043d982f8ffb51c8a78288d88d825d82 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 22 Apr 2014 15:53:32 -0400 Subject: run ./generate.sh --- app/controllers/matches_controller.rb | 2 +- app/controllers/teams_controller.rb | 2 +- app/models/team.rb | 1 - app/views/matches/_form.html.erb | 6 +----- app/views/matches/index.html.erb | 2 -- app/views/matches/index.json.jbuilder | 2 +- app/views/matches/show.html.erb | 5 ----- app/views/matches/show.json.jbuilder | 2 +- app/views/teams/_form.html.erb | 4 ---- app/views/teams/index.html.erb | 2 -- app/views/teams/index.json.jbuilder | 2 +- app/views/teams/show.html.erb | 5 ----- app/views/teams/show.json.jbuilder | 2 +- .../20140422021622_create_simple_captcha_data.rb | 15 --------------- db/migrate/20140422061625_create_delayed_jobs.rb | 22 ---------------------- db/migrate/20140422061628_create_servers.rb | 9 --------- db/migrate/20140422061631_create_matches.rb | 14 -------------- db/migrate/20140422061633_create_teams.rb | 9 --------- db/migrate/20140422061636_create_alerts.rb | 10 ---------- db/migrate/20140422061639_create_pms.rb | 11 ----------- db/migrate/20140422061642_create_tournaments.rb | 19 ------------------- db/migrate/20140422061645_create_games.rb | 17 ----------------- db/migrate/20140422061648_create_users.rb | 13 ------------- db/migrate/20140422061651_create_sessions.rb | 11 ----------- db/migrate/20140422061654_create_brackets.rb | 11 ----------- db/migrate/20140422061657_create_game_settings.rb | 15 --------------- .../20140422061700_create_tournament_settings.rb | 15 --------------- .../20140422061703_create_tournament_stages.rb | 11 ----------- db/migrate/20140422061706_create_statistics.rb | 12 ------------ .../20140422061709_create_remote_usernames.rb | 11 ----------- .../20140422061712_create_bracket_matches.rb | 11 ----------- db/migrate/20140422061715_create_api_requests.rb | 9 --------- ...2061718_create_tournament_players_join_table.rb | 8 -------- ...422061721_create_tournament_hosts_join_table.rb | 8 -------- .../20140422061724_create_team_user_join_table.rb | 8 -------- .../20140422061727_create_match_team_join_table.rb | 8 -------- .../20140422061739_add_hidden_attrs_to_user.rb | 6 ------ .../20140422155038_create_simple_captcha_data.rb | 15 +++++++++++++++ db/migrate/20140422195042_create_delayed_jobs.rb | 22 ++++++++++++++++++++++ db/migrate/20140422195045_create_servers.rb | 9 +++++++++ db/migrate/20140422195049_create_matches.rb | 13 +++++++++++++ db/migrate/20140422195052_create_teams.rb | 8 ++++++++ db/migrate/20140422195056_create_alerts.rb | 10 ++++++++++ db/migrate/20140422195059_create_pms.rb | 11 +++++++++++ db/migrate/20140422195103_create_tournaments.rb | 19 +++++++++++++++++++ db/migrate/20140422195107_create_games.rb | 17 +++++++++++++++++ db/migrate/20140422195110_create_users.rb | 13 +++++++++++++ db/migrate/20140422195114_create_sessions.rb | 11 +++++++++++ db/migrate/20140422195118_create_brackets.rb | 11 +++++++++++ db/migrate/20140422195121_create_game_settings.rb | 15 +++++++++++++++ .../20140422195125_create_tournament_settings.rb | 15 +++++++++++++++ .../20140422195128_create_tournament_stages.rb | 11 +++++++++++ db/migrate/20140422195132_create_statistics.rb | 12 ++++++++++++ .../20140422195135_create_remote_usernames.rb | 11 +++++++++++ .../20140422195139_create_bracket_matches.rb | 11 +++++++++++ db/migrate/20140422195143_create_api_requests.rb | 9 +++++++++ ...2195146_create_tournament_players_join_table.rb | 8 ++++++++ ...422195150_create_tournament_hosts_join_table.rb | 8 ++++++++ .../20140422195153_create_team_user_join_table.rb | 8 ++++++++ .../20140422195157_create_match_team_join_table.rb | 8 ++++++++ .../20140422195211_add_hidden_attrs_to_user.rb | 6 ++++++ db/schema.rb | 8 ++------ test/controllers/matches_controller_test.rb | 4 ++-- test/controllers/teams_controller_test.rb | 4 ++-- test/fixtures/matches.yml | 6 ++---- test/fixtures/teams.yml | 14 +++++++++----- 66 files changed, 305 insertions(+), 332 deletions(-) delete mode 100644 db/migrate/20140422021622_create_simple_captcha_data.rb delete mode 100644 db/migrate/20140422061625_create_delayed_jobs.rb delete mode 100644 db/migrate/20140422061628_create_servers.rb delete mode 100644 db/migrate/20140422061631_create_matches.rb delete mode 100644 db/migrate/20140422061633_create_teams.rb delete mode 100644 db/migrate/20140422061636_create_alerts.rb delete mode 100644 db/migrate/20140422061639_create_pms.rb delete mode 100644 db/migrate/20140422061642_create_tournaments.rb delete mode 100644 db/migrate/20140422061645_create_games.rb delete mode 100644 db/migrate/20140422061648_create_users.rb delete mode 100644 db/migrate/20140422061651_create_sessions.rb delete mode 100644 db/migrate/20140422061654_create_brackets.rb delete mode 100644 db/migrate/20140422061657_create_game_settings.rb delete mode 100644 db/migrate/20140422061700_create_tournament_settings.rb delete mode 100644 db/migrate/20140422061703_create_tournament_stages.rb delete mode 100644 db/migrate/20140422061706_create_statistics.rb delete mode 100644 db/migrate/20140422061709_create_remote_usernames.rb delete mode 100644 db/migrate/20140422061712_create_bracket_matches.rb delete mode 100644 db/migrate/20140422061715_create_api_requests.rb delete mode 100644 db/migrate/20140422061718_create_tournament_players_join_table.rb delete mode 100644 db/migrate/20140422061721_create_tournament_hosts_join_table.rb delete mode 100644 db/migrate/20140422061724_create_team_user_join_table.rb delete mode 100644 db/migrate/20140422061727_create_match_team_join_table.rb delete mode 100644 db/migrate/20140422061739_add_hidden_attrs_to_user.rb create mode 100644 db/migrate/20140422155038_create_simple_captcha_data.rb create mode 100644 db/migrate/20140422195042_create_delayed_jobs.rb create mode 100644 db/migrate/20140422195045_create_servers.rb create mode 100644 db/migrate/20140422195049_create_matches.rb create mode 100644 db/migrate/20140422195052_create_teams.rb create mode 100644 db/migrate/20140422195056_create_alerts.rb create mode 100644 db/migrate/20140422195059_create_pms.rb create mode 100644 db/migrate/20140422195103_create_tournaments.rb create mode 100644 db/migrate/20140422195107_create_games.rb create mode 100644 db/migrate/20140422195110_create_users.rb create mode 100644 db/migrate/20140422195114_create_sessions.rb create mode 100644 db/migrate/20140422195118_create_brackets.rb create mode 100644 db/migrate/20140422195121_create_game_settings.rb create mode 100644 db/migrate/20140422195125_create_tournament_settings.rb create mode 100644 db/migrate/20140422195128_create_tournament_stages.rb create mode 100644 db/migrate/20140422195132_create_statistics.rb create mode 100644 db/migrate/20140422195135_create_remote_usernames.rb create mode 100644 db/migrate/20140422195139_create_bracket_matches.rb create mode 100644 db/migrate/20140422195143_create_api_requests.rb create mode 100644 db/migrate/20140422195146_create_tournament_players_join_table.rb create mode 100644 db/migrate/20140422195150_create_tournament_hosts_join_table.rb create mode 100644 db/migrate/20140422195153_create_team_user_join_table.rb create mode 100644 db/migrate/20140422195157_create_match_team_join_table.rb create mode 100644 db/migrate/20140422195211_add_hidden_attrs_to_user.rb diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index b19faf4..b1162ef 100644 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -69,6 +69,6 @@ class MatchesController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def match_params - params.require(:match).permit(:status, :tournament_stage_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations) + params.require(:match).permit(:status, :tournament_stage_id, :winner_id, :remote_id, :submitted_peer_evaluations) end end diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb index 05e7a12..57b3d91 100644 --- a/app/controllers/teams_controller.rb +++ b/app/controllers/teams_controller.rb @@ -69,6 +69,6 @@ class TeamsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def team_params - params.require(:team).permit(:match_id) + params[:team] end end diff --git a/app/models/team.rb b/app/models/team.rb index 8d89f51..fa7ba9e 100644 --- a/app/models/team.rb +++ b/app/models/team.rb @@ -1,3 +1,2 @@ class Team < ActiveRecord::Base - belongs_to :match end diff --git a/app/views/matches/_form.html.erb b/app/views/matches/_form.html.erb index 65069d1..9e09fd8 100644 --- a/app/views/matches/_form.html.erb +++ b/app/views/matches/_form.html.erb @@ -19,17 +19,13 @@ <%= f.label :tournament_stage_id %>
<%= f.text_field :tournament_stage_id %> -
- <%= f.label :name %>
- <%= f.text_field :name %> -
<%= f.label :winner_id %>
<%= f.text_field :winner_id %>
<%= f.label :remote_id %>
- <%= f.text_field :remote_id %> + <%= f.text_area :remote_id %>
<%= f.label :submitted_peer_evaluations %>
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index 414d57d..766c3e8 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -5,7 +5,6 @@ Status Tournament stage - Name Winner Remote Submitted peer evaluations @@ -20,7 +19,6 @@ <%= match.status %> <%= match.tournament_stage %> - <%= match.name %> <%= match.winner %> <%= match.remote_id %> <%= match.submitted_peer_evaluations %> diff --git a/app/views/matches/index.json.jbuilder b/app/views/matches/index.json.jbuilder index f2499ac..bef149d 100644 --- a/app/views/matches/index.json.jbuilder +++ b/app/views/matches/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@matches) do |match| - json.extract! match, :id, :status, :tournament_stage_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations + json.extract! match, :id, :status, :tournament_stage_id, :winner_id, :remote_id, :submitted_peer_evaluations json.url match_url(match, format: :json) end diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb index 3356e28..8384ff2 100644 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -10,11 +10,6 @@ <%= @match.tournament_stage %>

-

- Name: - <%= @match.name %> -

-

Winner: <%= @match.winner %> diff --git a/app/views/matches/show.json.jbuilder b/app/views/matches/show.json.jbuilder index 5b543ea..145f069 100644 --- a/app/views/matches/show.json.jbuilder +++ b/app/views/matches/show.json.jbuilder @@ -1 +1 @@ -json.extract! @match, :id, :status, :tournament_stage_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations, :created_at, :updated_at +json.extract! @match, :id, :status, :tournament_stage_id, :winner_id, :remote_id, :submitted_peer_evaluations, :created_at, :updated_at diff --git a/app/views/teams/_form.html.erb b/app/views/teams/_form.html.erb index cdd4299..fd10129 100644 --- a/app/views/teams/_form.html.erb +++ b/app/views/teams/_form.html.erb @@ -11,10 +11,6 @@

<% end %> -
- <%= f.label :match_id %>
- <%= f.text_field :match_id %> -
<%= f.submit %>
diff --git a/app/views/teams/index.html.erb b/app/views/teams/index.html.erb index 6a3188d..b077e10 100644 --- a/app/views/teams/index.html.erb +++ b/app/views/teams/index.html.erb @@ -3,7 +3,6 @@ - @@ -13,7 +12,6 @@ <% @teams.each do |team| %> - diff --git a/app/views/teams/index.json.jbuilder b/app/views/teams/index.json.jbuilder index ca0ec8b..b29428b 100644 --- a/app/views/teams/index.json.jbuilder +++ b/app/views/teams/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@teams) do |team| - json.extract! team, :id, :match_id + json.extract! team, :id json.url team_url(team, format: :json) end diff --git a/app/views/teams/show.html.erb b/app/views/teams/show.html.erb index e41692a..5b18d33 100644 --- a/app/views/teams/show.html.erb +++ b/app/views/teams/show.html.erb @@ -1,9 +1,4 @@

<%= notice %>

-

- Match: - <%= @team.match %> -

- <%= link_to 'Edit', edit_team_path(@team) %> | <%= link_to 'Back', teams_path %> diff --git a/app/views/teams/show.json.jbuilder b/app/views/teams/show.json.jbuilder index 8a85dcc..1538019 100644 --- a/app/views/teams/show.json.jbuilder +++ b/app/views/teams/show.json.jbuilder @@ -1 +1 @@ -json.extract! @team, :id, :match_id, :created_at, :updated_at +json.extract! @team, :id, :created_at, :updated_at diff --git a/db/migrate/20140422021622_create_simple_captcha_data.rb b/db/migrate/20140422021622_create_simple_captcha_data.rb deleted file mode 100644 index 4573b20..0000000 --- a/db/migrate/20140422021622_create_simple_captcha_data.rb +++ /dev/null @@ -1,15 +0,0 @@ -class CreateSimpleCaptchaData < ActiveRecord::Migration - def self.up - create_table :simple_captcha_data do |t| - t.string :key, :limit => 40 - t.string :value, :limit => 6 - t.timestamps - end - - add_index :simple_captcha_data, :key, :name => "idx_key" - end - - def self.down - drop_table :simple_captcha_data - end -end diff --git a/db/migrate/20140422061625_create_delayed_jobs.rb b/db/migrate/20140422061625_create_delayed_jobs.rb deleted file mode 100644 index ec0dd93..0000000 --- a/db/migrate/20140422061625_create_delayed_jobs.rb +++ /dev/null @@ -1,22 +0,0 @@ -class CreateDelayedJobs < ActiveRecord::Migration - def self.up - create_table :delayed_jobs, :force => true do |table| - table.integer :priority, :default => 0, :null => false # Allows some jobs to jump to the front of the queue - table.integer :attempts, :default => 0, :null => false # Provides for retries, but still fail eventually. - table.text :handler, :null => false # YAML-encoded string of the object that will do work - table.text :last_error # reason for last failure (See Note below) - table.datetime :run_at # When to run. Could be Time.zone.now for immediately, or sometime in the future. - table.datetime :locked_at # Set when a client is working on this object - table.datetime :failed_at # Set when all retries have failed (actually, by default, the record is deleted instead) - table.string :locked_by # Who is working on this object (if locked) - table.string :queue # The name of the queue this job is in - table.timestamps - end - - add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority' - end - - def self.down - drop_table :delayed_jobs - end -end diff --git a/db/migrate/20140422061628_create_servers.rb b/db/migrate/20140422061628_create_servers.rb deleted file mode 100644 index fbe1b02..0000000 --- a/db/migrate/20140422061628_create_servers.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateServers < ActiveRecord::Migration - def change - create_table :servers do |t| - t.integer :default_user_permissions - - t.timestamps - end - end -end diff --git a/db/migrate/20140422061631_create_matches.rb b/db/migrate/20140422061631_create_matches.rb deleted file mode 100644 index 3786d52..0000000 --- a/db/migrate/20140422061631_create_matches.rb +++ /dev/null @@ -1,14 +0,0 @@ -class CreateMatches < ActiveRecord::Migration - def change - create_table :matches do |t| - t.integer :status - t.references :tournament_stage, index: true - t.string :name - t.references :winner, index: true - t.string :remote_id - t.integer :submitted_peer_evaluations - - t.timestamps - end - end -end diff --git a/db/migrate/20140422061633_create_teams.rb b/db/migrate/20140422061633_create_teams.rb deleted file mode 100644 index fdf9a68..0000000 --- a/db/migrate/20140422061633_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/20140422061636_create_alerts.rb b/db/migrate/20140422061636_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140422061636_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/20140422061639_create_pms.rb b/db/migrate/20140422061639_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140422061639_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/20140422061642_create_tournaments.rb b/db/migrate/20140422061642_create_tournaments.rb deleted file mode 100644 index 716871f..0000000 --- a/db/migrate/20140422061642_create_tournaments.rb +++ /dev/null @@ -1,19 +0,0 @@ -class CreateTournaments < ActiveRecord::Migration - def change - create_table :tournaments do |t| - t.references :game, index: true - t.integer :status - t.string :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.string :sampling_method - - t.timestamps - end - add_index :tournaments, :name, unique: true - end -end diff --git a/db/migrate/20140422061645_create_games.rb b/db/migrate/20140422061645_create_games.rb deleted file mode 100644 index 46ed30d..0000000 --- a/db/migrate/20140422061645_create_games.rb +++ /dev/null @@ -1,17 +0,0 @@ -class CreateGames < ActiveRecord::Migration - def change - create_table :games do |t| - t.string :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.string :sampling_method - - t.timestamps - end - add_index :games, :name, unique: true - end -end diff --git a/db/migrate/20140422061648_create_users.rb b/db/migrate/20140422061648_create_users.rb deleted file mode 100644 index 8032870..0000000 --- a/db/migrate/20140422061648_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/20140422061651_create_sessions.rb b/db/migrate/20140422061651_create_sessions.rb deleted file mode 100644 index f667f1e..0000000 --- a/db/migrate/20140422061651_create_sessions.rb +++ /dev/null @@ -1,11 +0,0 @@ -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/20140422061654_create_brackets.rb b/db/migrate/20140422061654_create_brackets.rb deleted file mode 100644 index 8813bf2..0000000 --- a/db/migrate/20140422061654_create_brackets.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateBrackets < ActiveRecord::Migration - def change - create_table :brackets do |t| - t.references :user, index: true - t.references :tournament, index: true - t.string :name - - t.timestamps - end - end -end diff --git a/db/migrate/20140422061657_create_game_settings.rb b/db/migrate/20140422061657_create_game_settings.rb deleted file mode 100644 index 06fb72e..0000000 --- a/db/migrate/20140422061657_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.string :name - t.integer :vartype - t.text :type_opt - t.text :description - t.integer :display_order - t.text :default - - t.timestamps - end - end -end diff --git a/db/migrate/20140422061700_create_tournament_settings.rb b/db/migrate/20140422061700_create_tournament_settings.rb deleted file mode 100644 index e56697f..0000000 --- a/db/migrate/20140422061700_create_tournament_settings.rb +++ /dev/null @@ -1,15 +0,0 @@ -class CreateTournamentSettings < ActiveRecord::Migration - def change - create_table :tournament_settings do |t| - t.references :tournament, index: true - t.string :name - t.integer :vartype - t.text :type_opt - t.text :description - t.integer :display_order - t.text :value - - t.timestamps - end - end -end diff --git a/db/migrate/20140422061703_create_tournament_stages.rb b/db/migrate/20140422061703_create_tournament_stages.rb deleted file mode 100644 index e3668cb..0000000 --- a/db/migrate/20140422061703_create_tournament_stages.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateTournamentStages < ActiveRecord::Migration - def change - create_table :tournament_stages do |t| - t.references :tournament, index: true - t.string :scheduling - t.text :structure - - t.timestamps - end - end -end diff --git a/db/migrate/20140422061706_create_statistics.rb b/db/migrate/20140422061706_create_statistics.rb deleted file mode 100644 index cc2e97d..0000000 --- a/db/migrate/20140422061706_create_statistics.rb +++ /dev/null @@ -1,12 +0,0 @@ -class CreateStatistics < ActiveRecord::Migration - def change - create_table :statistics do |t| - t.references :user, index: true - t.references :match, index: true - t.string :name - t.integer :value - - t.timestamps - end - end -end diff --git a/db/migrate/20140422061709_create_remote_usernames.rb b/db/migrate/20140422061709_create_remote_usernames.rb deleted file mode 100644 index e265985..0000000 --- a/db/migrate/20140422061709_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/20140422061712_create_bracket_matches.rb b/db/migrate/20140422061712_create_bracket_matches.rb deleted file mode 100644 index 3323e31..0000000 --- a/db/migrate/20140422061712_create_bracket_matches.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateBracketMatches < ActiveRecord::Migration - def change - create_table :bracket_matches do |t| - t.references :bracket, index: true - t.references :match, index: true - t.references :predicted_winner, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140422061715_create_api_requests.rb b/db/migrate/20140422061715_create_api_requests.rb deleted file mode 100644 index 544c330..0000000 --- a/db/migrate/20140422061715_create_api_requests.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateApiRequests < ActiveRecord::Migration - def change - create_table :api_requests do |t| - t.string :api_name - - t.timestamps - end - end -end diff --git a/db/migrate/20140422061718_create_tournament_players_join_table.rb b/db/migrate/20140422061718_create_tournament_players_join_table.rb deleted file mode 100644 index be240e8..0000000 --- a/db/migrate/20140422061718_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/20140422061721_create_tournament_hosts_join_table.rb b/db/migrate/20140422061721_create_tournament_hosts_join_table.rb deleted file mode 100644 index 7521d89..0000000 --- a/db/migrate/20140422061721_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/20140422061724_create_team_user_join_table.rb b/db/migrate/20140422061724_create_team_user_join_table.rb deleted file mode 100644 index f3b57fc..0000000 --- a/db/migrate/20140422061724_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/20140422061727_create_match_team_join_table.rb b/db/migrate/20140422061727_create_match_team_join_table.rb deleted file mode 100644 index c2ed1b7..0000000 --- a/db/migrate/20140422061727_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/20140422061739_add_hidden_attrs_to_user.rb b/db/migrate/20140422061739_add_hidden_attrs_to_user.rb deleted file mode 100644 index 9b5c505..0000000 --- a/db/migrate/20140422061739_add_hidden_attrs_to_user.rb +++ /dev/null @@ -1,6 +0,0 @@ -class AddHiddenAttrsToUser < ActiveRecord::Migration - def change - add_column :users, :password_digest, :string - add_column :users, :permissions, :integer - end -end diff --git a/db/migrate/20140422155038_create_simple_captcha_data.rb b/db/migrate/20140422155038_create_simple_captcha_data.rb new file mode 100644 index 0000000..4573b20 --- /dev/null +++ b/db/migrate/20140422155038_create_simple_captcha_data.rb @@ -0,0 +1,15 @@ +class CreateSimpleCaptchaData < ActiveRecord::Migration + def self.up + create_table :simple_captcha_data do |t| + t.string :key, :limit => 40 + t.string :value, :limit => 6 + t.timestamps + end + + add_index :simple_captcha_data, :key, :name => "idx_key" + end + + def self.down + drop_table :simple_captcha_data + end +end diff --git a/db/migrate/20140422195042_create_delayed_jobs.rb b/db/migrate/20140422195042_create_delayed_jobs.rb new file mode 100644 index 0000000..ec0dd93 --- /dev/null +++ b/db/migrate/20140422195042_create_delayed_jobs.rb @@ -0,0 +1,22 @@ +class CreateDelayedJobs < ActiveRecord::Migration + def self.up + create_table :delayed_jobs, :force => true do |table| + table.integer :priority, :default => 0, :null => false # Allows some jobs to jump to the front of the queue + table.integer :attempts, :default => 0, :null => false # Provides for retries, but still fail eventually. + table.text :handler, :null => false # YAML-encoded string of the object that will do work + table.text :last_error # reason for last failure (See Note below) + table.datetime :run_at # When to run. Could be Time.zone.now for immediately, or sometime in the future. + table.datetime :locked_at # Set when a client is working on this object + table.datetime :failed_at # Set when all retries have failed (actually, by default, the record is deleted instead) + table.string :locked_by # Who is working on this object (if locked) + table.string :queue # The name of the queue this job is in + table.timestamps + end + + add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority' + end + + def self.down + drop_table :delayed_jobs + end +end diff --git a/db/migrate/20140422195045_create_servers.rb b/db/migrate/20140422195045_create_servers.rb new file mode 100644 index 0000000..fbe1b02 --- /dev/null +++ b/db/migrate/20140422195045_create_servers.rb @@ -0,0 +1,9 @@ +class CreateServers < ActiveRecord::Migration + def change + create_table :servers do |t| + t.integer :default_user_permissions + + t.timestamps + end + end +end diff --git a/db/migrate/20140422195049_create_matches.rb b/db/migrate/20140422195049_create_matches.rb new file mode 100644 index 0000000..bac92d1 --- /dev/null +++ b/db/migrate/20140422195049_create_matches.rb @@ -0,0 +1,13 @@ +class CreateMatches < ActiveRecord::Migration + def change + create_table :matches do |t| + t.integer :status + t.references :tournament_stage, index: true + t.references :winner, index: true + t.text :remote_id + t.integer :submitted_peer_evaluations + + t.timestamps + end + end +end diff --git a/db/migrate/20140422195052_create_teams.rb b/db/migrate/20140422195052_create_teams.rb new file mode 100644 index 0000000..dd8397d --- /dev/null +++ b/db/migrate/20140422195052_create_teams.rb @@ -0,0 +1,8 @@ +class CreateTeams < ActiveRecord::Migration + def change + create_table :teams do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140422195056_create_alerts.rb b/db/migrate/20140422195056_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140422195056_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/20140422195059_create_pms.rb b/db/migrate/20140422195059_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140422195059_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/20140422195103_create_tournaments.rb b/db/migrate/20140422195103_create_tournaments.rb new file mode 100644 index 0000000..716871f --- /dev/null +++ b/db/migrate/20140422195103_create_tournaments.rb @@ -0,0 +1,19 @@ +class CreateTournaments < ActiveRecord::Migration + def change + create_table :tournaments do |t| + t.references :game, index: true + t.integer :status + t.string :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.string :sampling_method + + t.timestamps + end + add_index :tournaments, :name, unique: true + end +end diff --git a/db/migrate/20140422195107_create_games.rb b/db/migrate/20140422195107_create_games.rb new file mode 100644 index 0000000..46ed30d --- /dev/null +++ b/db/migrate/20140422195107_create_games.rb @@ -0,0 +1,17 @@ +class CreateGames < ActiveRecord::Migration + def change + create_table :games do |t| + t.string :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.string :sampling_method + + t.timestamps + end + add_index :games, :name, unique: true + end +end diff --git a/db/migrate/20140422195110_create_users.rb b/db/migrate/20140422195110_create_users.rb new file mode 100644 index 0000000..8032870 --- /dev/null +++ b/db/migrate/20140422195110_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/20140422195114_create_sessions.rb b/db/migrate/20140422195114_create_sessions.rb new file mode 100644 index 0000000..f667f1e --- /dev/null +++ b/db/migrate/20140422195114_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/20140422195118_create_brackets.rb b/db/migrate/20140422195118_create_brackets.rb new file mode 100644 index 0000000..8813bf2 --- /dev/null +++ b/db/migrate/20140422195118_create_brackets.rb @@ -0,0 +1,11 @@ +class CreateBrackets < ActiveRecord::Migration + def change + create_table :brackets do |t| + t.references :user, index: true + t.references :tournament, index: true + t.string :name + + t.timestamps + end + end +end diff --git a/db/migrate/20140422195121_create_game_settings.rb b/db/migrate/20140422195121_create_game_settings.rb new file mode 100644 index 0000000..06fb72e --- /dev/null +++ b/db/migrate/20140422195121_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.string :name + t.integer :vartype + t.text :type_opt + t.text :description + t.integer :display_order + t.text :default + + t.timestamps + end + end +end diff --git a/db/migrate/20140422195125_create_tournament_settings.rb b/db/migrate/20140422195125_create_tournament_settings.rb new file mode 100644 index 0000000..e56697f --- /dev/null +++ b/db/migrate/20140422195125_create_tournament_settings.rb @@ -0,0 +1,15 @@ +class CreateTournamentSettings < ActiveRecord::Migration + def change + create_table :tournament_settings do |t| + t.references :tournament, index: true + t.string :name + t.integer :vartype + t.text :type_opt + t.text :description + t.integer :display_order + t.text :value + + t.timestamps + end + end +end diff --git a/db/migrate/20140422195128_create_tournament_stages.rb b/db/migrate/20140422195128_create_tournament_stages.rb new file mode 100644 index 0000000..e3668cb --- /dev/null +++ b/db/migrate/20140422195128_create_tournament_stages.rb @@ -0,0 +1,11 @@ +class CreateTournamentStages < ActiveRecord::Migration + def change + create_table :tournament_stages do |t| + t.references :tournament, index: true + t.string :scheduling + t.text :structure + + t.timestamps + end + end +end diff --git a/db/migrate/20140422195132_create_statistics.rb b/db/migrate/20140422195132_create_statistics.rb new file mode 100644 index 0000000..cc2e97d --- /dev/null +++ b/db/migrate/20140422195132_create_statistics.rb @@ -0,0 +1,12 @@ +class CreateStatistics < ActiveRecord::Migration + def change + create_table :statistics do |t| + t.references :user, index: true + t.references :match, index: true + t.string :name + t.integer :value + + t.timestamps + end + end +end diff --git a/db/migrate/20140422195135_create_remote_usernames.rb b/db/migrate/20140422195135_create_remote_usernames.rb new file mode 100644 index 0000000..e265985 --- /dev/null +++ b/db/migrate/20140422195135_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/20140422195139_create_bracket_matches.rb b/db/migrate/20140422195139_create_bracket_matches.rb new file mode 100644 index 0000000..3323e31 --- /dev/null +++ b/db/migrate/20140422195139_create_bracket_matches.rb @@ -0,0 +1,11 @@ +class CreateBracketMatches < ActiveRecord::Migration + def change + create_table :bracket_matches do |t| + t.references :bracket, index: true + t.references :match, index: true + t.references :predicted_winner, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140422195143_create_api_requests.rb b/db/migrate/20140422195143_create_api_requests.rb new file mode 100644 index 0000000..544c330 --- /dev/null +++ b/db/migrate/20140422195143_create_api_requests.rb @@ -0,0 +1,9 @@ +class CreateApiRequests < ActiveRecord::Migration + def change + create_table :api_requests do |t| + t.string :api_name + + t.timestamps + end + end +end diff --git a/db/migrate/20140422195146_create_tournament_players_join_table.rb b/db/migrate/20140422195146_create_tournament_players_join_table.rb new file mode 100644 index 0000000..be240e8 --- /dev/null +++ b/db/migrate/20140422195146_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/20140422195150_create_tournament_hosts_join_table.rb b/db/migrate/20140422195150_create_tournament_hosts_join_table.rb new file mode 100644 index 0000000..7521d89 --- /dev/null +++ b/db/migrate/20140422195150_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/20140422195153_create_team_user_join_table.rb b/db/migrate/20140422195153_create_team_user_join_table.rb new file mode 100644 index 0000000..f3b57fc --- /dev/null +++ b/db/migrate/20140422195153_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/20140422195157_create_match_team_join_table.rb b/db/migrate/20140422195157_create_match_team_join_table.rb new file mode 100644 index 0000000..c2ed1b7 --- /dev/null +++ b/db/migrate/20140422195157_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/20140422195211_add_hidden_attrs_to_user.rb b/db/migrate/20140422195211_add_hidden_attrs_to_user.rb new file mode 100644 index 0000000..9b5c505 --- /dev/null +++ b/db/migrate/20140422195211_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 e8764b6..3f39538 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: 20140422061739) do +ActiveRecord::Schema.define(version: 20140422195211) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -104,9 +104,8 @@ ActiveRecord::Schema.define(version: 20140422061739) do create_table "matches", force: true do |t| t.integer "status" t.integer "tournament_stage_id" - t.string "name" t.integer "winner_id" - t.string "remote_id" + t.text "remote_id" t.integer "submitted_peer_evaluations" t.datetime "created_at" t.datetime "updated_at" @@ -185,13 +184,10 @@ ActiveRecord::Schema.define(version: 20140422061739) do add_index "statistics", ["user_id"], name: "index_statistics_on_user_id" create_table "teams", force: true do |t| - t.integer "match_id" t.datetime "created_at" t.datetime "updated_at" end - add_index "teams", ["match_id"], name: "index_teams_on_match_id" - create_table "teams_users", id: false, force: true do |t| t.integer "team_id", null: false t.integer "user_id", null: false diff --git a/test/controllers/matches_controller_test.rb b/test/controllers/matches_controller_test.rb index 033704e..d4ac1ed 100644 --- a/test/controllers/matches_controller_test.rb +++ b/test/controllers/matches_controller_test.rb @@ -18,7 +18,7 @@ class MatchesControllerTest < ActionController::TestCase test "should create match" do assert_difference('Match.count') do - post :create, match: { name: @match.name, remote_id: @match.remote_id, status: @match.status, submitted_peer_evaluations: @match.submitted_peer_evaluations, tournament_stage_id: @match.tournament_stage_id, winner_id: @match.winner_id } + post :create, match: { remote_id: @match.remote_id, status: @match.status, submitted_peer_evaluations: @match.submitted_peer_evaluations, tournament_stage_id: @match.tournament_stage_id, winner_id: @match.winner_id } end assert_redirected_to match_path(assigns(:match)) @@ -35,7 +35,7 @@ class MatchesControllerTest < ActionController::TestCase end test "should update match" do - patch :update, id: @match, match: { name: @match.name, remote_id: @match.remote_id, status: @match.status, submitted_peer_evaluations: @match.submitted_peer_evaluations, tournament_stage_id: @match.tournament_stage_id, winner_id: @match.winner_id } + patch :update, id: @match, match: { remote_id: @match.remote_id, status: @match.status, submitted_peer_evaluations: @match.submitted_peer_evaluations, tournament_stage_id: @match.tournament_stage_id, winner_id: @match.winner_id } assert_redirected_to match_path(assigns(:match)) end diff --git a/test/controllers/teams_controller_test.rb b/test/controllers/teams_controller_test.rb index 52f7c17..8bf60be 100644 --- a/test/controllers/teams_controller_test.rb +++ b/test/controllers/teams_controller_test.rb @@ -18,7 +18,7 @@ class TeamsControllerTest < ActionController::TestCase test "should create team" do assert_difference('Team.count') do - post :create, team: { match_id: @team.match_id } + post :create, team: { } end assert_redirected_to team_path(assigns(:team)) @@ -35,7 +35,7 @@ class TeamsControllerTest < ActionController::TestCase end test "should update team" do - patch :update, id: @team, team: { match_id: @team.match_id } + patch :update, id: @team, team: { } assert_redirected_to team_path(assigns(:team)) end diff --git a/test/fixtures/matches.yml b/test/fixtures/matches.yml index ff81182..4213238 100644 --- a/test/fixtures/matches.yml +++ b/test/fixtures/matches.yml @@ -3,15 +3,13 @@ one: status: 1 tournament_stage_id: - name: MyString winner_id: - remote_id: MyString + remote_id: MyText submitted_peer_evaluations: 1 two: status: 1 tournament_stage_id: - name: MyString winner_id: - remote_id: MyString + remote_id: MyText submitted_peer_evaluations: 1 diff --git a/test/fixtures/teams.yml b/test/fixtures/teams.yml index 4efc76e..937a0c0 100644 --- a/test/fixtures/teams.yml +++ b/test/fixtures/teams.yml @@ -1,7 +1,11 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - match_id: - -two: - match_id: +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value -- cgit v1.2.3
Match
<%= team.match %> <%= link_to 'Show', team %> <%= link_to 'Edit', edit_team_path(team) %> <%= link_to 'Destroy', team, method: :delete, data: { confirm: 'Are you sure?' } %>