Possibly broke everything. Added another model for populating tournament options.

16 files changed, 41 insertions, 2 deletions

diff --git a/app/models/tournament_options.rb b/app/models/tournament_options.rb
new file mode 100644
index 0000000..8ed6433
--- /dev/null
+++ b/app/models/tournament_options.rb
@@ -0,0 +1,2 @@
+class TournamentOptions < ActiveRecord::Base
+end
diff --git a/db/migrate/20140304014838_create_servers.rb b/db/migrate/20140304014940_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140304014838_create_servers.rb
+++ b/db/migrate/20140304014940_create_servers.rb
diff --git a/db/migrate/20140304014840_create_tournaments.rb b/db/migrate/20140304014942_create_tournaments.rb
index 2095590..2095590 100644
--- a/db/migrate/20140304014840_create_tournaments.rb
+++ b/db/migrate/20140304014942_create_tournaments.rb
diff --git a/db/migrate/20140304014842_create_matches.rb b/db/migrate/20140304014944_create_matches.rb
index 6c0c157..6c0c157 100644
--- a/db/migrate/20140304014842_create_matches.rb
+++ b/db/migrate/20140304014944_create_matches.rb
diff --git a/db/migrate/20140304014844_create_teams.rb b/db/migrate/20140304014946_create_teams.rb
index dd8397d..dd8397d 100644
--- a/db/migrate/20140304014844_create_teams.rb
+++ b/db/migrate/20140304014946_create_teams.rb
diff --git a/db/migrate/20140304014846_create_users.rb b/db/migrate/20140304014948_create_users.rb
index 6a500e5..6a500e5 100644
--- a/db/migrate/20140304014846_create_users.rb
+++ b/db/migrate/20140304014948_create_users.rb
diff --git a/db/migrate/20140304014848_create_user_team_pairs.rb b/db/migrate/20140304014950_create_user_team_pairs.rb
index 2c492ac..2c492ac 100644
--- a/db/migrate/20140304014848_create_user_team_pairs.rb
+++ b/db/migrate/20140304014950_create_user_team_pairs.rb
diff --git a/db/migrate/20140304014850_create_team_match_pairs.rb b/db/migrate/20140304014952_create_team_match_pairs.rb
index 8fac07e..8fac07e 100644
--- a/db/migrate/20140304014850_create_team_match_pairs.rb
+++ b/db/migrate/20140304014952_create_team_match_pairs.rb
diff --git a/db/migrate/20140304014852_create_alerts.rb b/db/migrate/20140304014954_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140304014852_create_alerts.rb
+++ b/db/migrate/20140304014954_create_alerts.rb
diff --git a/db/migrate/20140304014855_create_pms.rb b/db/migrate/20140304014957_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140304014855_create_pms.rb
+++ b/db/migrate/20140304014957_create_pms.rb
diff --git a/db/migrate/20140304014857_create_server_settings.rb b/db/migrate/20140304014959_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140304014857_create_server_settings.rb
+++ b/db/migrate/20140304014959_create_server_settings.rb
diff --git a/db/migrate/20140304015005_create_tournament_options.rb b/db/migrate/20140304015005_create_tournament_options.rb
new file mode 100644
index 0000000..d2df22e
--- /dev/null
+++ b/db/migrate/20140304015005_create_tournament_options.rb
@@ -0,0 +1,8 @@
+class CreateTournamentOptions < ActiveRecord::Migration
+  def change
+    create_table :tournament_options do |t|
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 88dfa1a..9d307ae 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: 20140304014857) do
+ActiveRecord::Schema.define(version: 20140304015005) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -66,6 +66,11 @@ ActiveRecord::Schema.define(version: 20140304014857) do
     t.datetime "updated_at"
   end
 
+  create_table "tournament_options", force: true do |t|
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "tournaments", force: true do |t|
     t.datetime "created_at"
     t.datetime "updated_at"
diff --git a/generate.sh b/generate.sh
index 666869c..52d0f90 100755
--- a/generate.sh
+++ b/generate.sh
@@ -4,7 +4,8 @@
 # To Start Rails Server:
 #   bundle exec rails server
 #
-#
+# To Clear the Generated Files:
+#   
 #
 
 set -x
@@ -20,6 +21,11 @@ bundle exec rails generate scaffold pm author:references recipient:references me
 bundle exec rails generate model server_settings
 bundle exec rails generate controller search
 bundle exec rails generate controller main
+
+#for the tournament controller to generate options
+bundle exec rails generate model tournament_options
+
 bundle exec rake db:drop RAILS_ENV=development
 bundle exec rake db:migrate RAILS_ENV=development
+
 #bundle exec rails generate scaffold 
diff --git a/test/fixtures/tournament_options.yml b/test/fixtures/tournament_options.yml
new file mode 100644
index 0000000..937a0c0
--- /dev/null
+++ b/test/fixtures/tournament_options.yml
@@ -0,0 +1,11 @@
+# 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
diff --git a/test/models/tournament_options_test.rb b/test/models/tournament_options_test.rb
new file mode 100644
index 0000000..7677fae
--- /dev/null
+++ b/test/models/tournament_options_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class TournamentOptionsTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end