Merge branch 'clean2'

Conflicts:
	start.sh

35 files changed, 65 insertions, 28 deletions

diff --git a/app/models/api_requests.rb b/app/models/api_requests.rb
new file mode 100644
index 0000000..19c76e2
--- /dev/null
+++ b/app/models/api_requests.rb
@@ -0,0 +1,2 @@
+class ApiRequests < ActiveRecord::Base
+end
diff --git a/app/models/tournament.rb b/app/models/tournament.rb
index d3ef12a..bf44cdf 100644
--- a/app/models/tournament.rb
+++ b/app/models/tournament.rb
@@ -1,7 +1,7 @@
 class Tournament < ActiveRecord::Base
 	belongs_to :game
 	has_many :matches
-	has_many :preferences_raw, class_name: "TournamentPreference"
+	has_many :settings_raw, class_name: "TournamentSetting"
 	has_and_belongs_to_many :players, class_name: "User", association_foreign_key: "player_id", join_table: "players_tournaments"
 	has_and_belongs_to_many :hosts,   class_name: "User", association_foreign_key: "host_id",   join_table: "hosts_tournaments"
 
@@ -15,17 +15,17 @@ class Tournament < ActiveRecord::Base
 		return h
 	end
 
-	def preferences
-		@preferences ||= Preferences.new(self)
+	def settings
+		@settings ||= Settings.new(self)
 	end
-	def preferences=(pref)
-		pref.each do |key, value|
-			value = false if valuedd == "0"
-			preferences[key] = value
+	def settings=(setting)
+		setting.each do |key, value|
+			value = false if value == "0"
+			settings[key] = value
 		end
 	end
 
-	class Preferences
+	class Settings
 		@vartypes = {
 			:true_false => 0,
 			:integer => 1,
@@ -38,8 +38,8 @@ class Tournament < ActiveRecord::Base
 			@tournament = tournament
 		end
 
-		def [](preference)
-			p = @tournament.preferences_raw.find_by_name(preference)
+		def [](setting)
+			p = @tournament.settings_raw.find_by_name(setting)
 			if p.nil?
 				return nil
 			else
@@ -47,10 +47,10 @@ class Tournament < ActiveRecord::Base
 			end
 		end
 
-		def []=(preference, val)
-			p = @tournament.preferences_raw.find_by_name(preference)
+		def []=(setting, val)
+			p = @tournament.settings_raw.find_by_name(setting)
 			if p.nil?
-				TournamentPreference.create( tournament_id: @tournament.id, vartype: get_type(val), name: preference, value: val )
+				TournamentSetting.create( tournament_id: @tournament.id, vartype: get_type(val), name: setting, value: val )
 			else
 				p.value = val
 			end
@@ -72,7 +72,7 @@ class Tournament < ActiveRecord::Base
 		end
 
 		def keys
-			@tournament.preferences_raw.all.collect { |x| x.name }
+			@tournament.settings_raw.all.collect { |x| x.name }
 		end
 
 		def method_missing(name, *args)
diff --git a/app/models/tournament_preference.rb b/app/models/tournament_preference.rb
deleted file mode 100644
index 3d15061..0000000
--- a/app/models/tournament_preference.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class TournamentPreference < ActiveRecord::Base
-	belongs_to :tournament
-end
diff --git a/app/models/tournament_setting.rb b/app/models/tournament_setting.rb
new file mode 100644
index 0000000..b3e6ace
--- /dev/null
+++ b/app/models/tournament_setting.rb
@@ -0,0 +1,3 @@
+class TournamentSetting < ActiveRecord::Base
+	belongs_to :tournament
+end
diff --git a/app/views/tournaments/_selected.html.erb b/app/views/tournaments/_selected.html.erb
index 8bb0532..2ab8379 100644
--- a/app/views/tournaments/_selected.html.erb
+++ b/app/views/tournaments/_selected.html.erb
@@ -17,7 +17,7 @@
     </p>
   <% end %>
 
-  <%= fields_for "tournament[preferences]", @tournament.preferences do |setting_fields|  %>
+  <%= fields_for "tournament[settings]", @tournament.settings do |setting_fields|  %>
     <% @game.settings.each do |setting| %>
       <p>
       <%= setting_fields.label setting.name %>
diff --git a/db/migrate/20140410173725_create_simple_captcha_data.rb b/db/migrate/20140421095649_create_simple_captcha_data.rb
index 4573b20..4573b20 100644
--- a/db/migrate/20140410173725_create_simple_captcha_data.rb
+++ b/db/migrate/20140421095649_create_simple_captcha_data.rb
diff --git a/db/migrate/20140410213731_create_delayed_jobs.rb b/db/migrate/20140421135652_create_delayed_jobs.rb
index ec0dd93..ec0dd93 100644
--- a/db/migrate/20140410213731_create_delayed_jobs.rb
+++ b/db/migrate/20140421135652_create_delayed_jobs.rb
diff --git a/db/migrate/20140410213738_create_servers.rb b/db/migrate/20140421135654_create_servers.rb
index fbe1b02..fbe1b02 100644
--- a/db/migrate/20140410213738_create_servers.rb
+++ b/db/migrate/20140421135654_create_servers.rb
diff --git a/db/migrate/20140410213745_create_matches.rb b/db/migrate/20140421135657_create_matches.rb
index bdeb1cd..bdeb1cd 100644
--- a/db/migrate/20140410213745_create_matches.rb
+++ b/db/migrate/20140421135657_create_matches.rb
diff --git a/db/migrate/20140410213752_create_teams.rb b/db/migrate/20140421135700_create_teams.rb
index fdf9a68..fdf9a68 100644
--- a/db/migrate/20140410213752_create_teams.rb
+++ b/db/migrate/20140421135700_create_teams.rb
diff --git a/db/migrate/20140410213758_create_alerts.rb b/db/migrate/20140421135703_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140410213758_create_alerts.rb
+++ b/db/migrate/20140421135703_create_alerts.rb
diff --git a/db/migrate/20140410213805_create_pms.rb b/db/migrate/20140421135706_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140410213805_create_pms.rb
+++ b/db/migrate/20140421135706_create_pms.rb
diff --git a/db/migrate/20140410213811_create_tournaments.rb b/db/migrate/20140421135709_create_tournaments.rb
index c0d8929..c0d8929 100644
--- a/db/migrate/20140410213811_create_tournaments.rb
+++ b/db/migrate/20140421135709_create_tournaments.rb
diff --git a/db/migrate/20140410213818_create_games.rb b/db/migrate/20140421135712_create_games.rb
index 5e4f56f..5e4f56f 100644
--- a/db/migrate/20140410213818_create_games.rb
+++ b/db/migrate/20140421135712_create_games.rb
diff --git a/db/migrate/20140410213824_create_users.rb b/db/migrate/20140421135715_create_users.rb
index 8032870..8032870 100644
--- a/db/migrate/20140410213824_create_users.rb
+++ b/db/migrate/20140421135715_create_users.rb
diff --git a/db/migrate/20140410213831_create_sessions.rb b/db/migrate/20140421135718_create_sessions.rb
index f667f1e..f667f1e 100644
--- a/db/migrate/20140410213831_create_sessions.rb
+++ b/db/migrate/20140421135718_create_sessions.rb
diff --git a/db/migrate/20140410213838_create_brackets.rb b/db/migrate/20140421135721_create_brackets.rb
index 8813bf2..8813bf2 100644
--- a/db/migrate/20140410213838_create_brackets.rb
+++ b/db/migrate/20140421135721_create_brackets.rb
diff --git a/db/migrate/20140410213844_create_server_settings.rb b/db/migrate/20140421135723_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140410213844_create_server_settings.rb
+++ b/db/migrate/20140421135723_create_server_settings.rb
diff --git a/db/migrate/20140410213851_create_game_settings.rb b/db/migrate/20140421135726_create_game_settings.rb
index b1caf5d..b1caf5d 100644
--- a/db/migrate/20140410213851_create_game_settings.rb
+++ b/db/migrate/20140421135726_create_game_settings.rb
diff --git a/db/migrate/20140410213857_create_tournament_preferences.rb b/db/migrate/20140421135729_create_tournament_settings.rb
index 991d659..a2e8e66 100644
--- a/db/migrate/20140410213857_create_tournament_preferences.rb
+++ b/db/migrate/20140421135729_create_tournament_settings.rb
@@ -1,6 +1,6 @@
-class CreateTournamentPreferences < ActiveRecord::Migration
+class CreateTournamentSettings < ActiveRecord::Migration
   def change
-    create_table :tournament_preferences do |t|
+    create_table :tournament_settings do |t|
       t.references :tournament, index: true
       t.integer :vartype
       t.string :name
diff --git a/db/migrate/20140410213903_create_scores.rb b/db/migrate/20140421135732_create_scores.rb
index 4ca0b0b..4ca0b0b 100644
--- a/db/migrate/20140410213903_create_scores.rb
+++ b/db/migrate/20140421135732_create_scores.rb
diff --git a/db/migrate/20140410213909_create_remote_usernames.rb b/db/migrate/20140421135735_create_remote_usernames.rb
index e265985..e265985 100644
--- a/db/migrate/20140410213909_create_remote_usernames.rb
+++ b/db/migrate/20140421135735_create_remote_usernames.rb
diff --git a/db/migrate/20140410213916_create_bracket_matches.rb b/db/migrate/20140421135738_create_bracket_matches.rb
index 3323e31..3323e31 100644
--- a/db/migrate/20140410213916_create_bracket_matches.rb
+++ b/db/migrate/20140421135738_create_bracket_matches.rb
diff --git a/db/migrate/20140421135741_create_api_requests.rb b/db/migrate/20140421135741_create_api_requests.rb
new file mode 100644
index 0000000..544c330
--- /dev/null
+++ b/db/migrate/20140421135741_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/20140421135744_create_tournament_players_join_table.rb
index be240e8..be240e8 100644
--- a/db/migrate/20140410213922_create_tournament_players_join_table.rb
+++ b/db/migrate/20140421135744_create_tournament_players_join_table.rb
diff --git a/db/migrate/20140410213928_create_tournament_hosts_join_table.rb b/db/migrate/20140421135747_create_tournament_hosts_join_table.rb
index 7521d89..7521d89 100644
--- a/db/migrate/20140410213928_create_tournament_hosts_join_table.rb
+++ b/db/migrate/20140421135747_create_tournament_hosts_join_table.rb
diff --git a/db/migrate/20140410213935_create_team_user_join_table.rb b/db/migrate/20140421135749_create_team_user_join_table.rb
index f3b57fc..f3b57fc 100644
--- a/db/migrate/20140410213935_create_team_user_join_table.rb
+++ b/db/migrate/20140421135749_create_team_user_join_table.rb
diff --git a/db/migrate/20140410213941_create_match_team_join_table.rb b/db/migrate/20140421135752_create_match_team_join_table.rb
index c2ed1b7..c2ed1b7 100644
--- a/db/migrate/20140410213941_create_match_team_join_table.rb
+++ b/db/migrate/20140421135752_create_match_team_join_table.rb
diff --git a/db/migrate/20140410214006_add_hidden_attrs_to_user.rb b/db/migrate/20140421135803_add_hidden_attrs_to_user.rb
index 9b5c505..9b5c505 100644
--- a/db/migrate/20140410214006_add_hidden_attrs_to_user.rb
+++ b/db/migrate/20140421135803_add_hidden_attrs_to_user.rb
diff --git a/db/schema.rb b/db/schema.rb
index e6ad821..82ba3d5 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: 20140421135803) 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"
@@ -192,7 +198,7 @@ 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"
@@ -201,7 +207,7 @@ ActiveRecord::Schema.define(version: 20140410214006) do
     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/generate.sh b/generate.sh
index 68504b0..059d3f8 100755
--- a/generate.sh
+++ b/generate.sh
@@ -9,9 +9,13 @@ set -xe
 srcdir=$(dirname "$(readlink -f "$0")")
 cd "$srcdir"
 
+export RAILS_ENV=development
+
 git rm -rf -- app test config/routes.rb db/migrate || true
 git checkout clean-start -- app test config/routes.rb
 
+bundle install
+
 bundle exec rails generate simple_captcha
 bundle exec rails generate delayed_job:active_record
 
@@ -37,10 +41,12 @@ bundle exec rails generate scaffold bracket user:references tournament:reference
 # Just models
 bundle exec rails generate model server_setting
 bundle exec rails generate model game_setting game:references stype:integer name:string default:text description:text type_opt:text display_order:integer
-bundle exec rails generate model tournament_preference tournament:references vartype:integer name:string value:text
+bundle exec rails generate model tournament_setting tournament:references vartype:integer name:string value:text
 bundle exec rails generate model score user:references match:references value:integer
 bundle exec rails generate model remote_username game:references user:references json_value:text
 bundle exec rails generate model bracket_match bracket:references match:references predicted_winner:references
+bundle exec rails generate model api_requests api_name:string
+
 # Join tables
 bundle exec rails generate migration CreateTournamentPlayersJoinTable	players	tournaments
 bundle exec rails generate migration CreateTournamentHostsJoinTable	hosts	tournaments
@@ -60,10 +66,10 @@ bundle exec rails generate migration AddHiddenAttrsToUser password_digest:string
 #for the tournament controller to generate options
 #bundle exec rails generate scaffold
 
-bundle exec rake db:drop RAILS_ENV=development
-bundle exec rake db:migrate RAILS_ENV=development
+bundle exec rake db:drop
+bundle exec rake db:migrate
 bundle exec rake db:seed
 
 find app -type f -name '*.rb' -exec bin/autoindent {} \;
 
-git add app test config/routes.rb db/migrate db/schema.rb
+git add app test config/routes.rb db/migrate db/schema.rb Gemfile.lock
diff --git a/test/fixtures/api_requests.yml b/test/fixtures/api_requests.yml
new file mode 100644
index 0000000..8739914
--- /dev/null
+++ b/test/fixtures/api_requests.yml
@@ -0,0 +1,7 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  api_name: MyString
+
+two:
+  api_name: MyString
diff --git a/test/fixtures/tournament_preferences.yml b/test/fixtures/tournament_settings.yml
index aa5eaef..aa5eaef 100644
--- a/test/fixtures/tournament_preferences.yml
+++ b/test/fixtures/tournament_settings.yml
diff --git a/test/models/tournament_preference_test.rb b/test/models/api_requests_test.rb
index e200b8e..18763a7 100644
--- a/test/models/tournament_preference_test.rb
+++ b/test/models/api_requests_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TournamentPreferenceTest < ActiveSupport::TestCase
+class ApiRequestsTest < ActiveSupport::TestCase
   # test "the truth" do
   #   assert true
   # end
diff --git a/test/models/tournament_setting_test.rb b/test/models/tournament_setting_test.rb
new file mode 100644
index 0000000..644df85
--- /dev/null
+++ b/test/models/tournament_setting_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class TournamentSettingTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end