27 files changed, 44 insertions, 36 deletions
diff --git a/db/migrate/20140410213844_create_server_settings.rb b/db/migrate/20140410213844_create_server_settings.rb
deleted file mode 100644
index dfdd91b..0000000
--- a/db/migrate/20140410213844_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/20140410213857_create_tournament_preferences.rb b/db/migrate/20140410213857_create_tournament_preferences.rb
deleted file mode 100644
index 991d659..0000000
--- a/db/migrate/20140410213857_create_tournament_preferences.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class CreateTournamentPreferences < ActiveRecord::Migration
-  def change
-    create_table :tournament_preferences do |t|
-      t.references :tournament, index: true
-      t.integer :vartype
-      t.string :name
-      t.text :value
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20140410173725_create_simple_captcha_data.rb b/db/migrate/20140421103137_create_simple_captcha_data.rb
index 4573b20..4573b20 100644
--- a/db/migrate/20140410173725_create_simple_captcha_data.rb
+++ b/db/migrate/20140421103137_create_simple_captcha_data.rb
diff --git a/db/migrate/20140410213731_create_delayed_jobs.rb b/db/migrate/20140421143140_create_delayed_jobs.rb
index ec0dd93..ec0dd93 100644
--- a/db/migrate/20140410213731_create_delayed_jobs.rb
+++ b/db/migrate/20140421143140_create_delayed_jobs.rb
diff --git a/db/migrate/20140410213738_create_servers.rb b/db/migrate/20140421143143_create_servers.rb
index fbe1b02..fbe1b02 100644
--- a/db/migrate/20140410213738_create_servers.rb
+++ b/db/migrate/20140421143143_create_servers.rb
diff --git a/db/migrate/20140410213745_create_matches.rb b/db/migrate/20140421143146_create_matches.rb
index bdeb1cd..bdeb1cd 100644
--- a/db/migrate/20140410213745_create_matches.rb
+++ b/db/migrate/20140421143146_create_matches.rb
diff --git a/db/migrate/20140410213752_create_teams.rb b/db/migrate/20140421143149_create_teams.rb
index fdf9a68..fdf9a68 100644
--- a/db/migrate/20140410213752_create_teams.rb
+++ b/db/migrate/20140421143149_create_teams.rb
diff --git a/db/migrate/20140410213758_create_alerts.rb b/db/migrate/20140421143152_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140410213758_create_alerts.rb
+++ b/db/migrate/20140421143152_create_alerts.rb
diff --git a/db/migrate/20140410213805_create_pms.rb b/db/migrate/20140421143155_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140410213805_create_pms.rb
+++ b/db/migrate/20140421143155_create_pms.rb
diff --git a/db/migrate/20140410213811_create_tournaments.rb b/db/migrate/20140421143158_create_tournaments.rb
index c0d8929..c0d8929 100644
--- a/db/migrate/20140410213811_create_tournaments.rb
+++ b/db/migrate/20140421143158_create_tournaments.rb
diff --git a/db/migrate/20140410213818_create_games.rb b/db/migrate/20140421143201_create_games.rb
index 5e4f56f..5e4f56f 100644
--- a/db/migrate/20140410213818_create_games.rb
+++ b/db/migrate/20140421143201_create_games.rb
diff --git a/db/migrate/20140410213824_create_users.rb b/db/migrate/20140421143204_create_users.rb
index 8032870..8032870 100644
--- a/db/migrate/20140410213824_create_users.rb
+++ b/db/migrate/20140421143204_create_users.rb
diff --git a/db/migrate/20140410213831_create_sessions.rb b/db/migrate/20140421143207_create_sessions.rb
index f667f1e..f667f1e 100644
--- a/db/migrate/20140410213831_create_sessions.rb
+++ b/db/migrate/20140421143207_create_sessions.rb
diff --git a/db/migrate/20140410213838_create_brackets.rb b/db/migrate/20140421143210_create_brackets.rb
index 8813bf2..8813bf2 100644
--- a/db/migrate/20140410213838_create_brackets.rb
+++ b/db/migrate/20140421143210_create_brackets.rb
diff --git a/db/migrate/20140410213851_create_game_settings.rb b/db/migrate/20140421143213_create_game_settings.rb
index b1caf5d..06fb72e 100644
--- a/db/migrate/20140410213851_create_game_settings.rb
+++ b/db/migrate/20140421143213_create_game_settings.rb
@@ -2,12 +2,12 @@ class CreateGameSettings < ActiveRecord::Migration
   def change
     create_table :game_settings do |t|
       t.references :game, index: true
-      t.integer :stype
       t.string :name
-      t.text :default
-      t.text :description
+      t.integer :vartype
       t.text :type_opt
+      t.text :description
       t.integer :display_order
+      t.text :default
 
       t.timestamps
     end
diff --git a/db/migrate/20140421143216_create_tournament_settings.rb b/db/migrate/20140421143216_create_tournament_settings.rb
new file mode 100644
index 0000000..e56697f
--- /dev/null
+++ b/db/migrate/20140421143216_create_tournament_settings.rb
@@ -0,0 +1,15 @@
+class CreateTournamentSettings < ActiveRecord::Migration
+  def change
+    create_table :tournament_settings do |t|
+      t.references :tournament, index: true
+      t.string :name
+      t.integer :vartype
+      t.text :type_opt
+      t.text :description
+      t.integer :display_order
+      t.text :value
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20140410213903_create_scores.rb b/db/migrate/20140421143219_create_scores.rb
index 4ca0b0b..4ca0b0b 100644
--- a/db/migrate/20140410213903_create_scores.rb
+++ b/db/migrate/20140421143219_create_scores.rb
diff --git a/db/migrate/20140410213909_create_remote_usernames.rb b/db/migrate/20140421143222_create_remote_usernames.rb
index e265985..e265985 100644
--- a/db/migrate/20140410213909_create_remote_usernames.rb
+++ b/db/migrate/20140421143222_create_remote_usernames.rb
diff --git a/db/migrate/20140410213916_create_bracket_matches.rb b/db/migrate/20140421143225_create_bracket_matches.rb
index 3323e31..3323e31 100644
--- a/db/migrate/20140410213916_create_bracket_matches.rb
+++ b/db/migrate/20140421143225_create_bracket_matches.rb
diff --git a/db/migrate/20140421143228_create_api_requests.rb b/db/migrate/20140421143228_create_api_requests.rb
new file mode 100644
index 0000000..544c330
--- /dev/null
+++ b/db/migrate/20140421143228_create_api_requests.rb
@@ -0,0 +1,9 @@
+class CreateApiRequests < ActiveRecord::Migration
+  def change
+    create_table :api_requests do |t|
+      t.string :api_name
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20140410213922_create_tournament_players_join_table.rb b/db/migrate/20140421143231_create_tournament_players_join_table.rb
index be240e8..be240e8 100644
--- a/db/migrate/20140410213922_create_tournament_players_join_table.rb
+++ b/db/migrate/20140421143231_create_tournament_players_join_table.rb
diff --git a/db/migrate/20140410213928_create_tournament_hosts_join_table.rb b/db/migrate/20140421143234_create_tournament_hosts_join_table.rb
index 7521d89..7521d89 100644
--- a/db/migrate/20140410213928_create_tournament_hosts_join_table.rb
+++ b/db/migrate/20140421143234_create_tournament_hosts_join_table.rb
diff --git a/db/migrate/20140410213935_create_team_user_join_table.rb b/db/migrate/20140421143237_create_team_user_join_table.rb
index f3b57fc..f3b57fc 100644
--- a/db/migrate/20140410213935_create_team_user_join_table.rb
+++ b/db/migrate/20140421143237_create_team_user_join_table.rb
diff --git a/db/migrate/20140410213941_create_match_team_join_table.rb b/db/migrate/20140421143239_create_match_team_join_table.rb
index c2ed1b7..c2ed1b7 100644
--- a/db/migrate/20140410213941_create_match_team_join_table.rb
+++ b/db/migrate/20140421143239_create_match_team_join_table.rb
diff --git a/db/migrate/20140410214006_add_hidden_attrs_to_user.rb b/db/migrate/20140421143251_add_hidden_attrs_to_user.rb
index 9b5c505..9b5c505 100644
--- a/db/migrate/20140410214006_add_hidden_attrs_to_user.rb
+++ b/db/migrate/20140421143251_add_hidden_attrs_to_user.rb
diff --git a/db/schema.rb b/db/schema.rb
index e6ad821..8e13073 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: 20140410214006) do
+ActiveRecord::Schema.define(version: 20140421143251) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -22,6 +22,12 @@ ActiveRecord::Schema.define(version: 20140410214006) do
 
   add_index "alerts", ["author_id"], name: "index_alerts_on_author_id"
 
+  create_table "api_requests", force: true do |t|
+    t.string   "api_name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "bracket_matches", force: true do |t|
     t.integer  "bracket_id"
     t.integer  "match_id"
@@ -63,12 +69,12 @@ ActiveRecord::Schema.define(version: 20140410214006) do
 
   create_table "game_settings", force: true do |t|
     t.integer  "game_id"
-    t.integer  "stype"
     t.string   "name"
-    t.text     "default"
-    t.text     "description"
+    t.integer  "vartype"
     t.text     "type_opt"
+    t.text     "description"
     t.integer  "display_order"
+    t.text     "default"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -149,11 +155,6 @@ ActiveRecord::Schema.define(version: 20140410214006) do
   add_index "scores", ["match_id"], name: "index_scores_on_match_id"
   add_index "scores", ["user_id"], name: "index_scores_on_user_id"
 
-  create_table "server_settings", force: true do |t|
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
   create_table "servers", force: true do |t|
     t.integer  "default_user_permissions"
     t.datetime "created_at"
@@ -192,16 +193,19 @@ ActiveRecord::Schema.define(version: 20140410214006) do
     t.integer "user_id", null: false
   end
 
-  create_table "tournament_preferences", force: true do |t|
+  create_table "tournament_settings", force: true do |t|
     t.integer  "tournament_id"
-    t.integer  "vartype"
     t.string   "name"
+    t.integer  "vartype"
+    t.text     "type_opt"
+    t.text     "description"
+    t.integer  "display_order"
     t.text     "value"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  add_index "tournament_preferences", ["tournament_id"], name: "index_tournament_preferences_on_tournament_id"
+  add_index "tournament_settings", ["tournament_id"], name: "index_tournament_settings_on_tournament_id"
 
   create_table "tournaments", force: true do |t|
     t.string   "name"
diff --git a/db/seeds.rb b/db/seeds.rb
index fe7c32e..a3637a8 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -25,7 +25,7 @@ Game.find_by_name("Rock, Paper, Scissors").settings.create(name: "Favorite Objec
 Game.find_by_name("Rock, Paper, Scissors").settings.create(name: "Lizard, Spock allowed?", description: "Will you allow Lizard and Spock?", stype: 4, display_order: 1)
 Game.find_by_name("Rock, Paper, Scissors").settings.create(name: "Why are those up there even called radio buttons?", description: "Check boxes make sense at least", type_opt: "I do not know.,There is now spoon.,Wow.,Because electricity.,Wat?", stype: 2, display_order: 3)
 
-unless ENV["RAILS_ENV"] and ENV["RAILS_ENV"] != "development"
+if Rails.env.development?
 	User.create(name: "Administrator", user_name: "admin", email: "root@localhost.lan", password: "password", password_confirmation: "password", permissions: 0xFFFFFFFF)
 
 	User.create(name: "John 0", password: "password", email: "john0@gmail.com", user_name: "johndoe0", password_confirmation: "password")