From 5d9cb2ec8a1edcdea4a1fa91c688ede16ed03845 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 21 Apr 2014 01:00:47 -0400 Subject: simplify/correct seeds development check --- db/seeds.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/seeds.rb b/db/seeds.rb index fe7c32e..a3637a8 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -25,7 +25,7 @@ Game.find_by_name("Rock, Paper, Scissors").settings.create(name: "Favorite Objec Game.find_by_name("Rock, Paper, Scissors").settings.create(name: "Lizard, Spock allowed?", description: "Will you allow Lizard and Spock?", stype: 4, display_order: 1) Game.find_by_name("Rock, Paper, Scissors").settings.create(name: "Why are those up there even called radio buttons?", description: "Check boxes make sense at least", type_opt: "I do not know.,There is now spoon.,Wow.,Because electricity.,Wat?", stype: 2, display_order: 3) -unless ENV["RAILS_ENV"] and ENV["RAILS_ENV"] != "development" +if Rails.env.development? User.create(name: "Administrator", user_name: "admin", email: "root@localhost.lan", password: "password", password_confirmation: "password", permissions: 0xFFFFFFFF) User.create(name: "John 0", password: "password", email: "john0@gmail.com", user_name: "johndoe0", password_confirmation: "password") -- cgit v1.2.3-54-g00ecf From 1fcac4a83e838ef5b94ffb899ea6b4c5fd1984de Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 21 Apr 2014 01:10:11 -0400 Subject: touch up Gemfile --- Gemfile | 4 ++-- Gemfile.lock | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index c33683a..1f30537 100644 --- a/Gemfile +++ b/Gemfile @@ -12,8 +12,6 @@ gem 'httparty' gem 'simple_captcha2', require: 'simple_captcha' -#gem 'rmagick' - group :development, :test do # Use sqlite3 as the database for Active Record gem 'sqlite3' @@ -48,6 +46,7 @@ gem 'turbolinks' gem 'jbuilder', '~> 1.2' # Asynchronously handle longer or delayed tasks +gem 'daemons' gem 'delayed_job_active_record' group :doc do @@ -67,3 +66,4 @@ end # Use debugger # gem 'debugger', group: [:development, :test] +# gem 'byebug', group: [:development, :test] diff --git a/Gemfile.lock b/Gemfile.lock index fd03576..e0d013b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,6 +38,7 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) + daemons (1.1.9) delayed_job (4.0.0) activesupport (>= 3.0, < 4.1) delayed_job_active_record (4.0.0) @@ -131,6 +132,7 @@ DEPENDENCIES bcrypt-ruby (= 3.1.2) bootstrap-sass coffee-rails (~> 4.0.0) + daemons delayed_job_active_record httparty jbuilder (~> 1.2) -- cgit v1.2.3-54-g00ecf From d55b94f83cd6a161d47b622e68c11bfdf09d1bbc Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 21 Apr 2014 01:26:20 -0400 Subject: tidy up --- generate.sh | 10 +++++++--- start.sh | 5 ----- 2 files changed, 7 insertions(+), 8 deletions(-) delete mode 100755 start.sh diff --git a/generate.sh b/generate.sh index 68504b0..9541184 100755 --- a/generate.sh +++ b/generate.sh @@ -9,9 +9,13 @@ set -xe srcdir=$(dirname "$(readlink -f "$0")") cd "$srcdir" +export RAILS_ENV=development + git rm -rf -- app test config/routes.rb db/migrate || true git checkout clean-start -- app test config/routes.rb +bundle install + bundle exec rails generate simple_captcha bundle exec rails generate delayed_job:active_record @@ -60,10 +64,10 @@ bundle exec rails generate migration AddHiddenAttrsToUser password_digest:string #for the tournament controller to generate options #bundle exec rails generate scaffold -bundle exec rake db:drop RAILS_ENV=development -bundle exec rake db:migrate RAILS_ENV=development +bundle exec rake db:drop +bundle exec rake db:migrate bundle exec rake db:seed find app -type f -name '*.rb' -exec bin/autoindent {} \; -git add app test config/routes.rb db/migrate db/schema.rb +git add app test config/routes.rb db/migrate db/schema.rb Gemfile.lock diff --git a/start.sh b/start.sh deleted file mode 100755 index 6c0d594..0000000 --- a/start.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -generate.sh -nohup bundle exec rails server & - -- cgit v1.2.3-54-g00ecf From 6d2baadfa051d6d08ade980e2d4603ca7c154e4a Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 21 Apr 2014 01:26:41 -0400 Subject: generate.sh: s/preference/setting/ --- generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate.sh b/generate.sh index 9541184..5a98b41 100755 --- a/generate.sh +++ b/generate.sh @@ -41,7 +41,7 @@ bundle exec rails generate scaffold bracket user:references tournament:reference # Just models bundle exec rails generate model server_setting bundle exec rails generate model game_setting game:references stype:integer name:string default:text description:text type_opt:text display_order:integer -bundle exec rails generate model tournament_preference tournament:references vartype:integer name:string value:text +bundle exec rails generate model tournament_setting tournament:references vartype:integer name:string value:text bundle exec rails generate model score user:references match:references value:integer bundle exec rails generate model remote_username game:references user:references json_value:text bundle exec rails generate model bracket_match bracket:references match:references predicted_winner:references -- cgit v1.2.3-54-g00ecf From a09778072023f08bfbc8987881be9f05965496c1 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 21 Apr 2014 09:59:19 -0400 Subject: generate.sh: add api_requests for managing throttling --- generate.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/generate.sh b/generate.sh index 5a98b41..059d3f8 100755 --- a/generate.sh +++ b/generate.sh @@ -45,6 +45,8 @@ bundle exec rails generate model tournament_setting tournament:references vartyp bundle exec rails generate model score user:references match:references value:integer bundle exec rails generate model remote_username game:references user:references json_value:text bundle exec rails generate model bracket_match bracket:references match:references predicted_winner:references +bundle exec rails generate model api_requests api_name:string + # Join tables bundle exec rails generate migration CreateTournamentPlayersJoinTable players tournaments bundle exec rails generate migration CreateTournamentHostsJoinTable hosts tournaments -- cgit v1.2.3-54-g00ecf From 493c2528076076beae43b2574493ed3955c38f4b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 21 Apr 2014 09:59:40 -0400 Subject: run ./generate.sh --- app/models/api_requests.rb | 2 ++ app/models/tournament_preference.rb | 3 --- app/models/tournament_setting.rb | 3 +++ .../20140410173725_create_simple_captcha_data.rb | 15 --------------- db/migrate/20140410213731_create_delayed_jobs.rb | 22 ---------------------- db/migrate/20140410213738_create_servers.rb | 9 --------- db/migrate/20140410213745_create_matches.rb | 14 -------------- db/migrate/20140410213752_create_teams.rb | 9 --------- db/migrate/20140410213758_create_alerts.rb | 10 ---------- db/migrate/20140410213805_create_pms.rb | 11 ----------- db/migrate/20140410213811_create_tournaments.rb | 17 ----------------- db/migrate/20140410213818_create_games.rb | 15 --------------- db/migrate/20140410213824_create_users.rb | 13 ------------- db/migrate/20140410213831_create_sessions.rb | 11 ----------- db/migrate/20140410213838_create_brackets.rb | 11 ----------- .../20140410213844_create_server_settings.rb | 8 -------- db/migrate/20140410213851_create_game_settings.rb | 15 --------------- ...20140410213857_create_tournament_preferences.rb | 12 ------------ db/migrate/20140410213903_create_scores.rb | 11 ----------- .../20140410213909_create_remote_usernames.rb | 11 ----------- .../20140410213916_create_bracket_matches.rb | 11 ----------- ...0213922_create_tournament_players_join_table.rb | 8 -------- ...410213928_create_tournament_hosts_join_table.rb | 8 -------- .../20140410213935_create_team_user_join_table.rb | 8 -------- .../20140410213941_create_match_team_join_table.rb | 8 -------- .../20140410214006_add_hidden_attrs_to_user.rb | 6 ------ .../20140421095649_create_simple_captcha_data.rb | 15 +++++++++++++++ db/migrate/20140421135652_create_delayed_jobs.rb | 22 ++++++++++++++++++++++ db/migrate/20140421135654_create_servers.rb | 9 +++++++++ db/migrate/20140421135657_create_matches.rb | 14 ++++++++++++++ db/migrate/20140421135700_create_teams.rb | 9 +++++++++ db/migrate/20140421135703_create_alerts.rb | 10 ++++++++++ db/migrate/20140421135706_create_pms.rb | 11 +++++++++++ db/migrate/20140421135709_create_tournaments.rb | 17 +++++++++++++++++ db/migrate/20140421135712_create_games.rb | 15 +++++++++++++++ db/migrate/20140421135715_create_users.rb | 13 +++++++++++++ db/migrate/20140421135718_create_sessions.rb | 11 +++++++++++ db/migrate/20140421135721_create_brackets.rb | 11 +++++++++++ .../20140421135723_create_server_settings.rb | 8 ++++++++ db/migrate/20140421135726_create_game_settings.rb | 15 +++++++++++++++ .../20140421135729_create_tournament_settings.rb | 12 ++++++++++++ db/migrate/20140421135732_create_scores.rb | 11 +++++++++++ .../20140421135735_create_remote_usernames.rb | 11 +++++++++++ .../20140421135738_create_bracket_matches.rb | 11 +++++++++++ db/migrate/20140421135741_create_api_requests.rb | 9 +++++++++ ...1135744_create_tournament_players_join_table.rb | 8 ++++++++ ...421135747_create_tournament_hosts_join_table.rb | 8 ++++++++ .../20140421135749_create_team_user_join_table.rb | 8 ++++++++ .../20140421135752_create_match_team_join_table.rb | 8 ++++++++ .../20140421135803_add_hidden_attrs_to_user.rb | 6 ++++++ db/schema.rb | 12 +++++++++--- test/fixtures/api_requests.yml | 7 +++++++ test/fixtures/tournament_preferences.yml | 13 ------------- test/fixtures/tournament_settings.yml | 13 +++++++++++++ test/models/api_requests_test.rb | 7 +++++++ test/models/tournament_preference_test.rb | 7 ------- test/models/tournament_setting_test.rb | 7 +++++++ 57 files changed, 320 insertions(+), 289 deletions(-) create mode 100644 app/models/api_requests.rb delete mode 100644 app/models/tournament_preference.rb create mode 100644 app/models/tournament_setting.rb delete mode 100644 db/migrate/20140410173725_create_simple_captcha_data.rb delete mode 100644 db/migrate/20140410213731_create_delayed_jobs.rb delete mode 100644 db/migrate/20140410213738_create_servers.rb delete mode 100644 db/migrate/20140410213745_create_matches.rb delete mode 100644 db/migrate/20140410213752_create_teams.rb delete mode 100644 db/migrate/20140410213758_create_alerts.rb delete mode 100644 db/migrate/20140410213805_create_pms.rb delete mode 100644 db/migrate/20140410213811_create_tournaments.rb delete mode 100644 db/migrate/20140410213818_create_games.rb delete mode 100644 db/migrate/20140410213824_create_users.rb delete mode 100644 db/migrate/20140410213831_create_sessions.rb delete mode 100644 db/migrate/20140410213838_create_brackets.rb delete mode 100644 db/migrate/20140410213844_create_server_settings.rb delete mode 100644 db/migrate/20140410213851_create_game_settings.rb delete mode 100644 db/migrate/20140410213857_create_tournament_preferences.rb delete mode 100644 db/migrate/20140410213903_create_scores.rb delete mode 100644 db/migrate/20140410213909_create_remote_usernames.rb delete mode 100644 db/migrate/20140410213916_create_bracket_matches.rb delete mode 100644 db/migrate/20140410213922_create_tournament_players_join_table.rb delete mode 100644 db/migrate/20140410213928_create_tournament_hosts_join_table.rb delete mode 100644 db/migrate/20140410213935_create_team_user_join_table.rb delete mode 100644 db/migrate/20140410213941_create_match_team_join_table.rb delete mode 100644 db/migrate/20140410214006_add_hidden_attrs_to_user.rb create mode 100644 db/migrate/20140421095649_create_simple_captcha_data.rb create mode 100644 db/migrate/20140421135652_create_delayed_jobs.rb create mode 100644 db/migrate/20140421135654_create_servers.rb create mode 100644 db/migrate/20140421135657_create_matches.rb create mode 100644 db/migrate/20140421135700_create_teams.rb create mode 100644 db/migrate/20140421135703_create_alerts.rb create mode 100644 db/migrate/20140421135706_create_pms.rb create mode 100644 db/migrate/20140421135709_create_tournaments.rb create mode 100644 db/migrate/20140421135712_create_games.rb create mode 100644 db/migrate/20140421135715_create_users.rb create mode 100644 db/migrate/20140421135718_create_sessions.rb create mode 100644 db/migrate/20140421135721_create_brackets.rb create mode 100644 db/migrate/20140421135723_create_server_settings.rb create mode 100644 db/migrate/20140421135726_create_game_settings.rb create mode 100644 db/migrate/20140421135729_create_tournament_settings.rb create mode 100644 db/migrate/20140421135732_create_scores.rb create mode 100644 db/migrate/20140421135735_create_remote_usernames.rb create mode 100644 db/migrate/20140421135738_create_bracket_matches.rb create mode 100644 db/migrate/20140421135741_create_api_requests.rb create mode 100644 db/migrate/20140421135744_create_tournament_players_join_table.rb create mode 100644 db/migrate/20140421135747_create_tournament_hosts_join_table.rb create mode 100644 db/migrate/20140421135749_create_team_user_join_table.rb create mode 100644 db/migrate/20140421135752_create_match_team_join_table.rb create mode 100644 db/migrate/20140421135803_add_hidden_attrs_to_user.rb create mode 100644 test/fixtures/api_requests.yml delete mode 100644 test/fixtures/tournament_preferences.yml create mode 100644 test/fixtures/tournament_settings.yml create mode 100644 test/models/api_requests_test.rb delete mode 100644 test/models/tournament_preference_test.rb create mode 100644 test/models/tournament_setting_test.rb diff --git a/app/models/api_requests.rb b/app/models/api_requests.rb new file mode 100644 index 0000000..19c76e2 --- /dev/null +++ b/app/models/api_requests.rb @@ -0,0 +1,2 @@ +class ApiRequests < ActiveRecord::Base +end diff --git a/app/models/tournament_preference.rb b/app/models/tournament_preference.rb deleted file mode 100644 index 3d15061..0000000 --- a/app/models/tournament_preference.rb +++ /dev/null @@ -1,3 +0,0 @@ -class TournamentPreference < ActiveRecord::Base - belongs_to :tournament -end diff --git a/app/models/tournament_setting.rb b/app/models/tournament_setting.rb new file mode 100644 index 0000000..b3e6ace --- /dev/null +++ b/app/models/tournament_setting.rb @@ -0,0 +1,3 @@ +class TournamentSetting < ActiveRecord::Base + belongs_to :tournament +end diff --git a/db/migrate/20140410173725_create_simple_captcha_data.rb b/db/migrate/20140410173725_create_simple_captcha_data.rb deleted file mode 100644 index 4573b20..0000000 --- a/db/migrate/20140410173725_create_simple_captcha_data.rb +++ /dev/null @@ -1,15 +0,0 @@ -class CreateSimpleCaptchaData < ActiveRecord::Migration - def self.up - create_table :simple_captcha_data do |t| - t.string :key, :limit => 40 - t.string :value, :limit => 6 - t.timestamps - end - - add_index :simple_captcha_data, :key, :name => "idx_key" - end - - def self.down - drop_table :simple_captcha_data - end -end diff --git a/db/migrate/20140410213731_create_delayed_jobs.rb b/db/migrate/20140410213731_create_delayed_jobs.rb deleted file mode 100644 index ec0dd93..0000000 --- a/db/migrate/20140410213731_create_delayed_jobs.rb +++ /dev/null @@ -1,22 +0,0 @@ -class CreateDelayedJobs < ActiveRecord::Migration - def self.up - create_table :delayed_jobs, :force => true do |table| - table.integer :priority, :default => 0, :null => false # Allows some jobs to jump to the front of the queue - table.integer :attempts, :default => 0, :null => false # Provides for retries, but still fail eventually. - table.text :handler, :null => false # YAML-encoded string of the object that will do work - table.text :last_error # reason for last failure (See Note below) - table.datetime :run_at # When to run. Could be Time.zone.now for immediately, or sometime in the future. - table.datetime :locked_at # Set when a client is working on this object - table.datetime :failed_at # Set when all retries have failed (actually, by default, the record is deleted instead) - table.string :locked_by # Who is working on this object (if locked) - table.string :queue # The name of the queue this job is in - table.timestamps - end - - add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority' - end - - def self.down - drop_table :delayed_jobs - end -end diff --git a/db/migrate/20140410213738_create_servers.rb b/db/migrate/20140410213738_create_servers.rb deleted file mode 100644 index fbe1b02..0000000 --- a/db/migrate/20140410213738_create_servers.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateServers < ActiveRecord::Migration - def change - create_table :servers do |t| - t.integer :default_user_permissions - - t.timestamps - end - end -end diff --git a/db/migrate/20140410213745_create_matches.rb b/db/migrate/20140410213745_create_matches.rb deleted file mode 100644 index bdeb1cd..0000000 --- a/db/migrate/20140410213745_create_matches.rb +++ /dev/null @@ -1,14 +0,0 @@ -class CreateMatches < ActiveRecord::Migration - def change - create_table :matches do |t| - t.integer :status - t.references :tournament, index: true - t.string :name - t.references :winner, index: true - t.string :remote_id - t.integer :submitted_peer_evaluations - - t.timestamps - end - end -end diff --git a/db/migrate/20140410213752_create_teams.rb b/db/migrate/20140410213752_create_teams.rb deleted file mode 100644 index fdf9a68..0000000 --- a/db/migrate/20140410213752_create_teams.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateTeams < ActiveRecord::Migration - def change - create_table :teams do |t| - t.references :match, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140410213758_create_alerts.rb b/db/migrate/20140410213758_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140410213758_create_alerts.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateAlerts < ActiveRecord::Migration - def change - create_table :alerts do |t| - t.references :author, index: true - t.text :message - - t.timestamps - end - end -end diff --git a/db/migrate/20140410213805_create_pms.rb b/db/migrate/20140410213805_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140410213805_create_pms.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreatePms < ActiveRecord::Migration - def change - create_table :pms do |t| - t.references :author, index: true - t.references :recipient, index: true - t.text :message - - t.timestamps - end - end -end diff --git a/db/migrate/20140410213811_create_tournaments.rb b/db/migrate/20140410213811_create_tournaments.rb deleted file mode 100644 index c0d8929..0000000 --- a/db/migrate/20140410213811_create_tournaments.rb +++ /dev/null @@ -1,17 +0,0 @@ -class CreateTournaments < ActiveRecord::Migration - def change - create_table :tournaments do |t| - t.string :name - t.references :game, index: true - t.integer :status - t.integer :min_players_per_team - t.integer :max_players_per_team - t.integer :min_teams_per_match - t.integer :max_teams_per_match - t.integer :set_rounds - t.boolean :randomized_teams - - t.timestamps - end - end -end diff --git a/db/migrate/20140410213818_create_games.rb b/db/migrate/20140410213818_create_games.rb deleted file mode 100644 index 5e4f56f..0000000 --- a/db/migrate/20140410213818_create_games.rb +++ /dev/null @@ -1,15 +0,0 @@ -class CreateGames < ActiveRecord::Migration - def change - create_table :games do |t| - t.text :name - t.integer :min_players_per_team - t.integer :max_players_per_team - t.integer :min_teams_per_match - t.integer :max_teams_per_match - t.integer :set_rounds - t.boolean :randomized_teams - - t.timestamps - end - end -end diff --git a/db/migrate/20140410213824_create_users.rb b/db/migrate/20140410213824_create_users.rb deleted file mode 100644 index 8032870..0000000 --- a/db/migrate/20140410213824_create_users.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateUsers < ActiveRecord::Migration - def change - create_table :users do |t| - t.string :name - t.string :email - t.string :user_name - - t.timestamps - end - add_index :users, :email, unique: true - add_index :users, :user_name, unique: true - end -end diff --git a/db/migrate/20140410213831_create_sessions.rb b/db/migrate/20140410213831_create_sessions.rb deleted file mode 100644 index f667f1e..0000000 --- a/db/migrate/20140410213831_create_sessions.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateSessions < ActiveRecord::Migration - def change - create_table :sessions do |t| - t.references :user, index: true - t.string :token - - t.timestamps - end - add_index :sessions, :token, unique: true - end -end diff --git a/db/migrate/20140410213838_create_brackets.rb b/db/migrate/20140410213838_create_brackets.rb deleted file mode 100644 index 8813bf2..0000000 --- a/db/migrate/20140410213838_create_brackets.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateBrackets < ActiveRecord::Migration - def change - create_table :brackets do |t| - t.references :user, index: true - t.references :tournament, index: true - t.string :name - - t.timestamps - end - end -end diff --git a/db/migrate/20140410213844_create_server_settings.rb b/db/migrate/20140410213844_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140410213844_create_server_settings.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateServerSettings < ActiveRecord::Migration - def change - create_table :server_settings do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140410213851_create_game_settings.rb b/db/migrate/20140410213851_create_game_settings.rb deleted file mode 100644 index b1caf5d..0000000 --- a/db/migrate/20140410213851_create_game_settings.rb +++ /dev/null @@ -1,15 +0,0 @@ -class CreateGameSettings < ActiveRecord::Migration - def change - create_table :game_settings do |t| - t.references :game, index: true - t.integer :stype - t.string :name - t.text :default - t.text :description - t.text :type_opt - t.integer :display_order - - t.timestamps - end - end -end diff --git a/db/migrate/20140410213857_create_tournament_preferences.rb b/db/migrate/20140410213857_create_tournament_preferences.rb deleted file mode 100644 index 991d659..0000000 --- a/db/migrate/20140410213857_create_tournament_preferences.rb +++ /dev/null @@ -1,12 +0,0 @@ -class CreateTournamentPreferences < ActiveRecord::Migration - def change - create_table :tournament_preferences do |t| - t.references :tournament, index: true - t.integer :vartype - t.string :name - t.text :value - - t.timestamps - end - end -end diff --git a/db/migrate/20140410213903_create_scores.rb b/db/migrate/20140410213903_create_scores.rb deleted file mode 100644 index 4ca0b0b..0000000 --- a/db/migrate/20140410213903_create_scores.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateScores < ActiveRecord::Migration - def change - create_table :scores do |t| - t.references :user, index: true - t.references :match, index: true - t.integer :value - - t.timestamps - end - end -end diff --git a/db/migrate/20140410213909_create_remote_usernames.rb b/db/migrate/20140410213909_create_remote_usernames.rb deleted file mode 100644 index e265985..0000000 --- a/db/migrate/20140410213909_create_remote_usernames.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateRemoteUsernames < ActiveRecord::Migration - def change - create_table :remote_usernames do |t| - t.references :game, index: true - t.references :user, index: true - t.text :json_value - - t.timestamps - end - end -end diff --git a/db/migrate/20140410213916_create_bracket_matches.rb b/db/migrate/20140410213916_create_bracket_matches.rb deleted file mode 100644 index 3323e31..0000000 --- a/db/migrate/20140410213916_create_bracket_matches.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateBracketMatches < ActiveRecord::Migration - def change - create_table :bracket_matches do |t| - t.references :bracket, index: true - t.references :match, index: true - t.references :predicted_winner, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140410213922_create_tournament_players_join_table.rb b/db/migrate/20140410213922_create_tournament_players_join_table.rb deleted file mode 100644 index be240e8..0000000 --- a/db/migrate/20140410213922_create_tournament_players_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTournamentPlayersJoinTable < ActiveRecord::Migration - def change - create_join_table :players, :tournaments do |t| - # t.index [:player_id, :tournament_id] - # t.index [:tournament_id, :player_id] - end - end -end diff --git a/db/migrate/20140410213928_create_tournament_hosts_join_table.rb b/db/migrate/20140410213928_create_tournament_hosts_join_table.rb deleted file mode 100644 index 7521d89..0000000 --- a/db/migrate/20140410213928_create_tournament_hosts_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTournamentHostsJoinTable < ActiveRecord::Migration - def change - create_join_table :hosts, :tournaments do |t| - # t.index [:host_id, :tournament_id] - # t.index [:tournament_id, :host_id] - end - end -end diff --git a/db/migrate/20140410213935_create_team_user_join_table.rb b/db/migrate/20140410213935_create_team_user_join_table.rb deleted file mode 100644 index f3b57fc..0000000 --- a/db/migrate/20140410213935_create_team_user_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTeamUserJoinTable < ActiveRecord::Migration - def change - create_join_table :teams, :users do |t| - # t.index [:team_id, :user_id] - # t.index [:user_id, :team_id] - end - end -end diff --git a/db/migrate/20140410213941_create_match_team_join_table.rb b/db/migrate/20140410213941_create_match_team_join_table.rb deleted file mode 100644 index c2ed1b7..0000000 --- a/db/migrate/20140410213941_create_match_team_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateMatchTeamJoinTable < ActiveRecord::Migration - def change - create_join_table :matches, :teams do |t| - # t.index [:match_id, :team_id] - # t.index [:team_id, :match_id] - end - end -end diff --git a/db/migrate/20140410214006_add_hidden_attrs_to_user.rb b/db/migrate/20140410214006_add_hidden_attrs_to_user.rb deleted file mode 100644 index 9b5c505..0000000 --- a/db/migrate/20140410214006_add_hidden_attrs_to_user.rb +++ /dev/null @@ -1,6 +0,0 @@ -class AddHiddenAttrsToUser < ActiveRecord::Migration - def change - add_column :users, :password_digest, :string - add_column :users, :permissions, :integer - end -end diff --git a/db/migrate/20140421095649_create_simple_captcha_data.rb b/db/migrate/20140421095649_create_simple_captcha_data.rb new file mode 100644 index 0000000..4573b20 --- /dev/null +++ b/db/migrate/20140421095649_create_simple_captcha_data.rb @@ -0,0 +1,15 @@ +class CreateSimpleCaptchaData < ActiveRecord::Migration + def self.up + create_table :simple_captcha_data do |t| + t.string :key, :limit => 40 + t.string :value, :limit => 6 + t.timestamps + end + + add_index :simple_captcha_data, :key, :name => "idx_key" + end + + def self.down + drop_table :simple_captcha_data + end +end diff --git a/db/migrate/20140421135652_create_delayed_jobs.rb b/db/migrate/20140421135652_create_delayed_jobs.rb new file mode 100644 index 0000000..ec0dd93 --- /dev/null +++ b/db/migrate/20140421135652_create_delayed_jobs.rb @@ -0,0 +1,22 @@ +class CreateDelayedJobs < ActiveRecord::Migration + def self.up + create_table :delayed_jobs, :force => true do |table| + table.integer :priority, :default => 0, :null => false # Allows some jobs to jump to the front of the queue + table.integer :attempts, :default => 0, :null => false # Provides for retries, but still fail eventually. + table.text :handler, :null => false # YAML-encoded string of the object that will do work + table.text :last_error # reason for last failure (See Note below) + table.datetime :run_at # When to run. Could be Time.zone.now for immediately, or sometime in the future. + table.datetime :locked_at # Set when a client is working on this object + table.datetime :failed_at # Set when all retries have failed (actually, by default, the record is deleted instead) + table.string :locked_by # Who is working on this object (if locked) + table.string :queue # The name of the queue this job is in + table.timestamps + end + + add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority' + end + + def self.down + drop_table :delayed_jobs + end +end diff --git a/db/migrate/20140421135654_create_servers.rb b/db/migrate/20140421135654_create_servers.rb new file mode 100644 index 0000000..fbe1b02 --- /dev/null +++ b/db/migrate/20140421135654_create_servers.rb @@ -0,0 +1,9 @@ +class CreateServers < ActiveRecord::Migration + def change + create_table :servers do |t| + t.integer :default_user_permissions + + t.timestamps + end + end +end diff --git a/db/migrate/20140421135657_create_matches.rb b/db/migrate/20140421135657_create_matches.rb new file mode 100644 index 0000000..bdeb1cd --- /dev/null +++ b/db/migrate/20140421135657_create_matches.rb @@ -0,0 +1,14 @@ +class CreateMatches < ActiveRecord::Migration + def change + create_table :matches do |t| + t.integer :status + t.references :tournament, index: true + t.string :name + t.references :winner, index: true + t.string :remote_id + t.integer :submitted_peer_evaluations + + t.timestamps + end + end +end diff --git a/db/migrate/20140421135700_create_teams.rb b/db/migrate/20140421135700_create_teams.rb new file mode 100644 index 0000000..fdf9a68 --- /dev/null +++ b/db/migrate/20140421135700_create_teams.rb @@ -0,0 +1,9 @@ +class CreateTeams < ActiveRecord::Migration + def change + create_table :teams do |t| + t.references :match, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140421135703_create_alerts.rb b/db/migrate/20140421135703_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140421135703_create_alerts.rb @@ -0,0 +1,10 @@ +class CreateAlerts < ActiveRecord::Migration + def change + create_table :alerts do |t| + t.references :author, index: true + t.text :message + + t.timestamps + end + end +end diff --git a/db/migrate/20140421135706_create_pms.rb b/db/migrate/20140421135706_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140421135706_create_pms.rb @@ -0,0 +1,11 @@ +class CreatePms < ActiveRecord::Migration + def change + create_table :pms do |t| + t.references :author, index: true + t.references :recipient, index: true + t.text :message + + t.timestamps + end + end +end diff --git a/db/migrate/20140421135709_create_tournaments.rb b/db/migrate/20140421135709_create_tournaments.rb new file mode 100644 index 0000000..c0d8929 --- /dev/null +++ b/db/migrate/20140421135709_create_tournaments.rb @@ -0,0 +1,17 @@ +class CreateTournaments < ActiveRecord::Migration + def change + create_table :tournaments do |t| + t.string :name + t.references :game, index: true + t.integer :status + t.integer :min_players_per_team + t.integer :max_players_per_team + t.integer :min_teams_per_match + t.integer :max_teams_per_match + t.integer :set_rounds + t.boolean :randomized_teams + + t.timestamps + end + end +end diff --git a/db/migrate/20140421135712_create_games.rb b/db/migrate/20140421135712_create_games.rb new file mode 100644 index 0000000..5e4f56f --- /dev/null +++ b/db/migrate/20140421135712_create_games.rb @@ -0,0 +1,15 @@ +class CreateGames < ActiveRecord::Migration + def change + create_table :games do |t| + t.text :name + t.integer :min_players_per_team + t.integer :max_players_per_team + t.integer :min_teams_per_match + t.integer :max_teams_per_match + t.integer :set_rounds + t.boolean :randomized_teams + + t.timestamps + end + end +end diff --git a/db/migrate/20140421135715_create_users.rb b/db/migrate/20140421135715_create_users.rb new file mode 100644 index 0000000..8032870 --- /dev/null +++ b/db/migrate/20140421135715_create_users.rb @@ -0,0 +1,13 @@ +class CreateUsers < ActiveRecord::Migration + def change + create_table :users do |t| + t.string :name + t.string :email + t.string :user_name + + t.timestamps + end + add_index :users, :email, unique: true + add_index :users, :user_name, unique: true + end +end diff --git a/db/migrate/20140421135718_create_sessions.rb b/db/migrate/20140421135718_create_sessions.rb new file mode 100644 index 0000000..f667f1e --- /dev/null +++ b/db/migrate/20140421135718_create_sessions.rb @@ -0,0 +1,11 @@ +class CreateSessions < ActiveRecord::Migration + def change + create_table :sessions do |t| + t.references :user, index: true + t.string :token + + t.timestamps + end + add_index :sessions, :token, unique: true + end +end diff --git a/db/migrate/20140421135721_create_brackets.rb b/db/migrate/20140421135721_create_brackets.rb new file mode 100644 index 0000000..8813bf2 --- /dev/null +++ b/db/migrate/20140421135721_create_brackets.rb @@ -0,0 +1,11 @@ +class CreateBrackets < ActiveRecord::Migration + def change + create_table :brackets do |t| + t.references :user, index: true + t.references :tournament, index: true + t.string :name + + t.timestamps + end + end +end diff --git a/db/migrate/20140421135723_create_server_settings.rb b/db/migrate/20140421135723_create_server_settings.rb new file mode 100644 index 0000000..dfdd91b --- /dev/null +++ b/db/migrate/20140421135723_create_server_settings.rb @@ -0,0 +1,8 @@ +class CreateServerSettings < ActiveRecord::Migration + def change + create_table :server_settings do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140421135726_create_game_settings.rb b/db/migrate/20140421135726_create_game_settings.rb new file mode 100644 index 0000000..b1caf5d --- /dev/null +++ b/db/migrate/20140421135726_create_game_settings.rb @@ -0,0 +1,15 @@ +class CreateGameSettings < ActiveRecord::Migration + def change + create_table :game_settings do |t| + t.references :game, index: true + t.integer :stype + t.string :name + t.text :default + t.text :description + t.text :type_opt + t.integer :display_order + + t.timestamps + end + end +end diff --git a/db/migrate/20140421135729_create_tournament_settings.rb b/db/migrate/20140421135729_create_tournament_settings.rb new file mode 100644 index 0000000..a2e8e66 --- /dev/null +++ b/db/migrate/20140421135729_create_tournament_settings.rb @@ -0,0 +1,12 @@ +class CreateTournamentSettings < ActiveRecord::Migration + def change + create_table :tournament_settings do |t| + t.references :tournament, index: true + t.integer :vartype + t.string :name + t.text :value + + t.timestamps + end + end +end diff --git a/db/migrate/20140421135732_create_scores.rb b/db/migrate/20140421135732_create_scores.rb new file mode 100644 index 0000000..4ca0b0b --- /dev/null +++ b/db/migrate/20140421135732_create_scores.rb @@ -0,0 +1,11 @@ +class CreateScores < ActiveRecord::Migration + def change + create_table :scores do |t| + t.references :user, index: true + t.references :match, index: true + t.integer :value + + t.timestamps + end + end +end diff --git a/db/migrate/20140421135735_create_remote_usernames.rb b/db/migrate/20140421135735_create_remote_usernames.rb new file mode 100644 index 0000000..e265985 --- /dev/null +++ b/db/migrate/20140421135735_create_remote_usernames.rb @@ -0,0 +1,11 @@ +class CreateRemoteUsernames < ActiveRecord::Migration + def change + create_table :remote_usernames do |t| + t.references :game, index: true + t.references :user, index: true + t.text :json_value + + t.timestamps + end + end +end diff --git a/db/migrate/20140421135738_create_bracket_matches.rb b/db/migrate/20140421135738_create_bracket_matches.rb new file mode 100644 index 0000000..3323e31 --- /dev/null +++ b/db/migrate/20140421135738_create_bracket_matches.rb @@ -0,0 +1,11 @@ +class CreateBracketMatches < ActiveRecord::Migration + def change + create_table :bracket_matches do |t| + t.references :bracket, index: true + t.references :match, index: true + t.references :predicted_winner, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140421135741_create_api_requests.rb b/db/migrate/20140421135741_create_api_requests.rb new file mode 100644 index 0000000..544c330 --- /dev/null +++ b/db/migrate/20140421135741_create_api_requests.rb @@ -0,0 +1,9 @@ +class CreateApiRequests < ActiveRecord::Migration + def change + create_table :api_requests do |t| + t.string :api_name + + t.timestamps + end + end +end diff --git a/db/migrate/20140421135744_create_tournament_players_join_table.rb b/db/migrate/20140421135744_create_tournament_players_join_table.rb new file mode 100644 index 0000000..be240e8 --- /dev/null +++ b/db/migrate/20140421135744_create_tournament_players_join_table.rb @@ -0,0 +1,8 @@ +class CreateTournamentPlayersJoinTable < ActiveRecord::Migration + def change + create_join_table :players, :tournaments do |t| + # t.index [:player_id, :tournament_id] + # t.index [:tournament_id, :player_id] + end + end +end diff --git a/db/migrate/20140421135747_create_tournament_hosts_join_table.rb b/db/migrate/20140421135747_create_tournament_hosts_join_table.rb new file mode 100644 index 0000000..7521d89 --- /dev/null +++ b/db/migrate/20140421135747_create_tournament_hosts_join_table.rb @@ -0,0 +1,8 @@ +class CreateTournamentHostsJoinTable < ActiveRecord::Migration + def change + create_join_table :hosts, :tournaments do |t| + # t.index [:host_id, :tournament_id] + # t.index [:tournament_id, :host_id] + end + end +end diff --git a/db/migrate/20140421135749_create_team_user_join_table.rb b/db/migrate/20140421135749_create_team_user_join_table.rb new file mode 100644 index 0000000..f3b57fc --- /dev/null +++ b/db/migrate/20140421135749_create_team_user_join_table.rb @@ -0,0 +1,8 @@ +class CreateTeamUserJoinTable < ActiveRecord::Migration + def change + create_join_table :teams, :users do |t| + # t.index [:team_id, :user_id] + # t.index [:user_id, :team_id] + end + end +end diff --git a/db/migrate/20140421135752_create_match_team_join_table.rb b/db/migrate/20140421135752_create_match_team_join_table.rb new file mode 100644 index 0000000..c2ed1b7 --- /dev/null +++ b/db/migrate/20140421135752_create_match_team_join_table.rb @@ -0,0 +1,8 @@ +class CreateMatchTeamJoinTable < ActiveRecord::Migration + def change + create_join_table :matches, :teams do |t| + # t.index [:match_id, :team_id] + # t.index [:team_id, :match_id] + end + end +end diff --git a/db/migrate/20140421135803_add_hidden_attrs_to_user.rb b/db/migrate/20140421135803_add_hidden_attrs_to_user.rb new file mode 100644 index 0000000..9b5c505 --- /dev/null +++ b/db/migrate/20140421135803_add_hidden_attrs_to_user.rb @@ -0,0 +1,6 @@ +class AddHiddenAttrsToUser < ActiveRecord::Migration + def change + add_column :users, :password_digest, :string + add_column :users, :permissions, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index e6ad821..82ba3d5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140410214006) do +ActiveRecord::Schema.define(version: 20140421135803) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -22,6 +22,12 @@ ActiveRecord::Schema.define(version: 20140410214006) do add_index "alerts", ["author_id"], name: "index_alerts_on_author_id" + create_table "api_requests", force: true do |t| + t.string "api_name" + t.datetime "created_at" + t.datetime "updated_at" + end + create_table "bracket_matches", force: true do |t| t.integer "bracket_id" t.integer "match_id" @@ -192,7 +198,7 @@ ActiveRecord::Schema.define(version: 20140410214006) do t.integer "user_id", null: false end - create_table "tournament_preferences", force: true do |t| + create_table "tournament_settings", force: true do |t| t.integer "tournament_id" t.integer "vartype" t.string "name" @@ -201,7 +207,7 @@ ActiveRecord::Schema.define(version: 20140410214006) do t.datetime "updated_at" end - add_index "tournament_preferences", ["tournament_id"], name: "index_tournament_preferences_on_tournament_id" + add_index "tournament_settings", ["tournament_id"], name: "index_tournament_settings_on_tournament_id" create_table "tournaments", force: true do |t| t.string "name" diff --git a/test/fixtures/api_requests.yml b/test/fixtures/api_requests.yml new file mode 100644 index 0000000..8739914 --- /dev/null +++ b/test/fixtures/api_requests.yml @@ -0,0 +1,7 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + api_name: MyString + +two: + api_name: MyString diff --git a/test/fixtures/tournament_preferences.yml b/test/fixtures/tournament_preferences.yml deleted file mode 100644 index aa5eaef..0000000 --- a/test/fixtures/tournament_preferences.yml +++ /dev/null @@ -1,13 +0,0 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - tournament_id: - vartype: 1 - name: MyString - value: MyText - -two: - tournament_id: - vartype: 1 - name: MyString - value: MyText diff --git a/test/fixtures/tournament_settings.yml b/test/fixtures/tournament_settings.yml new file mode 100644 index 0000000..aa5eaef --- /dev/null +++ b/test/fixtures/tournament_settings.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + tournament_id: + vartype: 1 + name: MyString + value: MyText + +two: + tournament_id: + vartype: 1 + name: MyString + value: MyText diff --git a/test/models/api_requests_test.rb b/test/models/api_requests_test.rb new file mode 100644 index 0000000..18763a7 --- /dev/null +++ b/test/models/api_requests_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class ApiRequestsTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/tournament_preference_test.rb b/test/models/tournament_preference_test.rb deleted file mode 100644 index e200b8e..0000000 --- a/test/models/tournament_preference_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class TournamentPreferenceTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end -end diff --git a/test/models/tournament_setting_test.rb b/test/models/tournament_setting_test.rb new file mode 100644 index 0000000..644df85 --- /dev/null +++ b/test/models/tournament_setting_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class TournamentSettingTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end -- cgit v1.2.3-54-g00ecf From 73576f4dd2e0115d3e78839b398e784a7ff9667a Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 21 Apr 2014 10:34:13 -0400 Subject: normalize field names between {game,tournament}_setting --- generate.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/generate.sh b/generate.sh index 059d3f8..ce9bcd5 100755 --- a/generate.sh +++ b/generate.sh @@ -40,8 +40,9 @@ bundle exec rails generate scaffold bracket user:references tournament:reference # Just models bundle exec rails generate model server_setting -bundle exec rails generate model game_setting game:references stype:integer name:string default:text description:text type_opt:text display_order:integer -bundle exec rails generate model tournament_setting tournament:references vartype:integer name:string value:text +bundle exec rails generate model game_setting game:references name:string vartype:integer type_opt:text description:text display_order:integer default:text +bundle exec rails generate model tournament_setting tournament:references name:string vartype:integer type_opt:text description:text display_order:integer value:text + bundle exec rails generate model score user:references match:references value:integer bundle exec rails generate model remote_username game:references user:references json_value:text bundle exec rails generate model bracket_match bracket:references match:references predicted_winner:references -- cgit v1.2.3-54-g00ecf From d768e5140cef66599b319000f21a27e289e2097b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 21 Apr 2014 10:34:28 -0400 Subject: generate.sh: remove the 'server_setting' model --- generate.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/generate.sh b/generate.sh index ce9bcd5..7bf87e5 100755 --- a/generate.sh +++ b/generate.sh @@ -39,7 +39,6 @@ bundle exec rails generate scaffold session user:references token:string:uniq bundle exec rails generate scaffold bracket user:references tournament:references name:string # Just models -bundle exec rails generate model server_setting bundle exec rails generate model game_setting game:references name:string vartype:integer type_opt:text description:text display_order:integer default:text bundle exec rails generate model tournament_setting tournament:references name:string vartype:integer type_opt:text description:text display_order:integer value:text -- cgit v1.2.3-54-g00ecf From c3d46241a2298ecec052332c1767a65b010cf9a1 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 21 Apr 2014 10:33:46 -0400 Subject: run ./generate.sh --- app/models/server_setting.rb | 2 -- .../20140421095649_create_simple_captcha_data.rb | 15 --------------- .../20140421103137_create_simple_captcha_data.rb | 15 +++++++++++++++ db/migrate/20140421135652_create_delayed_jobs.rb | 22 ---------------------- db/migrate/20140421135654_create_servers.rb | 9 --------- db/migrate/20140421135657_create_matches.rb | 14 -------------- db/migrate/20140421135700_create_teams.rb | 9 --------- db/migrate/20140421135703_create_alerts.rb | 10 ---------- db/migrate/20140421135706_create_pms.rb | 11 ----------- db/migrate/20140421135709_create_tournaments.rb | 17 ----------------- db/migrate/20140421135712_create_games.rb | 15 --------------- db/migrate/20140421135715_create_users.rb | 13 ------------- db/migrate/20140421135718_create_sessions.rb | 11 ----------- db/migrate/20140421135721_create_brackets.rb | 11 ----------- .../20140421135723_create_server_settings.rb | 8 -------- db/migrate/20140421135726_create_game_settings.rb | 15 --------------- .../20140421135729_create_tournament_settings.rb | 12 ------------ db/migrate/20140421135732_create_scores.rb | 11 ----------- .../20140421135735_create_remote_usernames.rb | 11 ----------- .../20140421135738_create_bracket_matches.rb | 11 ----------- db/migrate/20140421135741_create_api_requests.rb | 9 --------- ...1135744_create_tournament_players_join_table.rb | 8 -------- ...421135747_create_tournament_hosts_join_table.rb | 8 -------- .../20140421135749_create_team_user_join_table.rb | 8 -------- .../20140421135752_create_match_team_join_table.rb | 8 -------- .../20140421135803_add_hidden_attrs_to_user.rb | 6 ------ db/migrate/20140421143140_create_delayed_jobs.rb | 22 ++++++++++++++++++++++ db/migrate/20140421143143_create_servers.rb | 9 +++++++++ db/migrate/20140421143146_create_matches.rb | 14 ++++++++++++++ db/migrate/20140421143149_create_teams.rb | 9 +++++++++ db/migrate/20140421143152_create_alerts.rb | 10 ++++++++++ db/migrate/20140421143155_create_pms.rb | 11 +++++++++++ db/migrate/20140421143158_create_tournaments.rb | 17 +++++++++++++++++ db/migrate/20140421143201_create_games.rb | 15 +++++++++++++++ db/migrate/20140421143204_create_users.rb | 13 +++++++++++++ db/migrate/20140421143207_create_sessions.rb | 11 +++++++++++ db/migrate/20140421143210_create_brackets.rb | 11 +++++++++++ db/migrate/20140421143213_create_game_settings.rb | 15 +++++++++++++++ .../20140421143216_create_tournament_settings.rb | 15 +++++++++++++++ db/migrate/20140421143219_create_scores.rb | 11 +++++++++++ .../20140421143222_create_remote_usernames.rb | 11 +++++++++++ .../20140421143225_create_bracket_matches.rb | 11 +++++++++++ db/migrate/20140421143228_create_api_requests.rb | 9 +++++++++ ...1143231_create_tournament_players_join_table.rb | 8 ++++++++ ...421143234_create_tournament_hosts_join_table.rb | 8 ++++++++ .../20140421143237_create_team_user_join_table.rb | 8 ++++++++ .../20140421143239_create_match_team_join_table.rb | 8 ++++++++ .../20140421143251_add_hidden_attrs_to_user.rb | 6 ++++++ db/schema.rb | 18 ++++++++---------- test/fixtures/game_settings.yml | 12 ++++++------ test/fixtures/server_settings.yml | 11 ----------- test/fixtures/tournament_settings.yml | 10 ++++++++-- test/models/server_setting_test.rb | 7 ------- 53 files changed, 289 insertions(+), 310 deletions(-) delete mode 100644 app/models/server_setting.rb delete mode 100644 db/migrate/20140421095649_create_simple_captcha_data.rb create mode 100644 db/migrate/20140421103137_create_simple_captcha_data.rb delete mode 100644 db/migrate/20140421135652_create_delayed_jobs.rb delete mode 100644 db/migrate/20140421135654_create_servers.rb delete mode 100644 db/migrate/20140421135657_create_matches.rb delete mode 100644 db/migrate/20140421135700_create_teams.rb delete mode 100644 db/migrate/20140421135703_create_alerts.rb delete mode 100644 db/migrate/20140421135706_create_pms.rb delete mode 100644 db/migrate/20140421135709_create_tournaments.rb delete mode 100644 db/migrate/20140421135712_create_games.rb delete mode 100644 db/migrate/20140421135715_create_users.rb delete mode 100644 db/migrate/20140421135718_create_sessions.rb delete mode 100644 db/migrate/20140421135721_create_brackets.rb delete mode 100644 db/migrate/20140421135723_create_server_settings.rb delete mode 100644 db/migrate/20140421135726_create_game_settings.rb delete mode 100644 db/migrate/20140421135729_create_tournament_settings.rb delete mode 100644 db/migrate/20140421135732_create_scores.rb delete mode 100644 db/migrate/20140421135735_create_remote_usernames.rb delete mode 100644 db/migrate/20140421135738_create_bracket_matches.rb delete mode 100644 db/migrate/20140421135741_create_api_requests.rb delete mode 100644 db/migrate/20140421135744_create_tournament_players_join_table.rb delete mode 100644 db/migrate/20140421135747_create_tournament_hosts_join_table.rb delete mode 100644 db/migrate/20140421135749_create_team_user_join_table.rb delete mode 100644 db/migrate/20140421135752_create_match_team_join_table.rb delete mode 100644 db/migrate/20140421135803_add_hidden_attrs_to_user.rb create mode 100644 db/migrate/20140421143140_create_delayed_jobs.rb create mode 100644 db/migrate/20140421143143_create_servers.rb create mode 100644 db/migrate/20140421143146_create_matches.rb create mode 100644 db/migrate/20140421143149_create_teams.rb create mode 100644 db/migrate/20140421143152_create_alerts.rb create mode 100644 db/migrate/20140421143155_create_pms.rb create mode 100644 db/migrate/20140421143158_create_tournaments.rb create mode 100644 db/migrate/20140421143201_create_games.rb create mode 100644 db/migrate/20140421143204_create_users.rb create mode 100644 db/migrate/20140421143207_create_sessions.rb create mode 100644 db/migrate/20140421143210_create_brackets.rb create mode 100644 db/migrate/20140421143213_create_game_settings.rb create mode 100644 db/migrate/20140421143216_create_tournament_settings.rb create mode 100644 db/migrate/20140421143219_create_scores.rb create mode 100644 db/migrate/20140421143222_create_remote_usernames.rb create mode 100644 db/migrate/20140421143225_create_bracket_matches.rb create mode 100644 db/migrate/20140421143228_create_api_requests.rb create mode 100644 db/migrate/20140421143231_create_tournament_players_join_table.rb create mode 100644 db/migrate/20140421143234_create_tournament_hosts_join_table.rb create mode 100644 db/migrate/20140421143237_create_team_user_join_table.rb create mode 100644 db/migrate/20140421143239_create_match_team_join_table.rb create mode 100644 db/migrate/20140421143251_add_hidden_attrs_to_user.rb delete mode 100644 test/fixtures/server_settings.yml delete mode 100644 test/models/server_setting_test.rb diff --git a/app/models/server_setting.rb b/app/models/server_setting.rb deleted file mode 100644 index 28ae943..0000000 --- a/app/models/server_setting.rb +++ /dev/null @@ -1,2 +0,0 @@ -class ServerSetting < ActiveRecord::Base -end diff --git a/db/migrate/20140421095649_create_simple_captcha_data.rb b/db/migrate/20140421095649_create_simple_captcha_data.rb deleted file mode 100644 index 4573b20..0000000 --- a/db/migrate/20140421095649_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/20140421103137_create_simple_captcha_data.rb b/db/migrate/20140421103137_create_simple_captcha_data.rb new file mode 100644 index 0000000..4573b20 --- /dev/null +++ b/db/migrate/20140421103137_create_simple_captcha_data.rb @@ -0,0 +1,15 @@ +class CreateSimpleCaptchaData < ActiveRecord::Migration + def self.up + create_table :simple_captcha_data do |t| + t.string :key, :limit => 40 + t.string :value, :limit => 6 + t.timestamps + end + + add_index :simple_captcha_data, :key, :name => "idx_key" + end + + def self.down + drop_table :simple_captcha_data + end +end diff --git a/db/migrate/20140421135652_create_delayed_jobs.rb b/db/migrate/20140421135652_create_delayed_jobs.rb deleted file mode 100644 index ec0dd93..0000000 --- a/db/migrate/20140421135652_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/20140421135654_create_servers.rb b/db/migrate/20140421135654_create_servers.rb deleted file mode 100644 index fbe1b02..0000000 --- a/db/migrate/20140421135654_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/20140421135657_create_matches.rb b/db/migrate/20140421135657_create_matches.rb deleted file mode 100644 index bdeb1cd..0000000 --- a/db/migrate/20140421135657_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/20140421135700_create_teams.rb b/db/migrate/20140421135700_create_teams.rb deleted file mode 100644 index fdf9a68..0000000 --- a/db/migrate/20140421135700_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/20140421135703_create_alerts.rb b/db/migrate/20140421135703_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140421135703_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/20140421135706_create_pms.rb b/db/migrate/20140421135706_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140421135706_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/20140421135709_create_tournaments.rb b/db/migrate/20140421135709_create_tournaments.rb deleted file mode 100644 index c0d8929..0000000 --- a/db/migrate/20140421135709_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/20140421135712_create_games.rb b/db/migrate/20140421135712_create_games.rb deleted file mode 100644 index 5e4f56f..0000000 --- a/db/migrate/20140421135712_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/20140421135715_create_users.rb b/db/migrate/20140421135715_create_users.rb deleted file mode 100644 index 8032870..0000000 --- a/db/migrate/20140421135715_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/20140421135718_create_sessions.rb b/db/migrate/20140421135718_create_sessions.rb deleted file mode 100644 index f667f1e..0000000 --- a/db/migrate/20140421135718_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/20140421135721_create_brackets.rb b/db/migrate/20140421135721_create_brackets.rb deleted file mode 100644 index 8813bf2..0000000 --- a/db/migrate/20140421135721_create_brackets.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateBrackets < ActiveRecord::Migration - def change - create_table :brackets do |t| - t.references :user, index: true - t.references :tournament, index: true - t.string :name - - t.timestamps - end - end -end diff --git a/db/migrate/20140421135723_create_server_settings.rb b/db/migrate/20140421135723_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140421135723_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/20140421135726_create_game_settings.rb b/db/migrate/20140421135726_create_game_settings.rb deleted file mode 100644 index b1caf5d..0000000 --- a/db/migrate/20140421135726_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/20140421135729_create_tournament_settings.rb b/db/migrate/20140421135729_create_tournament_settings.rb deleted file mode 100644 index a2e8e66..0000000 --- a/db/migrate/20140421135729_create_tournament_settings.rb +++ /dev/null @@ -1,12 +0,0 @@ -class CreateTournamentSettings < ActiveRecord::Migration - def change - create_table :tournament_settings do |t| - t.references :tournament, index: true - t.integer :vartype - t.string :name - t.text :value - - t.timestamps - end - end -end diff --git a/db/migrate/20140421135732_create_scores.rb b/db/migrate/20140421135732_create_scores.rb deleted file mode 100644 index 4ca0b0b..0000000 --- a/db/migrate/20140421135732_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/20140421135735_create_remote_usernames.rb b/db/migrate/20140421135735_create_remote_usernames.rb deleted file mode 100644 index e265985..0000000 --- a/db/migrate/20140421135735_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/20140421135738_create_bracket_matches.rb b/db/migrate/20140421135738_create_bracket_matches.rb deleted file mode 100644 index 3323e31..0000000 --- a/db/migrate/20140421135738_create_bracket_matches.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateBracketMatches < ActiveRecord::Migration - def change - create_table :bracket_matches do |t| - t.references :bracket, index: true - t.references :match, index: true - t.references :predicted_winner, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140421135741_create_api_requests.rb b/db/migrate/20140421135741_create_api_requests.rb deleted file mode 100644 index 544c330..0000000 --- a/db/migrate/20140421135741_create_api_requests.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateApiRequests < ActiveRecord::Migration - def change - create_table :api_requests do |t| - t.string :api_name - - t.timestamps - end - end -end diff --git a/db/migrate/20140421135744_create_tournament_players_join_table.rb b/db/migrate/20140421135744_create_tournament_players_join_table.rb deleted file mode 100644 index be240e8..0000000 --- a/db/migrate/20140421135744_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/20140421135747_create_tournament_hosts_join_table.rb b/db/migrate/20140421135747_create_tournament_hosts_join_table.rb deleted file mode 100644 index 7521d89..0000000 --- a/db/migrate/20140421135747_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/20140421135749_create_team_user_join_table.rb b/db/migrate/20140421135749_create_team_user_join_table.rb deleted file mode 100644 index f3b57fc..0000000 --- a/db/migrate/20140421135749_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/20140421135752_create_match_team_join_table.rb b/db/migrate/20140421135752_create_match_team_join_table.rb deleted file mode 100644 index c2ed1b7..0000000 --- a/db/migrate/20140421135752_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/20140421135803_add_hidden_attrs_to_user.rb b/db/migrate/20140421135803_add_hidden_attrs_to_user.rb deleted file mode 100644 index 9b5c505..0000000 --- a/db/migrate/20140421135803_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/20140421143140_create_delayed_jobs.rb b/db/migrate/20140421143140_create_delayed_jobs.rb new file mode 100644 index 0000000..ec0dd93 --- /dev/null +++ b/db/migrate/20140421143140_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/20140421143143_create_servers.rb b/db/migrate/20140421143143_create_servers.rb new file mode 100644 index 0000000..fbe1b02 --- /dev/null +++ b/db/migrate/20140421143143_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/20140421143146_create_matches.rb b/db/migrate/20140421143146_create_matches.rb new file mode 100644 index 0000000..bdeb1cd --- /dev/null +++ b/db/migrate/20140421143146_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/20140421143149_create_teams.rb b/db/migrate/20140421143149_create_teams.rb new file mode 100644 index 0000000..fdf9a68 --- /dev/null +++ b/db/migrate/20140421143149_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/20140421143152_create_alerts.rb b/db/migrate/20140421143152_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140421143152_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/20140421143155_create_pms.rb b/db/migrate/20140421143155_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140421143155_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/20140421143158_create_tournaments.rb b/db/migrate/20140421143158_create_tournaments.rb new file mode 100644 index 0000000..c0d8929 --- /dev/null +++ b/db/migrate/20140421143158_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/20140421143201_create_games.rb b/db/migrate/20140421143201_create_games.rb new file mode 100644 index 0000000..5e4f56f --- /dev/null +++ b/db/migrate/20140421143201_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/20140421143204_create_users.rb b/db/migrate/20140421143204_create_users.rb new file mode 100644 index 0000000..8032870 --- /dev/null +++ b/db/migrate/20140421143204_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/20140421143207_create_sessions.rb b/db/migrate/20140421143207_create_sessions.rb new file mode 100644 index 0000000..f667f1e --- /dev/null +++ b/db/migrate/20140421143207_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/20140421143210_create_brackets.rb b/db/migrate/20140421143210_create_brackets.rb new file mode 100644 index 0000000..8813bf2 --- /dev/null +++ b/db/migrate/20140421143210_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/20140421143213_create_game_settings.rb b/db/migrate/20140421143213_create_game_settings.rb new file mode 100644 index 0000000..06fb72e --- /dev/null +++ b/db/migrate/20140421143213_create_game_settings.rb @@ -0,0 +1,15 @@ +class CreateGameSettings < ActiveRecord::Migration + def change + create_table :game_settings do |t| + t.references :game, index: true + t.string :name + t.integer :vartype + t.text :type_opt + t.text :description + t.integer :display_order + t.text :default + + t.timestamps + end + end +end diff --git a/db/migrate/20140421143216_create_tournament_settings.rb b/db/migrate/20140421143216_create_tournament_settings.rb new file mode 100644 index 0000000..e56697f --- /dev/null +++ b/db/migrate/20140421143216_create_tournament_settings.rb @@ -0,0 +1,15 @@ +class CreateTournamentSettings < ActiveRecord::Migration + def change + create_table :tournament_settings do |t| + t.references :tournament, index: true + t.string :name + t.integer :vartype + t.text :type_opt + t.text :description + t.integer :display_order + t.text :value + + t.timestamps + end + end +end diff --git a/db/migrate/20140421143219_create_scores.rb b/db/migrate/20140421143219_create_scores.rb new file mode 100644 index 0000000..4ca0b0b --- /dev/null +++ b/db/migrate/20140421143219_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/20140421143222_create_remote_usernames.rb b/db/migrate/20140421143222_create_remote_usernames.rb new file mode 100644 index 0000000..e265985 --- /dev/null +++ b/db/migrate/20140421143222_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/20140421143225_create_bracket_matches.rb b/db/migrate/20140421143225_create_bracket_matches.rb new file mode 100644 index 0000000..3323e31 --- /dev/null +++ b/db/migrate/20140421143225_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/20140421143228_create_api_requests.rb b/db/migrate/20140421143228_create_api_requests.rb new file mode 100644 index 0000000..544c330 --- /dev/null +++ b/db/migrate/20140421143228_create_api_requests.rb @@ -0,0 +1,9 @@ +class CreateApiRequests < ActiveRecord::Migration + def change + create_table :api_requests do |t| + t.string :api_name + + t.timestamps + end + end +end diff --git a/db/migrate/20140421143231_create_tournament_players_join_table.rb b/db/migrate/20140421143231_create_tournament_players_join_table.rb new file mode 100644 index 0000000..be240e8 --- /dev/null +++ b/db/migrate/20140421143231_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/20140421143234_create_tournament_hosts_join_table.rb b/db/migrate/20140421143234_create_tournament_hosts_join_table.rb new file mode 100644 index 0000000..7521d89 --- /dev/null +++ b/db/migrate/20140421143234_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/20140421143237_create_team_user_join_table.rb b/db/migrate/20140421143237_create_team_user_join_table.rb new file mode 100644 index 0000000..f3b57fc --- /dev/null +++ b/db/migrate/20140421143237_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/20140421143239_create_match_team_join_table.rb b/db/migrate/20140421143239_create_match_team_join_table.rb new file mode 100644 index 0000000..c2ed1b7 --- /dev/null +++ b/db/migrate/20140421143239_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/20140421143251_add_hidden_attrs_to_user.rb b/db/migrate/20140421143251_add_hidden_attrs_to_user.rb new file mode 100644 index 0000000..9b5c505 --- /dev/null +++ b/db/migrate/20140421143251_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 82ba3d5..8e13073 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: 20140421135803) do +ActiveRecord::Schema.define(version: 20140421143251) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -69,12 +69,12 @@ ActiveRecord::Schema.define(version: 20140421135803) do create_table "game_settings", force: true do |t| t.integer "game_id" - t.integer "stype" t.string "name" - t.text "default" - t.text "description" + t.integer "vartype" t.text "type_opt" + t.text "description" t.integer "display_order" + t.text "default" t.datetime "created_at" t.datetime "updated_at" end @@ -155,11 +155,6 @@ ActiveRecord::Schema.define(version: 20140421135803) do add_index "scores", ["match_id"], name: "index_scores_on_match_id" add_index "scores", ["user_id"], name: "index_scores_on_user_id" - create_table "server_settings", force: true do |t| - t.datetime "created_at" - t.datetime "updated_at" - end - create_table "servers", force: true do |t| t.integer "default_user_permissions" t.datetime "created_at" @@ -200,8 +195,11 @@ ActiveRecord::Schema.define(version: 20140421135803) do create_table "tournament_settings", force: true do |t| t.integer "tournament_id" - t.integer "vartype" t.string "name" + t.integer "vartype" + t.text "type_opt" + t.text "description" + t.integer "display_order" t.text "value" t.datetime "created_at" t.datetime "updated_at" diff --git a/test/fixtures/game_settings.yml b/test/fixtures/game_settings.yml index 2b574fd..118501b 100644 --- a/test/fixtures/game_settings.yml +++ b/test/fixtures/game_settings.yml @@ -2,18 +2,18 @@ one: game_id: - stype: 1 name: MyString - default: MyText - description: MyText + vartype: 1 type_opt: MyText + description: MyText display_order: 1 + default: MyText two: game_id: - stype: 1 name: MyString - default: MyText - description: MyText + vartype: 1 type_opt: MyText + description: MyText display_order: 1 + default: MyText diff --git a/test/fixtures/server_settings.yml b/test/fixtures/server_settings.yml deleted file mode 100644 index 937a0c0..0000000 --- a/test/fixtures/server_settings.yml +++ /dev/null @@ -1,11 +0,0 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -# This model initially had no columns defined. If you add columns to the -# model remove the '{}' from the fixture names and add the columns immediately -# below each fixture, per the syntax in the comments below -# -one: {} -# column: value -# -two: {} -# column: value diff --git a/test/fixtures/tournament_settings.yml b/test/fixtures/tournament_settings.yml index aa5eaef..6cdf24b 100644 --- a/test/fixtures/tournament_settings.yml +++ b/test/fixtures/tournament_settings.yml @@ -2,12 +2,18 @@ one: tournament_id: - vartype: 1 name: MyString + vartype: 1 + type_opt: MyText + description: MyText + display_order: 1 value: MyText two: tournament_id: - vartype: 1 name: MyString + vartype: 1 + type_opt: MyText + description: MyText + display_order: 1 value: MyText diff --git a/test/models/server_setting_test.rb b/test/models/server_setting_test.rb deleted file mode 100644 index eee32c1..0000000 --- a/test/models/server_setting_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class ServerSettingTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end -end -- cgit v1.2.3-54-g00ecf From d3bee0f1ce0c5dc3fa741338bc6d9914e9e92787 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 21 Apr 2014 21:46:24 -0400 Subject: re-jigger Tournament::Setting --- app/models/tournament.rb | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/app/models/tournament.rb b/app/models/tournament.rb index bf44cdf..73c8d93 100644 --- a/app/models/tournament.rb +++ b/app/models/tournament.rb @@ -38,36 +38,26 @@ class Tournament < ActiveRecord::Base @tournament = tournament end - def [](setting) - p = @tournament.settings_raw.find_by_name(setting) - if p.nil? + def [](setting_name) + tournament_setting = @tournament.settings_raw.find_by_name(setting_name) + if tournament_setting.nil? return nil else - return p.value + return tournament_setting.value end end - def []=(setting, val) - p = @tournament.settings_raw.find_by_name(setting) - if p.nil? - TournamentSetting.create( tournament_id: @tournament.id, vartype: get_type(val), name: setting, value: val ) + def []=(setting_name, val) + tournament_setting = @tournament.settings_raw.find_by_name(setting_name) + if tournament_setting.nil? + game_setting = @tournament.game.settings.find_by_name(setting_name) + @tournament.settings_raw.create(name: setting, value: val, + vartype: game_setting.vartype, + type_opt: game_setting.type_opt, + description: game_setting.description, + display_order: game_setting.display_order) else - p.value = val - end - end - - def get_type(val) - case val - when "true", "false" - vartypes[:true_false] - when /\d+-\d/ =~ val - vartypes[:range] - when /\d+/ =~ val - vartypes[:integer] - when /,/ =~ val - vartypes[:select] - else - vartypes[:string] + tournament_setting.value = val end end -- cgit v1.2.3-54-g00ecf From aa8437947b28dda73bcfaf3caccb738e5e2f48b3 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Tue, 22 Apr 2014 01:46:13 -0400 Subject: Made Scoring Algorithm files use the statistics interface and accept matches for a more general approach. --- lib/scoring_algorithms/FibonacciPeerWithBlowout.rb | 16 +++++++++++++ lib/scoring_algorithms/MarginalPeer.rb | 15 ++++++++++++ lib/scoring_algorithms/Recommended.rb | 8 ------- lib/scoring_algorithms/ScoringAlgorithm.rb | 8 +++++++ lib/scoring_algorithms/ScoringAlgorithms.rb | 28 ---------------------- lib/scoring_algorithms/WinnerTakesAll.rb | 16 +++++++++++++ 6 files changed, 55 insertions(+), 36 deletions(-) create mode 100644 lib/scoring_algorithms/FibonacciPeerWithBlowout.rb create mode 100644 lib/scoring_algorithms/MarginalPeer.rb delete mode 100644 lib/scoring_algorithms/Recommended.rb create mode 100644 lib/scoring_algorithms/ScoringAlgorithm.rb delete mode 100644 lib/scoring_algorithms/ScoringAlgorithms.rb create mode 100644 lib/scoring_algorithms/WinnerTakesAll.rb diff --git a/lib/scoring_algorithms/FibonacciPeerWithBlowout.rb b/lib/scoring_algorithms/FibonacciPeerWithBlowout.rb new file mode 100644 index 0000000..19ac9a7 --- /dev/null +++ b/lib/scoring_algorithms/FibonacciPeerWithBlowout.rb @@ -0,0 +1,16 @@ +require 'ScoringAlgorithm' + +class FibonacciPeerWithBlowout < ScoringAlgorithm + + def self.score(match, interface) + match.players.each do |player| + scores[player.user_name] = scoreUser(interface.getStatistic(match, player, :votes), match.win?(player), match.blowout) + end + scores + end + + def self.scoreUser(votes, win, blowout) + fibonacci = Hash.new { |h,k| h[k] = k < 2 ? k : h[k-1] + h[k-2] } + fibonacci[votes+3] + (win ? blowout ? 12 : 10 : blowout ? 5 : 7) + end +end \ No newline at end of file diff --git a/lib/scoring_algorithms/MarginalPeer.rb b/lib/scoring_algorithms/MarginalPeer.rb new file mode 100644 index 0000000..0e1cfa8 --- /dev/null +++ b/lib/scoring_algorithms/MarginalPeer.rb @@ -0,0 +1,15 @@ +require 'ScoringAlgorithm' + +class MarginalPeer < ScoringAlgorithm + + def self.score(match, interface) + match.players.each do |player| + scores[player.user_name] = scoreUser(interface.getStatistic(match, player, rating)) + end + scores + end + + def self.score(rating) + rating + end +end \ No newline at end of file diff --git a/lib/scoring_algorithms/Recommended.rb b/lib/scoring_algorithms/Recommended.rb deleted file mode 100644 index 8033bd2..0000000 --- a/lib/scoring_algorithms/Recommended.rb +++ /dev/null @@ -1,8 +0,0 @@ -class Recommended - def self.score(votes, win, blowout) - fibonacci = Hash.new{ |h,k| h[k] = k < 2 ? k : h[k-1] + h[k-2] } - fibonacci[votes+3] + (win ? blowout ? 12 : 10 : blowout ? 5 : 7) - end -end - -#puts Recommended.score(4, true, false) diff --git a/lib/scoring_algorithms/ScoringAlgorithm.rb b/lib/scoring_algorithms/ScoringAlgorithm.rb new file mode 100644 index 0000000..6277da8 --- /dev/null +++ b/lib/scoring_algorithms/ScoringAlgorithm.rb @@ -0,0 +1,8 @@ +module Leaguer + module Scoring + class ScoringAlgorithm + def self.score(match, interface) + end + end + end +end \ No newline at end of file diff --git a/lib/scoring_algorithms/ScoringAlgorithms.rb b/lib/scoring_algorithms/ScoringAlgorithms.rb deleted file mode 100644 index 7f8ec12..0000000 --- a/lib/scoring_algorithms/ScoringAlgorithms.rb +++ /dev/null @@ -1,28 +0,0 @@ -class ScoringAlgorithm - def self.score(*args) - end -end - -class FibonacciPeerWithBlowout < ScoringAlgorithm - def self.score(votes, win, blowout) - fibonacci = Hash.new{ |h,k| h[k] = k < 2 ? k : h[k-1] + h[k-2] } - fibonacci[votes+3] + (win ? blowout ? 12 : 10 : blowout ? 5 : 7) - end -end - -class WinnerTakesAll < ScoringAlgorithm - def self.score(win) - win.nil? ? 0.5 : win ? 1 : 0 - end -end - -class MarginalPeer < ScoringAlgorithm - def self.score(rating) - rating - end -end - - -#puts Recommended.score(4, true, false) -#puts WinnerTakesAll.score(nil) -#puts WinnerTakesAll.score(true) diff --git a/lib/scoring_algorithms/WinnerTakesAll.rb b/lib/scoring_algorithms/WinnerTakesAll.rb new file mode 100644 index 0000000..ad2471b --- /dev/null +++ b/lib/scoring_algorithms/WinnerTakesAll.rb @@ -0,0 +1,16 @@ +require 'ScoringAlgorithm' + +class WinnerTakesAll < ScoringAlgorithm + + def self.score(match, interface) + match.players.each do |player| + scores[player.user_name] = scoreUser(match.win?(player)) + end + scores + end + + + def self.score(win) + win.nil? ? 0.5 : win ? 1 : 0 + end +end \ No newline at end of file -- cgit v1.2.3-54-g00ecf