From 62219ac4e3af36cc15c9ad61701550bee9a8424c Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 26 Apr 2014 20:16:33 -0400 Subject: run ./generate.sh --- app/controllers/games_controller.rb | 2 +- app/controllers/tournaments_controller.rb | 2 +- app/views/games/_form.html.erb | 4 ++ app/views/games/index.html.erb | 2 + app/views/games/index.json.jbuilder | 2 +- app/views/games/show.html.erb | 5 ++ app/views/games/show.json.jbuilder | 2 +- app/views/tournaments/_form.html.erb | 4 ++ app/views/tournaments/index.html.erb | 2 + app/views/tournaments/index.json.jbuilder | 2 +- app/views/tournaments/show.html.erb | 5 ++ app/views/tournaments/show.json.jbuilder | 2 +- .../20140424190540_create_simple_captcha_data.rb | 15 ------ ...0424230536_create_mailboxer.mailboxer_engine.rb | 62 ---------------------- ...4230537_add_notified_object.mailboxer_engine.rb | 18 ------- ...30538_add_notification_code.mailboxer_engine.rb | 14 ----- ...40424230539_add_attachments.mailboxer_engine.rb | 10 ---- ...230540_rename_receipts_read.mailboxer_engine.rb | 10 ---- ...global_notification_support.mailboxer_engine.rb | 10 ---- db/migrate/20140424230543_create_delayed_jobs.rb | 22 -------- db/migrate/20140424230547_create_servers.rb | 9 ---- db/migrate/20140424230550_create_matches.rb | 13 ----- db/migrate/20140424230554_create_teams.rb | 8 --- db/migrate/20140424230558_create_alerts.rb | 10 ---- db/migrate/20140424230602_create_pms.rb | 13 ----- db/migrate/20140424230605_create_tournaments.rb | 19 ------- db/migrate/20140424230609_create_games.rb | 18 ------- db/migrate/20140424230613_create_users.rb | 13 ----- db/migrate/20140424230617_create_sessions.rb | 11 ---- db/migrate/20140424230620_create_brackets.rb | 11 ---- db/migrate/20140424230624_create_game_settings.rb | 15 ------ .../20140424230628_create_tournament_settings.rb | 15 ------ .../20140424230632_create_tournament_stages.rb | 11 ---- db/migrate/20140424230635_create_statistics.rb | 12 ----- .../20140424230639_create_remote_usernames.rb | 11 ---- .../20140424230643_create_bracket_matches.rb | 11 ---- db/migrate/20140424230646_create_api_requests.rb | 9 ---- ...4230650_create_tournament_players_join_table.rb | 8 --- ...424230654_create_tournament_hosts_join_table.rb | 8 --- .../20140424230657_create_team_user_join_table.rb | 8 --- .../20140424230701_create_match_team_join_table.rb | 8 --- .../20140424230712_add_hidden_attrs_to_user.rb | 6 --- .../20140426201409_create_simple_captcha_data.rb | 15 ++++++ ...0427001406_create_mailboxer.mailboxer_engine.rb | 62 ++++++++++++++++++++++ ...7001407_add_notified_object.mailboxer_engine.rb | 18 +++++++ ...01408_add_notification_code.mailboxer_engine.rb | 14 +++++ ...40427001409_add_attachments.mailboxer_engine.rb | 10 ++++ ...001410_rename_receipts_read.mailboxer_engine.rb | 10 ++++ ...global_notification_support.mailboxer_engine.rb | 10 ++++ db/migrate/20140427001413_create_delayed_jobs.rb | 22 ++++++++ db/migrate/20140427001416_create_servers.rb | 9 ++++ db/migrate/20140427001420_create_matches.rb | 13 +++++ db/migrate/20140427001424_create_teams.rb | 8 +++ db/migrate/20140427001428_create_alerts.rb | 10 ++++ db/migrate/20140427001431_create_pms.rb | 13 +++++ db/migrate/20140427001435_create_tournaments.rb | 20 +++++++ db/migrate/20140427001439_create_games.rb | 19 +++++++ db/migrate/20140427001443_create_users.rb | 13 +++++ db/migrate/20140427001446_create_sessions.rb | 11 ++++ db/migrate/20140427001450_create_brackets.rb | 11 ++++ db/migrate/20140427001454_create_game_settings.rb | 15 ++++++ .../20140427001458_create_tournament_settings.rb | 15 ++++++ .../20140427001502_create_tournament_stages.rb | 12 +++++ db/migrate/20140427001505_create_statistics.rb | 12 +++++ .../20140427001509_create_remote_usernames.rb | 11 ++++ .../20140427001513_create_bracket_matches.rb | 11 ++++ db/migrate/20140427001516_create_api_requests.rb | 9 ++++ ...7001520_create_tournament_players_join_table.rb | 8 +++ ...427001523_create_tournament_hosts_join_table.rb | 8 +++ .../20140427001527_create_team_user_join_table.rb | 8 +++ .../20140427001531_create_match_team_join_table.rb | 8 +++ .../20140427001542_add_hidden_attrs_to_user.rb | 6 +++ db/schema.rb | 7 ++- test/controllers/games_controller_test.rb | 4 +- test/controllers/tournaments_controller_test.rb | 4 +- test/fixtures/games.yml | 2 + test/fixtures/tournament_stages.yml | 6 ++- test/fixtures/tournaments.yml | 2 + 78 files changed, 456 insertions(+), 422 deletions(-) delete mode 100644 db/migrate/20140424190540_create_simple_captcha_data.rb delete mode 100644 db/migrate/20140424230536_create_mailboxer.mailboxer_engine.rb delete mode 100644 db/migrate/20140424230537_add_notified_object.mailboxer_engine.rb delete mode 100644 db/migrate/20140424230538_add_notification_code.mailboxer_engine.rb delete mode 100644 db/migrate/20140424230539_add_attachments.mailboxer_engine.rb delete mode 100644 db/migrate/20140424230540_rename_receipts_read.mailboxer_engine.rb delete mode 100644 db/migrate/20140424230541_add_global_notification_support.mailboxer_engine.rb delete mode 100644 db/migrate/20140424230543_create_delayed_jobs.rb delete mode 100644 db/migrate/20140424230547_create_servers.rb delete mode 100644 db/migrate/20140424230550_create_matches.rb delete mode 100644 db/migrate/20140424230554_create_teams.rb delete mode 100644 db/migrate/20140424230558_create_alerts.rb delete mode 100644 db/migrate/20140424230602_create_pms.rb delete mode 100644 db/migrate/20140424230605_create_tournaments.rb delete mode 100644 db/migrate/20140424230609_create_games.rb delete mode 100644 db/migrate/20140424230613_create_users.rb delete mode 100644 db/migrate/20140424230617_create_sessions.rb delete mode 100644 db/migrate/20140424230620_create_brackets.rb delete mode 100644 db/migrate/20140424230624_create_game_settings.rb delete mode 100644 db/migrate/20140424230628_create_tournament_settings.rb delete mode 100644 db/migrate/20140424230632_create_tournament_stages.rb delete mode 100644 db/migrate/20140424230635_create_statistics.rb delete mode 100644 db/migrate/20140424230639_create_remote_usernames.rb delete mode 100644 db/migrate/20140424230643_create_bracket_matches.rb delete mode 100644 db/migrate/20140424230646_create_api_requests.rb delete mode 100644 db/migrate/20140424230650_create_tournament_players_join_table.rb delete mode 100644 db/migrate/20140424230654_create_tournament_hosts_join_table.rb delete mode 100644 db/migrate/20140424230657_create_team_user_join_table.rb delete mode 100644 db/migrate/20140424230701_create_match_team_join_table.rb delete mode 100644 db/migrate/20140424230712_add_hidden_attrs_to_user.rb create mode 100644 db/migrate/20140426201409_create_simple_captcha_data.rb create mode 100644 db/migrate/20140427001406_create_mailboxer.mailboxer_engine.rb create mode 100644 db/migrate/20140427001407_add_notified_object.mailboxer_engine.rb create mode 100644 db/migrate/20140427001408_add_notification_code.mailboxer_engine.rb create mode 100644 db/migrate/20140427001409_add_attachments.mailboxer_engine.rb create mode 100644 db/migrate/20140427001410_rename_receipts_read.mailboxer_engine.rb create mode 100644 db/migrate/20140427001411_add_global_notification_support.mailboxer_engine.rb create mode 100644 db/migrate/20140427001413_create_delayed_jobs.rb create mode 100644 db/migrate/20140427001416_create_servers.rb create mode 100644 db/migrate/20140427001420_create_matches.rb create mode 100644 db/migrate/20140427001424_create_teams.rb create mode 100644 db/migrate/20140427001428_create_alerts.rb create mode 100644 db/migrate/20140427001431_create_pms.rb create mode 100644 db/migrate/20140427001435_create_tournaments.rb create mode 100644 db/migrate/20140427001439_create_games.rb create mode 100644 db/migrate/20140427001443_create_users.rb create mode 100644 db/migrate/20140427001446_create_sessions.rb create mode 100644 db/migrate/20140427001450_create_brackets.rb create mode 100644 db/migrate/20140427001454_create_game_settings.rb create mode 100644 db/migrate/20140427001458_create_tournament_settings.rb create mode 100644 db/migrate/20140427001502_create_tournament_stages.rb create mode 100644 db/migrate/20140427001505_create_statistics.rb create mode 100644 db/migrate/20140427001509_create_remote_usernames.rb create mode 100644 db/migrate/20140427001513_create_bracket_matches.rb create mode 100644 db/migrate/20140427001516_create_api_requests.rb create mode 100644 db/migrate/20140427001520_create_tournament_players_join_table.rb create mode 100644 db/migrate/20140427001523_create_tournament_hosts_join_table.rb create mode 100644 db/migrate/20140427001527_create_team_user_join_table.rb create mode 100644 db/migrate/20140427001531_create_match_team_join_table.rb create mode 100644 db/migrate/20140427001542_add_hidden_attrs_to_user.rb diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index 8546efb..76a6296 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -69,6 +69,6 @@ class GamesController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def game_params - params.require(:game).permit(:parent_id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method) + params.require(:game).permit(:parent_id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method, :scoring_method) end end diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index 6bf79fd..64ab155 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -69,6 +69,6 @@ class TournamentsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def tournament_params - params.require(:tournament).permit(:game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method) + params.require(:tournament).permit(:game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method, :scoring_method) end end diff --git a/app/views/games/_form.html.erb b/app/views/games/_form.html.erb index 20cb214..b1db0b3 100644 --- a/app/views/games/_form.html.erb +++ b/app/views/games/_form.html.erb @@ -47,6 +47,10 @@ <%= f.label :sampling_method %>
<%= f.text_field :sampling_method %> +
+ <%= f.label :scoring_method %>
+ <%= f.text_field :scoring_method %> +
<%= f.submit %>
diff --git a/app/views/games/index.html.erb b/app/views/games/index.html.erb index b4c3950..207a0ba 100644 --- a/app/views/games/index.html.erb +++ b/app/views/games/index.html.erb @@ -12,6 +12,7 @@ Set rounds Randomized teams Sampling method + Scoring method @@ -30,6 +31,7 @@ <%= game.set_rounds %> <%= game.randomized_teams %> <%= game.sampling_method %> + <%= game.scoring_method %> <%= link_to 'Show', game %> <%= link_to 'Edit', edit_game_path(game) %> <%= link_to 'Destroy', game, method: :delete, data: { confirm: 'Are you sure?' } %> diff --git a/app/views/games/index.json.jbuilder b/app/views/games/index.json.jbuilder index 6b20f60..7964f2c 100644 --- a/app/views/games/index.json.jbuilder +++ b/app/views/games/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@games) do |game| - json.extract! game, :id, :parent_id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method + json.extract! game, :id, :parent_id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method, :scoring_method json.url game_url(game, format: :json) end diff --git a/app/views/games/show.html.erb b/app/views/games/show.html.erb index 38c8ccb..6bca111 100644 --- a/app/views/games/show.html.erb +++ b/app/views/games/show.html.erb @@ -45,5 +45,10 @@ <%= @game.sampling_method %>

+

+ Scoring method: + <%= @game.scoring_method %> +

+ <%= link_to 'Edit', edit_game_path(@game) %> | <%= link_to 'Back', games_path %> diff --git a/app/views/games/show.json.jbuilder b/app/views/games/show.json.jbuilder index 087a156..c5fb4ed 100644 --- a/app/views/games/show.json.jbuilder +++ b/app/views/games/show.json.jbuilder @@ -1 +1 @@ -json.extract! @game, :id, :parent_id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method, :created_at, :updated_at +json.extract! @game, :id, :parent_id, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method, :scoring_method, :created_at, :updated_at diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb index 9b9681c..7127d38 100644 --- a/app/views/tournaments/_form.html.erb +++ b/app/views/tournaments/_form.html.erb @@ -51,6 +51,10 @@ <%= f.label :sampling_method %>
<%= f.text_field :sampling_method %> +
+ <%= f.label :scoring_method %>
+ <%= f.text_field :scoring_method %> +
<%= f.submit %>
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb index 49a83ec..c2b5a2b 100644 --- a/app/views/tournaments/index.html.erb +++ b/app/views/tournaments/index.html.erb @@ -13,6 +13,7 @@ Set rounds Randomized teams Sampling method + Scoring method @@ -32,6 +33,7 @@ <%= tournament.set_rounds %> <%= tournament.randomized_teams %> <%= tournament.sampling_method %> + <%= tournament.scoring_method %> <%= link_to 'Show', tournament %> <%= link_to 'Edit', edit_tournament_path(tournament) %> <%= link_to 'Destroy', tournament, method: :delete, data: { confirm: 'Are you sure?' } %> diff --git a/app/views/tournaments/index.json.jbuilder b/app/views/tournaments/index.json.jbuilder index 7118ecc..bd86e04 100644 --- a/app/views/tournaments/index.json.jbuilder +++ b/app/views/tournaments/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@tournaments) do |tournament| - json.extract! tournament, :id, :game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method + json.extract! tournament, :id, :game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method, :scoring_method json.url tournament_url(tournament, format: :json) end diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb index d97e504..f91e11e 100644 --- a/app/views/tournaments/show.html.erb +++ b/app/views/tournaments/show.html.erb @@ -50,5 +50,10 @@ <%= @tournament.sampling_method %>

+

+ Scoring method: + <%= @tournament.scoring_method %> +

+ <%= link_to 'Edit', edit_tournament_path(@tournament) %> | <%= link_to 'Back', tournaments_path %> diff --git a/app/views/tournaments/show.json.jbuilder b/app/views/tournaments/show.json.jbuilder index 4542e52..ff82412 100644 --- a/app/views/tournaments/show.json.jbuilder +++ b/app/views/tournaments/show.json.jbuilder @@ -1 +1 @@ -json.extract! @tournament, :id, :game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method, :created_at, :updated_at +json.extract! @tournament, :id, :game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method, :scoring_method, :created_at, :updated_at diff --git a/db/migrate/20140424190540_create_simple_captcha_data.rb b/db/migrate/20140424190540_create_simple_captcha_data.rb deleted file mode 100644 index 4573b20..0000000 --- a/db/migrate/20140424190540_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/20140424230536_create_mailboxer.mailboxer_engine.rb b/db/migrate/20140424230536_create_mailboxer.mailboxer_engine.rb deleted file mode 100644 index 690cec2..0000000 --- a/db/migrate/20140424230536_create_mailboxer.mailboxer_engine.rb +++ /dev/null @@ -1,62 +0,0 @@ -# This migration comes from mailboxer_engine (originally 20110511145103) -class CreateMailboxer < ActiveRecord::Migration - def self.up - #Tables - #Conversations - create_table :conversations do |t| - t.column :subject, :string, :default => "" - t.column :created_at, :datetime, :null => false - t.column :updated_at, :datetime, :null => false - end - #Receipts - create_table :receipts do |t| - t.references :receiver, :polymorphic => true - t.column :notification_id, :integer, :null => false - t.column :read, :boolean, :default => false - t.column :trashed, :boolean, :default => false - t.column :deleted, :boolean, :default => false - t.column :mailbox_type, :string, :limit => 25 - t.column :created_at, :datetime, :null => false - t.column :updated_at, :datetime, :null => false - end - #Notifications and Messages - create_table :notifications do |t| - t.column :type, :string - t.column :body, :text - t.column :subject, :string, :default => "" - t.references :sender, :polymorphic => true - t.references :object, :polymorphic => true - t.column :conversation_id, :integer - t.column :draft, :boolean, :default => false - t.column :updated_at, :datetime, :null => false - t.column :created_at, :datetime, :null => false - end - - - #Indexes - #Conversations - #Receipts - add_index "receipts","notification_id" - - #Messages - add_index "notifications","conversation_id" - - #Foreign keys - #Conversations - #Receipts - add_foreign_key "receipts", "notifications", :name => "receipts_on_notification_id" - #Messages - add_foreign_key "notifications", "conversations", :name => "notifications_on_conversation_id" - end - - def self.down - #Tables - remove_foreign_key "receipts", :name => "receipts_on_notification_id" - remove_foreign_key "notifications", :name => "notifications_on_conversation_id" - - #Indexes - drop_table :receipts - drop_table :conversations - drop_table :notifications - end -end diff --git a/db/migrate/20140424230537_add_notified_object.mailboxer_engine.rb b/db/migrate/20140424230537_add_notified_object.mailboxer_engine.rb deleted file mode 100644 index 7f41ac6..0000000 --- a/db/migrate/20140424230537_add_notified_object.mailboxer_engine.rb +++ /dev/null @@ -1,18 +0,0 @@ -# This migration comes from mailboxer_engine (originally 20110719110700) -class AddNotifiedObject < ActiveRecord::Migration - def self.up - change_table :notifications do |t| - t.references :notified_object, :polymorphic => true - t.remove :object_id - t.remove :object_type - end - end - - def self.down - change_table :notifications do |t| - t.remove :notified_object_id - t.remove :notified_object_type - t.references :object, :polymorphic => true - end - end -end diff --git a/db/migrate/20140424230538_add_notification_code.mailboxer_engine.rb b/db/migrate/20140424230538_add_notification_code.mailboxer_engine.rb deleted file mode 100644 index 04c12ef..0000000 --- a/db/migrate/20140424230538_add_notification_code.mailboxer_engine.rb +++ /dev/null @@ -1,14 +0,0 @@ -# This migration comes from mailboxer_engine (originally 20110912163911) -class AddNotificationCode < ActiveRecord::Migration - def self.up - change_table :notifications do |t| - t.string :notification_code, :default => nil - end - end - - def self.down - change_table :notifications do |t| - t.remove :notification_code - end - end -end \ No newline at end of file diff --git a/db/migrate/20140424230539_add_attachments.mailboxer_engine.rb b/db/migrate/20140424230539_add_attachments.mailboxer_engine.rb deleted file mode 100644 index b8d6588..0000000 --- a/db/migrate/20140424230539_add_attachments.mailboxer_engine.rb +++ /dev/null @@ -1,10 +0,0 @@ -# This migration comes from mailboxer_engine (originally 20111204163911) -class AddAttachments < ActiveRecord::Migration - def self.up - add_column :notifications, :attachment, :string - end - - def self.down - remove_column :notifications, :attachment - end -end diff --git a/db/migrate/20140424230540_rename_receipts_read.mailboxer_engine.rb b/db/migrate/20140424230540_rename_receipts_read.mailboxer_engine.rb deleted file mode 100644 index 9ce904f..0000000 --- a/db/migrate/20140424230540_rename_receipts_read.mailboxer_engine.rb +++ /dev/null @@ -1,10 +0,0 @@ -# This migration comes from mailboxer_engine (originally 20120813110712) -class RenameReceiptsRead < ActiveRecord::Migration - def up - rename_column :receipts, :read, :is_read - end - - def down - rename_column :receipts, :is_read, :read - end -end diff --git a/db/migrate/20140424230541_add_global_notification_support.mailboxer_engine.rb b/db/migrate/20140424230541_add_global_notification_support.mailboxer_engine.rb deleted file mode 100644 index 60f67ab..0000000 --- a/db/migrate/20140424230541_add_global_notification_support.mailboxer_engine.rb +++ /dev/null @@ -1,10 +0,0 @@ -# This migration comes from mailboxer_engine (originally 20130305144212) -class AddGlobalNotificationSupport < ActiveRecord::Migration - - def change - change_table :notifications do |t| - t.boolean :global, default: false - t.datetime :expires - end - end -end diff --git a/db/migrate/20140424230543_create_delayed_jobs.rb b/db/migrate/20140424230543_create_delayed_jobs.rb deleted file mode 100644 index ec0dd93..0000000 --- a/db/migrate/20140424230543_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/20140424230547_create_servers.rb b/db/migrate/20140424230547_create_servers.rb deleted file mode 100644 index fbe1b02..0000000 --- a/db/migrate/20140424230547_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/20140424230550_create_matches.rb b/db/migrate/20140424230550_create_matches.rb deleted file mode 100644 index bac92d1..0000000 --- a/db/migrate/20140424230550_create_matches.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateMatches < ActiveRecord::Migration - def change - create_table :matches do |t| - t.integer :status - t.references :tournament_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/20140424230554_create_teams.rb b/db/migrate/20140424230554_create_teams.rb deleted file mode 100644 index dd8397d..0000000 --- a/db/migrate/20140424230554_create_teams.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTeams < ActiveRecord::Migration - def change - create_table :teams do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140424230558_create_alerts.rb b/db/migrate/20140424230558_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140424230558_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/20140424230602_create_pms.rb b/db/migrate/20140424230602_create_pms.rb deleted file mode 100644 index eb9f443..0000000 --- a/db/migrate/20140424230602_create_pms.rb +++ /dev/null @@ -1,13 +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.text :subject - t.references :conversation, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140424230605_create_tournaments.rb b/db/migrate/20140424230605_create_tournaments.rb deleted file mode 100644 index 716871f..0000000 --- a/db/migrate/20140424230605_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/20140424230609_create_games.rb b/db/migrate/20140424230609_create_games.rb deleted file mode 100644 index 23edf0b..0000000 --- a/db/migrate/20140424230609_create_games.rb +++ /dev/null @@ -1,18 +0,0 @@ -class CreateGames < ActiveRecord::Migration - def change - create_table :games do |t| - t.references :parent, index: true - 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/20140424230613_create_users.rb b/db/migrate/20140424230613_create_users.rb deleted file mode 100644 index 8032870..0000000 --- a/db/migrate/20140424230613_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/20140424230617_create_sessions.rb b/db/migrate/20140424230617_create_sessions.rb deleted file mode 100644 index f667f1e..0000000 --- a/db/migrate/20140424230617_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/20140424230620_create_brackets.rb b/db/migrate/20140424230620_create_brackets.rb deleted file mode 100644 index 8813bf2..0000000 --- a/db/migrate/20140424230620_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/20140424230624_create_game_settings.rb b/db/migrate/20140424230624_create_game_settings.rb deleted file mode 100644 index 06fb72e..0000000 --- a/db/migrate/20140424230624_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/20140424230628_create_tournament_settings.rb b/db/migrate/20140424230628_create_tournament_settings.rb deleted file mode 100644 index e56697f..0000000 --- a/db/migrate/20140424230628_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/20140424230632_create_tournament_stages.rb b/db/migrate/20140424230632_create_tournament_stages.rb deleted file mode 100644 index e3668cb..0000000 --- a/db/migrate/20140424230632_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/20140424230635_create_statistics.rb b/db/migrate/20140424230635_create_statistics.rb deleted file mode 100644 index cc2e97d..0000000 --- a/db/migrate/20140424230635_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/20140424230639_create_remote_usernames.rb b/db/migrate/20140424230639_create_remote_usernames.rb deleted file mode 100644 index e265985..0000000 --- a/db/migrate/20140424230639_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/20140424230643_create_bracket_matches.rb b/db/migrate/20140424230643_create_bracket_matches.rb deleted file mode 100644 index 3323e31..0000000 --- a/db/migrate/20140424230643_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/20140424230646_create_api_requests.rb b/db/migrate/20140424230646_create_api_requests.rb deleted file mode 100644 index 544c330..0000000 --- a/db/migrate/20140424230646_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/20140424230650_create_tournament_players_join_table.rb b/db/migrate/20140424230650_create_tournament_players_join_table.rb deleted file mode 100644 index be240e8..0000000 --- a/db/migrate/20140424230650_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/20140424230654_create_tournament_hosts_join_table.rb b/db/migrate/20140424230654_create_tournament_hosts_join_table.rb deleted file mode 100644 index 7521d89..0000000 --- a/db/migrate/20140424230654_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/20140424230657_create_team_user_join_table.rb b/db/migrate/20140424230657_create_team_user_join_table.rb deleted file mode 100644 index f3b57fc..0000000 --- a/db/migrate/20140424230657_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/20140424230701_create_match_team_join_table.rb b/db/migrate/20140424230701_create_match_team_join_table.rb deleted file mode 100644 index c2ed1b7..0000000 --- a/db/migrate/20140424230701_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/20140424230712_add_hidden_attrs_to_user.rb b/db/migrate/20140424230712_add_hidden_attrs_to_user.rb deleted file mode 100644 index 9b5c505..0000000 --- a/db/migrate/20140424230712_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/20140426201409_create_simple_captcha_data.rb b/db/migrate/20140426201409_create_simple_captcha_data.rb new file mode 100644 index 0000000..4573b20 --- /dev/null +++ b/db/migrate/20140426201409_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/20140427001406_create_mailboxer.mailboxer_engine.rb b/db/migrate/20140427001406_create_mailboxer.mailboxer_engine.rb new file mode 100644 index 0000000..690cec2 --- /dev/null +++ b/db/migrate/20140427001406_create_mailboxer.mailboxer_engine.rb @@ -0,0 +1,62 @@ +# This migration comes from mailboxer_engine (originally 20110511145103) +class CreateMailboxer < ActiveRecord::Migration + def self.up + #Tables + #Conversations + create_table :conversations do |t| + t.column :subject, :string, :default => "" + t.column :created_at, :datetime, :null => false + t.column :updated_at, :datetime, :null => false + end + #Receipts + create_table :receipts do |t| + t.references :receiver, :polymorphic => true + t.column :notification_id, :integer, :null => false + t.column :read, :boolean, :default => false + t.column :trashed, :boolean, :default => false + t.column :deleted, :boolean, :default => false + t.column :mailbox_type, :string, :limit => 25 + t.column :created_at, :datetime, :null => false + t.column :updated_at, :datetime, :null => false + end + #Notifications and Messages + create_table :notifications do |t| + t.column :type, :string + t.column :body, :text + t.column :subject, :string, :default => "" + t.references :sender, :polymorphic => true + t.references :object, :polymorphic => true + t.column :conversation_id, :integer + t.column :draft, :boolean, :default => false + t.column :updated_at, :datetime, :null => false + t.column :created_at, :datetime, :null => false + end + + + #Indexes + #Conversations + #Receipts + add_index "receipts","notification_id" + + #Messages + add_index "notifications","conversation_id" + + #Foreign keys + #Conversations + #Receipts + add_foreign_key "receipts", "notifications", :name => "receipts_on_notification_id" + #Messages + add_foreign_key "notifications", "conversations", :name => "notifications_on_conversation_id" + end + + def self.down + #Tables + remove_foreign_key "receipts", :name => "receipts_on_notification_id" + remove_foreign_key "notifications", :name => "notifications_on_conversation_id" + + #Indexes + drop_table :receipts + drop_table :conversations + drop_table :notifications + end +end diff --git a/db/migrate/20140427001407_add_notified_object.mailboxer_engine.rb b/db/migrate/20140427001407_add_notified_object.mailboxer_engine.rb new file mode 100644 index 0000000..7f41ac6 --- /dev/null +++ b/db/migrate/20140427001407_add_notified_object.mailboxer_engine.rb @@ -0,0 +1,18 @@ +# This migration comes from mailboxer_engine (originally 20110719110700) +class AddNotifiedObject < ActiveRecord::Migration + def self.up + change_table :notifications do |t| + t.references :notified_object, :polymorphic => true + t.remove :object_id + t.remove :object_type + end + end + + def self.down + change_table :notifications do |t| + t.remove :notified_object_id + t.remove :notified_object_type + t.references :object, :polymorphic => true + end + end +end diff --git a/db/migrate/20140427001408_add_notification_code.mailboxer_engine.rb b/db/migrate/20140427001408_add_notification_code.mailboxer_engine.rb new file mode 100644 index 0000000..04c12ef --- /dev/null +++ b/db/migrate/20140427001408_add_notification_code.mailboxer_engine.rb @@ -0,0 +1,14 @@ +# This migration comes from mailboxer_engine (originally 20110912163911) +class AddNotificationCode < ActiveRecord::Migration + def self.up + change_table :notifications do |t| + t.string :notification_code, :default => nil + end + end + + def self.down + change_table :notifications do |t| + t.remove :notification_code + end + end +end \ No newline at end of file diff --git a/db/migrate/20140427001409_add_attachments.mailboxer_engine.rb b/db/migrate/20140427001409_add_attachments.mailboxer_engine.rb new file mode 100644 index 0000000..b8d6588 --- /dev/null +++ b/db/migrate/20140427001409_add_attachments.mailboxer_engine.rb @@ -0,0 +1,10 @@ +# This migration comes from mailboxer_engine (originally 20111204163911) +class AddAttachments < ActiveRecord::Migration + def self.up + add_column :notifications, :attachment, :string + end + + def self.down + remove_column :notifications, :attachment + end +end diff --git a/db/migrate/20140427001410_rename_receipts_read.mailboxer_engine.rb b/db/migrate/20140427001410_rename_receipts_read.mailboxer_engine.rb new file mode 100644 index 0000000..9ce904f --- /dev/null +++ b/db/migrate/20140427001410_rename_receipts_read.mailboxer_engine.rb @@ -0,0 +1,10 @@ +# This migration comes from mailboxer_engine (originally 20120813110712) +class RenameReceiptsRead < ActiveRecord::Migration + def up + rename_column :receipts, :read, :is_read + end + + def down + rename_column :receipts, :is_read, :read + end +end diff --git a/db/migrate/20140427001411_add_global_notification_support.mailboxer_engine.rb b/db/migrate/20140427001411_add_global_notification_support.mailboxer_engine.rb new file mode 100644 index 0000000..60f67ab --- /dev/null +++ b/db/migrate/20140427001411_add_global_notification_support.mailboxer_engine.rb @@ -0,0 +1,10 @@ +# This migration comes from mailboxer_engine (originally 20130305144212) +class AddGlobalNotificationSupport < ActiveRecord::Migration + + def change + change_table :notifications do |t| + t.boolean :global, default: false + t.datetime :expires + end + end +end diff --git a/db/migrate/20140427001413_create_delayed_jobs.rb b/db/migrate/20140427001413_create_delayed_jobs.rb new file mode 100644 index 0000000..ec0dd93 --- /dev/null +++ b/db/migrate/20140427001413_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/20140427001416_create_servers.rb b/db/migrate/20140427001416_create_servers.rb new file mode 100644 index 0000000..fbe1b02 --- /dev/null +++ b/db/migrate/20140427001416_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/20140427001420_create_matches.rb b/db/migrate/20140427001420_create_matches.rb new file mode 100644 index 0000000..bac92d1 --- /dev/null +++ b/db/migrate/20140427001420_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/20140427001424_create_teams.rb b/db/migrate/20140427001424_create_teams.rb new file mode 100644 index 0000000..dd8397d --- /dev/null +++ b/db/migrate/20140427001424_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/20140427001428_create_alerts.rb b/db/migrate/20140427001428_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140427001428_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/20140427001431_create_pms.rb b/db/migrate/20140427001431_create_pms.rb new file mode 100644 index 0000000..eb9f443 --- /dev/null +++ b/db/migrate/20140427001431_create_pms.rb @@ -0,0 +1,13 @@ +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.text :subject + t.references :conversation, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140427001435_create_tournaments.rb b/db/migrate/20140427001435_create_tournaments.rb new file mode 100644 index 0000000..03b42b2 --- /dev/null +++ b/db/migrate/20140427001435_create_tournaments.rb @@ -0,0 +1,20 @@ +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.string :scoring_method + + t.timestamps + end + add_index :tournaments, :name, unique: true + end +end diff --git a/db/migrate/20140427001439_create_games.rb b/db/migrate/20140427001439_create_games.rb new file mode 100644 index 0000000..fe2e596 --- /dev/null +++ b/db/migrate/20140427001439_create_games.rb @@ -0,0 +1,19 @@ +class CreateGames < ActiveRecord::Migration + def change + create_table :games do |t| + t.references :parent, index: true + 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.string :scoring_method + + t.timestamps + end + add_index :games, :name, unique: true + end +end diff --git a/db/migrate/20140427001443_create_users.rb b/db/migrate/20140427001443_create_users.rb new file mode 100644 index 0000000..8032870 --- /dev/null +++ b/db/migrate/20140427001443_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/20140427001446_create_sessions.rb b/db/migrate/20140427001446_create_sessions.rb new file mode 100644 index 0000000..f667f1e --- /dev/null +++ b/db/migrate/20140427001446_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/20140427001450_create_brackets.rb b/db/migrate/20140427001450_create_brackets.rb new file mode 100644 index 0000000..8813bf2 --- /dev/null +++ b/db/migrate/20140427001450_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/20140427001454_create_game_settings.rb b/db/migrate/20140427001454_create_game_settings.rb new file mode 100644 index 0000000..06fb72e --- /dev/null +++ b/db/migrate/20140427001454_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/20140427001458_create_tournament_settings.rb b/db/migrate/20140427001458_create_tournament_settings.rb new file mode 100644 index 0000000..e56697f --- /dev/null +++ b/db/migrate/20140427001458_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/20140427001502_create_tournament_stages.rb b/db/migrate/20140427001502_create_tournament_stages.rb new file mode 100644 index 0000000..6e52bf0 --- /dev/null +++ b/db/migrate/20140427001502_create_tournament_stages.rb @@ -0,0 +1,12 @@ +class CreateTournamentStages < ActiveRecord::Migration + def change + create_table :tournament_stages do |t| + t.references :tournament, index: true + t.text :structure + t.string :scheduling_method + t.string :seeding_method + + t.timestamps + end + end +end diff --git a/db/migrate/20140427001505_create_statistics.rb b/db/migrate/20140427001505_create_statistics.rb new file mode 100644 index 0000000..cc2e97d --- /dev/null +++ b/db/migrate/20140427001505_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/20140427001509_create_remote_usernames.rb b/db/migrate/20140427001509_create_remote_usernames.rb new file mode 100644 index 0000000..e265985 --- /dev/null +++ b/db/migrate/20140427001509_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/20140427001513_create_bracket_matches.rb b/db/migrate/20140427001513_create_bracket_matches.rb new file mode 100644 index 0000000..3323e31 --- /dev/null +++ b/db/migrate/20140427001513_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/20140427001516_create_api_requests.rb b/db/migrate/20140427001516_create_api_requests.rb new file mode 100644 index 0000000..544c330 --- /dev/null +++ b/db/migrate/20140427001516_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/20140427001520_create_tournament_players_join_table.rb b/db/migrate/20140427001520_create_tournament_players_join_table.rb new file mode 100644 index 0000000..be240e8 --- /dev/null +++ b/db/migrate/20140427001520_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/20140427001523_create_tournament_hosts_join_table.rb b/db/migrate/20140427001523_create_tournament_hosts_join_table.rb new file mode 100644 index 0000000..7521d89 --- /dev/null +++ b/db/migrate/20140427001523_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/20140427001527_create_team_user_join_table.rb b/db/migrate/20140427001527_create_team_user_join_table.rb new file mode 100644 index 0000000..f3b57fc --- /dev/null +++ b/db/migrate/20140427001527_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/20140427001531_create_match_team_join_table.rb b/db/migrate/20140427001531_create_match_team_join_table.rb new file mode 100644 index 0000000..c2ed1b7 --- /dev/null +++ b/db/migrate/20140427001531_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/20140427001542_add_hidden_attrs_to_user.rb b/db/migrate/20140427001542_add_hidden_attrs_to_user.rb new file mode 100644 index 0000000..9b5c505 --- /dev/null +++ b/db/migrate/20140427001542_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 d7e4efd..0616ef2 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: 20140424230712) do +ActiveRecord::Schema.define(version: 20140427001542) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -97,6 +97,7 @@ ActiveRecord::Schema.define(version: 20140424230712) do t.integer "set_rounds" t.boolean "randomized_teams" t.string "sampling_method" + t.string "scoring_method" t.datetime "created_at" t.datetime "updated_at" end @@ -254,8 +255,9 @@ ActiveRecord::Schema.define(version: 20140424230712) do create_table "tournament_stages", force: true do |t| t.integer "tournament_id" - t.string "scheduling" t.text "structure" + t.string "scheduling_method" + t.string "seeding_method" t.datetime "created_at" t.datetime "updated_at" end @@ -273,6 +275,7 @@ ActiveRecord::Schema.define(version: 20140424230712) do t.integer "set_rounds" t.boolean "randomized_teams" t.string "sampling_method" + t.string "scoring_method" t.datetime "created_at" t.datetime "updated_at" end diff --git a/test/controllers/games_controller_test.rb b/test/controllers/games_controller_test.rb index be97aa0..567ecb9 100644 --- a/test/controllers/games_controller_test.rb +++ b/test/controllers/games_controller_test.rb @@ -18,7 +18,7 @@ class GamesControllerTest < ActionController::TestCase test "should create game" do assert_difference('Game.count') do - post :create, game: { max_players_per_team: @game.max_players_per_team, max_teams_per_match: @game.max_teams_per_match, min_players_per_team: @game.min_players_per_team, min_teams_per_match: @game.min_teams_per_match, name: @game.name, parent_id: @game.parent_id, randomized_teams: @game.randomized_teams, sampling_method: @game.sampling_method, set_rounds: @game.set_rounds } + post :create, game: { max_players_per_team: @game.max_players_per_team, max_teams_per_match: @game.max_teams_per_match, min_players_per_team: @game.min_players_per_team, min_teams_per_match: @game.min_teams_per_match, name: @game.name, parent_id: @game.parent_id, randomized_teams: @game.randomized_teams, sampling_method: @game.sampling_method, scoring_method: @game.scoring_method, set_rounds: @game.set_rounds } end assert_redirected_to game_path(assigns(:game)) @@ -35,7 +35,7 @@ class GamesControllerTest < ActionController::TestCase end test "should update game" do - patch :update, id: @game, game: { max_players_per_team: @game.max_players_per_team, max_teams_per_match: @game.max_teams_per_match, min_players_per_team: @game.min_players_per_team, min_teams_per_match: @game.min_teams_per_match, name: @game.name, parent_id: @game.parent_id, randomized_teams: @game.randomized_teams, sampling_method: @game.sampling_method, set_rounds: @game.set_rounds } + patch :update, id: @game, game: { max_players_per_team: @game.max_players_per_team, max_teams_per_match: @game.max_teams_per_match, min_players_per_team: @game.min_players_per_team, min_teams_per_match: @game.min_teams_per_match, name: @game.name, parent_id: @game.parent_id, randomized_teams: @game.randomized_teams, sampling_method: @game.sampling_method, scoring_method: @game.scoring_method, set_rounds: @game.set_rounds } assert_redirected_to game_path(assigns(:game)) end diff --git a/test/controllers/tournaments_controller_test.rb b/test/controllers/tournaments_controller_test.rb index 0e5673c..0ee875a 100644 --- a/test/controllers/tournaments_controller_test.rb +++ b/test/controllers/tournaments_controller_test.rb @@ -18,7 +18,7 @@ class TournamentsControllerTest < ActionController::TestCase test "should create tournament" do assert_difference('Tournament.count') do - post :create, tournament: { game_id: @tournament.game_id, max_players_per_team: @tournament.max_players_per_team, max_teams_per_match: @tournament.max_teams_per_match, min_players_per_team: @tournament.min_players_per_team, min_teams_per_match: @tournament.min_teams_per_match, name: @tournament.name, randomized_teams: @tournament.randomized_teams, sampling_method: @tournament.sampling_method, set_rounds: @tournament.set_rounds, status: @tournament.status } + post :create, tournament: { game_id: @tournament.game_id, max_players_per_team: @tournament.max_players_per_team, max_teams_per_match: @tournament.max_teams_per_match, min_players_per_team: @tournament.min_players_per_team, min_teams_per_match: @tournament.min_teams_per_match, name: @tournament.name, randomized_teams: @tournament.randomized_teams, sampling_method: @tournament.sampling_method, scoring_method: @tournament.scoring_method, set_rounds: @tournament.set_rounds, status: @tournament.status } end assert_redirected_to tournament_path(assigns(:tournament)) @@ -35,7 +35,7 @@ class TournamentsControllerTest < ActionController::TestCase end test "should update tournament" do - patch :update, id: @tournament, tournament: { game_id: @tournament.game_id, max_players_per_team: @tournament.max_players_per_team, max_teams_per_match: @tournament.max_teams_per_match, min_players_per_team: @tournament.min_players_per_team, min_teams_per_match: @tournament.min_teams_per_match, name: @tournament.name, randomized_teams: @tournament.randomized_teams, sampling_method: @tournament.sampling_method, set_rounds: @tournament.set_rounds, status: @tournament.status } + patch :update, id: @tournament, tournament: { game_id: @tournament.game_id, max_players_per_team: @tournament.max_players_per_team, max_teams_per_match: @tournament.max_teams_per_match, min_players_per_team: @tournament.min_players_per_team, min_teams_per_match: @tournament.min_teams_per_match, name: @tournament.name, randomized_teams: @tournament.randomized_teams, sampling_method: @tournament.sampling_method, scoring_method: @tournament.scoring_method, set_rounds: @tournament.set_rounds, status: @tournament.status } assert_redirected_to tournament_path(assigns(:tournament)) end diff --git a/test/fixtures/games.yml b/test/fixtures/games.yml index b811dec..ac5bad8 100644 --- a/test/fixtures/games.yml +++ b/test/fixtures/games.yml @@ -10,6 +10,7 @@ one: set_rounds: 1 randomized_teams: false sampling_method: MyString + scoring_method: MyString two: parent_id: @@ -21,3 +22,4 @@ two: set_rounds: 1 randomized_teams: false sampling_method: MyString + scoring_method: MyString diff --git a/test/fixtures/tournament_stages.yml b/test/fixtures/tournament_stages.yml index fdb263c..32eaba3 100644 --- a/test/fixtures/tournament_stages.yml +++ b/test/fixtures/tournament_stages.yml @@ -2,10 +2,12 @@ one: tournament_id: - scheduling: MyString structure: MyText + scheduling_method: MyString + seeding_method: MyString two: tournament_id: - scheduling: MyString structure: MyText + scheduling_method: MyString + seeding_method: MyString diff --git a/test/fixtures/tournaments.yml b/test/fixtures/tournaments.yml index 714a963..dd9b56d 100644 --- a/test/fixtures/tournaments.yml +++ b/test/fixtures/tournaments.yml @@ -11,6 +11,7 @@ one: set_rounds: 1 randomized_teams: false sampling_method: MyString + scoring_method: MyString two: game_id: @@ -23,3 +24,4 @@ two: set_rounds: 1 randomized_teams: false sampling_method: MyString + scoring_method: MyString -- cgit v1.2.3