From 4a2ff9cc1b6f601d7c3da507957e9a174026e6c4 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 4 Apr 2014 21:24:29 -0400 Subject: Copy Gemfile* from master --- Gemfile | 9 +++++++++ Gemfile.lock | 32 ++++++++++++++++++++++---------- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index fbf6232..a34b0a6 100644 --- a/Gemfile +++ b/Gemfile @@ -8,6 +8,12 @@ gem 'rails', '4.0.2' # bcrypt is used for password digesting gem 'bcrypt-ruby', '3.1.2' +gem 'httparty' + +gem 'simple_captcha2', require: 'simple_captcha' + +#gem 'rmagick' + group :development, :test do # Use sqlite3 as the database for Active Record gem 'sqlite3' @@ -41,6 +47,9 @@ gem 'turbolinks' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 1.2' +# Asynchronously handle longer or delayed tasks +gem 'delayed_job' + group :doc do # bundle exec rake doc:rails generates the API under doc/api. gem 'sdoc', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 7899a93..51e29e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -26,7 +26,7 @@ GEM thread_safe (~> 0.1) tzinfo (~> 0.3.37) arel (4.0.2) - atomic (1.1.15) + atomic (1.1.16) bcrypt-ruby (3.1.2) bootstrap-sass (3.1.1.0) sass (~> 3.2) @@ -38,9 +38,14 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) + delayed_job (4.0.0) + activesupport (>= 3.0, < 4.1) erubis (2.7.0) execjs (2.0.2) hike (1.2.3) + httparty (0.13.0) + json (~> 1.8) + multi_xml (>= 0.5.2) i18n (0.6.9) jbuilder (1.5.3) activesupport (>= 3.0.0) @@ -55,7 +60,8 @@ GEM treetop (~> 1.4.8) mime-types (1.25.1) minitest (4.7.5) - multi_json (1.8.4) + multi_json (1.9.2) + multi_xml (0.5.5) polyglot (0.3.4) rack (1.5.2) rack-test (0.6.2) @@ -73,18 +79,21 @@ GEM activesupport (= 4.0.2) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.1.1) + rake (10.2.2) rdoc (4.1.1) json (~> 1.4) ref (1.0.5) - sass (3.2.14) - sass-rails (4.0.1) + sass (3.2.18) + sass-rails (4.0.2) railties (>= 4.0.0, < 5.0) - sass (>= 3.1.10) + sass (~> 3.2.0) + sprockets (~> 2.8, <= 2.11.0) sprockets-rails (~> 2.0.0) sdoc (0.4.0) json (~> 1.8) rdoc (~> 4.0, < 5.0) + simple_captcha2 (0.2.1) + rails (>= 3.1) sprockets (2.11.0) hike (~> 1.2) multi_json (~> 1.0) @@ -98,8 +107,8 @@ GEM therubyracer (0.12.1) libv8 (~> 3.16.14.0) ref - thor (0.18.1) - thread_safe (0.2.0) + thor (0.19.1) + thread_safe (0.3.1) atomic (>= 1.1.7, < 2) tilt (1.4.1) treetop (1.4.15) @@ -107,8 +116,8 @@ GEM polyglot (>= 0.3.1) turbolinks (2.2.1) coffee-rails - tzinfo (0.3.38) - uglifier (2.4.0) + tzinfo (0.3.39) + uglifier (2.5.0) execjs (>= 0.3.0) json (>= 1.8.0) @@ -119,11 +128,14 @@ DEPENDENCIES bcrypt-ruby (= 3.1.2) bootstrap-sass coffee-rails (~> 4.0.0) + delayed_job + httparty jbuilder (~> 1.2) jquery-rails rails (= 4.0.2) sass-rails (~> 4.0.0) sdoc + simple_captcha2 sqlite3 therubyracer turbolinks -- cgit v1.2.3-2-g168b From c79d2f61272aeb928e0a9545e421cf556feea99a Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 4 Apr 2014 21:24:42 -0400 Subject: have generate bail on an error --- generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate.sh b/generate.sh index aeb3326..33943ec 100755 --- a/generate.sh +++ b/generate.sh @@ -3,7 +3,7 @@ # The generate.sh bash file is used to generate all of the necessary # .rb files to run the website -set -x +set -xe # figure out where we are running from srcdir=$(dirname "$(readlink -f "$0")") -- cgit v1.2.3-2-g168b From faf4db767165d199b14777cebc70a37812313f08 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 4 Apr 2014 21:26:23 -0400 Subject: run generate.sh --- app/views/simple_captcha/_simple_captcha.erb | 37 ++++++++++++++++++++++ .../20140404212449_create_simple_captcha_data.rb | 15 +++++++++ db/migrate/20140405010436_create_servers.rb | 8 ----- db/migrate/20140405010438_create_matches.rb | 13 -------- db/migrate/20140405010441_create_teams.rb | 9 ------ db/migrate/20140405010443_create_alerts.rb | 10 ------ db/migrate/20140405010446_create_pms.rb | 11 ------- db/migrate/20140405010448_create_tournaments.rb | 17 ---------- db/migrate/20140405010451_create_games.rb | 15 --------- db/migrate/20140405010454_create_users.rb | 13 -------- db/migrate/20140405010456_create_sessions.rb | 11 ------- .../20140405010459_create_server_settings.rb | 8 ----- db/migrate/20140405010501_create_game_settings.rb | 15 --------- ...20140405010503_create_tournament_preferences.rb | 12 ------- db/migrate/20140405010506_create_scores.rb | 11 ------- .../20140405010508_create_remote_usernames.rb | 11 ------- ...5010511_create_tournament_players_join_table.rb | 8 ----- ...405010513_create_tournament_hosts_join_table.rb | 8 ----- .../20140405010515_create_team_user_join_table.rb | 8 ----- .../20140405010518_create_match_team_join_table.rb | 8 ----- .../20140405010527_add_hidden_attrs_to_user.rb | 6 ---- db/migrate/20140405012452_create_servers.rb | 8 +++++ db/migrate/20140405012455_create_matches.rb | 13 ++++++++ db/migrate/20140405012457_create_teams.rb | 9 ++++++ db/migrate/20140405012500_create_alerts.rb | 10 ++++++ db/migrate/20140405012503_create_pms.rb | 11 +++++++ db/migrate/20140405012506_create_tournaments.rb | 17 ++++++++++ db/migrate/20140405012508_create_games.rb | 15 +++++++++ db/migrate/20140405012510_create_users.rb | 13 ++++++++ db/migrate/20140405012513_create_sessions.rb | 11 +++++++ .../20140405012516_create_server_settings.rb | 8 +++++ db/migrate/20140405012519_create_game_settings.rb | 15 +++++++++ ...20140405012521_create_tournament_preferences.rb | 12 +++++++ db/migrate/20140405012524_create_scores.rb | 11 +++++++ .../20140405012527_create_remote_usernames.rb | 11 +++++++ ...5012529_create_tournament_players_join_table.rb | 8 +++++ ...405012532_create_tournament_hosts_join_table.rb | 8 +++++ .../20140405012535_create_team_user_join_table.rb | 8 +++++ .../20140405012537_create_match_team_join_table.rb | 8 +++++ .../20140405012548_add_hidden_attrs_to_user.rb | 6 ++++ db/schema.rb | 11 ++++++- 41 files changed, 264 insertions(+), 203 deletions(-) create mode 100644 app/views/simple_captcha/_simple_captcha.erb create mode 100644 db/migrate/20140404212449_create_simple_captcha_data.rb delete mode 100644 db/migrate/20140405010436_create_servers.rb delete mode 100644 db/migrate/20140405010438_create_matches.rb delete mode 100644 db/migrate/20140405010441_create_teams.rb delete mode 100644 db/migrate/20140405010443_create_alerts.rb delete mode 100644 db/migrate/20140405010446_create_pms.rb delete mode 100644 db/migrate/20140405010448_create_tournaments.rb delete mode 100644 db/migrate/20140405010451_create_games.rb delete mode 100644 db/migrate/20140405010454_create_users.rb delete mode 100644 db/migrate/20140405010456_create_sessions.rb delete mode 100644 db/migrate/20140405010459_create_server_settings.rb delete mode 100644 db/migrate/20140405010501_create_game_settings.rb delete mode 100644 db/migrate/20140405010503_create_tournament_preferences.rb delete mode 100644 db/migrate/20140405010506_create_scores.rb delete mode 100644 db/migrate/20140405010508_create_remote_usernames.rb delete mode 100644 db/migrate/20140405010511_create_tournament_players_join_table.rb delete mode 100644 db/migrate/20140405010513_create_tournament_hosts_join_table.rb delete mode 100644 db/migrate/20140405010515_create_team_user_join_table.rb delete mode 100644 db/migrate/20140405010518_create_match_team_join_table.rb delete mode 100644 db/migrate/20140405010527_add_hidden_attrs_to_user.rb create mode 100644 db/migrate/20140405012452_create_servers.rb create mode 100644 db/migrate/20140405012455_create_matches.rb create mode 100644 db/migrate/20140405012457_create_teams.rb create mode 100644 db/migrate/20140405012500_create_alerts.rb create mode 100644 db/migrate/20140405012503_create_pms.rb create mode 100644 db/migrate/20140405012506_create_tournaments.rb create mode 100644 db/migrate/20140405012508_create_games.rb create mode 100644 db/migrate/20140405012510_create_users.rb create mode 100644 db/migrate/20140405012513_create_sessions.rb create mode 100644 db/migrate/20140405012516_create_server_settings.rb create mode 100644 db/migrate/20140405012519_create_game_settings.rb create mode 100644 db/migrate/20140405012521_create_tournament_preferences.rb create mode 100644 db/migrate/20140405012524_create_scores.rb create mode 100644 db/migrate/20140405012527_create_remote_usernames.rb create mode 100644 db/migrate/20140405012529_create_tournament_players_join_table.rb create mode 100644 db/migrate/20140405012532_create_tournament_hosts_join_table.rb create mode 100644 db/migrate/20140405012535_create_team_user_join_table.rb create mode 100644 db/migrate/20140405012537_create_match_team_join_table.rb create mode 100644 db/migrate/20140405012548_add_hidden_attrs_to_user.rb diff --git a/app/views/simple_captcha/_simple_captcha.erb b/app/views/simple_captcha/_simple_captcha.erb new file mode 100644 index 0000000..9968910 --- /dev/null +++ b/app/views/simple_captcha/_simple_captcha.erb @@ -0,0 +1,37 @@ + + +
+
+ <%= simple_captcha_options[:image] %> +
+ +
+ <%= simple_captcha_options[:field] %> +
+ +
+ <%= simple_captcha_options[:label] %> +
+
diff --git a/db/migrate/20140404212449_create_simple_captcha_data.rb b/db/migrate/20140404212449_create_simple_captcha_data.rb new file mode 100644 index 0000000..4573b20 --- /dev/null +++ b/db/migrate/20140404212449_create_simple_captcha_data.rb @@ -0,0 +1,15 @@ +class CreateSimpleCaptchaData < ActiveRecord::Migration + def self.up + create_table :simple_captcha_data do |t| + t.string :key, :limit => 40 + t.string :value, :limit => 6 + t.timestamps + end + + add_index :simple_captcha_data, :key, :name => "idx_key" + end + + def self.down + drop_table :simple_captcha_data + end +end diff --git a/db/migrate/20140405010436_create_servers.rb b/db/migrate/20140405010436_create_servers.rb deleted file mode 100644 index f33241a..0000000 --- a/db/migrate/20140405010436_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/20140405010438_create_matches.rb b/db/migrate/20140405010438_create_matches.rb deleted file mode 100644 index 31eea12..0000000 --- a/db/migrate/20140405010438_create_matches.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateMatches < ActiveRecord::Migration - def change - create_table :matches do |t| - t.integer :status - t.references :tournament, index: true - t.string :name - t.references :winner, index: true - t.string :remote_id - - t.timestamps - end - end -end diff --git a/db/migrate/20140405010441_create_teams.rb b/db/migrate/20140405010441_create_teams.rb deleted file mode 100644 index fdf9a68..0000000 --- a/db/migrate/20140405010441_create_teams.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateTeams < ActiveRecord::Migration - def change - create_table :teams do |t| - t.references :match, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140405010443_create_alerts.rb b/db/migrate/20140405010443_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140405010443_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/20140405010446_create_pms.rb b/db/migrate/20140405010446_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140405010446_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/20140405010448_create_tournaments.rb b/db/migrate/20140405010448_create_tournaments.rb deleted file mode 100644 index c0d8929..0000000 --- a/db/migrate/20140405010448_create_tournaments.rb +++ /dev/null @@ -1,17 +0,0 @@ -class CreateTournaments < ActiveRecord::Migration - def change - create_table :tournaments do |t| - t.string :name - t.references :game, index: true - t.integer :status - t.integer :min_players_per_team - t.integer :max_players_per_team - t.integer :min_teams_per_match - t.integer :max_teams_per_match - t.integer :set_rounds - t.boolean :randomized_teams - - t.timestamps - end - end -end diff --git a/db/migrate/20140405010451_create_games.rb b/db/migrate/20140405010451_create_games.rb deleted file mode 100644 index 5e4f56f..0000000 --- a/db/migrate/20140405010451_create_games.rb +++ /dev/null @@ -1,15 +0,0 @@ -class CreateGames < ActiveRecord::Migration - def change - create_table :games do |t| - t.text :name - t.integer :min_players_per_team - t.integer :max_players_per_team - t.integer :min_teams_per_match - t.integer :max_teams_per_match - t.integer :set_rounds - t.boolean :randomized_teams - - t.timestamps - end - end -end diff --git a/db/migrate/20140405010454_create_users.rb b/db/migrate/20140405010454_create_users.rb deleted file mode 100644 index 8032870..0000000 --- a/db/migrate/20140405010454_create_users.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateUsers < ActiveRecord::Migration - def change - create_table :users do |t| - t.string :name - t.string :email - t.string :user_name - - t.timestamps - end - add_index :users, :email, unique: true - add_index :users, :user_name, unique: true - end -end diff --git a/db/migrate/20140405010456_create_sessions.rb b/db/migrate/20140405010456_create_sessions.rb deleted file mode 100644 index f667f1e..0000000 --- a/db/migrate/20140405010456_create_sessions.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateSessions < ActiveRecord::Migration - def change - create_table :sessions do |t| - t.references :user, index: true - t.string :token - - t.timestamps - end - add_index :sessions, :token, unique: true - end -end diff --git a/db/migrate/20140405010459_create_server_settings.rb b/db/migrate/20140405010459_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140405010459_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/20140405010501_create_game_settings.rb b/db/migrate/20140405010501_create_game_settings.rb deleted file mode 100644 index eed6b00..0000000 --- a/db/migrate/20140405010501_create_game_settings.rb +++ /dev/null @@ -1,15 +0,0 @@ -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 :description - t.text :type_opt - t.integer :display_order - - t.timestamps - end - end -end diff --git a/db/migrate/20140405010503_create_tournament_preferences.rb b/db/migrate/20140405010503_create_tournament_preferences.rb deleted file mode 100644 index 991d659..0000000 --- a/db/migrate/20140405010503_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/20140405010506_create_scores.rb b/db/migrate/20140405010506_create_scores.rb deleted file mode 100644 index 4ca0b0b..0000000 --- a/db/migrate/20140405010506_create_scores.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateScores < ActiveRecord::Migration - def change - create_table :scores do |t| - t.references :user, index: true - t.references :match, index: true - t.integer :value - - t.timestamps - end - end -end diff --git a/db/migrate/20140405010508_create_remote_usernames.rb b/db/migrate/20140405010508_create_remote_usernames.rb deleted file mode 100644 index e265985..0000000 --- a/db/migrate/20140405010508_create_remote_usernames.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateRemoteUsernames < ActiveRecord::Migration - def change - create_table :remote_usernames do |t| - t.references :game, index: true - t.references :user, index: true - t.text :json_value - - t.timestamps - end - end -end diff --git a/db/migrate/20140405010511_create_tournament_players_join_table.rb b/db/migrate/20140405010511_create_tournament_players_join_table.rb deleted file mode 100644 index be240e8..0000000 --- a/db/migrate/20140405010511_create_tournament_players_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTournamentPlayersJoinTable < ActiveRecord::Migration - def change - create_join_table :players, :tournaments do |t| - # t.index [:player_id, :tournament_id] - # t.index [:tournament_id, :player_id] - end - end -end diff --git a/db/migrate/20140405010513_create_tournament_hosts_join_table.rb b/db/migrate/20140405010513_create_tournament_hosts_join_table.rb deleted file mode 100644 index 7521d89..0000000 --- a/db/migrate/20140405010513_create_tournament_hosts_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTournamentHostsJoinTable < ActiveRecord::Migration - def change - create_join_table :hosts, :tournaments do |t| - # t.index [:host_id, :tournament_id] - # t.index [:tournament_id, :host_id] - end - end -end diff --git a/db/migrate/20140405010515_create_team_user_join_table.rb b/db/migrate/20140405010515_create_team_user_join_table.rb deleted file mode 100644 index f3b57fc..0000000 --- a/db/migrate/20140405010515_create_team_user_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTeamUserJoinTable < ActiveRecord::Migration - def change - create_join_table :teams, :users do |t| - # t.index [:team_id, :user_id] - # t.index [:user_id, :team_id] - end - end -end diff --git a/db/migrate/20140405010518_create_match_team_join_table.rb b/db/migrate/20140405010518_create_match_team_join_table.rb deleted file mode 100644 index c2ed1b7..0000000 --- a/db/migrate/20140405010518_create_match_team_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateMatchTeamJoinTable < ActiveRecord::Migration - def change - create_join_table :matches, :teams do |t| - # t.index [:match_id, :team_id] - # t.index [:team_id, :match_id] - end - end -end diff --git a/db/migrate/20140405010527_add_hidden_attrs_to_user.rb b/db/migrate/20140405010527_add_hidden_attrs_to_user.rb deleted file mode 100644 index 9b5c505..0000000 --- a/db/migrate/20140405010527_add_hidden_attrs_to_user.rb +++ /dev/null @@ -1,6 +0,0 @@ -class AddHiddenAttrsToUser < ActiveRecord::Migration - def change - add_column :users, :password_digest, :string - add_column :users, :permissions, :integer - end -end diff --git a/db/migrate/20140405012452_create_servers.rb b/db/migrate/20140405012452_create_servers.rb new file mode 100644 index 0000000..f33241a --- /dev/null +++ b/db/migrate/20140405012452_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/20140405012455_create_matches.rb b/db/migrate/20140405012455_create_matches.rb new file mode 100644 index 0000000..31eea12 --- /dev/null +++ b/db/migrate/20140405012455_create_matches.rb @@ -0,0 +1,13 @@ +class CreateMatches < ActiveRecord::Migration + def change + create_table :matches do |t| + t.integer :status + t.references :tournament, index: true + t.string :name + t.references :winner, index: true + t.string :remote_id + + t.timestamps + end + end +end diff --git a/db/migrate/20140405012457_create_teams.rb b/db/migrate/20140405012457_create_teams.rb new file mode 100644 index 0000000..fdf9a68 --- /dev/null +++ b/db/migrate/20140405012457_create_teams.rb @@ -0,0 +1,9 @@ +class CreateTeams < ActiveRecord::Migration + def change + create_table :teams do |t| + t.references :match, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140405012500_create_alerts.rb b/db/migrate/20140405012500_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140405012500_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/20140405012503_create_pms.rb b/db/migrate/20140405012503_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140405012503_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/20140405012506_create_tournaments.rb b/db/migrate/20140405012506_create_tournaments.rb new file mode 100644 index 0000000..c0d8929 --- /dev/null +++ b/db/migrate/20140405012506_create_tournaments.rb @@ -0,0 +1,17 @@ +class CreateTournaments < ActiveRecord::Migration + def change + create_table :tournaments do |t| + t.string :name + t.references :game, index: true + t.integer :status + t.integer :min_players_per_team + t.integer :max_players_per_team + t.integer :min_teams_per_match + t.integer :max_teams_per_match + t.integer :set_rounds + t.boolean :randomized_teams + + t.timestamps + end + end +end diff --git a/db/migrate/20140405012508_create_games.rb b/db/migrate/20140405012508_create_games.rb new file mode 100644 index 0000000..5e4f56f --- /dev/null +++ b/db/migrate/20140405012508_create_games.rb @@ -0,0 +1,15 @@ +class CreateGames < ActiveRecord::Migration + def change + create_table :games do |t| + t.text :name + t.integer :min_players_per_team + t.integer :max_players_per_team + t.integer :min_teams_per_match + t.integer :max_teams_per_match + t.integer :set_rounds + t.boolean :randomized_teams + + t.timestamps + end + end +end diff --git a/db/migrate/20140405012510_create_users.rb b/db/migrate/20140405012510_create_users.rb new file mode 100644 index 0000000..8032870 --- /dev/null +++ b/db/migrate/20140405012510_create_users.rb @@ -0,0 +1,13 @@ +class CreateUsers < ActiveRecord::Migration + def change + create_table :users do |t| + t.string :name + t.string :email + t.string :user_name + + t.timestamps + end + add_index :users, :email, unique: true + add_index :users, :user_name, unique: true + end +end diff --git a/db/migrate/20140405012513_create_sessions.rb b/db/migrate/20140405012513_create_sessions.rb new file mode 100644 index 0000000..f667f1e --- /dev/null +++ b/db/migrate/20140405012513_create_sessions.rb @@ -0,0 +1,11 @@ +class CreateSessions < ActiveRecord::Migration + def change + create_table :sessions do |t| + t.references :user, index: true + t.string :token + + t.timestamps + end + add_index :sessions, :token, unique: true + end +end diff --git a/db/migrate/20140405012516_create_server_settings.rb b/db/migrate/20140405012516_create_server_settings.rb new file mode 100644 index 0000000..dfdd91b --- /dev/null +++ b/db/migrate/20140405012516_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/20140405012519_create_game_settings.rb b/db/migrate/20140405012519_create_game_settings.rb new file mode 100644 index 0000000..eed6b00 --- /dev/null +++ b/db/migrate/20140405012519_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 :description + t.text :type_opt + t.integer :display_order + + t.timestamps + end + end +end diff --git a/db/migrate/20140405012521_create_tournament_preferences.rb b/db/migrate/20140405012521_create_tournament_preferences.rb new file mode 100644 index 0000000..991d659 --- /dev/null +++ b/db/migrate/20140405012521_create_tournament_preferences.rb @@ -0,0 +1,12 @@ +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/20140405012524_create_scores.rb b/db/migrate/20140405012524_create_scores.rb new file mode 100644 index 0000000..4ca0b0b --- /dev/null +++ b/db/migrate/20140405012524_create_scores.rb @@ -0,0 +1,11 @@ +class CreateScores < ActiveRecord::Migration + def change + create_table :scores do |t| + t.references :user, index: true + t.references :match, index: true + t.integer :value + + t.timestamps + end + end +end diff --git a/db/migrate/20140405012527_create_remote_usernames.rb b/db/migrate/20140405012527_create_remote_usernames.rb new file mode 100644 index 0000000..e265985 --- /dev/null +++ b/db/migrate/20140405012527_create_remote_usernames.rb @@ -0,0 +1,11 @@ +class CreateRemoteUsernames < ActiveRecord::Migration + def change + create_table :remote_usernames do |t| + t.references :game, index: true + t.references :user, index: true + t.text :json_value + + t.timestamps + end + end +end diff --git a/db/migrate/20140405012529_create_tournament_players_join_table.rb b/db/migrate/20140405012529_create_tournament_players_join_table.rb new file mode 100644 index 0000000..be240e8 --- /dev/null +++ b/db/migrate/20140405012529_create_tournament_players_join_table.rb @@ -0,0 +1,8 @@ +class CreateTournamentPlayersJoinTable < ActiveRecord::Migration + def change + create_join_table :players, :tournaments do |t| + # t.index [:player_id, :tournament_id] + # t.index [:tournament_id, :player_id] + end + end +end diff --git a/db/migrate/20140405012532_create_tournament_hosts_join_table.rb b/db/migrate/20140405012532_create_tournament_hosts_join_table.rb new file mode 100644 index 0000000..7521d89 --- /dev/null +++ b/db/migrate/20140405012532_create_tournament_hosts_join_table.rb @@ -0,0 +1,8 @@ +class CreateTournamentHostsJoinTable < ActiveRecord::Migration + def change + create_join_table :hosts, :tournaments do |t| + # t.index [:host_id, :tournament_id] + # t.index [:tournament_id, :host_id] + end + end +end diff --git a/db/migrate/20140405012535_create_team_user_join_table.rb b/db/migrate/20140405012535_create_team_user_join_table.rb new file mode 100644 index 0000000..f3b57fc --- /dev/null +++ b/db/migrate/20140405012535_create_team_user_join_table.rb @@ -0,0 +1,8 @@ +class CreateTeamUserJoinTable < ActiveRecord::Migration + def change + create_join_table :teams, :users do |t| + # t.index [:team_id, :user_id] + # t.index [:user_id, :team_id] + end + end +end diff --git a/db/migrate/20140405012537_create_match_team_join_table.rb b/db/migrate/20140405012537_create_match_team_join_table.rb new file mode 100644 index 0000000..c2ed1b7 --- /dev/null +++ b/db/migrate/20140405012537_create_match_team_join_table.rb @@ -0,0 +1,8 @@ +class CreateMatchTeamJoinTable < ActiveRecord::Migration + def change + create_join_table :matches, :teams do |t| + # t.index [:match_id, :team_id] + # t.index [:team_id, :match_id] + end + end +end diff --git a/db/migrate/20140405012548_add_hidden_attrs_to_user.rb b/db/migrate/20140405012548_add_hidden_attrs_to_user.rb new file mode 100644 index 0000000..9b5c505 --- /dev/null +++ b/db/migrate/20140405012548_add_hidden_attrs_to_user.rb @@ -0,0 +1,6 @@ +class AddHiddenAttrsToUser < ActiveRecord::Migration + def change + add_column :users, :password_digest, :string + add_column :users, :permissions, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 0763348..c0d4fee 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: 20140405010527) do +ActiveRecord::Schema.define(version: 20140405012548) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -129,6 +129,15 @@ ActiveRecord::Schema.define(version: 20140405010527) do add_index "sessions", ["token"], name: "index_sessions_on_token", unique: true add_index "sessions", ["user_id"], name: "index_sessions_on_user_id" + create_table "simple_captcha_data", force: true do |t| + t.string "key", limit: 40 + t.string "value", limit: 6 + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "simple_captcha_data", ["key"], name: "idx_key" + create_table "teams", force: true do |t| t.integer "match_id" t.datetime "created_at" -- cgit v1.2.3-2-g168b