24 files changed, 28 insertions, 16 deletions
diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index ea3857c..720305f 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -69,6 +69,6 @@ class TournamentsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def tournament_params
-      params[:tournament]
+      params.require(:tournament).permit(:game_id)
     end
 end
diff --git a/app/models/tournament.rb b/app/models/tournament.rb
index da3da0e..cc915a0 100644
--- a/app/models/tournament.rb
+++ b/app/models/tournament.rb
@@ -1,2 +1,3 @@
 class Tournament < ActiveRecord::Base
+  belongs_to :game
 end
diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb
index 8996266..1fd63e9 100644
--- a/app/views/tournaments/_form.html.erb
+++ b/app/views/tournaments/_form.html.erb
@@ -11,6 +11,10 @@
     </div>
   <% end %>
 
+  <div class="field">
+    <%= f.label :game_id %><br>
+    <%= f.text_field :game_id %>
+  </div>
   <div class="actions">
     <%= f.submit %>
   </div>
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb
index 7124111..ad2b7cf 100644
--- a/app/views/tournaments/index.html.erb
+++ b/app/views/tournaments/index.html.erb
@@ -3,6 +3,7 @@
 <table>
   <thead>
     <tr>
+      <th>Game</th>
       <th></th>
       <th></th>
       <th></th>
@@ -12,6 +13,7 @@
   <tbody>
     <% @tournaments.each do |tournament| %>
       <tr>
+        <td><%= tournament.game %></td>
         <td><%= link_to 'Show', tournament %></td>
         <td><%= link_to 'Edit', edit_tournament_path(tournament) %></td>
         <td><%= link_to 'Destroy', tournament, method: :delete, data: { confirm: 'Are you sure?' } %></td>
diff --git a/app/views/tournaments/index.json.jbuilder b/app/views/tournaments/index.json.jbuilder
index 28d6960..e6f3b49 100644
--- a/app/views/tournaments/index.json.jbuilder
+++ b/app/views/tournaments/index.json.jbuilder
@@ -1,4 +1,4 @@
 json.array!(@tournaments) do |tournament|
-  json.extract! tournament, :id
+  json.extract! tournament, :id, :game_id
   json.url tournament_url(tournament, format: :json)
 end
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
index 2c280ba..30df788 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -1,4 +1,9 @@
 <p id="notice"><%= notice %></p>
 
+<p>
+  <strong>Game:</strong>
+  <%= @tournament.game %>
+</p>
+
 <%= link_to 'Edit', edit_tournament_path(@tournament) %> |
 <%= link_to 'Back', tournaments_path %>
diff --git a/app/views/tournaments/show.json.jbuilder b/app/views/tournaments/show.json.jbuilder
index 211799a..0fe65a6 100644
--- a/app/views/tournaments/show.json.jbuilder
+++ b/app/views/tournaments/show.json.jbuilder
@@ -1 +1 @@
-json.extract! @tournament, :id, :created_at, :updated_at
+json.extract! @tournament, :id, :game_id, :created_at, :updated_at
diff --git a/db/migrate/20140304015013_create_servers.rb b/db/migrate/20140304015051_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140304015013_create_servers.rb
+++ b/db/migrate/20140304015051_create_servers.rb
diff --git a/db/migrate/20140304015015_create_tournaments.rb b/db/migrate/20140304015053_create_tournaments.rb
index 2095590..36fcf7e 100644
--- a/db/migrate/20140304015015_create_tournaments.rb
+++ b/db/migrate/20140304015053_create_tournaments.rb
@@ -1,6 +1,7 @@
 class CreateTournaments < ActiveRecord::Migration
   def change
     create_table :tournaments do |t|
+      t.references :game, index: true
 
       t.timestamps
     end
diff --git a/db/migrate/20140304015017_create_matches.rb b/db/migrate/20140304015055_create_matches.rb
index 6c0c157..6c0c157 100644
--- a/db/migrate/20140304015017_create_matches.rb
+++ b/db/migrate/20140304015055_create_matches.rb
diff --git a/db/migrate/20140304015019_create_teams.rb b/db/migrate/20140304015057_create_teams.rb
index dd8397d..dd8397d 100644
--- a/db/migrate/20140304015019_create_teams.rb
+++ b/db/migrate/20140304015057_create_teams.rb
diff --git a/db/migrate/20140304015021_create_users.rb b/db/migrate/20140304015059_create_users.rb
index 6a500e5..6a500e5 100644
--- a/db/migrate/20140304015021_create_users.rb
+++ b/db/migrate/20140304015059_create_users.rb
diff --git a/db/migrate/20140304015023_create_user_team_pairs.rb b/db/migrate/20140304015102_create_user_team_pairs.rb
index 2c492ac..2c492ac 100644
--- a/db/migrate/20140304015023_create_user_team_pairs.rb
+++ b/db/migrate/20140304015102_create_user_team_pairs.rb
diff --git a/db/migrate/20140304015026_create_team_match_pairs.rb b/db/migrate/20140304015104_create_team_match_pairs.rb
index 8fac07e..8fac07e 100644
--- a/db/migrate/20140304015026_create_team_match_pairs.rb
+++ b/db/migrate/20140304015104_create_team_match_pairs.rb
diff --git a/db/migrate/20140304015028_create_alerts.rb b/db/migrate/20140304015106_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140304015028_create_alerts.rb
+++ b/db/migrate/20140304015106_create_alerts.rb
diff --git a/db/migrate/20140304015030_create_pms.rb b/db/migrate/20140304015108_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140304015030_create_pms.rb
+++ b/db/migrate/20140304015108_create_pms.rb
diff --git a/db/migrate/20140304015032_create_games.rb b/db/migrate/20140304015110_create_games.rb
index fc54709..fc54709 100644
--- a/db/migrate/20140304015032_create_games.rb
+++ b/db/migrate/20140304015110_create_games.rb
diff --git a/db/migrate/20140304015034_create_game_attributes.rb b/db/migrate/20140304015112_create_game_attributes.rb
index b63f134..b63f134 100644
--- a/db/migrate/20140304015034_create_game_attributes.rb
+++ b/db/migrate/20140304015112_create_game_attributes.rb
diff --git a/db/migrate/20140304015036_create_server_settings.rb b/db/migrate/20140304015114_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140304015036_create_server_settings.rb
+++ b/db/migrate/20140304015114_create_server_settings.rb
diff --git a/db/migrate/20140304015042_create_tournament_options.rb b/db/migrate/20140304015120_create_tournament_options.rb
index d2df22e..d2df22e 100644
--- a/db/migrate/20140304015042_create_tournament_options.rb
+++ b/db/migrate/20140304015120_create_tournament_options.rb
diff --git a/db/schema.rb b/db/schema.rb
index 86afd1b..7681cfc 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: 20140304015042) do
+ActiveRecord::Schema.define(version: 20140304015120) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -88,10 +88,13 @@ ActiveRecord::Schema.define(version: 20140304015042) do
   end
 
   create_table "tournaments", force: true do |t|
+    t.integer  "game_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
+  add_index "tournaments", ["game_id"], name: "index_tournaments_on_game_id"
+
   create_table "user_team_pairs", force: true do |t|
     t.integer  "user_id"
     t.integer  "team_id"
diff --git a/generate.sh b/generate.sh
index 7dbb444..b384813 100755
--- a/generate.sh
+++ b/generate.sh
@@ -10,7 +10,7 @@
 
 set -x
 bundle exec rails generate scaffold server
-bundle exec rails generate scaffold tournament
+bundle exec rails generate scaffold tournament game:references
 bundle exec rails generate scaffold match tournament:references
 bundle exec rails generate scaffold team 
 bundle exec rails generate scaffold user name:text pw_hash:text groups:integer 
diff --git a/test/controllers/tournaments_controller_test.rb b/test/controllers/tournaments_controller_test.rb
index 9363bdf..bdbbfac 100644
--- a/test/controllers/tournaments_controller_test.rb
+++ b/test/controllers/tournaments_controller_test.rb
@@ -18,7 +18,7 @@ class TournamentsControllerTest < ActionController::TestCase
 
   test "should create tournament" do
     assert_difference('Tournament.count') do
-      post :create, tournament: {  }
+      post :create, tournament: { game_id: @tournament.game_id }
     end
 
     assert_redirected_to tournament_path(assigns(:tournament))
@@ -35,7 +35,7 @@ class TournamentsControllerTest < ActionController::TestCase
   end
 
   test "should update tournament" do
-    patch :update, id: @tournament, tournament: {  }
+    patch :update, id: @tournament, tournament: { game_id: @tournament.game_id }
     assert_redirected_to tournament_path(assigns(:tournament))
   end
 
diff --git a/test/fixtures/tournaments.yml b/test/fixtures/tournaments.yml
index 937a0c0..4cba7ca 100644
--- a/test/fixtures/tournaments.yml
+++ b/test/fixtures/tournaments.yml
@@ -1,11 +1,7 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
-# This model initially had no columns defined.  If you add columns to the
-# model remove the '{}' from the fixture names and add the columns immediately
-# below each fixture, per the syntax in the comments below
-#
-one: {}
-# column: value
-#
-two: {}
-#  column: value
+one:
+  game_id: 
+
+two:
+  game_id: