Merge branch 'master' of https://github.com/LukeShu/leaguer

author: tkimia <tkimia@purdue.edu> 2014-04-28 20:03:34 -0400
committer: tkimia <tkimia@purdue.edu> 2014-04-28 20:03:34 -0400
commit: 1a6450ec1f5c538eff6dbf6f91582c47fb16e3cc (patch)
tree: dc1a9455fedb082a3be0bb36ac19aae5cbbe39fd /db
parent: 3992a2e52a950c644cfe56bc23991e3a03166568 (diff)
parent: 3ab30900798a838b399d06f28251b6cdd82a94de (diff)
32 files changed, 73 insertions, 17 deletions
diff --git a/db/migrate/20140428092839_create_simple_captcha_data.rb b/db/migrate/20140428183808_create_simple_captcha_data.rb
index 4573b20..4573b20 100644
--- a/db/migrate/20140428092839_create_simple_captcha_data.rb
+++ b/db/migrate/20140428183808_create_simple_captcha_data.rb
diff --git a/db/migrate/20140428132832_create_mailboxer.mailboxer_engine.rb b/db/migrate/20140428223805_create_mailboxer.mailboxer_engine.rb
index 690cec2..690cec2 100644
--- a/db/migrate/20140428132832_create_mailboxer.mailboxer_engine.rb
+++ b/db/migrate/20140428223805_create_mailboxer.mailboxer_engine.rb
diff --git a/db/migrate/20140428132833_add_notified_object.mailboxer_engine.rb b/db/migrate/20140428223806_add_notified_object.mailboxer_engine.rb
index 7f41ac6..7f41ac6 100644
--- a/db/migrate/20140428132833_add_notified_object.mailboxer_engine.rb
+++ b/db/migrate/20140428223806_add_notified_object.mailboxer_engine.rb
diff --git a/db/migrate/20140428132834_add_notification_code.mailboxer_engine.rb b/db/migrate/20140428223807_add_notification_code.mailboxer_engine.rb
index 04c12ef..04c12ef 100644
--- a/db/migrate/20140428132834_add_notification_code.mailboxer_engine.rb
+++ b/db/migrate/20140428223807_add_notification_code.mailboxer_engine.rb
diff --git a/db/migrate/20140428132835_add_attachments.mailboxer_engine.rb b/db/migrate/20140428223808_add_attachments.mailboxer_engine.rb
index b8d6588..b8d6588 100644
--- a/db/migrate/20140428132835_add_attachments.mailboxer_engine.rb
+++ b/db/migrate/20140428223808_add_attachments.mailboxer_engine.rb
diff --git a/db/migrate/20140428132836_rename_receipts_read.mailboxer_engine.rb b/db/migrate/20140428223809_rename_receipts_read.mailboxer_engine.rb
index 9ce904f..9ce904f 100644
--- a/db/migrate/20140428132836_rename_receipts_read.mailboxer_engine.rb
+++ b/db/migrate/20140428223809_rename_receipts_read.mailboxer_engine.rb
diff --git a/db/migrate/20140428132837_add_global_notification_support.mailboxer_engine.rb b/db/migrate/20140428223810_add_global_notification_support.mailboxer_engine.rb
index 60f67ab..60f67ab 100644
--- a/db/migrate/20140428132837_add_global_notification_support.mailboxer_engine.rb
+++ b/db/migrate/20140428223810_add_global_notification_support.mailboxer_engine.rb
diff --git a/db/migrate/20140428132845_create_delayed_jobs.rb b/db/migrate/20140428223812_create_delayed_jobs.rb
index ec0dd93..ec0dd93 100644
--- a/db/migrate/20140428132845_create_delayed_jobs.rb
+++ b/db/migrate/20140428223812_create_delayed_jobs.rb
diff --git a/db/migrate/20140428132852_create_servers.rb b/db/migrate/20140428223815_create_servers.rb
index fbe1b02..fbe1b02 100644
--- a/db/migrate/20140428132852_create_servers.rb
+++ b/db/migrate/20140428223815_create_servers.rb
diff --git a/db/migrate/20140428132900_create_matches.rb b/db/migrate/20140428223819_create_matches.rb
index bac92d1..bac92d1 100644
--- a/db/migrate/20140428132900_create_matches.rb
+++ b/db/migrate/20140428223819_create_matches.rb
diff --git a/db/migrate/20140428132907_create_teams.rb b/db/migrate/20140428223823_create_teams.rb
index dd8397d..dd8397d 100644
--- a/db/migrate/20140428132907_create_teams.rb
+++ b/db/migrate/20140428223823_create_teams.rb
diff --git a/db/migrate/20140428132914_create_alerts.rb b/db/migrate/20140428223827_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140428132914_create_alerts.rb
+++ b/db/migrate/20140428223827_create_alerts.rb
diff --git a/db/migrate/20140428132922_create_pms.rb b/db/migrate/20140428223830_create_pms.rb
index eb9f443..eb9f443 100644
--- a/db/migrate/20140428132922_create_pms.rb
+++ b/db/migrate/20140428223830_create_pms.rb
diff --git a/db/migrate/20140428132929_create_tournaments.rb b/db/migrate/20140428223834_create_tournaments.rb
index f3715bb..f3715bb 100644
--- a/db/migrate/20140428132929_create_tournaments.rb
+++ b/db/migrate/20140428223834_create_tournaments.rb
diff --git a/db/migrate/20140428132937_create_games.rb b/db/migrate/20140428223838_create_games.rb
index e841667..e841667 100644
--- a/db/migrate/20140428132937_create_games.rb
+++ b/db/migrate/20140428223838_create_games.rb
diff --git a/db/migrate/20140428132944_create_users.rb b/db/migrate/20140428223842_create_users.rb
index 8032870..8032870 100644
--- a/db/migrate/20140428132944_create_users.rb
+++ b/db/migrate/20140428223842_create_users.rb
diff --git a/db/migrate/20140428132951_create_sessions.rb b/db/migrate/20140428223845_create_sessions.rb
index f667f1e..f667f1e 100644
--- a/db/migrate/20140428132951_create_sessions.rb
+++ b/db/migrate/20140428223845_create_sessions.rb
diff --git a/db/migrate/20140428132958_create_brackets.rb b/db/migrate/20140428223849_create_brackets.rb
index 8813bf2..8813bf2 100644
--- a/db/migrate/20140428132958_create_brackets.rb
+++ b/db/migrate/20140428223849_create_brackets.rb
diff --git a/db/migrate/20140428133006_create_game_settings.rb b/db/migrate/20140428223853_create_game_settings.rb
index 06fb72e..06fb72e 100644
--- a/db/migrate/20140428133006_create_game_settings.rb
+++ b/db/migrate/20140428223853_create_game_settings.rb
diff --git a/db/migrate/20140428133013_create_tournament_settings.rb b/db/migrate/20140428223856_create_tournament_settings.rb
index e56697f..e56697f 100644
--- a/db/migrate/20140428133013_create_tournament_settings.rb
+++ b/db/migrate/20140428223856_create_tournament_settings.rb
diff --git a/db/migrate/20140428133020_create_tournament_stages.rb b/db/migrate/20140428223900_create_tournament_stages.rb
index 6e52bf0..6e52bf0 100644
--- a/db/migrate/20140428133020_create_tournament_stages.rb
+++ b/db/migrate/20140428223900_create_tournament_stages.rb
diff --git a/db/migrate/20140428133026_create_statistics.rb b/db/migrate/20140428223903_create_statistics.rb
index cc2e97d..09a435f 100644
--- a/db/migrate/20140428133026_create_statistics.rb
+++ b/db/migrate/20140428223903_create_statistics.rb
@@ -4,7 +4,7 @@ class CreateStatistics < ActiveRecord::Migration
       t.references :user, index: true
       t.references :match, index: true
       t.string :name
-      t.integer :value
+      t.text :json_value
 
       t.timestamps
     end
diff --git a/db/migrate/20140428133033_create_remote_usernames.rb b/db/migrate/20140428223907_create_remote_usernames.rb
index e265985..e265985 100644
--- a/db/migrate/20140428133033_create_remote_usernames.rb
+++ b/db/migrate/20140428223907_create_remote_usernames.rb
diff --git a/db/migrate/20140428133041_create_bracket_matches.rb b/db/migrate/20140428223911_create_bracket_matches.rb
index 3323e31..3323e31 100644
--- a/db/migrate/20140428133041_create_bracket_matches.rb
+++ b/db/migrate/20140428223911_create_bracket_matches.rb
diff --git a/db/migrate/20140428133048_create_api_requests.rb b/db/migrate/20140428223914_create_api_requests.rb
index 544c330..544c330 100644
--- a/db/migrate/20140428133048_create_api_requests.rb
+++ b/db/migrate/20140428223914_create_api_requests.rb
diff --git a/db/migrate/20140428133055_create_tournament_players_join_table.rb b/db/migrate/20140428223918_create_tournament_players_join_table.rb
index be240e8..be240e8 100644
--- a/db/migrate/20140428133055_create_tournament_players_join_table.rb
+++ b/db/migrate/20140428223918_create_tournament_players_join_table.rb
diff --git a/db/migrate/20140428133102_create_tournament_hosts_join_table.rb b/db/migrate/20140428223922_create_tournament_hosts_join_table.rb
index 7521d89..7521d89 100644
--- a/db/migrate/20140428133102_create_tournament_hosts_join_table.rb
+++ b/db/migrate/20140428223922_create_tournament_hosts_join_table.rb
diff --git a/db/migrate/20140428133109_create_team_user_join_table.rb b/db/migrate/20140428223925_create_team_user_join_table.rb
index f3b57fc..f3b57fc 100644
--- a/db/migrate/20140428133109_create_team_user_join_table.rb
+++ b/db/migrate/20140428223925_create_team_user_join_table.rb
diff --git a/db/migrate/20140428133116_create_match_team_join_table.rb b/db/migrate/20140428223929_create_match_team_join_table.rb
index c2ed1b7..c2ed1b7 100644
--- a/db/migrate/20140428133116_create_match_team_join_table.rb
+++ b/db/migrate/20140428223929_create_match_team_join_table.rb
diff --git a/db/migrate/20140428133136_add_hidden_attrs_to_user.rb b/db/migrate/20140428223939_add_hidden_attrs_to_user.rb
index 9b5c505..9b5c505 100644
--- a/db/migrate/20140428133136_add_hidden_attrs_to_user.rb
+++ b/db/migrate/20140428223939_add_hidden_attrs_to_user.rb
diff --git a/db/schema.rb b/db/schema.rb
index a7910eb..c5032fa 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: 20140428133136) do
+ActiveRecord::Schema.define(version: 20140428223939) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -218,7 +218,7 @@ ActiveRecord::Schema.define(version: 20140428133136) do
     t.integer  "user_id"
     t.integer  "match_id"
     t.string   "name"
-    t.integer  "value"
+    t.text     "json_value"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
diff --git a/db/seeds.rb b/db/seeds.rb
index f9d32ac..50ee7db 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -54,25 +54,38 @@ if Rails.env.development?
 	players_for_league.push(User.create(name: "Kaceytron"       , password: "password", email: "Kaceytron@gmail.com"      , user_name: "Kaceytron"       , password_confirmation: "password"))
 
 	# Semi-real users
-	davis    = User.create(name: "Davis Webb"        , password: "password", email: "davislwebb@gmail.com"                   , user_name: "TeslasMind"  , password_confirmation: "password")
-	foy      = User.create(name: "Nathaniel Foy"     , password: "password", email: "nfoy@notreal.com"                       , user_name: "Nalfeinx"    , password_confirmation: "password")
 	guntas   = User.create(name: "Guntas Grewal"     , password: "password", email: "guntasgrewal@gmail.com"                 , user_name: "guntasgrewal", password_confirmation: "password")
 	luke     = User.create(name: "Luke Shumaker"     , password: "password", email: "lukeshu@emacs4lyfe.com"                 , user_name: "lukeshu"     , password_confirmation: "password")
 	tomer    = User.create(name: "Tomer Kimia"       , password: "password", email: "tomer@2majors4lyfe.com"                 , user_name: "tkimia"      , password_confirmation: "password")
-	andrew   = User.create(name: "Andrew Murrell"    , password: "password", email: "murrel@murrel.gov"                      , user_name: "ImFromNasa"  , password_confirmation: "password")
-	joey     = User.create(name: "Joseph Adams"      , password: "password", email: "alpha142@fluttershyop.com"              , user_name: "alpha142"    , password_confirmation: "password")
 	josh     = User.create(name: "Josh Huser"        , password: "password", email: "jhuser@iownabusiness.net"               , user_name: "WinterWorks" , password_confirmation: "password")
 	dunsmore = User.create(name: "Professor Dunsmore", password: "password", email: "bxd@purdue.edu"                         , user_name: "Dumbledore"  , password_confirmation: "password")
 	marco    = User.create(name: "Marco Polo"        , password: "password", email: "marco@ta4lyfe.com"                      , user_name: "iCoordinate" , password_confirmation: "password")
 	jordan   = User.create(name: "Geoffrey Webb"     , password: "password", email: "imnotjoffreybarathian@gameofthrones.com", user_name: "GTBPhoenix"  , password_confirmation: "password")
 	obama    = User.create(name: "Obama"             , password: "password", email: "obama@whitehouse.gov"                   , user_name: "Obama"       , password_confirmation: "password")
 
+	g = Array.new
+
+	davis         = User.create(name: "Davis Webb"        , password: "password", email: "davislwebb@gmail.com"         , user_name: "TeslasMind"         , password_confirmation: "password")
+	foy           = User.create(name: "Nathaniel Foy"     , password: "password", email: "nfoy@purdue.edu"              , user_name: "NalfeinX"           , password_confirmation: "password")
+	andrew        = User.create(name: "Andrew Murrell"    , password: "password", email: "murrel@murrel.gov"            , user_name: "ImFromNasa"         , password_confirmation: "password")
+	joey          = User.create(name: "Joseph Adams"      , password: "password", email: "alpha142@fluttershyop.com"    , user_name: "alpha142"           , password_confirmation: "password")
+	panda 	      = User.create(name: "Panda"        	  , password: "password", email: "panda@gmail.com"              , user_name: "InspectorPanderp"   , password_confirmation: "password")
+	mesa 	      = User.create(name: "Mesataki"          , password: "password", email: "mesataki@gmail.com"           , user_name: "Mesataki"           , password_confirmation: "password")
+	guntas_league = User.create(name: "TolkiensButt"      , password: "password", email: "TolkiensButt@gmail.com"       , user_name: "TolkiensButt"       , password_confirmation: "password")
+	lyra          = User.create(name: "Lyra Heartstings"  , password: "password", email: "LyraHeartstings@gmail.com"    , user_name: "Lyra Heartstings"   , password_confirmation: "password")
+	josh_league   = User.create(name: "Josh_league"       , password: "password", email: "josh_league@gmail.com"        , user_name: "Joshoowah"          , password_confirmation: "password")
+	jeff 		  = User.create(name: "Jeff Linguinee"    , password: "password", email: "jefflingueeneeeee@gmail.com"  , user_name: "SenorJeffafa"       , password_confirmation: "password")
+	sarah         = User.create(name: "Sarah Lawson"      , password: "password", email: "sarah@gmail.com"              , user_name: "LittlexSurah"       , password_confirmation: "password")
+
+
 	# League of Legends tournament
 	league_tourn = Tournament.create(game: league, name: "League of Legends Seed",
 		min_players_per_team: 5, max_players_per_team: 5,
 		min_teams_per_match: 2, max_teams_per_match: 2,
-		scoring_method: "TODO")
-	# TODO: create stages
+		scoring_method: "winner_takes_all")
+
+	league_tourn.stages.create(scheduling_method: "round_robin" , seeding_method: "random_seeding")
+
 	league_tourn.hosts.push(User.find(1))
 	players_for_league.each do |player|
 		league_tourn.join(player)
@@ -82,8 +95,10 @@ if Rails.env.development?
 	chess_tourn = Tournament.create(game: chess, name: "Chess Seed",
 		min_players_per_team: 1, max_players_per_team: 1,
 		min_teams_per_match: 2, max_teams_per_match: 2,
-		scoring_method: "TODO")
-	# TODO: create stages
+		scoring_method: "winner_takes_all")
+
+	chess_tourn.stages.create(scheduling_method: "round_robin" , seeding_method: "random_seeding")
+
 	chess_tourn.hosts.push(davis)
 	chess_tourn.join(davis)
 	chess_tourn.join(foy)
@@ -92,8 +107,8 @@ if Rails.env.development?
 	rps = Tournament.create(game: rockpaperscissors, name: "Rock, Paper, Scissors Seed",
 		min_players_per_team: 1, max_players_per_team: 3,
 		min_teams_per_match: 2, max_teams_per_match: 2,
-		scoring_method: "TODO")
-	rps.stages.create(scheduling_method: "elimination" , seeding_method: "random_seeding")
+		scoring_method: "winner_takes_all")
+	rps.stages.create(scheduling_method: "round_robin" , seeding_method: "random_seeding")
 	rps.hosts.push(davis)
 	rps.join(davis)
 	rps.join(foy)
@@ -103,20 +118,21 @@ if Rails.env.development?
 	tourn5 = Tournament.create(game: league, name: "5 Teams, 2 Teams Per Match",
 		min_players_per_team: 1, max_players_per_team: 1,
 		min_teams_per_match: 2, max_teams_per_match: 2,
-		scoring_method: "TODO")
+		scoring_method: "winner_takes_all")
 	tourn5.hosts.push(User.find(1))
 	players_for_league.each do |player|
 		tourn5.join(player)
 	end
-	tourn5.stages.create(scheduling_method: "elimination" , seeding_method: "random_seeding")
+	tourn5.stages.create(scheduling_method: "round_robin" , seeding_method: "random_seeding")
 
 	# Yet another League tournament
 	tourn6 = Tournament.create(game_id: 1, name: "3 teams per match",
 		min_players_per_team: 1, max_players_per_team: 1,
 		min_teams_per_match: 3, max_teams_per_match: 3,
-		scoring_method: "TODO")
+		scoring_method: "winner_takes_all")
+
 	tourn6.hosts.push(User.find(1))
-	tourn6.stages.create(scheduling_method: "elimination" , seeding_method: "random_seeding")
+	tourn6.stages.create(scheduling_method: "round_robin" , seeding_method: "random_seeding")
 	players_for_league.each do |player|
 		tourn6.join(player)
 	end
@@ -128,4 +144,44 @@ if Rails.env.development?
 	tourn6.join(jordan)
 	tourn6.join(obama)
 	tourn6.join(joey)
+
+	#Hearthstone tournament
+	hearth = Tournament.create(game: hearthstone, name: "Hearthstone Seed", min_teams_per_match: 1, min_players_per_team: 1, 
+	                           max_teams_per_match: 2, max_players_per_team: 1, scoring_method: "winner_takes_all")
+
+	hearth.join(davis)
+	hearth.join(foy)
+
+	hearth.stages.create(scheduling_method: "round_robin" , seeding_method: "random_seeding")
+
+	#THE REAL GAME WE ARE PLAYING AT 10
+	davis.remote_usernames.create(game: league, value: {"name" => "TeslasMind", "id" => 30533514} )
+	foy.remote_usernames.create(game: league, value: {"name" => "NalfeinX", "id" => 29538130} )
+	andrew.remote_usernames.create(game: league, value: {"name" => "ImFromNasa", "id" => 29782091} )
+	joey.remote_usernames.create(game: league, value: {"name" => "Alpha142", "id" => 29732514} )
+	sarah.remote_usernames.create(game: league, value: {"name" => "LittlexSurah", "id" => 30613787} )
+	mesa.remote_usernames.create(game: league, value: {"name" => "Mesataki", "id" => 37259275} )
+	panda.remote_usernames.create(game: league, value: {"name" => "NalfeinX", "id" => 47953989} )
+	jordan.remote_usernames.create(game: league, value: {"name" => "GTBPhoenix", "id" => 29812020} )
+	josh_league.remote_usernames.create(game: league, value: {"name" => "Joshoowah", "id" => 26083333} )
+	jeff.remote_usernames.create(game: league, value: {"name" => "SenorJeffafa", "id" => 32612067} )
+	lyra.remote_usernames.create(game: league, value: {"name" => "Lyra Heartstings", "id" => 32240762} )
+
+	g.push(davis, foy, andrew, joey, panda, mesa, jordan, jeff, sarah, josh_league)
+	#g.push(davis, foy, andrew, joey, panda, mesa, jordan, jeff, sarah, guntas_league)
+
+	custom = Tournament.create(game: league, name: "Real League Game",
+		min_players_per_team: 5, max_players_per_team: 5,
+		min_teams_per_match: 2, max_teams_per_match: 2,
+		scoring_method: "winner_takes_all")
+
+	custom.stages.create(scheduling_method: "round_robin" , seeding_method: "random_seeding")
+
+
+	custom.hosts.push(User.find(1))
+	g.each do |player|
+		custom.join(player)
+	end
+
 end
+
author	tkimia <tkimia@purdue.edu>	2014-04-28 20:03:34 -0400
committer	tkimia <tkimia@purdue.edu>	2014-04-28 20:03:34 -0400
commit	1a6450ec1f5c538eff6dbf6f91582c47fb16e3cc (patch)
tree	dc1a9455fedb082a3be0bb36ac19aae5cbbe39fd /db
parent	3992a2e52a950c644cfe56bc23991e3a03166568 (diff)
parent	3ab30900798a838b399d06f28251b6cdd82a94de (diff)