From 2fd131ea6c6a1810d27941d85bcf5a5eb2d8669f Mon Sep 17 00:00:00 2001 From: nfoy Date: Sun, 6 Apr 2014 19:54:04 -0400 Subject: add delayed_job_active_record to Gemfile --- Gemfile | 2 +- Gemfile.lock | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index a34b0a6..c33683a 100644 --- a/Gemfile +++ b/Gemfile @@ -48,7 +48,7 @@ gem 'turbolinks' gem 'jbuilder', '~> 1.2' # Asynchronously handle longer or delayed tasks -gem 'delayed_job' +gem 'delayed_job_active_record' group :doc do # bundle exec rake doc:rails generates the API under doc/api. diff --git a/Gemfile.lock b/Gemfile.lock index 51e29e7..fd03576 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,6 +40,9 @@ GEM coffee-script-source (1.7.0) delayed_job (4.0.0) activesupport (>= 3.0, < 4.1) + delayed_job_active_record (4.0.0) + activerecord (>= 3.0, < 4.1) + delayed_job (>= 3.0, < 4.1) erubis (2.7.0) execjs (2.0.2) hike (1.2.3) @@ -128,7 +131,7 @@ DEPENDENCIES bcrypt-ruby (= 3.1.2) bootstrap-sass coffee-rails (~> 4.0.0) - delayed_job + delayed_job_active_record httparty jbuilder (~> 1.2) jquery-rails -- cgit v1.2.3-2-g168b From d1bdf1ea4e3120c133cc5e81970958355a9719a1 Mon Sep 17 00:00:00 2001 From: nfoy Date: Sun, 6 Apr 2014 19:55:33 -0400 Subject: pull changes to Gemfile from master --- Gemfile | 2 +- Gemfile.lock | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index a34b0a6..c33683a 100644 --- a/Gemfile +++ b/Gemfile @@ -48,7 +48,7 @@ gem 'turbolinks' gem 'jbuilder', '~> 1.2' # Asynchronously handle longer or delayed tasks -gem 'delayed_job' +gem 'delayed_job_active_record' group :doc do # bundle exec rake doc:rails generates the API under doc/api. diff --git a/Gemfile.lock b/Gemfile.lock index 51e29e7..fd03576 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,6 +40,9 @@ GEM coffee-script-source (1.7.0) delayed_job (4.0.0) activesupport (>= 3.0, < 4.1) + delayed_job_active_record (4.0.0) + activerecord (>= 3.0, < 4.1) + delayed_job (>= 3.0, < 4.1) erubis (2.7.0) execjs (2.0.2) hike (1.2.3) @@ -128,7 +131,7 @@ DEPENDENCIES bcrypt-ruby (= 3.1.2) bootstrap-sass coffee-rails (~> 4.0.0) - delayed_job + delayed_job_active_record httparty jbuilder (~> 1.2) jquery-rails -- cgit v1.2.3-2-g168b From 7014368b151cba5b17ceaa85a107674d5865b22c Mon Sep 17 00:00:00 2001 From: nfoy Date: Sun, 6 Apr 2014 19:59:12 -0400 Subject: generate stuff for delayed job --- generate.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/generate.sh b/generate.sh index 18d0f63..e3e07f9 100755 --- a/generate.sh +++ b/generate.sh @@ -13,6 +13,7 @@ git rm -rf -- app test config/routes.rb db/migrate || true git checkout clean-start -- app test config/routes.rb bundle exec rails generate simple_captcha +bundle exec rails generate delayed_job:active_record # The whole shebang, models, views, and controllers bundle exec rails generate scaffold server default_user_permissions:integer -- cgit v1.2.3-2-g168b From e02fb83cdc7a971691cebf031eb35efd6665833b Mon Sep 17 00:00:00 2001 From: nfoy Date: Sun, 6 Apr 2014 20:04:20 -0400 Subject: Ran generate --- bin/delayed_job | 5 +++++ .../20140406131442_create_simple_captcha_data.rb | 15 --------------- db/migrate/20140406171445_create_servers.rb | 9 --------- db/migrate/20140406171448_create_matches.rb | 13 ------------- db/migrate/20140406171451_create_teams.rb | 9 --------- db/migrate/20140406171453_create_alerts.rb | 10 ---------- db/migrate/20140406171456_create_pms.rb | 11 ----------- db/migrate/20140406171459_create_tournaments.rb | 17 ----------------- db/migrate/20140406171502_create_games.rb | 15 --------------- db/migrate/20140406171505_create_users.rb | 13 ------------- db/migrate/20140406171508_create_sessions.rb | 11 ----------- .../20140406171510_create_server_settings.rb | 8 -------- db/migrate/20140406171513_create_game_settings.rb | 15 --------------- ...20140406171516_create_tournament_preferences.rb | 12 ------------ db/migrate/20140406171519_create_scores.rb | 11 ----------- .../20140406171522_create_remote_usernames.rb | 11 ----------- ...6171525_create_tournament_players_join_table.rb | 8 -------- ...406171527_create_tournament_hosts_join_table.rb | 8 -------- .../20140406171530_create_team_user_join_table.rb | 8 -------- .../20140406171532_create_match_team_join_table.rb | 8 -------- .../20140406171543_add_hidden_attrs_to_user.rb | 6 ------ .../20140406195921_create_simple_captcha_data.rb | 15 +++++++++++++++ db/migrate/20140406235927_create_delayed_jobs.rb | 22 ++++++++++++++++++++++ db/migrate/20140406235933_create_servers.rb | 9 +++++++++ db/migrate/20140406235940_create_matches.rb | 13 +++++++++++++ db/migrate/20140406235946_create_teams.rb | 9 +++++++++ db/migrate/20140406235952_create_alerts.rb | 10 ++++++++++ db/migrate/20140406235958_create_pms.rb | 11 +++++++++++ db/migrate/20140407000005_create_tournaments.rb | 17 +++++++++++++++++ db/migrate/20140407000011_create_games.rb | 15 +++++++++++++++ db/migrate/20140407000017_create_users.rb | 13 +++++++++++++ db/migrate/20140407000024_create_sessions.rb | 11 +++++++++++ .../20140407000030_create_server_settings.rb | 8 ++++++++ db/migrate/20140407000036_create_game_settings.rb | 15 +++++++++++++++ ...20140407000042_create_tournament_preferences.rb | 12 ++++++++++++ db/migrate/20140407000048_create_scores.rb | 11 +++++++++++ .../20140407000054_create_remote_usernames.rb | 11 +++++++++++ ...7000100_create_tournament_players_join_table.rb | 8 ++++++++ ...407000106_create_tournament_hosts_join_table.rb | 8 ++++++++ .../20140407000112_create_team_user_join_table.rb | 8 ++++++++ .../20140407000118_create_match_team_join_table.rb | 8 ++++++++ .../20140407000143_add_hidden_attrs_to_user.rb | 6 ++++++ db/schema.rb | 18 +++++++++++++++++- 43 files changed, 262 insertions(+), 219 deletions(-) create mode 100755 bin/delayed_job delete mode 100644 db/migrate/20140406131442_create_simple_captcha_data.rb delete mode 100644 db/migrate/20140406171445_create_servers.rb delete mode 100644 db/migrate/20140406171448_create_matches.rb delete mode 100644 db/migrate/20140406171451_create_teams.rb delete mode 100644 db/migrate/20140406171453_create_alerts.rb delete mode 100644 db/migrate/20140406171456_create_pms.rb delete mode 100644 db/migrate/20140406171459_create_tournaments.rb delete mode 100644 db/migrate/20140406171502_create_games.rb delete mode 100644 db/migrate/20140406171505_create_users.rb delete mode 100644 db/migrate/20140406171508_create_sessions.rb delete mode 100644 db/migrate/20140406171510_create_server_settings.rb delete mode 100644 db/migrate/20140406171513_create_game_settings.rb delete mode 100644 db/migrate/20140406171516_create_tournament_preferences.rb delete mode 100644 db/migrate/20140406171519_create_scores.rb delete mode 100644 db/migrate/20140406171522_create_remote_usernames.rb delete mode 100644 db/migrate/20140406171525_create_tournament_players_join_table.rb delete mode 100644 db/migrate/20140406171527_create_tournament_hosts_join_table.rb delete mode 100644 db/migrate/20140406171530_create_team_user_join_table.rb delete mode 100644 db/migrate/20140406171532_create_match_team_join_table.rb delete mode 100644 db/migrate/20140406171543_add_hidden_attrs_to_user.rb create mode 100644 db/migrate/20140406195921_create_simple_captcha_data.rb create mode 100644 db/migrate/20140406235927_create_delayed_jobs.rb create mode 100644 db/migrate/20140406235933_create_servers.rb create mode 100644 db/migrate/20140406235940_create_matches.rb create mode 100644 db/migrate/20140406235946_create_teams.rb create mode 100644 db/migrate/20140406235952_create_alerts.rb create mode 100644 db/migrate/20140406235958_create_pms.rb create mode 100644 db/migrate/20140407000005_create_tournaments.rb create mode 100644 db/migrate/20140407000011_create_games.rb create mode 100644 db/migrate/20140407000017_create_users.rb create mode 100644 db/migrate/20140407000024_create_sessions.rb create mode 100644 db/migrate/20140407000030_create_server_settings.rb create mode 100644 db/migrate/20140407000036_create_game_settings.rb create mode 100644 db/migrate/20140407000042_create_tournament_preferences.rb create mode 100644 db/migrate/20140407000048_create_scores.rb create mode 100644 db/migrate/20140407000054_create_remote_usernames.rb create mode 100644 db/migrate/20140407000100_create_tournament_players_join_table.rb create mode 100644 db/migrate/20140407000106_create_tournament_hosts_join_table.rb create mode 100644 db/migrate/20140407000112_create_team_user_join_table.rb create mode 100644 db/migrate/20140407000118_create_match_team_join_table.rb create mode 100644 db/migrate/20140407000143_add_hidden_attrs_to_user.rb diff --git a/bin/delayed_job b/bin/delayed_job new file mode 100755 index 0000000..edf1959 --- /dev/null +++ b/bin/delayed_job @@ -0,0 +1,5 @@ +#!/usr/bin/env ruby + +require File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'environment')) +require 'delayed/command' +Delayed::Command.new(ARGV).daemonize diff --git a/db/migrate/20140406131442_create_simple_captcha_data.rb b/db/migrate/20140406131442_create_simple_captcha_data.rb deleted file mode 100644 index 4573b20..0000000 --- a/db/migrate/20140406131442_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/20140406171445_create_servers.rb b/db/migrate/20140406171445_create_servers.rb deleted file mode 100644 index fbe1b02..0000000 --- a/db/migrate/20140406171445_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/20140406171448_create_matches.rb b/db/migrate/20140406171448_create_matches.rb deleted file mode 100644 index 31eea12..0000000 --- a/db/migrate/20140406171448_create_matches.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateMatches < ActiveRecord::Migration - def change - create_table :matches do |t| - t.integer :status - t.references :tournament, index: true - t.string :name - t.references :winner, index: true - t.string :remote_id - - t.timestamps - end - end -end diff --git a/db/migrate/20140406171451_create_teams.rb b/db/migrate/20140406171451_create_teams.rb deleted file mode 100644 index fdf9a68..0000000 --- a/db/migrate/20140406171451_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/20140406171453_create_alerts.rb b/db/migrate/20140406171453_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140406171453_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/20140406171456_create_pms.rb b/db/migrate/20140406171456_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140406171456_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/20140406171459_create_tournaments.rb b/db/migrate/20140406171459_create_tournaments.rb deleted file mode 100644 index c0d8929..0000000 --- a/db/migrate/20140406171459_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/20140406171502_create_games.rb b/db/migrate/20140406171502_create_games.rb deleted file mode 100644 index 5e4f56f..0000000 --- a/db/migrate/20140406171502_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/20140406171505_create_users.rb b/db/migrate/20140406171505_create_users.rb deleted file mode 100644 index 8032870..0000000 --- a/db/migrate/20140406171505_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/20140406171508_create_sessions.rb b/db/migrate/20140406171508_create_sessions.rb deleted file mode 100644 index f667f1e..0000000 --- a/db/migrate/20140406171508_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/20140406171510_create_server_settings.rb b/db/migrate/20140406171510_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140406171510_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/20140406171513_create_game_settings.rb b/db/migrate/20140406171513_create_game_settings.rb deleted file mode 100644 index b1caf5d..0000000 --- a/db/migrate/20140406171513_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/20140406171516_create_tournament_preferences.rb b/db/migrate/20140406171516_create_tournament_preferences.rb deleted file mode 100644 index 991d659..0000000 --- a/db/migrate/20140406171516_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/20140406171519_create_scores.rb b/db/migrate/20140406171519_create_scores.rb deleted file mode 100644 index 4ca0b0b..0000000 --- a/db/migrate/20140406171519_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/20140406171522_create_remote_usernames.rb b/db/migrate/20140406171522_create_remote_usernames.rb deleted file mode 100644 index e265985..0000000 --- a/db/migrate/20140406171522_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/20140406171525_create_tournament_players_join_table.rb b/db/migrate/20140406171525_create_tournament_players_join_table.rb deleted file mode 100644 index be240e8..0000000 --- a/db/migrate/20140406171525_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/20140406171527_create_tournament_hosts_join_table.rb b/db/migrate/20140406171527_create_tournament_hosts_join_table.rb deleted file mode 100644 index 7521d89..0000000 --- a/db/migrate/20140406171527_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/20140406171530_create_team_user_join_table.rb b/db/migrate/20140406171530_create_team_user_join_table.rb deleted file mode 100644 index f3b57fc..0000000 --- a/db/migrate/20140406171530_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/20140406171532_create_match_team_join_table.rb b/db/migrate/20140406171532_create_match_team_join_table.rb deleted file mode 100644 index c2ed1b7..0000000 --- a/db/migrate/20140406171532_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/20140406171543_add_hidden_attrs_to_user.rb b/db/migrate/20140406171543_add_hidden_attrs_to_user.rb deleted file mode 100644 index 9b5c505..0000000 --- a/db/migrate/20140406171543_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/20140406195921_create_simple_captcha_data.rb b/db/migrate/20140406195921_create_simple_captcha_data.rb new file mode 100644 index 0000000..4573b20 --- /dev/null +++ b/db/migrate/20140406195921_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/20140406235927_create_delayed_jobs.rb b/db/migrate/20140406235927_create_delayed_jobs.rb new file mode 100644 index 0000000..ec0dd93 --- /dev/null +++ b/db/migrate/20140406235927_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/20140406235933_create_servers.rb b/db/migrate/20140406235933_create_servers.rb new file mode 100644 index 0000000..fbe1b02 --- /dev/null +++ b/db/migrate/20140406235933_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/20140406235940_create_matches.rb b/db/migrate/20140406235940_create_matches.rb new file mode 100644 index 0000000..31eea12 --- /dev/null +++ b/db/migrate/20140406235940_create_matches.rb @@ -0,0 +1,13 @@ +class CreateMatches < ActiveRecord::Migration + def change + create_table :matches do |t| + t.integer :status + t.references :tournament, index: true + t.string :name + t.references :winner, index: true + t.string :remote_id + + t.timestamps + end + end +end diff --git a/db/migrate/20140406235946_create_teams.rb b/db/migrate/20140406235946_create_teams.rb new file mode 100644 index 0000000..fdf9a68 --- /dev/null +++ b/db/migrate/20140406235946_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/20140406235952_create_alerts.rb b/db/migrate/20140406235952_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140406235952_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/20140406235958_create_pms.rb b/db/migrate/20140406235958_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140406235958_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/20140407000005_create_tournaments.rb b/db/migrate/20140407000005_create_tournaments.rb new file mode 100644 index 0000000..c0d8929 --- /dev/null +++ b/db/migrate/20140407000005_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/20140407000011_create_games.rb b/db/migrate/20140407000011_create_games.rb new file mode 100644 index 0000000..5e4f56f --- /dev/null +++ b/db/migrate/20140407000011_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/20140407000017_create_users.rb b/db/migrate/20140407000017_create_users.rb new file mode 100644 index 0000000..8032870 --- /dev/null +++ b/db/migrate/20140407000017_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/20140407000024_create_sessions.rb b/db/migrate/20140407000024_create_sessions.rb new file mode 100644 index 0000000..f667f1e --- /dev/null +++ b/db/migrate/20140407000024_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/20140407000030_create_server_settings.rb b/db/migrate/20140407000030_create_server_settings.rb new file mode 100644 index 0000000..dfdd91b --- /dev/null +++ b/db/migrate/20140407000030_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/20140407000036_create_game_settings.rb b/db/migrate/20140407000036_create_game_settings.rb new file mode 100644 index 0000000..b1caf5d --- /dev/null +++ b/db/migrate/20140407000036_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/20140407000042_create_tournament_preferences.rb b/db/migrate/20140407000042_create_tournament_preferences.rb new file mode 100644 index 0000000..991d659 --- /dev/null +++ b/db/migrate/20140407000042_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/20140407000048_create_scores.rb b/db/migrate/20140407000048_create_scores.rb new file mode 100644 index 0000000..4ca0b0b --- /dev/null +++ b/db/migrate/20140407000048_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/20140407000054_create_remote_usernames.rb b/db/migrate/20140407000054_create_remote_usernames.rb new file mode 100644 index 0000000..e265985 --- /dev/null +++ b/db/migrate/20140407000054_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/20140407000100_create_tournament_players_join_table.rb b/db/migrate/20140407000100_create_tournament_players_join_table.rb new file mode 100644 index 0000000..be240e8 --- /dev/null +++ b/db/migrate/20140407000100_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/20140407000106_create_tournament_hosts_join_table.rb b/db/migrate/20140407000106_create_tournament_hosts_join_table.rb new file mode 100644 index 0000000..7521d89 --- /dev/null +++ b/db/migrate/20140407000106_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/20140407000112_create_team_user_join_table.rb b/db/migrate/20140407000112_create_team_user_join_table.rb new file mode 100644 index 0000000..f3b57fc --- /dev/null +++ b/db/migrate/20140407000112_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/20140407000118_create_match_team_join_table.rb b/db/migrate/20140407000118_create_match_team_join_table.rb new file mode 100644 index 0000000..c2ed1b7 --- /dev/null +++ b/db/migrate/20140407000118_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/20140407000143_add_hidden_attrs_to_user.rb b/db/migrate/20140407000143_add_hidden_attrs_to_user.rb new file mode 100644 index 0000000..9b5c505 --- /dev/null +++ b/db/migrate/20140407000143_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 53bc413..f4612b8 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: 20140406171543) do +ActiveRecord::Schema.define(version: 20140407000143) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -22,6 +22,22 @@ ActiveRecord::Schema.define(version: 20140406171543) do add_index "alerts", ["author_id"], name: "index_alerts_on_author_id" + create_table "delayed_jobs", force: true do |t| + t.integer "priority", default: 0, null: false + t.integer "attempts", default: 0, null: false + t.text "handler", null: false + t.text "last_error" + t.datetime "run_at" + t.datetime "locked_at" + t.datetime "failed_at" + t.string "locked_by" + t.string "queue" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority" + create_table "game_settings", force: true do |t| t.integer "game_id" t.integer "stype" -- cgit v1.2.3-2-g168b From 7b5bf825a8174712f3ef6e9ea7f6180e7d230f99 Mon Sep 17 00:00:00 2001 From: nfoy Date: Sun, 6 Apr 2014 20:18:17 -0400 Subject: Auto-Checking for a match's end is implemented. --- app/controllers/matches_controller.rb | 32 +++++++++++++++++++++++++++++++- app/views/matches/show.html.erb | 2 +- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index e773667..c369717 100644 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -5,6 +5,7 @@ class MatchesController < ApplicationController # GET /matches.json require 'httparty' require 'json' + require 'delayed_job' def index @matches = @tournament.matches @@ -14,6 +15,8 @@ class MatchesController < ApplicationController @height = 200 * 2**Math.log2(@matches.count).floor + 100; end + + def get_riot_info if signed_in? @@ -118,14 +121,41 @@ class MatchesController < ApplicationController end #end def # GET /matches/1 # GET /matches/1.json + + def is_match_over + response = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/by-name/#{@first}?api_key=ad539f86-22fd-474d-9279-79a7a296ac38") + riot_id = response["#{@first}"]['id'] + #recent game information + game_info = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/game/by-summoner/#{riot_id}/recent?api_key=ad539f86-22fd-474d-9279-79a7a296ac38") + first_id = game_info["games"][0]["gameId"] + + while true do + sleep(240) #wait four minutes + + recent = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/game/by-summoner/#{riot_id}/recent?api_key=ad539f86-22fd-474d-9279-79a7a296ac38") + current_id = recent["games"][0]["gameId"] + + if current_id != first_id + @match.status = 2 + end + end #while + end + handle_asynchronously :is_match_over + def show + if @match.id == 1 + is_match_over + end + + end private # Use callbacks to share common setup or constraints between actions. def set_match set_tournament - @match = @tournament.matches.find(params[:id]); + @match = @tournament.matches.find(params[:id]) + @first = @match.teams.first.users.first.user_name.downcase end def set_tournament @tournament = Tournament.find(params[:tournament_id]) diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb index 20860e2..44fe9ee 100644 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -61,7 +61,7 @@ Players see the Peer Review Page Host see the Game Status --> -<% if @match.status == 0 %> +if (@match.status==0) %> <% if @tournament.players.include?(current_user) %> <% @match.teams.each do |team| %>
    -- cgit v1.2.3-2-g168b From 0f982ba511d4f38322f69a6aaed768181b4e2852 Mon Sep 17 00:00:00 2001 From: tkimia Date: Sun, 6 Apr 2014 21:10:46 -0400 Subject: some more graphics --- app/assets/stylesheets/matches.css.scss | 8 ++++ app/controllers/matches_controller.rb | 2 +- app/models/tournament.rb | 2 +- app/views/matches/index.html.erb | 80 +++++++++++++++++++-------------- 4 files changed, 56 insertions(+), 36 deletions(-) diff --git a/app/assets/stylesheets/matches.css.scss b/app/assets/stylesheets/matches.css.scss index 4c396e3..e0bed85 100644 --- a/app/assets/stylesheets/matches.css.scss +++ b/app/assets/stylesheets/matches.css.scss @@ -1,3 +1,11 @@ // Place all the styles related to the matches controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ + +#match-tree{ + float: right; +} + +#hovered-info-text { + +} \ No newline at end of file diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index e773667..28bc512 100644 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -9,7 +9,7 @@ class MatchesController < ApplicationController def index @matches = @tournament.matches # width of SVG - @width = 300 * (Math.log2(@matches.count).floor + 1) + 300; + @width = 300 * (Math.log2(@matches.count).floor + 1); # height of SVG @height = 200 * 2**Math.log2(@matches.count).floor + 100; end diff --git a/app/models/tournament.rb b/app/models/tournament.rb index 0029de7..859518c 100644 --- a/app/models/tournament.rb +++ b/app/models/tournament.rb @@ -38,7 +38,7 @@ class Tournament < ActiveRecord::Base #create a new team in the current match self.matches[match_num].teams.push(Team.create(users: players)) #if the match is full, move to the next match, otherwise move to the next team - if (team_num != 0 and team_num % max_teams_per_match == 0) + if (team_num > max_teams_per_match) match_num -= 1 team_num = 0 else diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index 031b2a9..6fd831f 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -27,38 +27,50 @@
    - - - <% (1..@matches.count).each do |i| %> - - - <% when 0 %> - <% if @matches[i-1].teams.count < @tournament.min_teams_per_match %> - stroke="red" - fill-opacity="0.6" - <% else %> - stroke="green" - <% end %> - <% when 1 %> - stroke="orange" - <% when 2 %> - stroke="yellow" - <% when 3 %> - stroke="grey" - <% end %> - /> - - <% end %> - - + + + <% (1..@matches.count).each do |i| %> + + + <% when 0 %> + <% if @matches[i-1].teams.count < @tournament.min_teams_per_match %> + stroke="red" + fill-opacity="0.6" + <% else %> + stroke="green" + <% end %> + <% when 1 %> + stroke="orange" + <% when 2 %> + stroke="yellow" + <% when 3 %> + stroke="grey" + <% end %> + /> + + <% if i > 1 %> + + <% end %> + <% end %> -
    \ No newline at end of file + -- cgit v1.2.3-2-g168b From 94c0eb446f9ae49aa8d2fadee4ede17f0056a7b7 Mon Sep 17 00:00:00 2001 From: tkimia Date: Sun, 6 Apr 2014 21:21:47 -0400 Subject: how 2 spell tournament? --- app/views/tournaments/show.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb index b654804..e80e0e8 100644 --- a/app/views/tournaments/show.html.erb +++ b/app/views/tournaments/show.html.erb @@ -66,13 +66,13 @@ <% if @tournament.joinable_by?(current_user) && !@tournament.players.include?(current_user) %> <%= form_tag(tournament_path(@tournament), method: "put") do %> - <%= submit_tag("Join Tournamnet") %> + <%= submit_tag("Join Tournament") %> <% end %> <% elsif @tournament.players.include?(current_user) %> <%= form_tag(tournament_path(@tournament), method: "put") do %> - <%= submit_tag("Leave Tournamnet") %> + <%= submit_tag("Leave Tournament") %> <% end %> <% end %> -- cgit v1.2.3-2-g168b From 5084f01e0ea7ba7c378982099fdbf9880857f091 Mon Sep 17 00:00:00 2001 From: tkimia Date: Sun, 6 Apr 2014 21:52:32 -0400 Subject: matches are given teams correctly --- app/models/tournament.rb | 9 +++++---- app/views/tournaments/index.html.erb | 14 +++++++++----- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/app/models/tournament.rb b/app/models/tournament.rb index 859518c..72c3ac8 100644 --- a/app/models/tournament.rb +++ b/app/models/tournament.rb @@ -34,16 +34,17 @@ class Tournament < ActiveRecord::Base match_num = num_matches-1 team_num = 0 #for each grouping of min_players_per_team - self.players.each_slice(min_players_per_team) do |players| - #create a new team in the current match - self.matches[match_num].teams.push(Team.create(users: players)) + players.each_slice(min_players_per_team) do |players| + #if the match is full, move to the next match, otherwise move to the next team - if (team_num > max_teams_per_match) + if (team_num == min_teams_per_match) match_num -= 1 team_num = 0 else team_num += 1 end + #create a new team in the current match + self.matches[match_num].teams.push(Team.create(users: players)) end end end diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb index e174de7..72eacba 100644 --- a/app/views/tournaments/index.html.erb +++ b/app/views/tournaments/index.html.erb @@ -15,13 +15,17 @@

    <%= t.name %>

    <% end %> -
    +
    Hosted by: <%= t.hosts.first.name %>
    -
    -

    Players per team

    -

    two

    +
    +

    Players per team: <%= t.min_players_per_team %>

    +

    Players signed up: <%= t.players.count %>

    +
    +
    +

    <%= (t.randomized_teams)? "Teams are Random" : "Teams are Chosen" %>

    +

    Players signed up: <%= t.players.count %>

    @@ -36,7 +40,7 @@ <%= submit_tag("Join") %> <% end %> <% else %> -

    You've signed up for this tournament!

    +

    You've signed up for this tournament!

    <% end %>
    -- cgit v1.2.3-2-g168b