From b09b504fad01988004745363332375697135800a Mon Sep 17 00:00:00 2001 From: tkimia Date: Thu, 10 Apr 2014 17:41:24 -0400 Subject: ran generate.sh --- app/assets/javascripts/brackets.js.coffee | 3 + app/assets/stylesheets/brackets.css.scss | 3 + app/controllers/brackets_controller.rb | 74 ++++++++++++++++++++++ app/helpers/brackets_helper.rb | 2 + app/models/bracket.rb | 4 ++ app/models/bracket_match.rb | 5 ++ app/views/brackets/_form.html.erb | 29 +++++++++ app/views/brackets/edit.html.erb | 6 ++ app/views/brackets/index.html.erb | 31 +++++++++ app/views/brackets/index.json.jbuilder | 4 ++ app/views/brackets/new.html.erb | 5 ++ app/views/brackets/show.html.erb | 19 ++++++ app/views/brackets/show.json.jbuilder | 1 + config/routes.rb | 2 + .../20140407041416_create_simple_captcha_data.rb | 15 ----- db/migrate/20140407081419_create_delayed_jobs.rb | 22 ------- db/migrate/20140407081422_create_servers.rb | 9 --- db/migrate/20140407081425_create_matches.rb | 14 ---- db/migrate/20140407081427_create_teams.rb | 9 --- db/migrate/20140407081430_create_alerts.rb | 10 --- db/migrate/20140407081434_create_pms.rb | 11 ---- db/migrate/20140407081437_create_tournaments.rb | 17 ----- db/migrate/20140407081440_create_games.rb | 15 ----- db/migrate/20140407081443_create_users.rb | 13 ---- db/migrate/20140407081446_create_sessions.rb | 11 ---- .../20140407081449_create_server_settings.rb | 8 --- db/migrate/20140407081452_create_game_settings.rb | 15 ----- ...20140407081454_create_tournament_preferences.rb | 12 ---- db/migrate/20140407081458_create_scores.rb | 11 ---- .../20140407081501_create_remote_usernames.rb | 11 ---- ...7081503_create_tournament_players_join_table.rb | 8 --- ...407081506_create_tournament_hosts_join_table.rb | 8 --- .../20140407081509_create_team_user_join_table.rb | 8 --- .../20140407081512_create_match_team_join_table.rb | 8 --- .../20140407081524_add_hidden_attrs_to_user.rb | 6 -- .../20140410173725_create_simple_captcha_data.rb | 15 +++++ db/migrate/20140410213731_create_delayed_jobs.rb | 22 +++++++ db/migrate/20140410213738_create_servers.rb | 9 +++ db/migrate/20140410213745_create_matches.rb | 14 ++++ db/migrate/20140410213752_create_teams.rb | 9 +++ db/migrate/20140410213758_create_alerts.rb | 10 +++ db/migrate/20140410213805_create_pms.rb | 11 ++++ db/migrate/20140410213811_create_tournaments.rb | 17 +++++ db/migrate/20140410213818_create_games.rb | 15 +++++ db/migrate/20140410213824_create_users.rb | 13 ++++ db/migrate/20140410213831_create_sessions.rb | 11 ++++ db/migrate/20140410213838_create_brackets.rb | 11 ++++ .../20140410213844_create_server_settings.rb | 8 +++ db/migrate/20140410213851_create_game_settings.rb | 15 +++++ ...20140410213857_create_tournament_preferences.rb | 12 ++++ db/migrate/20140410213903_create_scores.rb | 11 ++++ .../20140410213909_create_remote_usernames.rb | 11 ++++ .../20140410213916_create_bracket_matches.rb | 11 ++++ ...0213922_create_tournament_players_join_table.rb | 8 +++ ...410213928_create_tournament_hosts_join_table.rb | 8 +++ .../20140410213935_create_team_user_join_table.rb | 8 +++ .../20140410213941_create_match_team_join_table.rb | 8 +++ .../20140410214006_add_hidden_attrs_to_user.rb | 6 ++ db/schema.rb | 25 +++++++- test/controllers/brackets_controller_test.rb | 49 ++++++++++++++ test/fixtures/bracket_matches.yml | 11 ++++ test/fixtures/brackets.yml | 11 ++++ test/helpers/brackets_helper_test.rb | 4 ++ test/models/bracket_match_test.rb | 7 ++ test/models/bracket_test.rb | 7 ++ 65 files changed, 564 insertions(+), 242 deletions(-) create mode 100644 app/assets/javascripts/brackets.js.coffee create mode 100644 app/assets/stylesheets/brackets.css.scss create mode 100644 app/controllers/brackets_controller.rb create mode 100644 app/helpers/brackets_helper.rb create mode 100644 app/models/bracket.rb create mode 100644 app/models/bracket_match.rb create mode 100644 app/views/brackets/_form.html.erb create mode 100644 app/views/brackets/edit.html.erb create mode 100644 app/views/brackets/index.html.erb create mode 100644 app/views/brackets/index.json.jbuilder create mode 100644 app/views/brackets/new.html.erb create mode 100644 app/views/brackets/show.html.erb create mode 100644 app/views/brackets/show.json.jbuilder delete mode 100644 db/migrate/20140407041416_create_simple_captcha_data.rb delete mode 100644 db/migrate/20140407081419_create_delayed_jobs.rb delete mode 100644 db/migrate/20140407081422_create_servers.rb delete mode 100644 db/migrate/20140407081425_create_matches.rb delete mode 100644 db/migrate/20140407081427_create_teams.rb delete mode 100644 db/migrate/20140407081430_create_alerts.rb delete mode 100644 db/migrate/20140407081434_create_pms.rb delete mode 100644 db/migrate/20140407081437_create_tournaments.rb delete mode 100644 db/migrate/20140407081440_create_games.rb delete mode 100644 db/migrate/20140407081443_create_users.rb delete mode 100644 db/migrate/20140407081446_create_sessions.rb delete mode 100644 db/migrate/20140407081449_create_server_settings.rb delete mode 100644 db/migrate/20140407081452_create_game_settings.rb delete mode 100644 db/migrate/20140407081454_create_tournament_preferences.rb delete mode 100644 db/migrate/20140407081458_create_scores.rb delete mode 100644 db/migrate/20140407081501_create_remote_usernames.rb delete mode 100644 db/migrate/20140407081503_create_tournament_players_join_table.rb delete mode 100644 db/migrate/20140407081506_create_tournament_hosts_join_table.rb delete mode 100644 db/migrate/20140407081509_create_team_user_join_table.rb delete mode 100644 db/migrate/20140407081512_create_match_team_join_table.rb delete mode 100644 db/migrate/20140407081524_add_hidden_attrs_to_user.rb create mode 100644 db/migrate/20140410173725_create_simple_captcha_data.rb create mode 100644 db/migrate/20140410213731_create_delayed_jobs.rb create mode 100644 db/migrate/20140410213738_create_servers.rb create mode 100644 db/migrate/20140410213745_create_matches.rb create mode 100644 db/migrate/20140410213752_create_teams.rb create mode 100644 db/migrate/20140410213758_create_alerts.rb create mode 100644 db/migrate/20140410213805_create_pms.rb create mode 100644 db/migrate/20140410213811_create_tournaments.rb create mode 100644 db/migrate/20140410213818_create_games.rb create mode 100644 db/migrate/20140410213824_create_users.rb create mode 100644 db/migrate/20140410213831_create_sessions.rb create mode 100644 db/migrate/20140410213838_create_brackets.rb create mode 100644 db/migrate/20140410213844_create_server_settings.rb create mode 100644 db/migrate/20140410213851_create_game_settings.rb create mode 100644 db/migrate/20140410213857_create_tournament_preferences.rb create mode 100644 db/migrate/20140410213903_create_scores.rb create mode 100644 db/migrate/20140410213909_create_remote_usernames.rb create mode 100644 db/migrate/20140410213916_create_bracket_matches.rb create mode 100644 db/migrate/20140410213922_create_tournament_players_join_table.rb create mode 100644 db/migrate/20140410213928_create_tournament_hosts_join_table.rb create mode 100644 db/migrate/20140410213935_create_team_user_join_table.rb create mode 100644 db/migrate/20140410213941_create_match_team_join_table.rb create mode 100644 db/migrate/20140410214006_add_hidden_attrs_to_user.rb create mode 100644 test/controllers/brackets_controller_test.rb create mode 100644 test/fixtures/bracket_matches.yml create mode 100644 test/fixtures/brackets.yml create mode 100644 test/helpers/brackets_helper_test.rb create mode 100644 test/models/bracket_match_test.rb create mode 100644 test/models/bracket_test.rb diff --git a/app/assets/javascripts/brackets.js.coffee b/app/assets/javascripts/brackets.js.coffee new file mode 100644 index 0000000..24f83d1 --- /dev/null +++ b/app/assets/javascripts/brackets.js.coffee @@ -0,0 +1,3 @@ +# 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/brackets.css.scss b/app/assets/stylesheets/brackets.css.scss new file mode 100644 index 0000000..481e6e6 --- /dev/null +++ b/app/assets/stylesheets/brackets.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the brackets 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/brackets_controller.rb b/app/controllers/brackets_controller.rb new file mode 100644 index 0000000..fe43ca9 --- /dev/null +++ b/app/controllers/brackets_controller.rb @@ -0,0 +1,74 @@ +class BracketsController < ApplicationController + before_action :set_bracket, only: [:show, :edit, :update, :destroy] + + # GET /brackets + # GET /brackets.json + def index + @brackets = Bracket.all + end + + # GET /brackets/1 + # GET /brackets/1.json + def show + end + + # GET /brackets/new + def new + @bracket = Bracket.new + end + + # GET /brackets/1/edit + def edit + end + + # POST /brackets + # POST /brackets.json + def create + @bracket = Bracket.new(bracket_params) + + respond_to do |format| + if @bracket.save + format.html { redirect_to @bracket, notice: 'Bracket was successfully created.' } + format.json { render action: 'show', status: :created, location: @bracket } + else + format.html { render action: 'new' } + format.json { render json: @bracket.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /brackets/1 + # PATCH/PUT /brackets/1.json + def update + respond_to do |format| + if @bracket.update(bracket_params) + format.html { redirect_to @bracket, notice: 'Bracket was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: 'edit' } + format.json { render json: @bracket.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /brackets/1 + # DELETE /brackets/1.json + def destroy + @bracket.destroy + respond_to do |format| + format.html { redirect_to brackets_url } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_bracket + @bracket = Bracket.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def bracket_params + params.require(:bracket).permit(:user_id, :tournament_id, :name) + end +end diff --git a/app/helpers/brackets_helper.rb b/app/helpers/brackets_helper.rb new file mode 100644 index 0000000..8c380fd --- /dev/null +++ b/app/helpers/brackets_helper.rb @@ -0,0 +1,2 @@ +module BracketsHelper +end diff --git a/app/models/bracket.rb b/app/models/bracket.rb new file mode 100644 index 0000000..e8d9c5a --- /dev/null +++ b/app/models/bracket.rb @@ -0,0 +1,4 @@ +class Bracket < ActiveRecord::Base + belongs_to :user + belongs_to :tournament +end diff --git a/app/models/bracket_match.rb b/app/models/bracket_match.rb new file mode 100644 index 0000000..823bc40 --- /dev/null +++ b/app/models/bracket_match.rb @@ -0,0 +1,5 @@ +class BracketMatch < ActiveRecord::Base + belongs_to :bracket + belongs_to :match + belongs_to :predicted_winner +end diff --git a/app/views/brackets/_form.html.erb b/app/views/brackets/_form.html.erb new file mode 100644 index 0000000..5050fc1 --- /dev/null +++ b/app/views/brackets/_form.html.erb @@ -0,0 +1,29 @@ +<%= form_for(@bracket) do |f| %> + <% if @bracket.errors.any? %> +
+

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

+ + +
+ <% end %> + +
+ <%= f.label :user_id %>
+ <%= f.text_field :user_id %> +
+
+ <%= f.label :tournament_id %>
+ <%= f.text_field :tournament_id %> +
+
+ <%= f.label :name %>
+ <%= f.text_field :name %> +
+
+ <%= f.submit %> +
+<% end %> diff --git a/app/views/brackets/edit.html.erb b/app/views/brackets/edit.html.erb new file mode 100644 index 0000000..10a2b3e --- /dev/null +++ b/app/views/brackets/edit.html.erb @@ -0,0 +1,6 @@ +

Editing bracket

+ +<%= render 'form' %> + +<%= link_to 'Show', @bracket %> | +<%= link_to 'Back', brackets_path %> diff --git a/app/views/brackets/index.html.erb b/app/views/brackets/index.html.erb new file mode 100644 index 0000000..2195d69 --- /dev/null +++ b/app/views/brackets/index.html.erb @@ -0,0 +1,31 @@ +

Listing brackets

+ + + + + + + + + + + + + + + <% @brackets.each do |bracket| %> + + + + + + + + + <% end %> + +
UserTournamentName
<%= bracket.user %><%= bracket.tournament %><%= bracket.name %><%= link_to 'Show', bracket %><%= link_to 'Edit', edit_bracket_path(bracket) %><%= link_to 'Destroy', bracket, method: :delete, data: { confirm: 'Are you sure?' } %>
+ +
+ +<%= link_to 'New Bracket', new_bracket_path %> diff --git a/app/views/brackets/index.json.jbuilder b/app/views/brackets/index.json.jbuilder new file mode 100644 index 0000000..8a66626 --- /dev/null +++ b/app/views/brackets/index.json.jbuilder @@ -0,0 +1,4 @@ +json.array!(@brackets) do |bracket| + json.extract! bracket, :id, :user_id, :tournament_id, :name + json.url bracket_url(bracket, format: :json) +end diff --git a/app/views/brackets/new.html.erb b/app/views/brackets/new.html.erb new file mode 100644 index 0000000..c379c15 --- /dev/null +++ b/app/views/brackets/new.html.erb @@ -0,0 +1,5 @@ +

New bracket

+ +<%= render 'form' %> + +<%= link_to 'Back', brackets_path %> diff --git a/app/views/brackets/show.html.erb b/app/views/brackets/show.html.erb new file mode 100644 index 0000000..9c7c14b --- /dev/null +++ b/app/views/brackets/show.html.erb @@ -0,0 +1,19 @@ +

<%= notice %>

+ +

+ User: + <%= @bracket.user %> +

+ +

+ Tournament: + <%= @bracket.tournament %> +

+ +

+ Name: + <%= @bracket.name %> +

+ +<%= link_to 'Edit', edit_bracket_path(@bracket) %> | +<%= link_to 'Back', brackets_path %> diff --git a/app/views/brackets/show.json.jbuilder b/app/views/brackets/show.json.jbuilder new file mode 100644 index 0000000..6a8d478 --- /dev/null +++ b/app/views/brackets/show.json.jbuilder @@ -0,0 +1 @@ +json.extract! @bracket, :id, :user_id, :tournament_id, :name, :created_at, :updated_at diff --git a/config/routes.rb b/config/routes.rb index 97e82f8..fe92ba5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,6 @@ Leaguer::Application.routes.draw do + resources :brackets + resources :sessions resources :users diff --git a/db/migrate/20140407041416_create_simple_captcha_data.rb b/db/migrate/20140407041416_create_simple_captcha_data.rb deleted file mode 100644 index 4573b20..0000000 --- a/db/migrate/20140407041416_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/20140407081419_create_delayed_jobs.rb b/db/migrate/20140407081419_create_delayed_jobs.rb deleted file mode 100644 index ec0dd93..0000000 --- a/db/migrate/20140407081419_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/20140407081422_create_servers.rb b/db/migrate/20140407081422_create_servers.rb deleted file mode 100644 index fbe1b02..0000000 --- a/db/migrate/20140407081422_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/20140407081425_create_matches.rb b/db/migrate/20140407081425_create_matches.rb deleted file mode 100644 index bdeb1cd..0000000 --- a/db/migrate/20140407081425_create_matches.rb +++ /dev/null @@ -1,14 +0,0 @@ -class CreateMatches < ActiveRecord::Migration - def change - create_table :matches do |t| - t.integer :status - t.references :tournament, index: true - t.string :name - t.references :winner, index: true - t.string :remote_id - t.integer :submitted_peer_evaluations - - t.timestamps - end - end -end diff --git a/db/migrate/20140407081427_create_teams.rb b/db/migrate/20140407081427_create_teams.rb deleted file mode 100644 index fdf9a68..0000000 --- a/db/migrate/20140407081427_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/20140407081430_create_alerts.rb b/db/migrate/20140407081430_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140407081430_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/20140407081434_create_pms.rb b/db/migrate/20140407081434_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140407081434_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/20140407081437_create_tournaments.rb b/db/migrate/20140407081437_create_tournaments.rb deleted file mode 100644 index c0d8929..0000000 --- a/db/migrate/20140407081437_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/20140407081440_create_games.rb b/db/migrate/20140407081440_create_games.rb deleted file mode 100644 index 5e4f56f..0000000 --- a/db/migrate/20140407081440_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/20140407081443_create_users.rb b/db/migrate/20140407081443_create_users.rb deleted file mode 100644 index 8032870..0000000 --- a/db/migrate/20140407081443_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/20140407081446_create_sessions.rb b/db/migrate/20140407081446_create_sessions.rb deleted file mode 100644 index f667f1e..0000000 --- a/db/migrate/20140407081446_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/20140407081449_create_server_settings.rb b/db/migrate/20140407081449_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140407081449_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/20140407081452_create_game_settings.rb b/db/migrate/20140407081452_create_game_settings.rb deleted file mode 100644 index b1caf5d..0000000 --- a/db/migrate/20140407081452_create_game_settings.rb +++ /dev/null @@ -1,15 +0,0 @@ -class CreateGameSettings < ActiveRecord::Migration - def change - create_table :game_settings do |t| - t.references :game, index: true - t.integer :stype - t.string :name - t.text :default - t.text :description - t.text :type_opt - t.integer :display_order - - t.timestamps - end - end -end diff --git a/db/migrate/20140407081454_create_tournament_preferences.rb b/db/migrate/20140407081454_create_tournament_preferences.rb deleted file mode 100644 index 991d659..0000000 --- a/db/migrate/20140407081454_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/20140407081458_create_scores.rb b/db/migrate/20140407081458_create_scores.rb deleted file mode 100644 index 4ca0b0b..0000000 --- a/db/migrate/20140407081458_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/20140407081501_create_remote_usernames.rb b/db/migrate/20140407081501_create_remote_usernames.rb deleted file mode 100644 index e265985..0000000 --- a/db/migrate/20140407081501_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/20140407081503_create_tournament_players_join_table.rb b/db/migrate/20140407081503_create_tournament_players_join_table.rb deleted file mode 100644 index be240e8..0000000 --- a/db/migrate/20140407081503_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/20140407081506_create_tournament_hosts_join_table.rb b/db/migrate/20140407081506_create_tournament_hosts_join_table.rb deleted file mode 100644 index 7521d89..0000000 --- a/db/migrate/20140407081506_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/20140407081509_create_team_user_join_table.rb b/db/migrate/20140407081509_create_team_user_join_table.rb deleted file mode 100644 index f3b57fc..0000000 --- a/db/migrate/20140407081509_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/20140407081512_create_match_team_join_table.rb b/db/migrate/20140407081512_create_match_team_join_table.rb deleted file mode 100644 index c2ed1b7..0000000 --- a/db/migrate/20140407081512_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/20140407081524_add_hidden_attrs_to_user.rb b/db/migrate/20140407081524_add_hidden_attrs_to_user.rb deleted file mode 100644 index 9b5c505..0000000 --- a/db/migrate/20140407081524_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/20140410173725_create_simple_captcha_data.rb b/db/migrate/20140410173725_create_simple_captcha_data.rb new file mode 100644 index 0000000..4573b20 --- /dev/null +++ b/db/migrate/20140410173725_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/20140410213731_create_delayed_jobs.rb b/db/migrate/20140410213731_create_delayed_jobs.rb new file mode 100644 index 0000000..ec0dd93 --- /dev/null +++ b/db/migrate/20140410213731_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/20140410213738_create_servers.rb b/db/migrate/20140410213738_create_servers.rb new file mode 100644 index 0000000..fbe1b02 --- /dev/null +++ b/db/migrate/20140410213738_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/20140410213745_create_matches.rb b/db/migrate/20140410213745_create_matches.rb new file mode 100644 index 0000000..bdeb1cd --- /dev/null +++ b/db/migrate/20140410213745_create_matches.rb @@ -0,0 +1,14 @@ +class CreateMatches < ActiveRecord::Migration + def change + create_table :matches do |t| + t.integer :status + t.references :tournament, index: true + t.string :name + t.references :winner, index: true + t.string :remote_id + t.integer :submitted_peer_evaluations + + t.timestamps + end + end +end diff --git a/db/migrate/20140410213752_create_teams.rb b/db/migrate/20140410213752_create_teams.rb new file mode 100644 index 0000000..fdf9a68 --- /dev/null +++ b/db/migrate/20140410213752_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/20140410213758_create_alerts.rb b/db/migrate/20140410213758_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140410213758_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/20140410213805_create_pms.rb b/db/migrate/20140410213805_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140410213805_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/20140410213811_create_tournaments.rb b/db/migrate/20140410213811_create_tournaments.rb new file mode 100644 index 0000000..c0d8929 --- /dev/null +++ b/db/migrate/20140410213811_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/20140410213818_create_games.rb b/db/migrate/20140410213818_create_games.rb new file mode 100644 index 0000000..5e4f56f --- /dev/null +++ b/db/migrate/20140410213818_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/20140410213824_create_users.rb b/db/migrate/20140410213824_create_users.rb new file mode 100644 index 0000000..8032870 --- /dev/null +++ b/db/migrate/20140410213824_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/20140410213831_create_sessions.rb b/db/migrate/20140410213831_create_sessions.rb new file mode 100644 index 0000000..f667f1e --- /dev/null +++ b/db/migrate/20140410213831_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/20140410213838_create_brackets.rb b/db/migrate/20140410213838_create_brackets.rb new file mode 100644 index 0000000..8813bf2 --- /dev/null +++ b/db/migrate/20140410213838_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/20140410213844_create_server_settings.rb b/db/migrate/20140410213844_create_server_settings.rb new file mode 100644 index 0000000..dfdd91b --- /dev/null +++ b/db/migrate/20140410213844_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/20140410213851_create_game_settings.rb b/db/migrate/20140410213851_create_game_settings.rb new file mode 100644 index 0000000..b1caf5d --- /dev/null +++ b/db/migrate/20140410213851_create_game_settings.rb @@ -0,0 +1,15 @@ +class CreateGameSettings < ActiveRecord::Migration + def change + create_table :game_settings do |t| + t.references :game, index: true + t.integer :stype + t.string :name + t.text :default + t.text :description + t.text :type_opt + t.integer :display_order + + t.timestamps + end + end +end diff --git a/db/migrate/20140410213857_create_tournament_preferences.rb b/db/migrate/20140410213857_create_tournament_preferences.rb new file mode 100644 index 0000000..991d659 --- /dev/null +++ b/db/migrate/20140410213857_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/20140410213903_create_scores.rb b/db/migrate/20140410213903_create_scores.rb new file mode 100644 index 0000000..4ca0b0b --- /dev/null +++ b/db/migrate/20140410213903_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/20140410213909_create_remote_usernames.rb b/db/migrate/20140410213909_create_remote_usernames.rb new file mode 100644 index 0000000..e265985 --- /dev/null +++ b/db/migrate/20140410213909_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/20140410213916_create_bracket_matches.rb b/db/migrate/20140410213916_create_bracket_matches.rb new file mode 100644 index 0000000..3323e31 --- /dev/null +++ b/db/migrate/20140410213916_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/20140410213922_create_tournament_players_join_table.rb b/db/migrate/20140410213922_create_tournament_players_join_table.rb new file mode 100644 index 0000000..be240e8 --- /dev/null +++ b/db/migrate/20140410213922_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/20140410213928_create_tournament_hosts_join_table.rb b/db/migrate/20140410213928_create_tournament_hosts_join_table.rb new file mode 100644 index 0000000..7521d89 --- /dev/null +++ b/db/migrate/20140410213928_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/20140410213935_create_team_user_join_table.rb b/db/migrate/20140410213935_create_team_user_join_table.rb new file mode 100644 index 0000000..f3b57fc --- /dev/null +++ b/db/migrate/20140410213935_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/20140410213941_create_match_team_join_table.rb b/db/migrate/20140410213941_create_match_team_join_table.rb new file mode 100644 index 0000000..c2ed1b7 --- /dev/null +++ b/db/migrate/20140410213941_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/20140410214006_add_hidden_attrs_to_user.rb b/db/migrate/20140410214006_add_hidden_attrs_to_user.rb new file mode 100644 index 0000000..9b5c505 --- /dev/null +++ b/db/migrate/20140410214006_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 9214da8..e6ad821 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: 20140407081524) do +ActiveRecord::Schema.define(version: 20140410214006) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -22,6 +22,29 @@ ActiveRecord::Schema.define(version: 20140407081524) do add_index "alerts", ["author_id"], name: "index_alerts_on_author_id" + create_table "bracket_matches", force: true do |t| + t.integer "bracket_id" + t.integer "match_id" + t.integer "predicted_winner_id" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "bracket_matches", ["bracket_id"], name: "index_bracket_matches_on_bracket_id" + add_index "bracket_matches", ["match_id"], name: "index_bracket_matches_on_match_id" + add_index "bracket_matches", ["predicted_winner_id"], name: "index_bracket_matches_on_predicted_winner_id" + + create_table "brackets", force: true do |t| + t.integer "user_id" + t.integer "tournament_id" + t.string "name" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "brackets", ["tournament_id"], name: "index_brackets_on_tournament_id" + add_index "brackets", ["user_id"], name: "index_brackets_on_user_id" + create_table "delayed_jobs", force: true do |t| t.integer "priority", default: 0, null: false t.integer "attempts", default: 0, null: false diff --git a/test/controllers/brackets_controller_test.rb b/test/controllers/brackets_controller_test.rb new file mode 100644 index 0000000..3f45a64 --- /dev/null +++ b/test/controllers/brackets_controller_test.rb @@ -0,0 +1,49 @@ +require 'test_helper' + +class BracketsControllerTest < ActionController::TestCase + setup do + @bracket = brackets(:one) + end + + test "should get index" do + get :index + assert_response :success + assert_not_nil assigns(:brackets) + end + + test "should get new" do + get :new + assert_response :success + end + + test "should create bracket" do + assert_difference('Bracket.count') do + post :create, bracket: { name: @bracket.name, tournament_id: @bracket.tournament_id, user_id: @bracket.user_id } + end + + assert_redirected_to bracket_path(assigns(:bracket)) + end + + test "should show bracket" do + get :show, id: @bracket + assert_response :success + end + + test "should get edit" do + get :edit, id: @bracket + assert_response :success + end + + test "should update bracket" do + patch :update, id: @bracket, bracket: { name: @bracket.name, tournament_id: @bracket.tournament_id, user_id: @bracket.user_id } + assert_redirected_to bracket_path(assigns(:bracket)) + end + + test "should destroy bracket" do + assert_difference('Bracket.count', -1) do + delete :destroy, id: @bracket + end + + assert_redirected_to brackets_path + end +end diff --git a/test/fixtures/bracket_matches.yml b/test/fixtures/bracket_matches.yml new file mode 100644 index 0000000..a9a0c78 --- /dev/null +++ b/test/fixtures/bracket_matches.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + bracket_id: + match_id: + predicted_winner_id: + +two: + bracket_id: + match_id: + predicted_winner_id: diff --git a/test/fixtures/brackets.yml b/test/fixtures/brackets.yml new file mode 100644 index 0000000..15b8207 --- /dev/null +++ b/test/fixtures/brackets.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + user_id: + tournament_id: + name: MyString + +two: + user_id: + tournament_id: + name: MyString diff --git a/test/helpers/brackets_helper_test.rb b/test/helpers/brackets_helper_test.rb new file mode 100644 index 0000000..53da038 --- /dev/null +++ b/test/helpers/brackets_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class BracketsHelperTest < ActionView::TestCase +end diff --git a/test/models/bracket_match_test.rb b/test/models/bracket_match_test.rb new file mode 100644 index 0000000..f7c770c --- /dev/null +++ b/test/models/bracket_match_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class BracketMatchTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/bracket_test.rb b/test/models/bracket_test.rb new file mode 100644 index 0000000..5faab05 --- /dev/null +++ b/test/models/bracket_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class BracketTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end -- cgit v1.2.3