From 0f2b05889cba090e4824f62965ee8d131da09973 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Tue, 1 Apr 2014 17:07:46 -0400 Subject: Re-ran generate. --- app/controllers/matches_controller.rb | 2 +- app/controllers/tournaments_controller.rb | 2 +- app/models/remote_username.rb | 4 ++++ app/models/server_setting.rb | 2 ++ app/models/server_settings.rb | 2 -- app/models/tournament_option.rb | 3 --- app/models/tournament_preference.rb | 3 +++ app/views/matches/_form.html.erb | 4 ++++ app/views/matches/index.html.erb | 2 ++ app/views/matches/index.json.jbuilder | 2 +- app/views/matches/show.html.erb | 5 +++++ app/views/matches/show.json.jbuilder | 2 +- app/views/tournaments/_form.html.erb | 20 ++---------------- app/views/tournaments/index.html.erb | 12 ++--------- app/views/tournaments/index.json.jbuilder | 2 +- app/views/tournaments/show.html.erb | 24 ++-------------------- app/views/tournaments/show.json.jbuilder | 2 +- db/migrate/20140325214513_create_servers.rb | 8 -------- db/migrate/20140325214516_create_matches.rb | 12 ----------- db/migrate/20140325214518_create_teams.rb | 9 -------- db/migrate/20140325214521_create_alerts.rb | 10 --------- db/migrate/20140325214523_create_pms.rb | 11 ---------- db/migrate/20140325214525_create_tournaments.rb | 17 --------------- db/migrate/20140325214528_create_games.rb | 15 -------------- db/migrate/20140325214531_create_users.rb | 13 ------------ db/migrate/20140325214533_create_sessions.rb | 9 -------- .../20140325214536_create_server_settings.rb | 8 -------- .../20140325214538_create_tournament_options.rb | 12 ----------- db/migrate/20140325214540_create_game_settings.rb | 15 -------------- db/migrate/20140325214543_create_scores.rb | 11 ---------- ...5214545_create_tournament_players_join_table.rb | 8 -------- ...325214548_create_tournament_hosts_join_table.rb | 8 -------- .../20140325214550_create_team_user_join_table.rb | 8 -------- .../20140325214553_create_match_team_join_table.rb | 8 -------- .../20140325214602_add_hidden_attrs_to_user.rb | 8 -------- db/migrate/20140401205355_create_servers.rb | 8 ++++++++ db/migrate/20140401205357_create_matches.rb | 13 ++++++++++++ db/migrate/20140401205400_create_teams.rb | 9 ++++++++ db/migrate/20140401205402_create_alerts.rb | 10 +++++++++ db/migrate/20140401205405_create_pms.rb | 11 ++++++++++ db/migrate/20140401205407_create_tournaments.rb | 13 ++++++++++++ db/migrate/20140401205410_create_games.rb | 15 ++++++++++++++ db/migrate/20140401205412_create_users.rb | 13 ++++++++++++ db/migrate/20140401205415_create_sessions.rb | 9 ++++++++ .../20140401205417_create_server_settings.rb | 8 ++++++++ db/migrate/20140401205420_create_game_settings.rb | 15 ++++++++++++++ ...20140401205422_create_tournament_preferences.rb | 12 +++++++++++ db/migrate/20140401205424_create_scores.rb | 11 ++++++++++ .../20140401205427_create_remote_usernames.rb | 11 ++++++++++ ...1205429_create_tournament_players_join_table.rb | 8 ++++++++ ...401205432_create_tournament_hosts_join_table.rb | 8 ++++++++ .../20140401205434_create_team_user_join_table.rb | 8 ++++++++ .../20140401205437_create_match_team_join_table.rb | 8 ++++++++ .../20140401205446_add_hidden_attrs_to_user.rb | 8 ++++++++ db/schema.rb | 24 ++++++++++++++-------- generate.sh | 12 +++++------ test/controllers/matches_controller_test.rb | 4 ++-- test/controllers/tournaments_controller_test.rb | 4 ++-- test/fixtures/matches.yml | 2 ++ test/fixtures/remote_usernames.yml | 11 ++++++++++ test/fixtures/tournament_options.yml | 13 ------------ test/fixtures/tournament_preferences.yml | 13 ++++++++++++ test/fixtures/tournaments.yml | 12 ++--------- test/models/remote_username_test.rb | 7 +++++++ test/models/server_setting_test.rb | 7 +++++++ test/models/server_settings_test.rb | 7 ------- test/models/tournament_option_test.rb | 7 ------- test/models/tournament_preference_test.rb | 7 +++++++ 68 files changed, 304 insertions(+), 307 deletions(-) create mode 100644 app/models/remote_username.rb create mode 100644 app/models/server_setting.rb delete mode 100644 app/models/server_settings.rb delete mode 100644 app/models/tournament_option.rb create mode 100644 app/models/tournament_preference.rb delete mode 100644 db/migrate/20140325214513_create_servers.rb delete mode 100644 db/migrate/20140325214516_create_matches.rb delete mode 100644 db/migrate/20140325214518_create_teams.rb delete mode 100644 db/migrate/20140325214521_create_alerts.rb delete mode 100644 db/migrate/20140325214523_create_pms.rb delete mode 100644 db/migrate/20140325214525_create_tournaments.rb delete mode 100644 db/migrate/20140325214528_create_games.rb delete mode 100644 db/migrate/20140325214531_create_users.rb delete mode 100644 db/migrate/20140325214533_create_sessions.rb delete mode 100644 db/migrate/20140325214536_create_server_settings.rb delete mode 100644 db/migrate/20140325214538_create_tournament_options.rb delete mode 100644 db/migrate/20140325214540_create_game_settings.rb delete mode 100644 db/migrate/20140325214543_create_scores.rb delete mode 100644 db/migrate/20140325214545_create_tournament_players_join_table.rb delete mode 100644 db/migrate/20140325214548_create_tournament_hosts_join_table.rb delete mode 100644 db/migrate/20140325214550_create_team_user_join_table.rb delete mode 100644 db/migrate/20140325214553_create_match_team_join_table.rb delete mode 100644 db/migrate/20140325214602_add_hidden_attrs_to_user.rb create mode 100644 db/migrate/20140401205355_create_servers.rb create mode 100644 db/migrate/20140401205357_create_matches.rb create mode 100644 db/migrate/20140401205400_create_teams.rb create mode 100644 db/migrate/20140401205402_create_alerts.rb create mode 100644 db/migrate/20140401205405_create_pms.rb create mode 100644 db/migrate/20140401205407_create_tournaments.rb create mode 100644 db/migrate/20140401205410_create_games.rb create mode 100644 db/migrate/20140401205412_create_users.rb create mode 100644 db/migrate/20140401205415_create_sessions.rb create mode 100644 db/migrate/20140401205417_create_server_settings.rb create mode 100644 db/migrate/20140401205420_create_game_settings.rb create mode 100644 db/migrate/20140401205422_create_tournament_preferences.rb create mode 100644 db/migrate/20140401205424_create_scores.rb create mode 100644 db/migrate/20140401205427_create_remote_usernames.rb create mode 100644 db/migrate/20140401205429_create_tournament_players_join_table.rb create mode 100644 db/migrate/20140401205432_create_tournament_hosts_join_table.rb create mode 100644 db/migrate/20140401205434_create_team_user_join_table.rb create mode 100644 db/migrate/20140401205437_create_match_team_join_table.rb create mode 100644 db/migrate/20140401205446_add_hidden_attrs_to_user.rb create mode 100644 test/fixtures/remote_usernames.yml delete mode 100644 test/fixtures/tournament_options.yml create mode 100644 test/fixtures/tournament_preferences.yml create mode 100644 test/models/remote_username_test.rb create mode 100644 test/models/server_setting_test.rb delete mode 100644 test/models/server_settings_test.rb delete mode 100644 test/models/tournament_option_test.rb create mode 100644 test/models/tournament_preference_test.rb diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index d79a7fc..64414cf 100644 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -69,6 +69,6 @@ class MatchesController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def match_params - params.require(:match).permit(:status, :tournament_id, :name, :winner_id) + params.require(:match).permit(:status, :tournament_id, :name, :winner_id, :remote_id) end end diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index d7db632..2565577 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -69,6 +69,6 @@ class TournamentsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def tournament_params - params.require(:tournament).permit(:name, :game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams) + params.require(:tournament).permit(:name, :game_id, :status, :ger, :randomized_teams) end end diff --git a/app/models/remote_username.rb b/app/models/remote_username.rb new file mode 100644 index 0000000..94e5063 --- /dev/null +++ b/app/models/remote_username.rb @@ -0,0 +1,4 @@ +class RemoteUsername < ActiveRecord::Base + belongs_to :game + belongs_to :user +end diff --git a/app/models/server_setting.rb b/app/models/server_setting.rb new file mode 100644 index 0000000..28ae943 --- /dev/null +++ b/app/models/server_setting.rb @@ -0,0 +1,2 @@ +class ServerSetting < ActiveRecord::Base +end diff --git a/app/models/server_settings.rb b/app/models/server_settings.rb deleted file mode 100644 index 7f49863..0000000 --- a/app/models/server_settings.rb +++ /dev/null @@ -1,2 +0,0 @@ -class ServerSettings < ActiveRecord::Base -end diff --git a/app/models/tournament_option.rb b/app/models/tournament_option.rb deleted file mode 100644 index 242a6f6..0000000 --- a/app/models/tournament_option.rb +++ /dev/null @@ -1,3 +0,0 @@ -class TournamentOption < ActiveRecord::Base - belongs_to :tournament -end diff --git a/app/models/tournament_preference.rb b/app/models/tournament_preference.rb new file mode 100644 index 0000000..1f335e3 --- /dev/null +++ b/app/models/tournament_preference.rb @@ -0,0 +1,3 @@ +class TournamentPreference < ActiveRecord::Base + belongs_to :tournament +end diff --git a/app/views/matches/_form.html.erb b/app/views/matches/_form.html.erb index 727c002..9fe255c 100644 --- a/app/views/matches/_form.html.erb +++ b/app/views/matches/_form.html.erb @@ -27,6 +27,10 @@ <%= f.label :winner_id %>
<%= f.text_field :winner_id %> +
+ <%= f.label :remote_id %>
+ <%= f.text_field :remote_id %> +
<%= f.submit %>
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index 400efb4..8d699f9 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -7,6 +7,7 @@ Tournament Name Winner + Remote @@ -20,6 +21,7 @@ <%= match.tournament %> <%= match.name %> <%= match.winner %> + <%= match.remote_id %> <%= link_to 'Show', match %> <%= link_to 'Edit', edit_match_path(match) %> <%= link_to 'Destroy', match, method: :delete, data: { confirm: 'Are you sure?' } %> diff --git a/app/views/matches/index.json.jbuilder b/app/views/matches/index.json.jbuilder index 1a63f5f..18f172d 100644 --- a/app/views/matches/index.json.jbuilder +++ b/app/views/matches/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@matches) do |match| - json.extract! match, :id, :status, :tournament_id, :name, :winner_id + json.extract! match, :id, :status, :tournament_id, :name, :winner_id, :remote_id json.url match_url(match, format: :json) end diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb index f3fc822..1ee7f1d 100644 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -20,5 +20,10 @@ <%= @match.winner %>

+

+ Remote: + <%= @match.remote_id %> +

+ <%= link_to 'Edit', edit_match_path(@match) %> | <%= link_to 'Back', matches_path %> diff --git a/app/views/matches/show.json.jbuilder b/app/views/matches/show.json.jbuilder index a3ef588..bfd2be4 100644 --- a/app/views/matches/show.json.jbuilder +++ b/app/views/matches/show.json.jbuilder @@ -1 +1 @@ -json.extract! @match, :id, :status, :tournament_id, :name, :winner_id, :created_at, :updated_at +json.extract! @match, :id, :status, :tournament_id, :name, :winner_id, :remote_id, :created_at, :updated_at diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb index 38855a0..fe92318 100644 --- a/app/views/tournaments/_form.html.erb +++ b/app/views/tournaments/_form.html.erb @@ -24,24 +24,8 @@ <%= f.number_field :status %>
- <%= f.label :min_players_per_team %>
- <%= f.number_field :min_players_per_team %> -
-
- <%= f.label :max_players_per_team %>
- <%= f.number_field :max_players_per_team %> -
-
- <%= f.label :min_teams_per_match %>
- <%= f.number_field :min_teams_per_match %> -
-
- <%= f.label :max_teams_per_match %>
- <%= f.number_field :max_teams_per_match %> -
-
- <%= f.label :set_rounds %>
- <%= f.number_field :set_rounds %> + <%= f.label :ger %>
+ <%= f.text_field :ger %>
<%= f.label :randomized_teams %>
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb index f8f21e7..96bb5ba 100644 --- a/app/views/tournaments/index.html.erb +++ b/app/views/tournaments/index.html.erb @@ -6,11 +6,7 @@ Name Game Status - Min players per team - Max players per team - Min teams per match - Max teams per match - Set rounds + Ger Randomized teams @@ -24,11 +20,7 @@ <%= tournament.name %> <%= tournament.game %> <%= tournament.status %> - <%= tournament.min_players_per_team %> - <%= tournament.max_players_per_team %> - <%= tournament.min_teams_per_match %> - <%= tournament.max_teams_per_match %> - <%= tournament.set_rounds %> + <%= tournament.ger %> <%= tournament.randomized_teams %> <%= link_to 'Show', tournament %> <%= link_to 'Edit', edit_tournament_path(tournament) %> diff --git a/app/views/tournaments/index.json.jbuilder b/app/views/tournaments/index.json.jbuilder index 4038f04..653442f 100644 --- a/app/views/tournaments/index.json.jbuilder +++ b/app/views/tournaments/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@tournaments) do |tournament| - json.extract! tournament, :id, :name, :game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams + json.extract! tournament, :id, :name, :game_id, :status, :ger, :randomized_teams json.url tournament_url(tournament, format: :json) end diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb index 3cb6179..3657871 100644 --- a/app/views/tournaments/show.html.erb +++ b/app/views/tournaments/show.html.erb @@ -16,28 +16,8 @@

- Min players per team: - <%= @tournament.min_players_per_team %> -

- -

- Max players per team: - <%= @tournament.max_players_per_team %> -

- -

- Min teams per match: - <%= @tournament.min_teams_per_match %> -

- -

- Max teams per match: - <%= @tournament.max_teams_per_match %> -

- -

- Set rounds: - <%= @tournament.set_rounds %> + Ger: + <%= @tournament.ger %>

diff --git a/app/views/tournaments/show.json.jbuilder b/app/views/tournaments/show.json.jbuilder index 27fd5c0..d70a27a 100644 --- a/app/views/tournaments/show.json.jbuilder +++ b/app/views/tournaments/show.json.jbuilder @@ -1 +1 @@ -json.extract! @tournament, :id, :name, :game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :created_at, :updated_at +json.extract! @tournament, :id, :name, :game_id, :status, :ger, :randomized_teams, :created_at, :updated_at diff --git a/db/migrate/20140325214513_create_servers.rb b/db/migrate/20140325214513_create_servers.rb deleted file mode 100644 index f33241a..0000000 --- a/db/migrate/20140325214513_create_servers.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateServers < ActiveRecord::Migration - def change - create_table :servers do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140325214516_create_matches.rb b/db/migrate/20140325214516_create_matches.rb deleted file mode 100644 index 30949a8..0000000 --- a/db/migrate/20140325214516_create_matches.rb +++ /dev/null @@ -1,12 +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.timestamps - end - end -end diff --git a/db/migrate/20140325214518_create_teams.rb b/db/migrate/20140325214518_create_teams.rb deleted file mode 100644 index fdf9a68..0000000 --- a/db/migrate/20140325214518_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/20140325214521_create_alerts.rb b/db/migrate/20140325214521_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140325214521_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/20140325214523_create_pms.rb b/db/migrate/20140325214523_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140325214523_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/20140325214525_create_tournaments.rb b/db/migrate/20140325214525_create_tournaments.rb deleted file mode 100644 index c0d8929..0000000 --- a/db/migrate/20140325214525_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/20140325214528_create_games.rb b/db/migrate/20140325214528_create_games.rb deleted file mode 100644 index 5e4f56f..0000000 --- a/db/migrate/20140325214528_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/20140325214531_create_users.rb b/db/migrate/20140325214531_create_users.rb deleted file mode 100644 index 8032870..0000000 --- a/db/migrate/20140325214531_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/20140325214533_create_sessions.rb b/db/migrate/20140325214533_create_sessions.rb deleted file mode 100644 index fe25bf2..0000000 --- a/db/migrate/20140325214533_create_sessions.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateSessions < ActiveRecord::Migration - def change - create_table :sessions do |t| - t.references :user, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140325214536_create_server_settings.rb b/db/migrate/20140325214536_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140325214536_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/20140325214538_create_tournament_options.rb b/db/migrate/20140325214538_create_tournament_options.rb deleted file mode 100644 index 53b601c..0000000 --- a/db/migrate/20140325214538_create_tournament_options.rb +++ /dev/null @@ -1,12 +0,0 @@ -class CreateTournamentOptions < ActiveRecord::Migration - def change - create_table :tournament_options 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/20140325214540_create_game_settings.rb b/db/migrate/20140325214540_create_game_settings.rb deleted file mode 100644 index 0ebbf18..0000000 --- a/db/migrate/20140325214540_create_game_settings.rb +++ /dev/null @@ -1,15 +0,0 @@ -class CreateGameSettings < ActiveRecord::Migration - def change - create_table :game_settings do |t| - t.references :game, index: true - t.integer :type - t.string :name - t.text :default - t.text :discription - t.text :type_opt - t.integer :display_order - - t.timestamps - end - end -end diff --git a/db/migrate/20140325214543_create_scores.rb b/db/migrate/20140325214543_create_scores.rb deleted file mode 100644 index 4ca0b0b..0000000 --- a/db/migrate/20140325214543_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/20140325214545_create_tournament_players_join_table.rb b/db/migrate/20140325214545_create_tournament_players_join_table.rb deleted file mode 100644 index be240e8..0000000 --- a/db/migrate/20140325214545_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/20140325214548_create_tournament_hosts_join_table.rb b/db/migrate/20140325214548_create_tournament_hosts_join_table.rb deleted file mode 100644 index 7521d89..0000000 --- a/db/migrate/20140325214548_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/20140325214550_create_team_user_join_table.rb b/db/migrate/20140325214550_create_team_user_join_table.rb deleted file mode 100644 index f3b57fc..0000000 --- a/db/migrate/20140325214550_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/20140325214553_create_match_team_join_table.rb b/db/migrate/20140325214553_create_match_team_join_table.rb deleted file mode 100644 index c2ed1b7..0000000 --- a/db/migrate/20140325214553_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/20140325214602_add_hidden_attrs_to_user.rb b/db/migrate/20140325214602_add_hidden_attrs_to_user.rb deleted file mode 100644 index 2f1b0b2..0000000 --- a/db/migrate/20140325214602_add_hidden_attrs_to_user.rb +++ /dev/null @@ -1,8 +0,0 @@ -class AddHiddenAttrsToUser < ActiveRecord::Migration - def change - add_column :users, :password_digest, :string - add_column :users, :remember_token, :string - add_index :users, :remember_token, unique: true - add_column :users, :groups, :integer - end -end diff --git a/db/migrate/20140401205355_create_servers.rb b/db/migrate/20140401205355_create_servers.rb new file mode 100644 index 0000000..f33241a --- /dev/null +++ b/db/migrate/20140401205355_create_servers.rb @@ -0,0 +1,8 @@ +class CreateServers < ActiveRecord::Migration + def change + create_table :servers do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140401205357_create_matches.rb b/db/migrate/20140401205357_create_matches.rb new file mode 100644 index 0000000..31eea12 --- /dev/null +++ b/db/migrate/20140401205357_create_matches.rb @@ -0,0 +1,13 @@ +class CreateMatches < ActiveRecord::Migration + def change + create_table :matches do |t| + t.integer :status + t.references :tournament, index: true + t.string :name + t.references :winner, index: true + t.string :remote_id + + t.timestamps + end + end +end diff --git a/db/migrate/20140401205400_create_teams.rb b/db/migrate/20140401205400_create_teams.rb new file mode 100644 index 0000000..fdf9a68 --- /dev/null +++ b/db/migrate/20140401205400_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/20140401205402_create_alerts.rb b/db/migrate/20140401205402_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140401205402_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/20140401205405_create_pms.rb b/db/migrate/20140401205405_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140401205405_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/20140401205407_create_tournaments.rb b/db/migrate/20140401205407_create_tournaments.rb new file mode 100644 index 0000000..3e36441 --- /dev/null +++ b/db/migrate/20140401205407_create_tournaments.rb @@ -0,0 +1,13 @@ +class CreateTournaments < ActiveRecord::Migration + def change + create_table :tournaments do |t| + t.string :name + t.references :game, index: true + t.integer :status + t.string :ger + t.boolean :randomized_teams + + t.timestamps + end + end +end diff --git a/db/migrate/20140401205410_create_games.rb b/db/migrate/20140401205410_create_games.rb new file mode 100644 index 0000000..5e4f56f --- /dev/null +++ b/db/migrate/20140401205410_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/20140401205412_create_users.rb b/db/migrate/20140401205412_create_users.rb new file mode 100644 index 0000000..8032870 --- /dev/null +++ b/db/migrate/20140401205412_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/20140401205415_create_sessions.rb b/db/migrate/20140401205415_create_sessions.rb new file mode 100644 index 0000000..fe25bf2 --- /dev/null +++ b/db/migrate/20140401205415_create_sessions.rb @@ -0,0 +1,9 @@ +class CreateSessions < ActiveRecord::Migration + def change + create_table :sessions do |t| + t.references :user, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140401205417_create_server_settings.rb b/db/migrate/20140401205417_create_server_settings.rb new file mode 100644 index 0000000..dfdd91b --- /dev/null +++ b/db/migrate/20140401205417_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/20140401205420_create_game_settings.rb b/db/migrate/20140401205420_create_game_settings.rb new file mode 100644 index 0000000..0ebbf18 --- /dev/null +++ b/db/migrate/20140401205420_create_game_settings.rb @@ -0,0 +1,15 @@ +class CreateGameSettings < ActiveRecord::Migration + def change + create_table :game_settings do |t| + t.references :game, index: true + t.integer :type + t.string :name + t.text :default + t.text :discription + t.text :type_opt + t.integer :display_order + + t.timestamps + end + end +end diff --git a/db/migrate/20140401205422_create_tournament_preferences.rb b/db/migrate/20140401205422_create_tournament_preferences.rb new file mode 100644 index 0000000..991d659 --- /dev/null +++ b/db/migrate/20140401205422_create_tournament_preferences.rb @@ -0,0 +1,12 @@ +class CreateTournamentPreferences < ActiveRecord::Migration + def change + create_table :tournament_preferences do |t| + t.references :tournament, index: true + t.integer :vartype + t.string :name + t.text :value + + t.timestamps + end + end +end diff --git a/db/migrate/20140401205424_create_scores.rb b/db/migrate/20140401205424_create_scores.rb new file mode 100644 index 0000000..4ca0b0b --- /dev/null +++ b/db/migrate/20140401205424_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/20140401205427_create_remote_usernames.rb b/db/migrate/20140401205427_create_remote_usernames.rb new file mode 100644 index 0000000..e265985 --- /dev/null +++ b/db/migrate/20140401205427_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/20140401205429_create_tournament_players_join_table.rb b/db/migrate/20140401205429_create_tournament_players_join_table.rb new file mode 100644 index 0000000..be240e8 --- /dev/null +++ b/db/migrate/20140401205429_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/20140401205432_create_tournament_hosts_join_table.rb b/db/migrate/20140401205432_create_tournament_hosts_join_table.rb new file mode 100644 index 0000000..7521d89 --- /dev/null +++ b/db/migrate/20140401205432_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/20140401205434_create_team_user_join_table.rb b/db/migrate/20140401205434_create_team_user_join_table.rb new file mode 100644 index 0000000..f3b57fc --- /dev/null +++ b/db/migrate/20140401205434_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/20140401205437_create_match_team_join_table.rb b/db/migrate/20140401205437_create_match_team_join_table.rb new file mode 100644 index 0000000..c2ed1b7 --- /dev/null +++ b/db/migrate/20140401205437_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/20140401205446_add_hidden_attrs_to_user.rb b/db/migrate/20140401205446_add_hidden_attrs_to_user.rb new file mode 100644 index 0000000..2f1b0b2 --- /dev/null +++ b/db/migrate/20140401205446_add_hidden_attrs_to_user.rb @@ -0,0 +1,8 @@ +class AddHiddenAttrsToUser < ActiveRecord::Migration + def change + add_column :users, :password_digest, :string + add_column :users, :remember_token, :string + add_index :users, :remember_token, unique: true + add_column :users, :groups, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 4704a45..eda2839 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: 20140325214602) do +ActiveRecord::Schema.define(version: 20140401205446) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -58,6 +58,7 @@ ActiveRecord::Schema.define(version: 20140325214602) do t.integer "tournament_id" t.string "name" t.integer "winner_id" + t.string "remote_id" t.datetime "created_at" t.datetime "updated_at" end @@ -86,6 +87,17 @@ ActiveRecord::Schema.define(version: 20140325214602) do add_index "pms", ["author_id"], name: "index_pms_on_author_id" add_index "pms", ["recipient_id"], name: "index_pms_on_recipient_id" + create_table "remote_usernames", force: true do |t| + t.integer "game_id" + t.integer "user_id" + t.text "json_value" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "remote_usernames", ["game_id"], name: "index_remote_usernames_on_game_id" + add_index "remote_usernames", ["user_id"], name: "index_remote_usernames_on_user_id" + create_table "scores", force: true do |t| t.integer "user_id" t.integer "match_id" @@ -128,7 +140,7 @@ ActiveRecord::Schema.define(version: 20140325214602) do t.integer "user_id", null: false end - create_table "tournament_options", force: true do |t| + create_table "tournament_preferences", force: true do |t| t.integer "tournament_id" t.integer "vartype" t.string "name" @@ -137,17 +149,13 @@ ActiveRecord::Schema.define(version: 20140325214602) do t.datetime "updated_at" end - add_index "tournament_options", ["tournament_id"], name: "index_tournament_options_on_tournament_id" + add_index "tournament_preferences", ["tournament_id"], name: "index_tournament_preferences_on_tournament_id" create_table "tournaments", force: true do |t| t.string "name" t.integer "game_id" 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.string "ger" t.boolean "randomized_teams" t.datetime "created_at" t.datetime "updated_at" diff --git a/generate.sh b/generate.sh index 2013703..261392f 100755 --- a/generate.sh +++ b/generate.sh @@ -18,14 +18,11 @@ git checkout clean-start -- app test config/routes.rb # The whole shebang, models, views, and controllers bundle exec rails generate scaffold server --force $NOTEST -bundle exec rails generate scaffold match status:integer tournament:references name:string winner:references --force $NOTEST +bundle exec rails generate scaffold match status:integer tournament:references name:string winner:references remote_id:string $NOTEST bundle exec rails generate scaffold team match:references $NOTEST bundle exec rails generate scaffold alert author:references message:text $NOTEST bundle exec rails generate scaffold pm author:references recipient:references message:text $NOTEST -bundle exec rails generate scaffold tournament name:string:unique game:references status:integer \ - min_players_per_team:integer max_players_per_team:integer \ - min_teams_per_match:integer max_teams_per_match:integer \ - set_rounds:integer randomized_teams:boolean +bundle exec rails generate scaffold tournament name:string:unique game:references status:integer ger randomized_teams:boolean bundle exec rails generate scaffold game \ name:text \ min_players_per_team:integer max_players_per_team:integer \ @@ -35,10 +32,11 @@ bundle exec rails generate scaffold user name:string email:string:uniq user_name bundle exec rails generate scaffold session user:references # Just models -bundle exec rails generate model server_settings $NOTEST -bundle exec rails generate model tournament_option tournament:references vartype:integer name:string value:text $NOTEST +bundle exec rails generate model server_setting $NOTEST bundle exec rails generate model game_setting game:references type:integer name:string default:text discription:text type_opt:text display_order:integer $NOTEST +bundle exec rails generate model tournament_preference tournament:references vartype:integer name:string value:text $NOTEST bundle exec rails generate model score user:references match:references value:integer $NOTEST +bundle exec rails generate model remote_username game:references user:references json_value:text # Join tables bundle exec rails generate migration CreateTournamentPlayersJoinTable players tournaments diff --git a/test/controllers/matches_controller_test.rb b/test/controllers/matches_controller_test.rb index c3cc7a4..8782b2c 100644 --- a/test/controllers/matches_controller_test.rb +++ b/test/controllers/matches_controller_test.rb @@ -18,7 +18,7 @@ class MatchesControllerTest < ActionController::TestCase test "should create match" do assert_difference('Match.count') do - post :create, match: { name: @match.name, status: @match.status, tournament_id: @match.tournament_id, winner_id: @match.winner_id } + post :create, match: { name: @match.name, remote_id: @match.remote_id, status: @match.status, tournament_id: @match.tournament_id, winner_id: @match.winner_id } end assert_redirected_to match_path(assigns(:match)) @@ -35,7 +35,7 @@ class MatchesControllerTest < ActionController::TestCase end test "should update match" do - patch :update, id: @match, match: { name: @match.name, status: @match.status, tournament_id: @match.tournament_id, winner_id: @match.winner_id } + patch :update, id: @match, match: { name: @match.name, remote_id: @match.remote_id, status: @match.status, tournament_id: @match.tournament_id, winner_id: @match.winner_id } assert_redirected_to match_path(assigns(:match)) end diff --git a/test/controllers/tournaments_controller_test.rb b/test/controllers/tournaments_controller_test.rb index d5ab2af..775288c 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, set_rounds: @tournament.set_rounds, status: @tournament.status } + post :create, tournament: { game_id: @tournament.game_id, ger: @tournament.ger, name: @tournament.name, randomized_teams: @tournament.randomized_teams, status: @tournament.status } end assert_redirected_to tournament_path(assigns(:tournament)) @@ -35,7 +35,7 @@ class TournamentsControllerTest < ActionController::TestCase end test "should update tournament" do - patch :update, id: @tournament, tournament: { game_id: @tournament.game_id, 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, set_rounds: @tournament.set_rounds, status: @tournament.status } + patch :update, id: @tournament, tournament: { game_id: @tournament.game_id, ger: @tournament.ger, name: @tournament.name, randomized_teams: @tournament.randomized_teams, status: @tournament.status } assert_redirected_to tournament_path(assigns(:tournament)) end diff --git a/test/fixtures/matches.yml b/test/fixtures/matches.yml index 00af9f5..8e86062 100644 --- a/test/fixtures/matches.yml +++ b/test/fixtures/matches.yml @@ -5,9 +5,11 @@ one: tournament_id: name: MyString winner_id: + remote_id: MyString two: status: 1 tournament_id: name: MyString winner_id: + remote_id: MyString diff --git a/test/fixtures/remote_usernames.yml b/test/fixtures/remote_usernames.yml new file mode 100644 index 0000000..baa1714 --- /dev/null +++ b/test/fixtures/remote_usernames.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + game_id: + user_id: + json_value: MyText + +two: + game_id: + user_id: + json_value: MyText diff --git a/test/fixtures/tournament_options.yml b/test/fixtures/tournament_options.yml deleted file mode 100644 index aa5eaef..0000000 --- a/test/fixtures/tournament_options.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_preferences.yml b/test/fixtures/tournament_preferences.yml new file mode 100644 index 0000000..aa5eaef --- /dev/null +++ b/test/fixtures/tournament_preferences.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/fixtures/tournaments.yml b/test/fixtures/tournaments.yml index 89edc9f..25bb065 100644 --- a/test/fixtures/tournaments.yml +++ b/test/fixtures/tournaments.yml @@ -4,20 +4,12 @@ one: name: MyString game_id: status: 1 - min_players_per_team: 1 - max_players_per_team: 1 - min_teams_per_match: 1 - max_teams_per_match: 1 - set_rounds: 1 + ger: MyString randomized_teams: false two: name: MyString game_id: status: 1 - min_players_per_team: 1 - max_players_per_team: 1 - min_teams_per_match: 1 - max_teams_per_match: 1 - set_rounds: 1 + ger: MyString randomized_teams: false diff --git a/test/models/remote_username_test.rb b/test/models/remote_username_test.rb new file mode 100644 index 0000000..3321b6c --- /dev/null +++ b/test/models/remote_username_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class RemoteUsernameTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/server_setting_test.rb b/test/models/server_setting_test.rb new file mode 100644 index 0000000..eee32c1 --- /dev/null +++ b/test/models/server_setting_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class ServerSettingTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/server_settings_test.rb b/test/models/server_settings_test.rb deleted file mode 100644 index 470b316..0000000 --- a/test/models/server_settings_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class ServerSettingsTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end -end diff --git a/test/models/tournament_option_test.rb b/test/models/tournament_option_test.rb deleted file mode 100644 index 8fa9628..0000000 --- a/test/models/tournament_option_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class TournamentOptionTest < 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 new file mode 100644 index 0000000..e200b8e --- /dev/null +++ b/test/models/tournament_preference_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class TournamentPreferenceTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end -- cgit v1.2.3