From 8e3e88f52c1f2d73acdcb7fdf60326b5f7717068 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Wed, 26 Feb 2014 20:07:42 -0500 Subject: Possibly broke everything. Added another model for populating tournament options. --- app/models/tournament_options.rb | 2 ++ db/migrate/20140304014838_create_servers.rb | 8 -------- db/migrate/20140304014840_create_tournaments.rb | 8 -------- db/migrate/20140304014842_create_matches.rb | 9 --------- db/migrate/20140304014844_create_teams.rb | 8 -------- db/migrate/20140304014846_create_users.rb | 11 ----------- db/migrate/20140304014848_create_user_team_pairs.rb | 10 ---------- db/migrate/20140304014850_create_team_match_pairs.rb | 10 ---------- db/migrate/20140304014852_create_alerts.rb | 10 ---------- db/migrate/20140304014855_create_pms.rb | 11 ----------- db/migrate/20140304014857_create_server_settings.rb | 8 -------- db/migrate/20140304014940_create_servers.rb | 8 ++++++++ db/migrate/20140304014942_create_tournaments.rb | 8 ++++++++ db/migrate/20140304014944_create_matches.rb | 9 +++++++++ db/migrate/20140304014946_create_teams.rb | 8 ++++++++ db/migrate/20140304014948_create_users.rb | 11 +++++++++++ db/migrate/20140304014950_create_user_team_pairs.rb | 10 ++++++++++ db/migrate/20140304014952_create_team_match_pairs.rb | 10 ++++++++++ db/migrate/20140304014954_create_alerts.rb | 10 ++++++++++ db/migrate/20140304014957_create_pms.rb | 11 +++++++++++ db/migrate/20140304014959_create_server_settings.rb | 8 ++++++++ db/migrate/20140304015005_create_tournament_options.rb | 8 ++++++++ db/schema.rb | 7 ++++++- generate.sh | 8 +++++++- test/fixtures/tournament_options.yml | 11 +++++++++++ test/models/tournament_options_test.rb | 7 +++++++ 26 files changed, 134 insertions(+), 95 deletions(-) create mode 100644 app/models/tournament_options.rb delete mode 100644 db/migrate/20140304014838_create_servers.rb delete mode 100644 db/migrate/20140304014840_create_tournaments.rb delete mode 100644 db/migrate/20140304014842_create_matches.rb delete mode 100644 db/migrate/20140304014844_create_teams.rb delete mode 100644 db/migrate/20140304014846_create_users.rb delete mode 100644 db/migrate/20140304014848_create_user_team_pairs.rb delete mode 100644 db/migrate/20140304014850_create_team_match_pairs.rb delete mode 100644 db/migrate/20140304014852_create_alerts.rb delete mode 100644 db/migrate/20140304014855_create_pms.rb delete mode 100644 db/migrate/20140304014857_create_server_settings.rb create mode 100644 db/migrate/20140304014940_create_servers.rb create mode 100644 db/migrate/20140304014942_create_tournaments.rb create mode 100644 db/migrate/20140304014944_create_matches.rb create mode 100644 db/migrate/20140304014946_create_teams.rb create mode 100644 db/migrate/20140304014948_create_users.rb create mode 100644 db/migrate/20140304014950_create_user_team_pairs.rb create mode 100644 db/migrate/20140304014952_create_team_match_pairs.rb create mode 100644 db/migrate/20140304014954_create_alerts.rb create mode 100644 db/migrate/20140304014957_create_pms.rb create mode 100644 db/migrate/20140304014959_create_server_settings.rb create mode 100644 db/migrate/20140304015005_create_tournament_options.rb create mode 100644 test/fixtures/tournament_options.yml create mode 100644 test/models/tournament_options_test.rb 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/20140304014838_create_servers.rb deleted file mode 100644 index f33241a..0000000 --- a/db/migrate/20140304014838_create_servers.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateServers < ActiveRecord::Migration - def change - create_table :servers do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140304014840_create_tournaments.rb b/db/migrate/20140304014840_create_tournaments.rb deleted file mode 100644 index 2095590..0000000 --- a/db/migrate/20140304014840_create_tournaments.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTournaments < ActiveRecord::Migration - def change - create_table :tournaments do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140304014842_create_matches.rb b/db/migrate/20140304014842_create_matches.rb deleted file mode 100644 index 6c0c157..0000000 --- a/db/migrate/20140304014842_create_matches.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateMatches < ActiveRecord::Migration - def change - create_table :matches do |t| - t.references :tournament, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140304014844_create_teams.rb b/db/migrate/20140304014844_create_teams.rb deleted file mode 100644 index dd8397d..0000000 --- a/db/migrate/20140304014844_create_teams.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTeams < ActiveRecord::Migration - def change - create_table :teams do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140304014846_create_users.rb b/db/migrate/20140304014846_create_users.rb deleted file mode 100644 index 6a500e5..0000000 --- a/db/migrate/20140304014846_create_users.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateUsers < ActiveRecord::Migration - def change - create_table :users do |t| - t.text :name - t.text :pw_hash - t.integer :groups - - t.timestamps - end - end -end diff --git a/db/migrate/20140304014848_create_user_team_pairs.rb b/db/migrate/20140304014848_create_user_team_pairs.rb deleted file mode 100644 index 2c492ac..0000000 --- a/db/migrate/20140304014848_create_user_team_pairs.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateUserTeamPairs < ActiveRecord::Migration - def change - create_table :user_team_pairs do |t| - t.references :user, index: true - t.references :team, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140304014850_create_team_match_pairs.rb b/db/migrate/20140304014850_create_team_match_pairs.rb deleted file mode 100644 index 8fac07e..0000000 --- a/db/migrate/20140304014850_create_team_match_pairs.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateTeamMatchPairs < ActiveRecord::Migration - def change - create_table :team_match_pairs do |t| - t.references :team, index: true - t.references :match, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140304014852_create_alerts.rb b/db/migrate/20140304014852_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140304014852_create_alerts.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateAlerts < ActiveRecord::Migration - def change - create_table :alerts do |t| - t.references :author, index: true - t.text :message - - t.timestamps - end - end -end diff --git a/db/migrate/20140304014855_create_pms.rb b/db/migrate/20140304014855_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140304014855_create_pms.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreatePms < ActiveRecord::Migration - def change - create_table :pms do |t| - t.references :author, index: true - t.references :recipient, index: true - t.text :message - - t.timestamps - end - end -end diff --git a/db/migrate/20140304014857_create_server_settings.rb b/db/migrate/20140304014857_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140304014857_create_server_settings.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateServerSettings < ActiveRecord::Migration - def change - create_table :server_settings do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140304014940_create_servers.rb b/db/migrate/20140304014940_create_servers.rb new file mode 100644 index 0000000..f33241a --- /dev/null +++ b/db/migrate/20140304014940_create_servers.rb @@ -0,0 +1,8 @@ +class CreateServers < ActiveRecord::Migration + def change + create_table :servers do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140304014942_create_tournaments.rb b/db/migrate/20140304014942_create_tournaments.rb new file mode 100644 index 0000000..2095590 --- /dev/null +++ b/db/migrate/20140304014942_create_tournaments.rb @@ -0,0 +1,8 @@ +class CreateTournaments < ActiveRecord::Migration + def change + create_table :tournaments do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140304014944_create_matches.rb b/db/migrate/20140304014944_create_matches.rb new file mode 100644 index 0000000..6c0c157 --- /dev/null +++ b/db/migrate/20140304014944_create_matches.rb @@ -0,0 +1,9 @@ +class CreateMatches < ActiveRecord::Migration + def change + create_table :matches do |t| + t.references :tournament, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140304014946_create_teams.rb b/db/migrate/20140304014946_create_teams.rb new file mode 100644 index 0000000..dd8397d --- /dev/null +++ b/db/migrate/20140304014946_create_teams.rb @@ -0,0 +1,8 @@ +class CreateTeams < ActiveRecord::Migration + def change + create_table :teams do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140304014948_create_users.rb b/db/migrate/20140304014948_create_users.rb new file mode 100644 index 0000000..6a500e5 --- /dev/null +++ b/db/migrate/20140304014948_create_users.rb @@ -0,0 +1,11 @@ +class CreateUsers < ActiveRecord::Migration + def change + create_table :users do |t| + t.text :name + t.text :pw_hash + t.integer :groups + + t.timestamps + end + end +end diff --git a/db/migrate/20140304014950_create_user_team_pairs.rb b/db/migrate/20140304014950_create_user_team_pairs.rb new file mode 100644 index 0000000..2c492ac --- /dev/null +++ b/db/migrate/20140304014950_create_user_team_pairs.rb @@ -0,0 +1,10 @@ +class CreateUserTeamPairs < ActiveRecord::Migration + def change + create_table :user_team_pairs do |t| + t.references :user, index: true + t.references :team, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140304014952_create_team_match_pairs.rb b/db/migrate/20140304014952_create_team_match_pairs.rb new file mode 100644 index 0000000..8fac07e --- /dev/null +++ b/db/migrate/20140304014952_create_team_match_pairs.rb @@ -0,0 +1,10 @@ +class CreateTeamMatchPairs < ActiveRecord::Migration + def change + create_table :team_match_pairs do |t| + t.references :team, index: true + t.references :match, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140304014954_create_alerts.rb b/db/migrate/20140304014954_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140304014954_create_alerts.rb @@ -0,0 +1,10 @@ +class CreateAlerts < ActiveRecord::Migration + def change + create_table :alerts do |t| + t.references :author, index: true + t.text :message + + t.timestamps + end + end +end diff --git a/db/migrate/20140304014957_create_pms.rb b/db/migrate/20140304014957_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140304014957_create_pms.rb @@ -0,0 +1,11 @@ +class CreatePms < ActiveRecord::Migration + def change + create_table :pms do |t| + t.references :author, index: true + t.references :recipient, index: true + t.text :message + + t.timestamps + end + end +end diff --git a/db/migrate/20140304014959_create_server_settings.rb b/db/migrate/20140304014959_create_server_settings.rb new file mode 100644 index 0000000..dfdd91b --- /dev/null +++ b/db/migrate/20140304014959_create_server_settings.rb @@ -0,0 +1,8 @@ +class CreateServerSettings < ActiveRecord::Migration + def change + create_table :server_settings do |t| + + t.timestamps + end + end +end 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 -- cgit v1.2.3