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

32 files changed, 88 insertions, 14 deletions

diff --git a/db/migrate/20140423214420_create_simple_captcha_data.rb b/db/migrate/20140424162546_create_simple_captcha_data.rb
index 4573b20..4573b20 100644
--- a/db/migrate/20140423214420_create_simple_captcha_data.rb
+++ b/db/migrate/20140424162546_create_simple_captcha_data.rb
diff --git a/db/migrate/20140424014418_create_mailboxer.mailboxer_engine.rb b/db/migrate/20140424202542_create_mailboxer.mailboxer_engine.rb
index 690cec2..690cec2 100644
--- a/db/migrate/20140424014418_create_mailboxer.mailboxer_engine.rb
+++ b/db/migrate/20140424202542_create_mailboxer.mailboxer_engine.rb
diff --git a/db/migrate/20140424014419_add_notified_object.mailboxer_engine.rb b/db/migrate/20140424202543_add_notified_object.mailboxer_engine.rb
index 7f41ac6..7f41ac6 100644
--- a/db/migrate/20140424014419_add_notified_object.mailboxer_engine.rb
+++ b/db/migrate/20140424202543_add_notified_object.mailboxer_engine.rb
diff --git a/db/migrate/20140424014420_add_notification_code.mailboxer_engine.rb b/db/migrate/20140424202544_add_notification_code.mailboxer_engine.rb
index 04c12ef..04c12ef 100644
--- a/db/migrate/20140424014420_add_notification_code.mailboxer_engine.rb
+++ b/db/migrate/20140424202544_add_notification_code.mailboxer_engine.rb
diff --git a/db/migrate/20140424014421_add_attachments.mailboxer_engine.rb b/db/migrate/20140424202545_add_attachments.mailboxer_engine.rb
index b8d6588..b8d6588 100644
--- a/db/migrate/20140424014421_add_attachments.mailboxer_engine.rb
+++ b/db/migrate/20140424202545_add_attachments.mailboxer_engine.rb
diff --git a/db/migrate/20140424014422_rename_receipts_read.mailboxer_engine.rb b/db/migrate/20140424202546_rename_receipts_read.mailboxer_engine.rb
index 9ce904f..9ce904f 100644
--- a/db/migrate/20140424014422_rename_receipts_read.mailboxer_engine.rb
+++ b/db/migrate/20140424202546_rename_receipts_read.mailboxer_engine.rb
diff --git a/db/migrate/20140424014423_add_global_notification_support.mailboxer_engine.rb b/db/migrate/20140424202547_add_global_notification_support.mailboxer_engine.rb
index 60f67ab..60f67ab 100644
--- a/db/migrate/20140424014423_add_global_notification_support.mailboxer_engine.rb
+++ b/db/migrate/20140424202547_add_global_notification_support.mailboxer_engine.rb
diff --git a/db/migrate/20140424014424_create_delayed_jobs.rb b/db/migrate/20140424202549_create_delayed_jobs.rb
index ec0dd93..ec0dd93 100644
--- a/db/migrate/20140424014424_create_delayed_jobs.rb
+++ b/db/migrate/20140424202549_create_delayed_jobs.rb
diff --git a/db/migrate/20140424014425_create_servers.rb b/db/migrate/20140424202553_create_servers.rb
index fbe1b02..fbe1b02 100644
--- a/db/migrate/20140424014425_create_servers.rb
+++ b/db/migrate/20140424202553_create_servers.rb
diff --git a/db/migrate/20140424014426_create_matches.rb b/db/migrate/20140424202557_create_matches.rb
index bac92d1..bac92d1 100644
--- a/db/migrate/20140424014426_create_matches.rb
+++ b/db/migrate/20140424202557_create_matches.rb
diff --git a/db/migrate/20140424014427_create_teams.rb b/db/migrate/20140424202600_create_teams.rb
index dd8397d..dd8397d 100644
--- a/db/migrate/20140424014427_create_teams.rb
+++ b/db/migrate/20140424202600_create_teams.rb
diff --git a/db/migrate/20140424014428_create_alerts.rb b/db/migrate/20140424202604_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140424014428_create_alerts.rb
+++ b/db/migrate/20140424202604_create_alerts.rb
diff --git a/db/migrate/20140424014429_create_pms.rb b/db/migrate/20140424202608_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140424014429_create_pms.rb
+++ b/db/migrate/20140424202608_create_pms.rb
diff --git a/db/migrate/20140424014431_create_tournaments.rb b/db/migrate/20140424202611_create_tournaments.rb
index 716871f..716871f 100644
--- a/db/migrate/20140424014431_create_tournaments.rb
+++ b/db/migrate/20140424202611_create_tournaments.rb
diff --git a/db/migrate/20140424014433_create_games.rb b/db/migrate/20140424202615_create_games.rb
index 23edf0b..23edf0b 100644
--- a/db/migrate/20140424014433_create_games.rb
+++ b/db/migrate/20140424202615_create_games.rb
diff --git a/db/migrate/20140424014434_create_users.rb b/db/migrate/20140424202619_create_users.rb
index 8032870..8032870 100644
--- a/db/migrate/20140424014434_create_users.rb
+++ b/db/migrate/20140424202619_create_users.rb
diff --git a/db/migrate/20140424014436_create_sessions.rb b/db/migrate/20140424202623_create_sessions.rb
index f667f1e..f667f1e 100644
--- a/db/migrate/20140424014436_create_sessions.rb
+++ b/db/migrate/20140424202623_create_sessions.rb
diff --git a/db/migrate/20140424014437_create_brackets.rb b/db/migrate/20140424202626_create_brackets.rb
index 8813bf2..8813bf2 100644
--- a/db/migrate/20140424014437_create_brackets.rb
+++ b/db/migrate/20140424202626_create_brackets.rb
diff --git a/db/migrate/20140424014439_create_game_settings.rb b/db/migrate/20140424202630_create_game_settings.rb
index 06fb72e..06fb72e 100644
--- a/db/migrate/20140424014439_create_game_settings.rb
+++ b/db/migrate/20140424202630_create_game_settings.rb
diff --git a/db/migrate/20140424014440_create_tournament_settings.rb b/db/migrate/20140424202634_create_tournament_settings.rb
index e56697f..e56697f 100644
--- a/db/migrate/20140424014440_create_tournament_settings.rb
+++ b/db/migrate/20140424202634_create_tournament_settings.rb
diff --git a/db/migrate/20140424014442_create_tournament_stages.rb b/db/migrate/20140424202638_create_tournament_stages.rb
index e3668cb..e3668cb 100644
--- a/db/migrate/20140424014442_create_tournament_stages.rb
+++ b/db/migrate/20140424202638_create_tournament_stages.rb
diff --git a/db/migrate/20140424014443_create_statistics.rb b/db/migrate/20140424202641_create_statistics.rb
index cc2e97d..cc2e97d 100644
--- a/db/migrate/20140424014443_create_statistics.rb
+++ b/db/migrate/20140424202641_create_statistics.rb
diff --git a/db/migrate/20140424014445_create_remote_usernames.rb b/db/migrate/20140424202645_create_remote_usernames.rb
index e265985..e265985 100644
--- a/db/migrate/20140424014445_create_remote_usernames.rb
+++ b/db/migrate/20140424202645_create_remote_usernames.rb
diff --git a/db/migrate/20140424014446_create_bracket_matches.rb b/db/migrate/20140424202649_create_bracket_matches.rb
index 3323e31..3323e31 100644
--- a/db/migrate/20140424014446_create_bracket_matches.rb
+++ b/db/migrate/20140424202649_create_bracket_matches.rb
diff --git a/db/migrate/20140424014448_create_api_requests.rb b/db/migrate/20140424202652_create_api_requests.rb
index 544c330..544c330 100644
--- a/db/migrate/20140424014448_create_api_requests.rb
+++ b/db/migrate/20140424202652_create_api_requests.rb
diff --git a/db/migrate/20140424014449_create_tournament_players_join_table.rb b/db/migrate/20140424202656_create_tournament_players_join_table.rb
index be240e8..be240e8 100644
--- a/db/migrate/20140424014449_create_tournament_players_join_table.rb
+++ b/db/migrate/20140424202656_create_tournament_players_join_table.rb
diff --git a/db/migrate/20140424014451_create_tournament_hosts_join_table.rb b/db/migrate/20140424202659_create_tournament_hosts_join_table.rb
index 7521d89..7521d89 100644
--- a/db/migrate/20140424014451_create_tournament_hosts_join_table.rb
+++ b/db/migrate/20140424202659_create_tournament_hosts_join_table.rb
diff --git a/db/migrate/20140424014452_create_team_user_join_table.rb b/db/migrate/20140424202703_create_team_user_join_table.rb
index f3b57fc..f3b57fc 100644
--- a/db/migrate/20140424014452_create_team_user_join_table.rb
+++ b/db/migrate/20140424202703_create_team_user_join_table.rb
diff --git a/db/migrate/20140424014454_create_match_team_join_table.rb b/db/migrate/20140424202706_create_match_team_join_table.rb
index c2ed1b7..c2ed1b7 100644
--- a/db/migrate/20140424014454_create_match_team_join_table.rb
+++ b/db/migrate/20140424202706_create_match_team_join_table.rb
diff --git a/db/migrate/20140424014459_add_hidden_attrs_to_user.rb b/db/migrate/20140424202717_add_hidden_attrs_to_user.rb
index 9b5c505..9b5c505 100644
--- a/db/migrate/20140424014459_add_hidden_attrs_to_user.rb
+++ b/db/migrate/20140424202717_add_hidden_attrs_to_user.rb
diff --git a/db/schema.rb b/db/schema.rb
index 0e9202a..0833263 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: 20140424014459) do
+ActiveRecord::Schema.define(version: 20140424202717) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
diff --git a/db/seeds.rb b/db/seeds.rb
index 7b8709c..61cf44a 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -16,18 +16,32 @@ Game.create(name: "Rock, Paper, Scissors", min_players_per_team: 1, max_players_
 
 Game.find_by_name("League of Legends").settings.create(name: "Map", default: "Summoners Rift", type_opt: "Summoners Rift,Twisted Treeline,Crystal Scar,Haunted Abyss", description: "Select a map to play on.", vartype: 5, display_order: 1)
 Game.find_by_name("League of Legends").settings.create(name: "Pick Type", type_opt: "Blind Pick,Draft", description: "Select a pick type.", vartype: 5, display_order: 2)
+Game.find_by_name("League of Legends").settings.create(name: "Scoring Method", type_opt: "FibonacciPeerWithBlowout,MarginalPeer,WinnerTakesAll", description: "Select Scoring Method", vartype: 5, display_order: 3)
+Game.find_by_name("League of Legends").settings.create(name: "Seeding Method", type_opt: "Manual,Random,MultiStage", description: "Select Seeding Method", vartype: 5, display_order: 4)
+Game.find_by_name("League of Legends").settings.create(name: "Scheduling Method", type_opt: "Elimination,RoundRobin", description: "Select Scheduling Method", vartype: 5, display_order: 5)
 
 Game.find_by_name("Chess").settings.create(name: "Time Control", description: "Enter a value for Time Control (ie. 5-5, 30, 6hr, or None)", vartype: 0, display_order: 1)
+Game.find_by_name("Chess").settings.create(name: "Scoring Method", type_opt: "WinnerTakesAll", description: "Select Scoring Method", vartype: 5, display_order: 2)
+Game.find_by_name("Chess").settings.create(name: "Seeding Method", type_opt: "Manual,Random,MultiStage", description: "Select Seeding Method", vartype: 5, display_order: 3)
+Game.find_by_name("Chess").settings.create(name: "Scheduling Method", type_opt: "Elimination,RoundRobin", description: "Select Scheduling Method", vartype: 5, display_order: 4)
 
 Game.find_by_name("Hearthstone").settings.create(name: "Deck Name", description: "Enter a name for your deck, be descriptive.", vartype: 1, display_order: 1)
+Game.find_by_name("Hearthstone").settings.create(name: "Scoring Method", type_opt: "WinnerTakesAll", description: "Select Scoring Method", vartype: 5, display_order: 2)
+Game.find_by_name("Hearthstone").settings.create(name: "Seeding Method", type_opt: "Manual,Random,MultiStage", description: "Select Seeding Method", vartype: 5, display_order: 3)
+Game.find_by_name("Hearthstone").settings.create(name: "Scheduling Method", type_opt: "Elimination,RoundRobin", description: "Select Scheduling Method", vartype: 5, display_order: 4)
 
-Game.find_by_name("Rock, Paper, Scissors").settings.create(name: "Favorite Object", description: "What is your favorite object in RPS?", type_opt: "Rock,Paper,Scissors", vartype: 2, display_order: 2)
-Game.find_by_name("Rock, Paper, Scissors").settings.create(name: "Lizard, Spock allowed?", description: "Will you allow Lizard and Spock?", vartype: 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?", vartype: 3, display_order: 3)
+Game.find_by_name("Rock, Paper, Scissors").settings.create(name: "Favorite Object", description: "What is your favorite object in RPS?", type_opt: "Rock,Paper,Scissors", vartype: 2, display_order: 5)
+Game.find_by_name("Rock, Paper, Scissors").settings.create(name: "Lizard, Spock allowed?", description: "Will you allow Lizard and Spock?", vartype: 4, display_order: 4)
+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?", vartype: 3, display_order: 6)
+Game.find_by_name("Rock, Paper, Scissors").settings.create(name: "Scoring Method", type_opt: "WinnerTakesAll", description: "Select Scoring Method", vartype: 5, display_order: 1)
+Game.find_by_name("Rock, Paper, Scissors").settings.create(name: "Seeding Method", type_opt: "Manual,Random,MultiStage", description: "Select Seeding Method", vartype: 5, display_order: 2)
+Game.find_by_name("Rock, Paper, Scissors").settings.create(name: "Scheduling Method", type_opt: "Elimination,RoundRobin", description: "Select Scheduling Method", vartype: 5, display_order: 3)
 
 if Rails.env.development?
+	#user 1, the ADMIN
 	User.create(name: "Administrator", user_name: "admin", email: "root@localhost.lan", password: "password", password_confirmation: "password", permissions: 0xFFFFFFFF)
 
+	#john doe's for testing
 	User.create(name: "John 0", password: "password", email: "john0@gmail.com", user_name: "johndoe0", password_confirmation: "password")
 	User.create(name: "John 1", password: "password", email: "john1@gmail.com", user_name: "johndoe1", password_confirmation: "password")
 	User.create(name: "John 2", password: "password", email: "john2@gmail.com", user_name: "johndoe2", password_confirmation: "password")
@@ -39,14 +53,74 @@ if Rails.env.development?
 	User.create(name: "John 8", password: "password", email: "john8@gmail.com", user_name: "johndoe8", password_confirmation: "password")
 	User.create(name: "John 9", password: "password", email: "john9@gmail.com", user_name: "johndoe9", password_confirmation: "password")
 
-	User.create(name: "Sytrie", password: "password", email: "Sytrie@gmail.com", user_name: "Sytrie", password_confirmation: "password")
-	User.create(name: "Derpanator115", password: "password", email: "Derpanator115@gmail.com", user_name: "Derpanator115", password_confirmation: "password")
-	User.create(name: "Wlknexe56", password: "password", email: "Wlknexe56@gmail.com", user_name: "Wlknexe56", password_confirmation: "password")
-	User.create(name: "DVisionzz", password: "password", email: "DVisionzz@gmail.com", user_name: "DVisionzz", password_confirmation: "password")
-	User.create(name: "HYP3RTONIC", password: "password", email: "HYP3RTONIC@gmail.com", user_name: "HYP3RTONIC", password_confirmation: "password")
-	User.create(name: "M9Fumjaa", password: "password", email: "M9Fumjaa@gmail.com", user_name: "M9Fumjaa", password_confirmation: "password")
-	User.create(name: "spikevsnaruto", password: "password", email: "spikevsnaruto@gmail.com", user_name: "spikevsnaruto", password_confirmation: "password")
-	User.create(name: "GoogleMaSkills", password: "password", email: "GoogleMaSkills@gmail.com", user_name: "GoogleMaSkills", password_confirmation: "password")
-	User.create(name: "james chamberlan", password: "password", email: "james chamberlan@gmail.com", user_name: "james chamberlan", password_confirmation: "password")
-	User.create(name: "Kaceytron", password: "password", email: "Kaceytron@gmail.com", user_name: "Kaceytron", password_confirmation: "password")
+	players_for_league = Array.new
+
+	#users for our fake seeded game from the yamls
+	players_for_league.push(User.create(name: "Sytrie", password: "password", email: "Sytrie@gmail.com", user_name: "Sytrie", password_confirmation: "password"))
+	players_for_league.push(User.create(name: "Derpanator115", password: "password", email: "Derpanator115@gmail.com", user_name: "Derpanator115", password_confirmation: "password"))
+	players_for_league.push(User.create(name: "Wlknexe56", password: "password", email: "Wlknexe56@gmail.com", user_name: "Wlknexe56", password_confirmation: "password"))
+	players_for_league.push(User.create(name: "DVisionzz", password: "password", email: "DVisionzz@gmail.com", user_name: "DVisionzz", password_confirmation: "password"))
+	players_for_league.push(User.create(name: "HYP3RTONIC", password: "password", email: "HYP3RTONIC@gmail.com", user_name: "HYP3RTONIC", password_confirmation: "password"))
+	players_for_league.push(User.create(name: "M9Fumjaa", password: "password", email: "M9Fumjaa@gmail.com", user_name: "M9Fumjaa", password_confirmation: "password"))
+	players_for_league.push(User.create(name: "spikevsnaruto", password: "password", email: "spikevsnaruto@gmail.com", user_name: "spikevsnaruto", password_confirmation: "password"))
+	players_for_league.push(User.create(name: "GoogleMaSkills", password: "password", email: "GoogleMaSkills@gmail.com", user_name: "GoogleMaSkills", password_confirmation: "password"))
+	players_for_league.push(User.create(name: "james chamberlan", password: "password", email: "jameschamberlan@gmail.com", user_name: "james chamberlan", password_confirmation: "password"))
+	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")
+
+
+	#league of legends tournament
+	league_tourn = Tournament.create(game_id: 1, status: 0, 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, set_rounds: 1, randomized_teams: true, sampling_method: nil)
+
+	#adds players to the seeded league tournament
+	for i in 0..9
+		if i == 0
+			league_tourn.hosts.push(players_for_league[i])
+		end
+		league_tourn.join(players_for_league[i])
+	end
+	league_tourn.join(players_for_league[9])
+
+	#chess
+	chess_tourn = Tournament.create(game_id: 2, status: 0, name: "Chess Seed", min_players_per_team: 1, max_players_per_team: 1, min_teams_per_match: 2, 
+		max_teams_per_match: 2, set_rounds: 1, randomized_teams: true, sampling_method: nil)
+
+	chess_tourn.hosts.push(davis)
+	chess_tourn.join(davis)
+	chess_tourn.join(foy)
+
+	#Rock Paper Scissors
+	rps = Tournament.create(game_id: 4, status: 0, 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, set_rounds: 1, randomized_teams: true, sampling_method: nil)
+
+	rps.hosts.push(davis)
+	rps.join(davis)
+	rps.join(foy)
+	rps.join(guntas)
+
+	tourn5 = Tournament.create(game_id: 1, status: 0, 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, set_rounds: 1, randomized_teams: true, sampling_method: nil)
+
+	for i in 0..9
+		if i == 0
+			tourn5.hosts.push(players_for_league[i])
+		end
+		tourn5.join(players_for_league[i])
+	end
+	tourn5.join(players_for_league[9])
+
 end