Merge branch 'clean2'

Conflicts:
	app/assets/stylesheets/matches.css.scss
	app/assets/stylesheets/tournaments.css.scss
	app/controllers/alerts_controller.rb
	app/controllers/games_controller.rb
	app/controllers/matches_controller.rb
	app/controllers/pms_controller.rb
	app/controllers/servers_controller.rb
	app/controllers/sessions_controller.rb
	app/controllers/teams_controller.rb
	app/controllers/tournaments_controller.rb
	app/controllers/users_controller.rb
	app/helpers/sessions_helper.rb
	app/models/alert.rb
	app/models/game.rb
	app/models/match.rb
	app/models/server.rb
	app/models/session.rb
	app/models/team.rb
	app/models/tournament.rb
	app/models/user.rb
	app/views/alerts/show.html.erb
	app/views/games/index.html.erb
	app/views/games/show.html.erb
	app/views/matches/_form.html.erb
	app/views/matches/index.html.erb
	app/views/matches/index.json.jbuilder
	app/views/matches/new.html.erb
	app/views/matches/show.html.erb
	app/views/matches/show.json.jbuilder
	app/views/pms/show.html.erb
	app/views/servers/_form.html.erb
	app/views/servers/edit.html.erb
	app/views/servers/show.html.erb
	app/views/sessions/new.html.erb
	app/views/tournaments/index.html.erb
	app/views/tournaments/new.html.erb
	app/views/tournaments/show.html.erb
	app/views/users/_form.html.erb
	app/views/users/edit.html.erb
	app/views/users/index.html.erb
	app/views/users/new.html.erb
	app/views/users/show.html.erb
	config/routes.rb
	db/migrate/20140406195921_create_simple_captcha_data.rb
	db/migrate/20140406235927_create_delayed_jobs.rb
	db/migrate/20140406235933_create_servers.rb
	db/migrate/20140406235940_create_matches.rb
	db/migrate/20140406235946_create_teams.rb
	db/migrate/20140406235952_create_alerts.rb
	db/migrate/20140406235958_create_pms.rb
	db/migrate/20140407000005_create_tournaments.rb
	db/migrate/20140407000011_create_games.rb
	db/migrate/20140407000017_create_users.rb
	db/migrate/20140407000024_create_sessions.rb
	db/migrate/20140407000030_create_server_settings.rb
	db/migrate/20140407000036_create_game_settings.rb
	db/migrate/20140407000042_create_tournament_preferences.rb
	db/migrate/20140407000048_create_scores.rb
	db/migrate/20140407000054_create_remote_usernames.rb
	db/migrate/20140407000100_create_tournament_players_join_table.rb
	db/migrate/20140407000106_create_tournament_hosts_join_table.rb
	db/migrate/20140407000112_create_team_user_join_table.rb
	db/migrate/20140407000118_create_match_team_join_table.rb
	db/migrate/20140407000143_add_hidden_attrs_to_user.rb
	db/migrate/20140407041416_create_simple_captcha_data.rb
	db/migrate/20140407081419_create_delayed_jobs.rb
	db/migrate/20140407081422_create_servers.rb
	db/migrate/20140407081425_create_matches.rb
	db/migrate/20140407081427_create_teams.rb
	db/migrate/20140407081430_create_alerts.rb
	db/migrate/20140407081434_create_pms.rb
	db/migrate/20140407081437_create_tournaments.rb
	db/migrate/20140407081440_create_games.rb
	db/migrate/20140407081443_create_users.rb
	db/migrate/20140407081446_create_sessions.rb
	db/migrate/20140407081449_create_server_settings.rb
	db/migrate/20140407081452_create_game_settings.rb
	db/migrate/20140407081454_create_tournament_preferences.rb
	db/migrate/20140407081458_create_scores.rb
	db/migrate/20140407081501_create_remote_usernames.rb
	db/migrate/20140407081503_create_tournament_players_join_table.rb
	db/migrate/20140407081506_create_tournament_hosts_join_table.rb
	db/migrate/20140407081509_create_team_user_join_table.rb
	db/migrate/20140407081512_create_match_team_join_table.rb
	db/migrate/20140407081524_add_hidden_attrs_to_user.rb
	db/migrate/20140410170710_create_simple_captcha_data.rb
	db/migrate/20140410210717_create_delayed_jobs.rb
	db/migrate/20140410210723_create_servers.rb
	db/migrate/20140410210730_create_matches.rb
	db/migrate/20140410210736_create_teams.rb
	db/migrate/20140410210743_create_alerts.rb
	db/migrate/20140410210750_create_pms.rb
	db/migrate/20140410210756_create_tournaments.rb
	db/migrate/20140410210803_create_games.rb
	db/migrate/20140410210809_create_users.rb
	db/migrate/20140410210816_create_sessions.rb
	db/migrate/20140410211152_create_server_settings.rb
	db/migrate/20140410211158_create_game_settings.rb
	db/migrate/20140410211205_create_tournament_preferences.rb
	db/migrate/20140410211211_create_scores.rb
	db/migrate/20140410211217_create_remote_usernames.rb
	db/migrate/20140410211229_create_tournament_players_join_table.rb
	db/migrate/20140410211236_create_tournament_hosts_join_table.rb
	db/migrate/20140410211242_create_team_user_join_table.rb
	db/migrate/20140410211248_create_match_team_join_table.rb
	db/migrate/20140410211313_add_hidden_attrs_to_user.rb
	db/schema.rb
	test/controllers/matches_controller_test.rb
	test/fixtures/matches.yml

13 files changed, 186 insertions, 0 deletions

diff --git a/app/assets/javascripts/brackets.js.coffee b/app/assets/javascripts/brackets.js.coffee
new file mode 100644
index 0000000..24f83d1
--- /dev/null
+++ b/app/assets/javascripts/brackets.js.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/brackets.css.scss b/app/assets/stylesheets/brackets.css.scss
new file mode 100644
index 0000000..481e6e6
--- /dev/null
+++ b/app/assets/stylesheets/brackets.css.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the brackets controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/brackets_controller.rb b/app/controllers/brackets_controller.rb
new file mode 100644
index 0000000..fe43ca9
--- /dev/null
+++ b/app/controllers/brackets_controller.rb
@@ -0,0 +1,74 @@
+class BracketsController < ApplicationController
+	before_action :set_bracket, only: [:show, :edit, :update, :destroy]
+
+	# GET /brackets
+	# GET /brackets.json
+	def index
+		@brackets = Bracket.all
+	end
+
+	# GET /brackets/1
+	# GET /brackets/1.json
+	def show
+	end
+
+	# GET /brackets/new
+	def new
+		@bracket = Bracket.new
+	end
+
+	# GET /brackets/1/edit
+	def edit
+	end
+
+	# POST /brackets
+	# POST /brackets.json
+	def create
+		@bracket = Bracket.new(bracket_params)
+
+		respond_to do |format|
+			if @bracket.save
+				format.html { redirect_to @bracket, notice: 'Bracket was successfully created.' }
+				format.json { render action: 'show', status: :created, location: @bracket }
+			else
+				format.html { render action: 'new' }
+				format.json { render json: @bracket.errors, status: :unprocessable_entity }
+			end
+		end
+	end
+
+	# PATCH/PUT /brackets/1
+	# PATCH/PUT /brackets/1.json
+	def update
+		respond_to do |format|
+			if @bracket.update(bracket_params)
+				format.html { redirect_to @bracket, notice: 'Bracket was successfully updated.' }
+				format.json { head :no_content }
+			else
+				format.html { render action: 'edit' }
+				format.json { render json: @bracket.errors, status: :unprocessable_entity }
+			end
+		end
+	end
+
+	# DELETE /brackets/1
+	# DELETE /brackets/1.json
+	def destroy
+		@bracket.destroy
+		respond_to do |format|
+			format.html { redirect_to brackets_url }
+			format.json { head :no_content }
+		end
+	end
+
+	private
+	# Use callbacks to share common setup or constraints between actions.
+	def set_bracket
+		@bracket = Bracket.find(params[:id])
+	end
+
+	# Never trust parameters from the scary internet, only allow the white list through.
+	def bracket_params
+		params.require(:bracket).permit(:user_id, :tournament_id, :name)
+	end
+end
diff --git a/app/helpers/brackets_helper.rb b/app/helpers/brackets_helper.rb
new file mode 100644
index 0000000..8c380fd
--- /dev/null
+++ b/app/helpers/brackets_helper.rb
@@ -0,0 +1,2 @@
+module BracketsHelper
+end
diff --git a/app/models/bracket.rb b/app/models/bracket.rb
new file mode 100644
index 0000000..e8d9c5a
--- /dev/null
+++ b/app/models/bracket.rb
@@ -0,0 +1,4 @@
+class Bracket < ActiveRecord::Base
+	belongs_to :user
+	belongs_to :tournament
+end
diff --git a/app/models/bracket_match.rb b/app/models/bracket_match.rb
new file mode 100644
index 0000000..823bc40
--- /dev/null
+++ b/app/models/bracket_match.rb
@@ -0,0 +1,5 @@
+class BracketMatch < ActiveRecord::Base
+	belongs_to :bracket
+	belongs_to :match
+	belongs_to :predicted_winner
+end
diff --git a/app/views/brackets/_form.html.erb b/app/views/brackets/_form.html.erb
new file mode 100644
index 0000000..5050fc1
--- /dev/null
+++ b/app/views/brackets/_form.html.erb
@@ -0,0 +1,29 @@
+<%= form_for(@bracket) do |f| %>
+  <% if @bracket.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@bracket.errors.count, "error") %> prohibited this bracket from being saved:</h2>
+
+      <ul>
+      <% @bracket.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :user_id %><br>
+    <%= f.text_field :user_id %>
+  </div>
+  <div class="field">
+    <%= f.label :tournament_id %><br>
+    <%= f.text_field :tournament_id %>
+  </div>
+  <div class="field">
+    <%= f.label :name %><br>
+    <%= f.text_field :name %>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>
diff --git a/app/views/brackets/edit.html.erb b/app/views/brackets/edit.html.erb
new file mode 100644
index 0000000..10a2b3e
--- /dev/null
+++ b/app/views/brackets/edit.html.erb
@@ -0,0 +1,6 @@
+<h1>Editing bracket</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @bracket %> |
+<%= link_to 'Back', brackets_path %>
diff --git a/app/views/brackets/index.html.erb b/app/views/brackets/index.html.erb
new file mode 100644
index 0000000..2195d69
--- /dev/null
+++ b/app/views/brackets/index.html.erb
@@ -0,0 +1,31 @@
+<h1>Listing brackets</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th>User</th>
+      <th>Tournament</th>
+      <th>Name</th>
+      <th></th>
+      <th></th>
+      <th></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @brackets.each do |bracket| %>
+      <tr>
+        <td><%= bracket.user %></td>
+        <td><%= bracket.tournament %></td>
+        <td><%= bracket.name %></td>
+        <td><%= link_to 'Show', bracket %></td>
+        <td><%= link_to 'Edit', edit_bracket_path(bracket) %></td>
+        <td><%= link_to 'Destroy', bracket, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br>
+
+<%= link_to 'New Bracket', new_bracket_path %>
diff --git a/app/views/brackets/index.json.jbuilder b/app/views/brackets/index.json.jbuilder
new file mode 100644
index 0000000..8a66626
--- /dev/null
+++ b/app/views/brackets/index.json.jbuilder
@@ -0,0 +1,4 @@
+json.array!(@brackets) do |bracket|
+  json.extract! bracket, :id, :user_id, :tournament_id, :name
+  json.url bracket_url(bracket, format: :json)
+end
diff --git a/app/views/brackets/new.html.erb b/app/views/brackets/new.html.erb
new file mode 100644
index 0000000..c379c15
--- /dev/null
+++ b/app/views/brackets/new.html.erb
@@ -0,0 +1,5 @@
+<h1>New bracket</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', brackets_path %>
diff --git a/app/views/brackets/show.html.erb b/app/views/brackets/show.html.erb
new file mode 100644
index 0000000..9c7c14b
--- /dev/null
+++ b/app/views/brackets/show.html.erb
@@ -0,0 +1,19 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong>User:</strong>
+  <%= @bracket.user %>
+</p>
+
+<p>
+  <strong>Tournament:</strong>
+  <%= @bracket.tournament %>
+</p>
+
+<p>
+  <strong>Name:</strong>
+  <%= @bracket.name %>
+</p>
+
+<%= link_to 'Edit', edit_bracket_path(@bracket) %> |
+<%= link_to 'Back', brackets_path %>
diff --git a/app/views/brackets/show.json.jbuilder b/app/views/brackets/show.json.jbuilder
new file mode 100644
index 0000000..6a8d478
--- /dev/null
+++ b/app/views/brackets/show.json.jbuilder
@@ -0,0 +1 @@
+json.extract! @bracket, :id, :user_id, :tournament_id, :name, :created_at, :updated_at