Merge branch 'master' into luke

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/tournaments_controller.rb

4 files changed, 129 insertions, 18 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 85fc5b0..d5752aa 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -11,6 +11,8 @@ class ApplicationController < ActionController::Base
 	#include sessionhelper for the session controller and view
 	include SessionsHelper
 
+	include SimpleCaptcha::ControllerHelpers
+
 	def check_permission(verb, object=nil)
 		unless current_user.can?((verb.to_s+"_"+noun).to_sym) or (!object.nil? and is_owner?(object))
 			respond_to do |format|
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index 474ae04..31fc9ad 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -3,10 +3,115 @@ class MatchesController < ApplicationController
 
 	# GET /matches
 	# GET /matches.json
-	def index
-		@matches = @tournament.matches
-	end
+  require 'httparty'
+  require 'json'
+
+  def index
+    @matches = @tournament.matches
+  end
+
+  def get_riot_info
+	if signed_in?
+
+			#current user information
+			response = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/by-name/#{current_user.user_name}?api_key=ad539f86-22fd-474d-9279-79a7a296ac38")
+
+			id = response["#{current_user.user_name.downcase}"]['id']
+
+			#recent game information
+			recent = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/game/by-summoner/#{response["#{current_user.user_name.downcase}"]['id']}/recent?api_key=ad539f86-22fd-474d-9279-79a7a296ac38")
+
+			game_id = recent["games"][0]["gameId"]
+
+			#remote_user_id = 6651654651354
+			#remove_user_name = TeslasMind
+			#How to Add
+			#how do I access
+
+			#members of most recent game id's
+			player1 = recent["games"][0]["fellowPlayers"][0]["summonerId"]
+			player2 = recent["games"][0]["fellowPlayers"][1]["summonerId"]
+			player3 = recent["games"][0]["fellowPlayers"][2]["summonerId"]
+			player4 = recent["games"][0]["fellowPlayers"][3]["summonerId"]
+			player5 = recent["games"][0]["fellowPlayers"][4]["summonerId"]
+			player6 = recent["games"][0]["fellowPlayers"][5]["summonerId"]
+			player7 = recent["games"][0]["fellowPlayers"][6]["summonerId"]
+			player8 = recent["games"][0]["fellowPlayers"][7]["summonerId"]
+			player9 = recent["games"][0]["fellowPlayers"][8]["summonerId"]
+
+			players_by_id = [player1, player2, player3, player4, player5, player6, player7, player8, player9]
+
+			#collect summoner names
+			memb1 = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/#{player1}/name?api_key=ad539f86-22fd-474d-9279-79a7a296ac38")
+			memb1 = memb1["#{player1}"]
+			sleep(1);
+
+			memb2 = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/#{player2}/name?api_key=ad539f86-22fd-474d-9279-79a7a296ac38")
+			memb2 = memb2["#{player2}"]
+			sleep(1);
+
+			memb3 = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/#{player3}/name?api_key=ad539f86-22fd-474d-9279-79a7a296ac38")
+			memb3 = memb3["#{player3}"]
+			sleep(1);
+
+			memb4 = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/#{player4}/name?api_key=ad539f86-22fd-474d-9279-79a7a296ac38")
+			memb4 = memb4["#{player4}"]
+			sleep(1);
+
+			memb5 = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/#{player5}/name?api_key=ad539f86-22fd-474d-9279-79a7a296ac38")
+			memb5 = memb5["#{player5}"]
+			sleep(1);
+
+			memb6 = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/#{player6}/name?api_key=ad539f86-22fd-474d-9279-79a7a296ac38")
+			memb6 = memb6["#{player6}"]
+			sleep(1);
+
+			memb7 = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/#{player7}/name?api_key=ad539f86-22fd-474d-9279-79a7a296ac38")
+			memb7 = memb7["#{player7}"]
+			sleep(1);
+
+			memb8 = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/#{player8}/name?api_key=ad539f86-22fd-474d-9279-79a7a296ac38")
+			memb8 = memb8["#{player8}"]
+			sleep(1);
+
+			memb9 = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/#{player9}/name?api_key=ad539f86-22fd-474d-9279-79a7a296ac38")
+			memb9 = memb9["#{player9}"]
+			sleep(1);
+
+			memb10 = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/#{id}/name?api_key=ad539f86-22fd-474d-9279-79a7a296ac38")
+			memb10 = memb10["#{id}"]
+
+			players = ["#{memb1}", "#{memb2}", "#{memb3}", "#{memb4}", "#{memb5}", "#{memb6}", "#{memb7}", "#{memb8}", "#{memb9}", "#{memb10}"]
+
+			sleep(5);
+
+			blue = Hash.new
+			purple = Hash.new
+
+			for i in 0..8
+				current_player = players_by_id[i]
+				place = players[i]
+				info = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/game/by-summoner/#{current_player}/recent?api_key=ad539f86-22fd-474d-9279-79a7a296ac38")
+
+				if 100 == info["games"][0]["stats"]["team"]
+					blue.merge!("#{place}" => info["games"][0]["stats"])
+				else
+					purple.merge!("#{place}" => info["games"][0]["stats"])
+				end
+				sleep(1)
+			end					
+
+			if 100 == recent["games"][0]["stats"]["team"]
+				blue.merge!("#{players[9]}" => recent["games"][0]["stats"])
+			else
+				purple.merge!("#{players[9]}" => recent["games"][0]["stats"])
+			end
+
+			@purp = purple
+			@blue = blue
 
+	end #end if
+  end #end def
 	# GET /matches/1
 	# GET /matches/1.json
 	def show
diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index 2d63068..d1a926b 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -69,12 +69,11 @@ class TournamentsController < ApplicationController
 					format.json { render json: @tournament.errors, status: :unprocessable_entity }
 				end
 			end
-
 		when "join"
 			check_permission(:join)
 			respond_to do |format|
 				if @tournament.join(current_user)
-					format.html { render action: 'show', notice: 'You have joined this tournament.' }
+					format.html { redirect_to @tournament, notice: 'You have joined this tournament.' }
 					format.json { head :no_content }
 				end
 				format.html { render action: 'permission_denied', status: :forbidden }
@@ -83,17 +82,19 @@ class TournamentsController < ApplicationController
 		when "leave"
 			respond_to do |format|
 				if @tournament.leave(current_user)
-					format.html {redirect_to tournaments_url, notice: 'You have left the tournament.' }
+					format.html { redirect_to tournaments_url, notice: 'You have left the tournament.' }
 					format.json { head :no_content }
 				end
 				format.html {redirect_to @tournament, notice: 'You were\'t a part of this tournament.' }
 				format.json { render json: "Permission denied", status: :forbidden }
 			end
-		when "open"
+		when "start"
 			check_permission(:edit, @tournament)
+			@tournament.status = 1
+			@tournament.save
 			respond_to do |format|
 				if @tournament.setup
-					format.html { render action: 'show', notice: 'You have joined this tournament.' }
+					format.html { redirect_to @tournament, notice: 'You have joined this tournament.' }
 					format.json { head :no_content }
 				end
 				format.html { render action: 'permission_denied', status: :forbidden }
@@ -101,7 +102,7 @@ class TournamentsController < ApplicationController
 			end
 		else
 			respond_to do |format|
-				format.html { render action: 'show', notice: "Invalid action", status: :unprocessable_entity }
+				format.html { redirect_to @tournament, notice: "Invalid action", status: :unprocessable_entity }
 				format.json { render json: @tournament.errors, status: :unprocessable_entity }
 			end
 		end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 82edae7..bcb45aa 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,6 +1,7 @@
 class UsersController < ApplicationController
 
 	# GET /users
+
 	# GET /users.json
 	def index
 		@users = User.all
@@ -23,15 +24,17 @@ class UsersController < ApplicationController
 	# POST /users
 	# POST /users.json
 	def create
-		@user = User.new(user_params)
-		respond_to do |format|
-			if @user.save
-				sign_in @user
-				format.html { redirect_to root_path, notice: 'User was successfully created.' }
-				format.json { render action: 'show', status: :created, location: @user }
-			else
-				format.html { render action: 'new', status: :unprocessable_entity }
-				format.json { render json: @user.errors, status: :unprocessable_entity }
+		if simple_captcha_valid?
+			@user = User.new(user_params)
+			respond_to do |format|
+				if @user.save
+					sign_in @user
+					format.html { redirect_to root_path, notice: 'User was successfully created.' }
+					format.json { render action: 'show', status: :created, location: @user }
+				else
+					format.html { render action: 'new', status: :unprocessable_entity }
+					format.json { render json: @user.errors, status: :unprocessable_entity }
+				end
 			end
 		end
 	end