From b43bab15521c7c511ab7012bd137daa0e85bb95b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 4 Apr 2014 21:06:05 -0400 Subject: run generate.sh --- app/assets/javascripts/remote_usernames.js.coffee | 3 - app/assets/stylesheets/remote_usernames.css.scss | 3 - app/controllers/remote_usernames_controller.rb | 74 ---------------------- app/helpers/remote_usernames_helper.rb | 2 - app/views/remote_usernames/_form.html.erb | 29 --------- app/views/remote_usernames/edit.html.erb | 6 -- app/views/remote_usernames/index.html.erb | 31 --------- app/views/remote_usernames/index.json.jbuilder | 4 -- app/views/remote_usernames/new.html.erb | 5 -- app/views/remote_usernames/show.html.erb | 19 ------ app/views/remote_usernames/show.json.jbuilder | 1 - config/routes.rb | 2 - db/migrate/20140403155007_create_servers.rb | 8 --- db/migrate/20140403155008_create_matches.rb | 13 ---- db/migrate/20140403155011_create_teams.rb | 9 --- db/migrate/20140403155012_create_alerts.rb | 10 --- db/migrate/20140403155014_create_pms.rb | 11 ---- db/migrate/20140403155017_create_tournaments.rb | 17 ----- db/migrate/20140403155019_create_games.rb | 15 ----- db/migrate/20140403155020_create_users.rb | 13 ---- db/migrate/20140403155022_create_sessions.rb | 11 ---- .../20140403155024_create_remote_usernames.rb | 11 ---- .../20140403155026_create_server_settings.rb | 8 --- db/migrate/20140403155029_create_game_settings.rb | 15 ----- ...20140403155030_create_tournament_preferences.rb | 12 ---- db/migrate/20140403155032_create_scores.rb | 11 ---- ...3155035_create_tournament_players_join_table.rb | 8 --- ...403155038_create_tournament_hosts_join_table.rb | 8 --- .../20140403155039_create_team_user_join_table.rb | 8 --- .../20140403155042_create_match_team_join_table.rb | 8 --- .../20140403155049_add_hidden_attrs_to_user.rb | 6 -- db/migrate/20140405010436_create_servers.rb | 8 +++ db/migrate/20140405010438_create_matches.rb | 13 ++++ db/migrate/20140405010441_create_teams.rb | 9 +++ db/migrate/20140405010443_create_alerts.rb | 10 +++ db/migrate/20140405010446_create_pms.rb | 11 ++++ db/migrate/20140405010448_create_tournaments.rb | 17 +++++ db/migrate/20140405010451_create_games.rb | 15 +++++ db/migrate/20140405010454_create_users.rb | 13 ++++ db/migrate/20140405010456_create_sessions.rb | 11 ++++ .../20140405010459_create_server_settings.rb | 8 +++ db/migrate/20140405010501_create_game_settings.rb | 15 +++++ ...20140405010503_create_tournament_preferences.rb | 12 ++++ db/migrate/20140405010506_create_scores.rb | 11 ++++ .../20140405010508_create_remote_usernames.rb | 11 ++++ ...5010511_create_tournament_players_join_table.rb | 8 +++ ...405010513_create_tournament_hosts_join_table.rb | 8 +++ .../20140405010515_create_team_user_join_table.rb | 8 +++ .../20140405010518_create_match_team_join_table.rb | 8 +++ .../20140405010527_add_hidden_attrs_to_user.rb | 6 ++ db/schema.rb | 6 +- .../remote_usernames_controller_test.rb | 49 -------------- test/fixtures/game_settings.yml | 4 +- test/fixtures/remote_usernames.yml | 4 +- test/helpers/remote_usernames_helper_test.rb | 4 -- 55 files changed, 209 insertions(+), 441 deletions(-) delete mode 100644 app/assets/javascripts/remote_usernames.js.coffee delete mode 100644 app/assets/stylesheets/remote_usernames.css.scss delete mode 100644 app/controllers/remote_usernames_controller.rb delete mode 100644 app/helpers/remote_usernames_helper.rb delete mode 100644 app/views/remote_usernames/_form.html.erb delete mode 100644 app/views/remote_usernames/edit.html.erb delete mode 100644 app/views/remote_usernames/index.html.erb delete mode 100644 app/views/remote_usernames/index.json.jbuilder delete mode 100644 app/views/remote_usernames/new.html.erb delete mode 100644 app/views/remote_usernames/show.html.erb delete mode 100644 app/views/remote_usernames/show.json.jbuilder delete mode 100644 db/migrate/20140403155007_create_servers.rb delete mode 100644 db/migrate/20140403155008_create_matches.rb delete mode 100644 db/migrate/20140403155011_create_teams.rb delete mode 100644 db/migrate/20140403155012_create_alerts.rb delete mode 100644 db/migrate/20140403155014_create_pms.rb delete mode 100644 db/migrate/20140403155017_create_tournaments.rb delete mode 100644 db/migrate/20140403155019_create_games.rb delete mode 100644 db/migrate/20140403155020_create_users.rb delete mode 100644 db/migrate/20140403155022_create_sessions.rb delete mode 100644 db/migrate/20140403155024_create_remote_usernames.rb delete mode 100644 db/migrate/20140403155026_create_server_settings.rb delete mode 100644 db/migrate/20140403155029_create_game_settings.rb delete mode 100644 db/migrate/20140403155030_create_tournament_preferences.rb delete mode 100644 db/migrate/20140403155032_create_scores.rb delete mode 100644 db/migrate/20140403155035_create_tournament_players_join_table.rb delete mode 100644 db/migrate/20140403155038_create_tournament_hosts_join_table.rb delete mode 100644 db/migrate/20140403155039_create_team_user_join_table.rb delete mode 100644 db/migrate/20140403155042_create_match_team_join_table.rb delete mode 100644 db/migrate/20140403155049_add_hidden_attrs_to_user.rb create mode 100644 db/migrate/20140405010436_create_servers.rb create mode 100644 db/migrate/20140405010438_create_matches.rb create mode 100644 db/migrate/20140405010441_create_teams.rb create mode 100644 db/migrate/20140405010443_create_alerts.rb create mode 100644 db/migrate/20140405010446_create_pms.rb create mode 100644 db/migrate/20140405010448_create_tournaments.rb create mode 100644 db/migrate/20140405010451_create_games.rb create mode 100644 db/migrate/20140405010454_create_users.rb create mode 100644 db/migrate/20140405010456_create_sessions.rb create mode 100644 db/migrate/20140405010459_create_server_settings.rb create mode 100644 db/migrate/20140405010501_create_game_settings.rb create mode 100644 db/migrate/20140405010503_create_tournament_preferences.rb create mode 100644 db/migrate/20140405010506_create_scores.rb create mode 100644 db/migrate/20140405010508_create_remote_usernames.rb create mode 100644 db/migrate/20140405010511_create_tournament_players_join_table.rb create mode 100644 db/migrate/20140405010513_create_tournament_hosts_join_table.rb create mode 100644 db/migrate/20140405010515_create_team_user_join_table.rb create mode 100644 db/migrate/20140405010518_create_match_team_join_table.rb create mode 100644 db/migrate/20140405010527_add_hidden_attrs_to_user.rb delete mode 100644 test/controllers/remote_usernames_controller_test.rb delete mode 100644 test/helpers/remote_usernames_helper_test.rb diff --git a/app/assets/javascripts/remote_usernames.js.coffee b/app/assets/javascripts/remote_usernames.js.coffee deleted file mode 100644 index 24f83d1..0000000 --- a/app/assets/javascripts/remote_usernames.js.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/remote_usernames.css.scss b/app/assets/stylesheets/remote_usernames.css.scss deleted file mode 100644 index b9e841e..0000000 --- a/app/assets/stylesheets/remote_usernames.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the remote_usernames controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/remote_usernames_controller.rb b/app/controllers/remote_usernames_controller.rb deleted file mode 100644 index 8676c00..0000000 --- a/app/controllers/remote_usernames_controller.rb +++ /dev/null @@ -1,74 +0,0 @@ -class RemoteUsernamesController < ApplicationController - before_action :set_remote_username, only: [:show, :edit, :update, :destroy] - - # GET /remote_usernames - # GET /remote_usernames.json - def index - @remote_usernames = RemoteUsername.all - end - - # GET /remote_usernames/1 - # GET /remote_usernames/1.json - def show - end - - # GET /remote_usernames/new - def new - @remote_username = RemoteUsername.new - end - - # GET /remote_usernames/1/edit - def edit - end - - # POST /remote_usernames - # POST /remote_usernames.json - def create - @remote_username = RemoteUsername.new(remote_username_params) - - respond_to do |format| - if @remote_username.save - format.html { redirect_to @remote_username, notice: 'Remote username was successfully created.' } - format.json { render action: 'show', status: :created, location: @remote_username } - else - format.html { render action: 'new' } - format.json { render json: @remote_username.errors, status: :unprocessable_entity } - end - end - end - - # PATCH/PUT /remote_usernames/1 - # PATCH/PUT /remote_usernames/1.json - def update - respond_to do |format| - if @remote_username.update(remote_username_params) - format.html { redirect_to @remote_username, notice: 'Remote username was successfully updated.' } - format.json { head :no_content } - else - format.html { render action: 'edit' } - format.json { render json: @remote_username.errors, status: :unprocessable_entity } - end - end - end - - # DELETE /remote_usernames/1 - # DELETE /remote_usernames/1.json - def destroy - @remote_username.destroy - respond_to do |format| - format.html { redirect_to remote_usernames_url } - format.json { head :no_content } - end - end - - private - # Use callbacks to share common setup or constraints between actions. - def set_remote_username - @remote_username = RemoteUsername.find(params[:id]) - end - - # Never trust parameters from the scary internet, only allow the white list through. - def remote_username_params - params.require(:remote_username).permit(:game_id, :user_id, :user_name) - end -end diff --git a/app/helpers/remote_usernames_helper.rb b/app/helpers/remote_usernames_helper.rb deleted file mode 100644 index 3240c4f..0000000 --- a/app/helpers/remote_usernames_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module RemoteUsernamesHelper -end diff --git a/app/views/remote_usernames/_form.html.erb b/app/views/remote_usernames/_form.html.erb deleted file mode 100644 index 5da1f8f..0000000 --- a/app/views/remote_usernames/_form.html.erb +++ /dev/null @@ -1,29 +0,0 @@ -<%= form_for(@remote_username) do |f| %> - <% if @remote_username.errors.any? %> -
-

<%= pluralize(@remote_username.errors.count, "error") %> prohibited this remote_username from being saved:

- - -
- <% end %> - -
- <%= f.label :game_id %>
- <%= f.text_field :game_id %> -
-
- <%= f.label :user_id %>
- <%= f.text_field :user_id %> -
-
- <%= f.label :user_name %>
- <%= f.text_field :user_name %> -
-
- <%= f.submit %> -
-<% end %> diff --git a/app/views/remote_usernames/edit.html.erb b/app/views/remote_usernames/edit.html.erb deleted file mode 100644 index 52d4b37..0000000 --- a/app/views/remote_usernames/edit.html.erb +++ /dev/null @@ -1,6 +0,0 @@ -

Editing remote_username

- -<%= render 'form' %> - -<%= link_to 'Show', @remote_username %> | -<%= link_to 'Back', remote_usernames_path %> diff --git a/app/views/remote_usernames/index.html.erb b/app/views/remote_usernames/index.html.erb deleted file mode 100644 index 14f5876..0000000 --- a/app/views/remote_usernames/index.html.erb +++ /dev/null @@ -1,31 +0,0 @@ -

Listing remote_usernames

- - - - - - - - - - - - - - - <% @remote_usernames.each do |remote_username| %> - - - - - - - - - <% end %> - -
GameUserUser name
<%= remote_username.game %><%= remote_username.user %><%= remote_username.user_name %><%= link_to 'Show', remote_username %><%= link_to 'Edit', edit_remote_username_path(remote_username) %><%= link_to 'Destroy', remote_username, method: :delete, data: { confirm: 'Are you sure?' } %>
- -
- -<%= link_to 'New Remote username', new_remote_username_path %> diff --git a/app/views/remote_usernames/index.json.jbuilder b/app/views/remote_usernames/index.json.jbuilder deleted file mode 100644 index c9fbc0f..0000000 --- a/app/views/remote_usernames/index.json.jbuilder +++ /dev/null @@ -1,4 +0,0 @@ -json.array!(@remote_usernames) do |remote_username| - json.extract! remote_username, :id, :game_id, :user_id, :user_name - json.url remote_username_url(remote_username, format: :json) -end diff --git a/app/views/remote_usernames/new.html.erb b/app/views/remote_usernames/new.html.erb deleted file mode 100644 index b9cfcf4..0000000 --- a/app/views/remote_usernames/new.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -

New remote_username

- -<%= render 'form' %> - -<%= link_to 'Back', remote_usernames_path %> diff --git a/app/views/remote_usernames/show.html.erb b/app/views/remote_usernames/show.html.erb deleted file mode 100644 index 416ca9d..0000000 --- a/app/views/remote_usernames/show.html.erb +++ /dev/null @@ -1,19 +0,0 @@ -

<%= notice %>

- -

- Game: - <%= @remote_username.game %> -

- -

- User: - <%= @remote_username.user %> -

- -

- User name: - <%= @remote_username.user_name %> -

- -<%= link_to 'Edit', edit_remote_username_path(@remote_username) %> | -<%= link_to 'Back', remote_usernames_path %> diff --git a/app/views/remote_usernames/show.json.jbuilder b/app/views/remote_usernames/show.json.jbuilder deleted file mode 100644 index 1a0f6f9..0000000 --- a/app/views/remote_usernames/show.json.jbuilder +++ /dev/null @@ -1 +0,0 @@ -json.extract! @remote_username, :id, :game_id, :user_id, :user_name, :created_at, :updated_at diff --git a/config/routes.rb b/config/routes.rb index ee624c9..97e82f8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,4 @@ Leaguer::Application.routes.draw do - resources :remote_usernames - resources :sessions resources :users diff --git a/db/migrate/20140403155007_create_servers.rb b/db/migrate/20140403155007_create_servers.rb deleted file mode 100644 index f33241a..0000000 --- a/db/migrate/20140403155007_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/20140403155008_create_matches.rb b/db/migrate/20140403155008_create_matches.rb deleted file mode 100644 index 31eea12..0000000 --- a/db/migrate/20140403155008_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, index: true - t.string :name - t.references :winner, index: true - t.string :remote_id - - t.timestamps - end - end -end diff --git a/db/migrate/20140403155011_create_teams.rb b/db/migrate/20140403155011_create_teams.rb deleted file mode 100644 index fdf9a68..0000000 --- a/db/migrate/20140403155011_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/20140403155012_create_alerts.rb b/db/migrate/20140403155012_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140403155012_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/20140403155014_create_pms.rb b/db/migrate/20140403155014_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140403155014_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/20140403155017_create_tournaments.rb b/db/migrate/20140403155017_create_tournaments.rb deleted file mode 100644 index c0d8929..0000000 --- a/db/migrate/20140403155017_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/20140403155019_create_games.rb b/db/migrate/20140403155019_create_games.rb deleted file mode 100644 index 5e4f56f..0000000 --- a/db/migrate/20140403155019_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/20140403155020_create_users.rb b/db/migrate/20140403155020_create_users.rb deleted file mode 100644 index 8032870..0000000 --- a/db/migrate/20140403155020_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/20140403155022_create_sessions.rb b/db/migrate/20140403155022_create_sessions.rb deleted file mode 100644 index f667f1e..0000000 --- a/db/migrate/20140403155022_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/20140403155024_create_remote_usernames.rb b/db/migrate/20140403155024_create_remote_usernames.rb deleted file mode 100644 index b837e53..0000000 --- a/db/migrate/20140403155024_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.string :user_name - - t.timestamps - end - end -end diff --git a/db/migrate/20140403155026_create_server_settings.rb b/db/migrate/20140403155026_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140403155026_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/20140403155029_create_game_settings.rb b/db/migrate/20140403155029_create_game_settings.rb deleted file mode 100644 index 0ebbf18..0000000 --- a/db/migrate/20140403155029_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/20140403155030_create_tournament_preferences.rb b/db/migrate/20140403155030_create_tournament_preferences.rb deleted file mode 100644 index 991d659..0000000 --- a/db/migrate/20140403155030_create_tournament_preferences.rb +++ /dev/null @@ -1,12 +0,0 @@ -class CreateTournamentPreferences < ActiveRecord::Migration - def change - create_table :tournament_preferences do |t| - t.references :tournament, index: true - t.integer :vartype - t.string :name - t.text :value - - t.timestamps - end - end -end diff --git a/db/migrate/20140403155032_create_scores.rb b/db/migrate/20140403155032_create_scores.rb deleted file mode 100644 index 4ca0b0b..0000000 --- a/db/migrate/20140403155032_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/20140403155035_create_tournament_players_join_table.rb b/db/migrate/20140403155035_create_tournament_players_join_table.rb deleted file mode 100644 index be240e8..0000000 --- a/db/migrate/20140403155035_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/20140403155038_create_tournament_hosts_join_table.rb b/db/migrate/20140403155038_create_tournament_hosts_join_table.rb deleted file mode 100644 index 7521d89..0000000 --- a/db/migrate/20140403155038_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/20140403155039_create_team_user_join_table.rb b/db/migrate/20140403155039_create_team_user_join_table.rb deleted file mode 100644 index f3b57fc..0000000 --- a/db/migrate/20140403155039_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/20140403155042_create_match_team_join_table.rb b/db/migrate/20140403155042_create_match_team_join_table.rb deleted file mode 100644 index c2ed1b7..0000000 --- a/db/migrate/20140403155042_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/20140403155049_add_hidden_attrs_to_user.rb b/db/migrate/20140403155049_add_hidden_attrs_to_user.rb deleted file mode 100644 index 9b5c505..0000000 --- a/db/migrate/20140403155049_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/20140405010436_create_servers.rb b/db/migrate/20140405010436_create_servers.rb new file mode 100644 index 0000000..f33241a --- /dev/null +++ b/db/migrate/20140405010436_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/20140405010438_create_matches.rb b/db/migrate/20140405010438_create_matches.rb new file mode 100644 index 0000000..31eea12 --- /dev/null +++ b/db/migrate/20140405010438_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/20140405010441_create_teams.rb b/db/migrate/20140405010441_create_teams.rb new file mode 100644 index 0000000..fdf9a68 --- /dev/null +++ b/db/migrate/20140405010441_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/20140405010443_create_alerts.rb b/db/migrate/20140405010443_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140405010443_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/20140405010446_create_pms.rb b/db/migrate/20140405010446_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140405010446_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/20140405010448_create_tournaments.rb b/db/migrate/20140405010448_create_tournaments.rb new file mode 100644 index 0000000..c0d8929 --- /dev/null +++ b/db/migrate/20140405010448_create_tournaments.rb @@ -0,0 +1,17 @@ +class CreateTournaments < ActiveRecord::Migration + def change + create_table :tournaments do |t| + t.string :name + t.references :game, index: true + t.integer :status + t.integer :min_players_per_team + t.integer :max_players_per_team + t.integer :min_teams_per_match + t.integer :max_teams_per_match + t.integer :set_rounds + t.boolean :randomized_teams + + t.timestamps + end + end +end diff --git a/db/migrate/20140405010451_create_games.rb b/db/migrate/20140405010451_create_games.rb new file mode 100644 index 0000000..5e4f56f --- /dev/null +++ b/db/migrate/20140405010451_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/20140405010454_create_users.rb b/db/migrate/20140405010454_create_users.rb new file mode 100644 index 0000000..8032870 --- /dev/null +++ b/db/migrate/20140405010454_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/20140405010456_create_sessions.rb b/db/migrate/20140405010456_create_sessions.rb new file mode 100644 index 0000000..f667f1e --- /dev/null +++ b/db/migrate/20140405010456_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/20140405010459_create_server_settings.rb b/db/migrate/20140405010459_create_server_settings.rb new file mode 100644 index 0000000..dfdd91b --- /dev/null +++ b/db/migrate/20140405010459_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/20140405010501_create_game_settings.rb b/db/migrate/20140405010501_create_game_settings.rb new file mode 100644 index 0000000..eed6b00 --- /dev/null +++ b/db/migrate/20140405010501_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 :description + t.text :type_opt + t.integer :display_order + + t.timestamps + end + end +end diff --git a/db/migrate/20140405010503_create_tournament_preferences.rb b/db/migrate/20140405010503_create_tournament_preferences.rb new file mode 100644 index 0000000..991d659 --- /dev/null +++ b/db/migrate/20140405010503_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/20140405010506_create_scores.rb b/db/migrate/20140405010506_create_scores.rb new file mode 100644 index 0000000..4ca0b0b --- /dev/null +++ b/db/migrate/20140405010506_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/20140405010508_create_remote_usernames.rb b/db/migrate/20140405010508_create_remote_usernames.rb new file mode 100644 index 0000000..e265985 --- /dev/null +++ b/db/migrate/20140405010508_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/20140405010511_create_tournament_players_join_table.rb b/db/migrate/20140405010511_create_tournament_players_join_table.rb new file mode 100644 index 0000000..be240e8 --- /dev/null +++ b/db/migrate/20140405010511_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/20140405010513_create_tournament_hosts_join_table.rb b/db/migrate/20140405010513_create_tournament_hosts_join_table.rb new file mode 100644 index 0000000..7521d89 --- /dev/null +++ b/db/migrate/20140405010513_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/20140405010515_create_team_user_join_table.rb b/db/migrate/20140405010515_create_team_user_join_table.rb new file mode 100644 index 0000000..f3b57fc --- /dev/null +++ b/db/migrate/20140405010515_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/20140405010518_create_match_team_join_table.rb b/db/migrate/20140405010518_create_match_team_join_table.rb new file mode 100644 index 0000000..c2ed1b7 --- /dev/null +++ b/db/migrate/20140405010518_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/20140405010527_add_hidden_attrs_to_user.rb b/db/migrate/20140405010527_add_hidden_attrs_to_user.rb new file mode 100644 index 0000000..9b5c505 --- /dev/null +++ b/db/migrate/20140405010527_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 113f16d..0763348 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: 20140403155049) do +ActiveRecord::Schema.define(version: 20140405010527) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -27,7 +27,7 @@ ActiveRecord::Schema.define(version: 20140403155049) do t.integer "type" t.string "name" t.text "default" - t.text "discription" + t.text "description" t.text "type_opt" t.integer "display_order" t.datetime "created_at" @@ -90,7 +90,7 @@ ActiveRecord::Schema.define(version: 20140403155049) do create_table "remote_usernames", force: true do |t| t.integer "game_id" t.integer "user_id" - t.string "user_name" + t.text "json_value" t.datetime "created_at" t.datetime "updated_at" end diff --git a/test/controllers/remote_usernames_controller_test.rb b/test/controllers/remote_usernames_controller_test.rb deleted file mode 100644 index ff6a91d..0000000 --- a/test/controllers/remote_usernames_controller_test.rb +++ /dev/null @@ -1,49 +0,0 @@ -require 'test_helper' - -class RemoteUsernamesControllerTest < ActionController::TestCase - setup do - @remote_username = remote_usernames(:one) - end - - test "should get index" do - get :index - assert_response :success - assert_not_nil assigns(:remote_usernames) - end - - test "should get new" do - get :new - assert_response :success - end - - test "should create remote_username" do - assert_difference('RemoteUsername.count') do - post :create, remote_username: { game_id: @remote_username.game_id, user_id: @remote_username.user_id, user_name: @remote_username.user_name } - end - - assert_redirected_to remote_username_path(assigns(:remote_username)) - end - - test "should show remote_username" do - get :show, id: @remote_username - assert_response :success - end - - test "should get edit" do - get :edit, id: @remote_username - assert_response :success - end - - test "should update remote_username" do - patch :update, id: @remote_username, remote_username: { game_id: @remote_username.game_id, user_id: @remote_username.user_id, user_name: @remote_username.user_name } - assert_redirected_to remote_username_path(assigns(:remote_username)) - end - - test "should destroy remote_username" do - assert_difference('RemoteUsername.count', -1) do - delete :destroy, id: @remote_username - end - - assert_redirected_to remote_usernames_path - end -end diff --git a/test/fixtures/game_settings.yml b/test/fixtures/game_settings.yml index 5626c97..7497d02 100644 --- a/test/fixtures/game_settings.yml +++ b/test/fixtures/game_settings.yml @@ -5,7 +5,7 @@ one: type: 1 name: MyString default: MyText - discription: MyText + description: MyText type_opt: MyText display_order: 1 @@ -14,6 +14,6 @@ two: type: 1 name: MyString default: MyText - discription: MyText + description: MyText type_opt: MyText display_order: 1 diff --git a/test/fixtures/remote_usernames.yml b/test/fixtures/remote_usernames.yml index 0b3055a..baa1714 100644 --- a/test/fixtures/remote_usernames.yml +++ b/test/fixtures/remote_usernames.yml @@ -3,9 +3,9 @@ one: game_id: user_id: - user_name: MyString + json_value: MyText two: game_id: user_id: - user_name: MyString + json_value: MyText diff --git a/test/helpers/remote_usernames_helper_test.rb b/test/helpers/remote_usernames_helper_test.rb deleted file mode 100644 index 1c9a795..0000000 --- a/test/helpers/remote_usernames_helper_test.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'test_helper' - -class RemoteUsernamesHelperTest < ActionView::TestCase -end -- cgit v1.2.3