From c3d46241a2298ecec052332c1767a65b010cf9a1 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 21 Apr 2014 10:33:46 -0400 Subject: run ./generate.sh --- app/models/server_setting.rb | 2 -- .../20140421095649_create_simple_captcha_data.rb | 15 --------------- .../20140421103137_create_simple_captcha_data.rb | 15 +++++++++++++++ db/migrate/20140421135652_create_delayed_jobs.rb | 22 ---------------------- db/migrate/20140421135654_create_servers.rb | 9 --------- db/migrate/20140421135657_create_matches.rb | 14 -------------- db/migrate/20140421135700_create_teams.rb | 9 --------- db/migrate/20140421135703_create_alerts.rb | 10 ---------- db/migrate/20140421135706_create_pms.rb | 11 ----------- db/migrate/20140421135709_create_tournaments.rb | 17 ----------------- db/migrate/20140421135712_create_games.rb | 15 --------------- db/migrate/20140421135715_create_users.rb | 13 ------------- db/migrate/20140421135718_create_sessions.rb | 11 ----------- db/migrate/20140421135721_create_brackets.rb | 11 ----------- .../20140421135723_create_server_settings.rb | 8 -------- db/migrate/20140421135726_create_game_settings.rb | 15 --------------- .../20140421135729_create_tournament_settings.rb | 12 ------------ db/migrate/20140421135732_create_scores.rb | 11 ----------- .../20140421135735_create_remote_usernames.rb | 11 ----------- .../20140421135738_create_bracket_matches.rb | 11 ----------- db/migrate/20140421135741_create_api_requests.rb | 9 --------- ...1135744_create_tournament_players_join_table.rb | 8 -------- ...421135747_create_tournament_hosts_join_table.rb | 8 -------- .../20140421135749_create_team_user_join_table.rb | 8 -------- .../20140421135752_create_match_team_join_table.rb | 8 -------- .../20140421135803_add_hidden_attrs_to_user.rb | 6 ------ db/migrate/20140421143140_create_delayed_jobs.rb | 22 ++++++++++++++++++++++ db/migrate/20140421143143_create_servers.rb | 9 +++++++++ db/migrate/20140421143146_create_matches.rb | 14 ++++++++++++++ db/migrate/20140421143149_create_teams.rb | 9 +++++++++ db/migrate/20140421143152_create_alerts.rb | 10 ++++++++++ db/migrate/20140421143155_create_pms.rb | 11 +++++++++++ db/migrate/20140421143158_create_tournaments.rb | 17 +++++++++++++++++ db/migrate/20140421143201_create_games.rb | 15 +++++++++++++++ db/migrate/20140421143204_create_users.rb | 13 +++++++++++++ db/migrate/20140421143207_create_sessions.rb | 11 +++++++++++ db/migrate/20140421143210_create_brackets.rb | 11 +++++++++++ db/migrate/20140421143213_create_game_settings.rb | 15 +++++++++++++++ .../20140421143216_create_tournament_settings.rb | 15 +++++++++++++++ db/migrate/20140421143219_create_scores.rb | 11 +++++++++++ .../20140421143222_create_remote_usernames.rb | 11 +++++++++++ .../20140421143225_create_bracket_matches.rb | 11 +++++++++++ db/migrate/20140421143228_create_api_requests.rb | 9 +++++++++ ...1143231_create_tournament_players_join_table.rb | 8 ++++++++ ...421143234_create_tournament_hosts_join_table.rb | 8 ++++++++ .../20140421143237_create_team_user_join_table.rb | 8 ++++++++ .../20140421143239_create_match_team_join_table.rb | 8 ++++++++ .../20140421143251_add_hidden_attrs_to_user.rb | 6 ++++++ db/schema.rb | 18 ++++++++---------- test/fixtures/game_settings.yml | 12 ++++++------ test/fixtures/server_settings.yml | 11 ----------- test/fixtures/tournament_settings.yml | 10 ++++++++-- test/models/server_setting_test.rb | 7 ------- 53 files changed, 289 insertions(+), 310 deletions(-) delete mode 100644 app/models/server_setting.rb delete mode 100644 db/migrate/20140421095649_create_simple_captcha_data.rb create mode 100644 db/migrate/20140421103137_create_simple_captcha_data.rb delete mode 100644 db/migrate/20140421135652_create_delayed_jobs.rb delete mode 100644 db/migrate/20140421135654_create_servers.rb delete mode 100644 db/migrate/20140421135657_create_matches.rb delete mode 100644 db/migrate/20140421135700_create_teams.rb delete mode 100644 db/migrate/20140421135703_create_alerts.rb delete mode 100644 db/migrate/20140421135706_create_pms.rb delete mode 100644 db/migrate/20140421135709_create_tournaments.rb delete mode 100644 db/migrate/20140421135712_create_games.rb delete mode 100644 db/migrate/20140421135715_create_users.rb delete mode 100644 db/migrate/20140421135718_create_sessions.rb delete mode 100644 db/migrate/20140421135721_create_brackets.rb delete mode 100644 db/migrate/20140421135723_create_server_settings.rb delete mode 100644 db/migrate/20140421135726_create_game_settings.rb delete mode 100644 db/migrate/20140421135729_create_tournament_settings.rb delete mode 100644 db/migrate/20140421135732_create_scores.rb delete mode 100644 db/migrate/20140421135735_create_remote_usernames.rb delete mode 100644 db/migrate/20140421135738_create_bracket_matches.rb delete mode 100644 db/migrate/20140421135741_create_api_requests.rb delete mode 100644 db/migrate/20140421135744_create_tournament_players_join_table.rb delete mode 100644 db/migrate/20140421135747_create_tournament_hosts_join_table.rb delete mode 100644 db/migrate/20140421135749_create_team_user_join_table.rb delete mode 100644 db/migrate/20140421135752_create_match_team_join_table.rb delete mode 100644 db/migrate/20140421135803_add_hidden_attrs_to_user.rb create mode 100644 db/migrate/20140421143140_create_delayed_jobs.rb create mode 100644 db/migrate/20140421143143_create_servers.rb create mode 100644 db/migrate/20140421143146_create_matches.rb create mode 100644 db/migrate/20140421143149_create_teams.rb create mode 100644 db/migrate/20140421143152_create_alerts.rb create mode 100644 db/migrate/20140421143155_create_pms.rb create mode 100644 db/migrate/20140421143158_create_tournaments.rb create mode 100644 db/migrate/20140421143201_create_games.rb create mode 100644 db/migrate/20140421143204_create_users.rb create mode 100644 db/migrate/20140421143207_create_sessions.rb create mode 100644 db/migrate/20140421143210_create_brackets.rb create mode 100644 db/migrate/20140421143213_create_game_settings.rb create mode 100644 db/migrate/20140421143216_create_tournament_settings.rb create mode 100644 db/migrate/20140421143219_create_scores.rb create mode 100644 db/migrate/20140421143222_create_remote_usernames.rb create mode 100644 db/migrate/20140421143225_create_bracket_matches.rb create mode 100644 db/migrate/20140421143228_create_api_requests.rb create mode 100644 db/migrate/20140421143231_create_tournament_players_join_table.rb create mode 100644 db/migrate/20140421143234_create_tournament_hosts_join_table.rb create mode 100644 db/migrate/20140421143237_create_team_user_join_table.rb create mode 100644 db/migrate/20140421143239_create_match_team_join_table.rb create mode 100644 db/migrate/20140421143251_add_hidden_attrs_to_user.rb delete mode 100644 test/fixtures/server_settings.yml delete mode 100644 test/models/server_setting_test.rb diff --git a/app/models/server_setting.rb b/app/models/server_setting.rb deleted file mode 100644 index 28ae943..0000000 --- a/app/models/server_setting.rb +++ /dev/null @@ -1,2 +0,0 @@ -class ServerSetting < ActiveRecord::Base -end diff --git a/db/migrate/20140421095649_create_simple_captcha_data.rb b/db/migrate/20140421095649_create_simple_captcha_data.rb deleted file mode 100644 index 4573b20..0000000 --- a/db/migrate/20140421095649_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/20140421103137_create_simple_captcha_data.rb b/db/migrate/20140421103137_create_simple_captcha_data.rb new file mode 100644 index 0000000..4573b20 --- /dev/null +++ b/db/migrate/20140421103137_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/20140421135652_create_delayed_jobs.rb b/db/migrate/20140421135652_create_delayed_jobs.rb deleted file mode 100644 index ec0dd93..0000000 --- a/db/migrate/20140421135652_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/20140421135654_create_servers.rb b/db/migrate/20140421135654_create_servers.rb deleted file mode 100644 index fbe1b02..0000000 --- a/db/migrate/20140421135654_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/20140421135657_create_matches.rb b/db/migrate/20140421135657_create_matches.rb deleted file mode 100644 index bdeb1cd..0000000 --- a/db/migrate/20140421135657_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, 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/20140421135700_create_teams.rb b/db/migrate/20140421135700_create_teams.rb deleted file mode 100644 index fdf9a68..0000000 --- a/db/migrate/20140421135700_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/20140421135703_create_alerts.rb b/db/migrate/20140421135703_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140421135703_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/20140421135706_create_pms.rb b/db/migrate/20140421135706_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140421135706_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/20140421135709_create_tournaments.rb b/db/migrate/20140421135709_create_tournaments.rb deleted file mode 100644 index c0d8929..0000000 --- a/db/migrate/20140421135709_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/20140421135712_create_games.rb b/db/migrate/20140421135712_create_games.rb deleted file mode 100644 index 5e4f56f..0000000 --- a/db/migrate/20140421135712_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/20140421135715_create_users.rb b/db/migrate/20140421135715_create_users.rb deleted file mode 100644 index 8032870..0000000 --- a/db/migrate/20140421135715_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/20140421135718_create_sessions.rb b/db/migrate/20140421135718_create_sessions.rb deleted file mode 100644 index f667f1e..0000000 --- a/db/migrate/20140421135718_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/20140421135721_create_brackets.rb b/db/migrate/20140421135721_create_brackets.rb deleted file mode 100644 index 8813bf2..0000000 --- a/db/migrate/20140421135721_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/20140421135723_create_server_settings.rb b/db/migrate/20140421135723_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140421135723_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/20140421135726_create_game_settings.rb b/db/migrate/20140421135726_create_game_settings.rb deleted file mode 100644 index b1caf5d..0000000 --- a/db/migrate/20140421135726_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 :stype - t.string :name - t.text :default - t.text :description - t.text :type_opt - t.integer :display_order - - t.timestamps - end - end -end diff --git a/db/migrate/20140421135729_create_tournament_settings.rb b/db/migrate/20140421135729_create_tournament_settings.rb deleted file mode 100644 index a2e8e66..0000000 --- a/db/migrate/20140421135729_create_tournament_settings.rb +++ /dev/null @@ -1,12 +0,0 @@ -class CreateTournamentSettings < ActiveRecord::Migration - def change - create_table :tournament_settings 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/20140421135732_create_scores.rb b/db/migrate/20140421135732_create_scores.rb deleted file mode 100644 index 4ca0b0b..0000000 --- a/db/migrate/20140421135732_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/20140421135735_create_remote_usernames.rb b/db/migrate/20140421135735_create_remote_usernames.rb deleted file mode 100644 index e265985..0000000 --- a/db/migrate/20140421135735_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/20140421135738_create_bracket_matches.rb b/db/migrate/20140421135738_create_bracket_matches.rb deleted file mode 100644 index 3323e31..0000000 --- a/db/migrate/20140421135738_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/20140421135741_create_api_requests.rb b/db/migrate/20140421135741_create_api_requests.rb deleted file mode 100644 index 544c330..0000000 --- a/db/migrate/20140421135741_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/20140421135744_create_tournament_players_join_table.rb b/db/migrate/20140421135744_create_tournament_players_join_table.rb deleted file mode 100644 index be240e8..0000000 --- a/db/migrate/20140421135744_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/20140421135747_create_tournament_hosts_join_table.rb b/db/migrate/20140421135747_create_tournament_hosts_join_table.rb deleted file mode 100644 index 7521d89..0000000 --- a/db/migrate/20140421135747_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/20140421135749_create_team_user_join_table.rb b/db/migrate/20140421135749_create_team_user_join_table.rb deleted file mode 100644 index f3b57fc..0000000 --- a/db/migrate/20140421135749_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/20140421135752_create_match_team_join_table.rb b/db/migrate/20140421135752_create_match_team_join_table.rb deleted file mode 100644 index c2ed1b7..0000000 --- a/db/migrate/20140421135752_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/20140421135803_add_hidden_attrs_to_user.rb b/db/migrate/20140421135803_add_hidden_attrs_to_user.rb deleted file mode 100644 index 9b5c505..0000000 --- a/db/migrate/20140421135803_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/20140421143140_create_delayed_jobs.rb b/db/migrate/20140421143140_create_delayed_jobs.rb new file mode 100644 index 0000000..ec0dd93 --- /dev/null +++ b/db/migrate/20140421143140_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/20140421143143_create_servers.rb b/db/migrate/20140421143143_create_servers.rb new file mode 100644 index 0000000..fbe1b02 --- /dev/null +++ b/db/migrate/20140421143143_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/20140421143146_create_matches.rb b/db/migrate/20140421143146_create_matches.rb new file mode 100644 index 0000000..bdeb1cd --- /dev/null +++ b/db/migrate/20140421143146_create_matches.rb @@ -0,0 +1,14 @@ +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.integer :submitted_peer_evaluations + + t.timestamps + end + end +end diff --git a/db/migrate/20140421143149_create_teams.rb b/db/migrate/20140421143149_create_teams.rb new file mode 100644 index 0000000..fdf9a68 --- /dev/null +++ b/db/migrate/20140421143149_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/20140421143152_create_alerts.rb b/db/migrate/20140421143152_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140421143152_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/20140421143155_create_pms.rb b/db/migrate/20140421143155_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140421143155_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/20140421143158_create_tournaments.rb b/db/migrate/20140421143158_create_tournaments.rb new file mode 100644 index 0000000..c0d8929 --- /dev/null +++ b/db/migrate/20140421143158_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/20140421143201_create_games.rb b/db/migrate/20140421143201_create_games.rb new file mode 100644 index 0000000..5e4f56f --- /dev/null +++ b/db/migrate/20140421143201_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/20140421143204_create_users.rb b/db/migrate/20140421143204_create_users.rb new file mode 100644 index 0000000..8032870 --- /dev/null +++ b/db/migrate/20140421143204_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/20140421143207_create_sessions.rb b/db/migrate/20140421143207_create_sessions.rb new file mode 100644 index 0000000..f667f1e --- /dev/null +++ b/db/migrate/20140421143207_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/20140421143210_create_brackets.rb b/db/migrate/20140421143210_create_brackets.rb new file mode 100644 index 0000000..8813bf2 --- /dev/null +++ b/db/migrate/20140421143210_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/20140421143213_create_game_settings.rb b/db/migrate/20140421143213_create_game_settings.rb new file mode 100644 index 0000000..06fb72e --- /dev/null +++ b/db/migrate/20140421143213_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/20140421143216_create_tournament_settings.rb b/db/migrate/20140421143216_create_tournament_settings.rb new file mode 100644 index 0000000..e56697f --- /dev/null +++ b/db/migrate/20140421143216_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/20140421143219_create_scores.rb b/db/migrate/20140421143219_create_scores.rb new file mode 100644 index 0000000..4ca0b0b --- /dev/null +++ b/db/migrate/20140421143219_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/20140421143222_create_remote_usernames.rb b/db/migrate/20140421143222_create_remote_usernames.rb new file mode 100644 index 0000000..e265985 --- /dev/null +++ b/db/migrate/20140421143222_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/20140421143225_create_bracket_matches.rb b/db/migrate/20140421143225_create_bracket_matches.rb new file mode 100644 index 0000000..3323e31 --- /dev/null +++ b/db/migrate/20140421143225_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/20140421143228_create_api_requests.rb b/db/migrate/20140421143228_create_api_requests.rb new file mode 100644 index 0000000..544c330 --- /dev/null +++ b/db/migrate/20140421143228_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/20140421143231_create_tournament_players_join_table.rb b/db/migrate/20140421143231_create_tournament_players_join_table.rb new file mode 100644 index 0000000..be240e8 --- /dev/null +++ b/db/migrate/20140421143231_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/20140421143234_create_tournament_hosts_join_table.rb b/db/migrate/20140421143234_create_tournament_hosts_join_table.rb new file mode 100644 index 0000000..7521d89 --- /dev/null +++ b/db/migrate/20140421143234_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/20140421143237_create_team_user_join_table.rb b/db/migrate/20140421143237_create_team_user_join_table.rb new file mode 100644 index 0000000..f3b57fc --- /dev/null +++ b/db/migrate/20140421143237_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/20140421143239_create_match_team_join_table.rb b/db/migrate/20140421143239_create_match_team_join_table.rb new file mode 100644 index 0000000..c2ed1b7 --- /dev/null +++ b/db/migrate/20140421143239_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/20140421143251_add_hidden_attrs_to_user.rb b/db/migrate/20140421143251_add_hidden_attrs_to_user.rb new file mode 100644 index 0000000..9b5c505 --- /dev/null +++ b/db/migrate/20140421143251_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 82ba3d5..8e13073 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: 20140421135803) do +ActiveRecord::Schema.define(version: 20140421143251) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -69,12 +69,12 @@ ActiveRecord::Schema.define(version: 20140421135803) do create_table "game_settings", force: true do |t| t.integer "game_id" - t.integer "stype" t.string "name" - t.text "default" - t.text "description" + t.integer "vartype" t.text "type_opt" + t.text "description" t.integer "display_order" + t.text "default" t.datetime "created_at" t.datetime "updated_at" end @@ -155,11 +155,6 @@ ActiveRecord::Schema.define(version: 20140421135803) do add_index "scores", ["match_id"], name: "index_scores_on_match_id" add_index "scores", ["user_id"], name: "index_scores_on_user_id" - create_table "server_settings", force: true do |t| - t.datetime "created_at" - t.datetime "updated_at" - end - create_table "servers", force: true do |t| t.integer "default_user_permissions" t.datetime "created_at" @@ -200,8 +195,11 @@ ActiveRecord::Schema.define(version: 20140421135803) do create_table "tournament_settings", force: true do |t| t.integer "tournament_id" - t.integer "vartype" t.string "name" + t.integer "vartype" + t.text "type_opt" + t.text "description" + t.integer "display_order" t.text "value" t.datetime "created_at" t.datetime "updated_at" diff --git a/test/fixtures/game_settings.yml b/test/fixtures/game_settings.yml index 2b574fd..118501b 100644 --- a/test/fixtures/game_settings.yml +++ b/test/fixtures/game_settings.yml @@ -2,18 +2,18 @@ one: game_id: - stype: 1 name: MyString - default: MyText - description: MyText + vartype: 1 type_opt: MyText + description: MyText display_order: 1 + default: MyText two: game_id: - stype: 1 name: MyString - default: MyText - description: MyText + vartype: 1 type_opt: MyText + description: MyText display_order: 1 + default: MyText diff --git a/test/fixtures/server_settings.yml b/test/fixtures/server_settings.yml deleted file mode 100644 index 937a0c0..0000000 --- a/test/fixtures/server_settings.yml +++ /dev/null @@ -1,11 +0,0 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -# 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 diff --git a/test/fixtures/tournament_settings.yml b/test/fixtures/tournament_settings.yml index aa5eaef..6cdf24b 100644 --- a/test/fixtures/tournament_settings.yml +++ b/test/fixtures/tournament_settings.yml @@ -2,12 +2,18 @@ one: tournament_id: - vartype: 1 name: MyString + vartype: 1 + type_opt: MyText + description: MyText + display_order: 1 value: MyText two: tournament_id: - vartype: 1 name: MyString + vartype: 1 + type_opt: MyText + description: MyText + display_order: 1 value: MyText diff --git a/test/models/server_setting_test.rb b/test/models/server_setting_test.rb deleted file mode 100644 index eee32c1..0000000 --- a/test/models/server_setting_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class ServerSettingTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end -end -- cgit v1.2.3