From 493c2528076076beae43b2574493ed3955c38f4b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 21 Apr 2014 09:59:40 -0400 Subject: run ./generate.sh --- app/models/api_requests.rb | 2 ++ app/models/tournament_preference.rb | 3 --- app/models/tournament_setting.rb | 3 +++ .../20140410173725_create_simple_captcha_data.rb | 15 --------------- db/migrate/20140410213731_create_delayed_jobs.rb | 22 ---------------------- db/migrate/20140410213738_create_servers.rb | 9 --------- db/migrate/20140410213745_create_matches.rb | 14 -------------- db/migrate/20140410213752_create_teams.rb | 9 --------- db/migrate/20140410213758_create_alerts.rb | 10 ---------- db/migrate/20140410213805_create_pms.rb | 11 ----------- db/migrate/20140410213811_create_tournaments.rb | 17 ----------------- db/migrate/20140410213818_create_games.rb | 15 --------------- db/migrate/20140410213824_create_users.rb | 13 ------------- db/migrate/20140410213831_create_sessions.rb | 11 ----------- db/migrate/20140410213838_create_brackets.rb | 11 ----------- .../20140410213844_create_server_settings.rb | 8 -------- db/migrate/20140410213851_create_game_settings.rb | 15 --------------- ...20140410213857_create_tournament_preferences.rb | 12 ------------ db/migrate/20140410213903_create_scores.rb | 11 ----------- .../20140410213909_create_remote_usernames.rb | 11 ----------- .../20140410213916_create_bracket_matches.rb | 11 ----------- ...0213922_create_tournament_players_join_table.rb | 8 -------- ...410213928_create_tournament_hosts_join_table.rb | 8 -------- .../20140410213935_create_team_user_join_table.rb | 8 -------- .../20140410213941_create_match_team_join_table.rb | 8 -------- .../20140410214006_add_hidden_attrs_to_user.rb | 6 ------ .../20140421095649_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/schema.rb | 12 +++++++++--- test/fixtures/api_requests.yml | 7 +++++++ test/fixtures/tournament_preferences.yml | 13 ------------- test/fixtures/tournament_settings.yml | 13 +++++++++++++ test/models/api_requests_test.rb | 7 +++++++ test/models/tournament_preference_test.rb | 7 ------- test/models/tournament_setting_test.rb | 7 +++++++ 57 files changed, 320 insertions(+), 289 deletions(-) create mode 100644 app/models/api_requests.rb delete mode 100644 app/models/tournament_preference.rb create mode 100644 app/models/tournament_setting.rb delete mode 100644 db/migrate/20140410173725_create_simple_captcha_data.rb delete mode 100644 db/migrate/20140410213731_create_delayed_jobs.rb delete mode 100644 db/migrate/20140410213738_create_servers.rb delete mode 100644 db/migrate/20140410213745_create_matches.rb delete mode 100644 db/migrate/20140410213752_create_teams.rb delete mode 100644 db/migrate/20140410213758_create_alerts.rb delete mode 100644 db/migrate/20140410213805_create_pms.rb delete mode 100644 db/migrate/20140410213811_create_tournaments.rb delete mode 100644 db/migrate/20140410213818_create_games.rb delete mode 100644 db/migrate/20140410213824_create_users.rb delete mode 100644 db/migrate/20140410213831_create_sessions.rb delete mode 100644 db/migrate/20140410213838_create_brackets.rb delete mode 100644 db/migrate/20140410213844_create_server_settings.rb delete mode 100644 db/migrate/20140410213851_create_game_settings.rb delete mode 100644 db/migrate/20140410213857_create_tournament_preferences.rb delete mode 100644 db/migrate/20140410213903_create_scores.rb delete mode 100644 db/migrate/20140410213909_create_remote_usernames.rb delete mode 100644 db/migrate/20140410213916_create_bracket_matches.rb delete mode 100644 db/migrate/20140410213922_create_tournament_players_join_table.rb delete mode 100644 db/migrate/20140410213928_create_tournament_hosts_join_table.rb delete mode 100644 db/migrate/20140410213935_create_team_user_join_table.rb delete mode 100644 db/migrate/20140410213941_create_match_team_join_table.rb delete mode 100644 db/migrate/20140410214006_add_hidden_attrs_to_user.rb create mode 100644 db/migrate/20140421095649_create_simple_captcha_data.rb create mode 100644 db/migrate/20140421135652_create_delayed_jobs.rb create mode 100644 db/migrate/20140421135654_create_servers.rb create mode 100644 db/migrate/20140421135657_create_matches.rb create mode 100644 db/migrate/20140421135700_create_teams.rb create mode 100644 db/migrate/20140421135703_create_alerts.rb create mode 100644 db/migrate/20140421135706_create_pms.rb create mode 100644 db/migrate/20140421135709_create_tournaments.rb create mode 100644 db/migrate/20140421135712_create_games.rb create mode 100644 db/migrate/20140421135715_create_users.rb create mode 100644 db/migrate/20140421135718_create_sessions.rb create mode 100644 db/migrate/20140421135721_create_brackets.rb create mode 100644 db/migrate/20140421135723_create_server_settings.rb create mode 100644 db/migrate/20140421135726_create_game_settings.rb create mode 100644 db/migrate/20140421135729_create_tournament_settings.rb create mode 100644 db/migrate/20140421135732_create_scores.rb create mode 100644 db/migrate/20140421135735_create_remote_usernames.rb create mode 100644 db/migrate/20140421135738_create_bracket_matches.rb create mode 100644 db/migrate/20140421135741_create_api_requests.rb create mode 100644 db/migrate/20140421135744_create_tournament_players_join_table.rb create mode 100644 db/migrate/20140421135747_create_tournament_hosts_join_table.rb create mode 100644 db/migrate/20140421135749_create_team_user_join_table.rb create mode 100644 db/migrate/20140421135752_create_match_team_join_table.rb create mode 100644 db/migrate/20140421135803_add_hidden_attrs_to_user.rb create mode 100644 test/fixtures/api_requests.yml delete mode 100644 test/fixtures/tournament_preferences.yml create mode 100644 test/fixtures/tournament_settings.yml create mode 100644 test/models/api_requests_test.rb delete mode 100644 test/models/tournament_preference_test.rb create mode 100644 test/models/tournament_setting_test.rb diff --git a/app/models/api_requests.rb b/app/models/api_requests.rb new file mode 100644 index 0000000..19c76e2 --- /dev/null +++ b/app/models/api_requests.rb @@ -0,0 +1,2 @@ +class ApiRequests < ActiveRecord::Base +end diff --git a/app/models/tournament_preference.rb b/app/models/tournament_preference.rb deleted file mode 100644 index 3d15061..0000000 --- a/app/models/tournament_preference.rb +++ /dev/null @@ -1,3 +0,0 @@ -class TournamentPreference < ActiveRecord::Base - belongs_to :tournament -end diff --git a/app/models/tournament_setting.rb b/app/models/tournament_setting.rb new file mode 100644 index 0000000..b3e6ace --- /dev/null +++ b/app/models/tournament_setting.rb @@ -0,0 +1,3 @@ +class TournamentSetting < ActiveRecord::Base + belongs_to :tournament +end diff --git a/db/migrate/20140410173725_create_simple_captcha_data.rb b/db/migrate/20140410173725_create_simple_captcha_data.rb deleted file mode 100644 index 4573b20..0000000 --- a/db/migrate/20140410173725_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/20140410213731_create_delayed_jobs.rb b/db/migrate/20140410213731_create_delayed_jobs.rb deleted file mode 100644 index ec0dd93..0000000 --- a/db/migrate/20140410213731_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/20140410213738_create_servers.rb b/db/migrate/20140410213738_create_servers.rb deleted file mode 100644 index fbe1b02..0000000 --- a/db/migrate/20140410213738_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/20140410213745_create_matches.rb b/db/migrate/20140410213745_create_matches.rb deleted file mode 100644 index bdeb1cd..0000000 --- a/db/migrate/20140410213745_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/20140410213752_create_teams.rb b/db/migrate/20140410213752_create_teams.rb deleted file mode 100644 index fdf9a68..0000000 --- a/db/migrate/20140410213752_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/20140410213758_create_alerts.rb b/db/migrate/20140410213758_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140410213758_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/20140410213805_create_pms.rb b/db/migrate/20140410213805_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140410213805_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/20140410213811_create_tournaments.rb b/db/migrate/20140410213811_create_tournaments.rb deleted file mode 100644 index c0d8929..0000000 --- a/db/migrate/20140410213811_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/20140410213818_create_games.rb b/db/migrate/20140410213818_create_games.rb deleted file mode 100644 index 5e4f56f..0000000 --- a/db/migrate/20140410213818_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/20140410213824_create_users.rb b/db/migrate/20140410213824_create_users.rb deleted file mode 100644 index 8032870..0000000 --- a/db/migrate/20140410213824_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/20140410213831_create_sessions.rb b/db/migrate/20140410213831_create_sessions.rb deleted file mode 100644 index f667f1e..0000000 --- a/db/migrate/20140410213831_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/20140410213838_create_brackets.rb b/db/migrate/20140410213838_create_brackets.rb deleted file mode 100644 index 8813bf2..0000000 --- a/db/migrate/20140410213838_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/20140410213844_create_server_settings.rb b/db/migrate/20140410213844_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140410213844_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/20140410213851_create_game_settings.rb b/db/migrate/20140410213851_create_game_settings.rb deleted file mode 100644 index b1caf5d..0000000 --- a/db/migrate/20140410213851_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/20140410213857_create_tournament_preferences.rb b/db/migrate/20140410213857_create_tournament_preferences.rb deleted file mode 100644 index 991d659..0000000 --- a/db/migrate/20140410213857_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/20140410213903_create_scores.rb b/db/migrate/20140410213903_create_scores.rb deleted file mode 100644 index 4ca0b0b..0000000 --- a/db/migrate/20140410213903_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/20140410213909_create_remote_usernames.rb b/db/migrate/20140410213909_create_remote_usernames.rb deleted file mode 100644 index e265985..0000000 --- a/db/migrate/20140410213909_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/20140410213916_create_bracket_matches.rb b/db/migrate/20140410213916_create_bracket_matches.rb deleted file mode 100644 index 3323e31..0000000 --- a/db/migrate/20140410213916_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/20140410213922_create_tournament_players_join_table.rb b/db/migrate/20140410213922_create_tournament_players_join_table.rb deleted file mode 100644 index be240e8..0000000 --- a/db/migrate/20140410213922_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/20140410213928_create_tournament_hosts_join_table.rb b/db/migrate/20140410213928_create_tournament_hosts_join_table.rb deleted file mode 100644 index 7521d89..0000000 --- a/db/migrate/20140410213928_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/20140410213935_create_team_user_join_table.rb b/db/migrate/20140410213935_create_team_user_join_table.rb deleted file mode 100644 index f3b57fc..0000000 --- a/db/migrate/20140410213935_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/20140410213941_create_match_team_join_table.rb b/db/migrate/20140410213941_create_match_team_join_table.rb deleted file mode 100644 index c2ed1b7..0000000 --- a/db/migrate/20140410213941_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/20140410214006_add_hidden_attrs_to_user.rb b/db/migrate/20140410214006_add_hidden_attrs_to_user.rb deleted file mode 100644 index 9b5c505..0000000 --- a/db/migrate/20140410214006_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/20140421095649_create_simple_captcha_data.rb b/db/migrate/20140421095649_create_simple_captcha_data.rb new file mode 100644 index 0000000..4573b20 --- /dev/null +++ b/db/migrate/20140421095649_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 new file mode 100644 index 0000000..ec0dd93 --- /dev/null +++ b/db/migrate/20140421135652_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/20140421135654_create_servers.rb b/db/migrate/20140421135654_create_servers.rb new file mode 100644 index 0000000..fbe1b02 --- /dev/null +++ b/db/migrate/20140421135654_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/20140421135657_create_matches.rb b/db/migrate/20140421135657_create_matches.rb new file mode 100644 index 0000000..bdeb1cd --- /dev/null +++ b/db/migrate/20140421135657_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/20140421135700_create_teams.rb b/db/migrate/20140421135700_create_teams.rb new file mode 100644 index 0000000..fdf9a68 --- /dev/null +++ b/db/migrate/20140421135700_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/20140421135703_create_alerts.rb b/db/migrate/20140421135703_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140421135703_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/20140421135706_create_pms.rb b/db/migrate/20140421135706_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140421135706_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/20140421135709_create_tournaments.rb b/db/migrate/20140421135709_create_tournaments.rb new file mode 100644 index 0000000..c0d8929 --- /dev/null +++ b/db/migrate/20140421135709_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/20140421135712_create_games.rb b/db/migrate/20140421135712_create_games.rb new file mode 100644 index 0000000..5e4f56f --- /dev/null +++ b/db/migrate/20140421135712_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/20140421135715_create_users.rb b/db/migrate/20140421135715_create_users.rb new file mode 100644 index 0000000..8032870 --- /dev/null +++ b/db/migrate/20140421135715_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/20140421135718_create_sessions.rb b/db/migrate/20140421135718_create_sessions.rb new file mode 100644 index 0000000..f667f1e --- /dev/null +++ b/db/migrate/20140421135718_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/20140421135721_create_brackets.rb b/db/migrate/20140421135721_create_brackets.rb new file mode 100644 index 0000000..8813bf2 --- /dev/null +++ b/db/migrate/20140421135721_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/20140421135723_create_server_settings.rb b/db/migrate/20140421135723_create_server_settings.rb new file mode 100644 index 0000000..dfdd91b --- /dev/null +++ b/db/migrate/20140421135723_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/20140421135726_create_game_settings.rb b/db/migrate/20140421135726_create_game_settings.rb new file mode 100644 index 0000000..b1caf5d --- /dev/null +++ b/db/migrate/20140421135726_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 :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 new file mode 100644 index 0000000..a2e8e66 --- /dev/null +++ b/db/migrate/20140421135729_create_tournament_settings.rb @@ -0,0 +1,12 @@ +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 new file mode 100644 index 0000000..4ca0b0b --- /dev/null +++ b/db/migrate/20140421135732_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/20140421135735_create_remote_usernames.rb b/db/migrate/20140421135735_create_remote_usernames.rb new file mode 100644 index 0000000..e265985 --- /dev/null +++ b/db/migrate/20140421135735_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/20140421135738_create_bracket_matches.rb b/db/migrate/20140421135738_create_bracket_matches.rb new file mode 100644 index 0000000..3323e31 --- /dev/null +++ b/db/migrate/20140421135738_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/20140421135741_create_api_requests.rb b/db/migrate/20140421135741_create_api_requests.rb new file mode 100644 index 0000000..544c330 --- /dev/null +++ b/db/migrate/20140421135741_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/20140421135744_create_tournament_players_join_table.rb b/db/migrate/20140421135744_create_tournament_players_join_table.rb new file mode 100644 index 0000000..be240e8 --- /dev/null +++ b/db/migrate/20140421135744_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/20140421135747_create_tournament_hosts_join_table.rb b/db/migrate/20140421135747_create_tournament_hosts_join_table.rb new file mode 100644 index 0000000..7521d89 --- /dev/null +++ b/db/migrate/20140421135747_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/20140421135749_create_team_user_join_table.rb b/db/migrate/20140421135749_create_team_user_join_table.rb new file mode 100644 index 0000000..f3b57fc --- /dev/null +++ b/db/migrate/20140421135749_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/20140421135752_create_match_team_join_table.rb b/db/migrate/20140421135752_create_match_team_join_table.rb new file mode 100644 index 0000000..c2ed1b7 --- /dev/null +++ b/db/migrate/20140421135752_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/20140421135803_add_hidden_attrs_to_user.rb b/db/migrate/20140421135803_add_hidden_attrs_to_user.rb new file mode 100644 index 0000000..9b5c505 --- /dev/null +++ b/db/migrate/20140421135803_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 e6ad821..82ba3d5 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: 20140410214006) do +ActiveRecord::Schema.define(version: 20140421135803) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -22,6 +22,12 @@ ActiveRecord::Schema.define(version: 20140410214006) do add_index "alerts", ["author_id"], name: "index_alerts_on_author_id" + create_table "api_requests", force: true do |t| + t.string "api_name" + t.datetime "created_at" + t.datetime "updated_at" + end + create_table "bracket_matches", force: true do |t| t.integer "bracket_id" t.integer "match_id" @@ -192,7 +198,7 @@ ActiveRecord::Schema.define(version: 20140410214006) do t.integer "user_id", null: false end - create_table "tournament_preferences", force: true do |t| + create_table "tournament_settings", force: true do |t| t.integer "tournament_id" t.integer "vartype" t.string "name" @@ -201,7 +207,7 @@ ActiveRecord::Schema.define(version: 20140410214006) do t.datetime "updated_at" end - add_index "tournament_preferences", ["tournament_id"], name: "index_tournament_preferences_on_tournament_id" + add_index "tournament_settings", ["tournament_id"], name: "index_tournament_settings_on_tournament_id" create_table "tournaments", force: true do |t| t.string "name" diff --git a/test/fixtures/api_requests.yml b/test/fixtures/api_requests.yml new file mode 100644 index 0000000..8739914 --- /dev/null +++ b/test/fixtures/api_requests.yml @@ -0,0 +1,7 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + api_name: MyString + +two: + api_name: MyString diff --git a/test/fixtures/tournament_preferences.yml b/test/fixtures/tournament_preferences.yml deleted file mode 100644 index aa5eaef..0000000 --- a/test/fixtures/tournament_preferences.yml +++ /dev/null @@ -1,13 +0,0 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - tournament_id: - vartype: 1 - name: MyString - value: MyText - -two: - tournament_id: - vartype: 1 - name: MyString - value: MyText diff --git a/test/fixtures/tournament_settings.yml b/test/fixtures/tournament_settings.yml new file mode 100644 index 0000000..aa5eaef --- /dev/null +++ b/test/fixtures/tournament_settings.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + tournament_id: + vartype: 1 + name: MyString + value: MyText + +two: + tournament_id: + vartype: 1 + name: MyString + value: MyText diff --git a/test/models/api_requests_test.rb b/test/models/api_requests_test.rb new file mode 100644 index 0000000..18763a7 --- /dev/null +++ b/test/models/api_requests_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class ApiRequestsTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/tournament_preference_test.rb b/test/models/tournament_preference_test.rb deleted file mode 100644 index e200b8e..0000000 --- a/test/models/tournament_preference_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class TournamentPreferenceTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end -end diff --git a/test/models/tournament_setting_test.rb b/test/models/tournament_setting_test.rb new file mode 100644 index 0000000..644df85 --- /dev/null +++ b/test/models/tournament_setting_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class TournamentSettingTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end -- cgit v1.2.3