Changes to generate.sh

25 files changed, 39 insertions, 20 deletions

diff --git a/app/models/game_option.rb b/app/models/game_option.rb
deleted file mode 100644
index bdc5560..0000000
--- a/app/models/game_option.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class GameOption < ActiveRecord::Base
-end
diff --git a/app/models/game_setting.rb b/app/models/game_setting.rb
new file mode 100644
index 0000000..e147b15
--- /dev/null
+++ b/app/models/game_setting.rb
@@ -0,0 +1,3 @@
+class GameSetting < ActiveRecord::Base
+  belongs_to :game
+end
diff --git a/db/migrate/20140307052409_create_game_options.rb b/db/migrate/20140307052409_create_game_options.rb
deleted file mode 100644
index 2f62ef7..0000000
--- a/db/migrate/20140307052409_create_game_options.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class CreateGameOptions < ActiveRecord::Migration
-  def change
-    create_table :game_options do |t|
-      t.integer :vartype
-      t.string :name
-      t.text :default
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20140307052327_create_servers.rb b/db/migrate/20140325201020_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140307052327_create_servers.rb
+++ b/db/migrate/20140325201020_create_servers.rb
diff --git a/db/migrate/20140307052331_create_matches.rb b/db/migrate/20140325201022_create_matches.rb
index 67a5b7b..67a5b7b 100644
--- a/db/migrate/20140307052331_create_matches.rb
+++ b/db/migrate/20140325201022_create_matches.rb
diff --git a/db/migrate/20140307052334_create_teams.rb b/db/migrate/20140325201025_create_teams.rb
index fdf9a68..fdf9a68 100644
--- a/db/migrate/20140307052334_create_teams.rb
+++ b/db/migrate/20140325201025_create_teams.rb
diff --git a/db/migrate/20140307052338_create_alerts.rb b/db/migrate/20140325201027_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140307052338_create_alerts.rb
+++ b/db/migrate/20140325201027_create_alerts.rb
diff --git a/db/migrate/20140307052342_create_pms.rb b/db/migrate/20140325201030_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140307052342_create_pms.rb
+++ b/db/migrate/20140325201030_create_pms.rb
diff --git a/db/migrate/20140307052346_create_tournaments.rb b/db/migrate/20140325201033_create_tournaments.rb
index 545e603..545e603 100644
--- a/db/migrate/20140307052346_create_tournaments.rb
+++ b/db/migrate/20140325201033_create_tournaments.rb
diff --git a/db/migrate/20140307052350_create_games.rb b/db/migrate/20140325201035_create_games.rb
index 5e4f56f..5e4f56f 100644
--- a/db/migrate/20140307052350_create_games.rb
+++ b/db/migrate/20140325201035_create_games.rb
diff --git a/db/migrate/20140307052354_create_users.rb b/db/migrate/20140325201038_create_users.rb
index 8032870..8032870 100644
--- a/db/migrate/20140307052354_create_users.rb
+++ b/db/migrate/20140325201038_create_users.rb
diff --git a/db/migrate/20140307052358_create_sessions.rb b/db/migrate/20140325201040_create_sessions.rb
index fe25bf2..fe25bf2 100644
--- a/db/migrate/20140307052358_create_sessions.rb
+++ b/db/migrate/20140325201040_create_sessions.rb
diff --git a/db/migrate/20140307052402_create_server_settings.rb b/db/migrate/20140325201043_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140307052402_create_server_settings.rb
+++ b/db/migrate/20140325201043_create_server_settings.rb
diff --git a/db/migrate/20140307052405_create_tournament_options.rb b/db/migrate/20140325201045_create_tournament_options.rb
index 53b601c..53b601c 100644
--- a/db/migrate/20140307052405_create_tournament_options.rb
+++ b/db/migrate/20140325201045_create_tournament_options.rb
diff --git a/db/migrate/20140325201047_create_game_settings.rb b/db/migrate/20140325201047_create_game_settings.rb
new file mode 100644
index 0000000..0ebbf18
--- /dev/null
+++ b/db/migrate/20140325201047_create_game_settings.rb
@@ -0,0 +1,15 @@
+class CreateGameSettings < ActiveRecord::Migration
+  def change
+    create_table :game_settings do |t|
+      t.references :game, index: true
+      t.integer :type
+      t.string :name
+      t.text :default
+      t.text :discription
+      t.text :type_opt
+      t.integer :display_order
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20140307052413_create_scores.rb b/db/migrate/20140325201050_create_scores.rb
index 4ca0b0b..4ca0b0b 100644
--- a/db/migrate/20140307052413_create_scores.rb
+++ b/db/migrate/20140325201050_create_scores.rb
diff --git a/db/migrate/20140307052417_create_tournament_players_join_table.rb b/db/migrate/20140325201052_create_tournament_players_join_table.rb
index be240e8..be240e8 100644
--- a/db/migrate/20140307052417_create_tournament_players_join_table.rb
+++ b/db/migrate/20140325201052_create_tournament_players_join_table.rb
diff --git a/db/migrate/20140307052421_create_tournament_hosts_join_table.rb b/db/migrate/20140325201055_create_tournament_hosts_join_table.rb
index 7521d89..7521d89 100644
--- a/db/migrate/20140307052421_create_tournament_hosts_join_table.rb
+++ b/db/migrate/20140325201055_create_tournament_hosts_join_table.rb
diff --git a/db/migrate/20140307052424_create_team_user_join_table.rb b/db/migrate/20140325201057_create_team_user_join_table.rb
index f3b57fc..f3b57fc 100644
--- a/db/migrate/20140307052424_create_team_user_join_table.rb
+++ b/db/migrate/20140325201057_create_team_user_join_table.rb
diff --git a/db/migrate/20140307052428_create_match_team_join_table.rb b/db/migrate/20140325201059_create_match_team_join_table.rb
index c2ed1b7..c2ed1b7 100644
--- a/db/migrate/20140307052428_create_match_team_join_table.rb
+++ b/db/migrate/20140325201059_create_match_team_join_table.rb
diff --git a/db/migrate/20140307052443_add_hidden_attrs_to_user.rb b/db/migrate/20140325201109_add_hidden_attrs_to_user.rb
index 2f1b0b2..2f1b0b2 100644
--- a/db/migrate/20140307052443_add_hidden_attrs_to_user.rb
+++ b/db/migrate/20140325201109_add_hidden_attrs_to_user.rb
diff --git a/db/schema.rb b/db/schema.rb
index 55f4046..0394946 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: 20140307052443) do
+ActiveRecord::Schema.define(version: 20140325201109) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -22,14 +22,20 @@ ActiveRecord::Schema.define(version: 20140307052443) do
 
   add_index "alerts", ["author_id"], name: "index_alerts_on_author_id"
 
-  create_table "game_options", force: true do |t|
-    t.integer  "vartype"
+  create_table "game_settings", force: true do |t|
+    t.integer  "game_id"
+    t.integer  "type"
     t.string   "name"
     t.text     "default"
+    t.text     "discription"
+    t.text     "type_opt"
+    t.integer  "display_order"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
+  add_index "game_settings", ["game_id"], name: "index_game_settings_on_game_id"
+
   create_table "games", force: true do |t|
     t.text     "name"
     t.integer  "min_players_per_team"
diff --git a/generate.sh b/generate.sh
index 45a8ab6..5079abd 100755
--- a/generate.sh
+++ b/generate.sh
@@ -37,7 +37,7 @@ bundle exec rails generate scaffold session user:references
 # Just models
 bundle exec rails generate model server_settings $NOTEST
 bundle exec rails generate model tournament_option tournament:references vartype:integer name:string value:text $NOTEST
-bundle exec rails generate model game_option vartype:integer name:string default:text $NOTEST
+bundle exec rails generate model game_setting game:references type:integer name:string default:text discription:text type_opt:text display_order:integer $NOTEST
 bundle exec rails generate model score user:references match:references value:integer $NOTEST
 
 # Join tables
diff --git a/test/fixtures/game_options.yml b/test/fixtures/game_settings.yml
index eb4760a..5626c97 100644
--- a/test/fixtures/game_options.yml
+++ b/test/fixtures/game_settings.yml
@@ -1,11 +1,19 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
 one:
-  vartype: 1
+  game_id: 
+  type: 1
   name: MyString
   default: MyText
+  discription: MyText
+  type_opt: MyText
+  display_order: 1
 
 two:
-  vartype: 1
+  game_id: 
+  type: 1
   name: MyString
   default: MyText
+  discription: MyText
+  type_opt: MyText
+  display_order: 1
diff --git a/test/models/game_option_test.rb b/test/models/game_setting_test.rb
index 1ae5701..8ab8bcf 100644
--- a/test/models/game_option_test.rb
+++ b/test/models/game_setting_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class GameOptionTest < ActiveSupport::TestCase
+class GameSettingTest < ActiveSupport::TestCase
   # test "the truth" do
   #   assert true
   # end