1
0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-03-25 01:14:43 +00:00

Updated to rails 7.1 and ruby 3.1.4

This commit is contained in:
2024-03-14 14:09:09 -04:00
parent fc3623008b
commit e46180e9ea
29 changed files with 706 additions and 230 deletions

3
.gitignore vendored
View File

@@ -11,9 +11,12 @@ vendor/bundle/
# Ignore the default SQLite database. # Ignore the default SQLite database.
db/*.sqlite3 db/*.sqlite3
db/*.sqlite3-journal db/*.sqlite3-journal
db/*.sqlite3-shm
db/*.sqlite3-wal
# Ignore all logfiles and tempfiles. # Ignore all logfiles and tempfiles.
log/*.log log/*.log
log/*.log*
tmp tmp
.rvmrc .rvmrc
deploy/prod.env deploy/prod.env

11
Gemfile
View File

@@ -1,8 +1,15 @@
source 'https://rubygems.org' source 'https://rubygems.org'
ruby '3.0.4' ruby '3.1.4'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '6.1.7.2' gem 'rails', '7.1.3.2'
# Added in rails 7.1
gem 'rails-html-sanitizer'
# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
gem "sprockets-rails"
# Use sqlite3 as the database for Active Record # Use sqlite3 as the database for Active Record
#gem 'sqlite3', '~> 1.3', '< 1.4', :group => :development #gem 'sqlite3', '~> 1.3', '< 1.4', :group => :development
gem 'sqlite3', :group => :development gem 'sqlite3', :group => :development

View File

@@ -1,76 +1,94 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actioncable (6.1.7.2) actioncable (7.1.3.2)
actionpack (= 6.1.7.2) actionpack (= 7.1.3.2)
activesupport (= 6.1.7.2) activesupport (= 7.1.3.2)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailbox (6.1.7.2) zeitwerk (~> 2.6)
actionpack (= 6.1.7.2) actionmailbox (7.1.3.2)
activejob (= 6.1.7.2) actionpack (= 7.1.3.2)
activerecord (= 6.1.7.2) activejob (= 7.1.3.2)
activestorage (= 6.1.7.2) activerecord (= 7.1.3.2)
activesupport (= 6.1.7.2) activestorage (= 7.1.3.2)
activesupport (= 7.1.3.2)
mail (>= 2.7.1) mail (>= 2.7.1)
actionmailer (6.1.7.2) net-imap
actionpack (= 6.1.7.2) net-pop
actionview (= 6.1.7.2) net-smtp
activejob (= 6.1.7.2) actionmailer (7.1.3.2)
activesupport (= 6.1.7.2) actionpack (= 7.1.3.2)
actionview (= 7.1.3.2)
activejob (= 7.1.3.2)
activesupport (= 7.1.3.2)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) net-imap
actionpack (6.1.7.2) net-pop
actionview (= 6.1.7.2) net-smtp
activesupport (= 6.1.7.2) rails-dom-testing (~> 2.2)
rack (~> 2.0, >= 2.0.9) actionpack (7.1.3.2)
rack-test (>= 0.6.3) actionview (= 7.1.3.2)
rails-dom-testing (~> 2.0) activesupport (= 7.1.3.2)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.7.2)
actionpack (= 6.1.7.2)
activerecord (= 6.1.7.2)
activestorage (= 6.1.7.2)
activesupport (= 6.1.7.2)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (6.1.7.2) racc
activesupport (= 6.1.7.2) rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actiontext (7.1.3.2)
actionpack (= 7.1.3.2)
activerecord (= 7.1.3.2)
activestorage (= 7.1.3.2)
activesupport (= 7.1.3.2)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.1.3.2)
activesupport (= 7.1.3.2)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.11)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.1, >= 1.2.0) rails-html-sanitizer (~> 1.6)
activejob (6.1.7.2) activejob (7.1.3.2)
activesupport (= 6.1.7.2) activesupport (= 7.1.3.2)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (6.1.7.2) activemodel (7.1.3.2)
activesupport (= 6.1.7.2) activesupport (= 7.1.3.2)
activerecord (6.1.7.2) activerecord (7.1.3.2)
activemodel (= 6.1.7.2) activemodel (= 7.1.3.2)
activesupport (= 6.1.7.2) activesupport (= 7.1.3.2)
activestorage (6.1.7.2) timeout (>= 0.4.0)
actionpack (= 6.1.7.2) activestorage (7.1.3.2)
activejob (= 6.1.7.2) actionpack (= 7.1.3.2)
activerecord (= 6.1.7.2) activejob (= 7.1.3.2)
activesupport (= 6.1.7.2) activerecord (= 7.1.3.2)
activesupport (= 7.1.3.2)
marcel (~> 1.0) marcel (~> 1.0)
mini_mime (>= 1.1.0) activesupport (7.1.3.2)
activesupport (6.1.7.2) base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2) i18n (>= 1.6, < 2)
minitest (>= 5.1) minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0) tzinfo (~> 2.0)
zeitwerk (~> 2.3)
ast (2.4.2) ast (2.4.2)
bcrypt (3.1.18) base64 (0.2.0)
brakeman (5.4.0) bcrypt (3.1.20)
bigdecimal (3.1.6)
brakeman (6.1.2)
racc
builder (3.2.4) builder (3.2.4)
bullet (7.0.7) bullet (7.1.6)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
uniform_notifier (~> 1.11) uniform_notifier (~> 1.11)
bundler-audit (0.9.1) bundler-audit (0.9.1)
bundler (>= 1.2.0, < 3) bundler (>= 1.2.0, < 3)
thor (~> 1.0) thor (~> 1.0)
cancancan (3.4.0) cancancan (3.5.0)
coffee-rails (5.0.0) coffee-rails (5.0.0)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (>= 5.2.0) railties (>= 5.2.0)
@@ -78,14 +96,15 @@ GEM
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.12.2) coffee-script-source (1.12.2)
concurrent-ruby (1.2.0) concurrent-ruby (1.2.3)
connection_pool (2.4.1)
crass (1.0.6) crass (1.0.6)
daemons (1.4.1) daemons (1.4.1)
dalli (3.2.3) dalli (3.2.8)
date (3.3.3) date (3.3.4)
delayed_job (4.1.11) delayed_job (4.1.11)
activesupport (>= 3.0, < 8.0) activesupport (>= 3.0, < 8.0)
delayed_job_active_record (4.1.7) delayed_job_active_record (4.1.8)
activerecord (>= 3.0, < 8.0) activerecord (>= 3.0, < 8.0)
delayed_job (>= 3.0, < 5) delayed_job (>= 3.0, < 5)
delayed_job_web (1.4.4) delayed_job_web (1.4.4)
@@ -93,170 +112,211 @@ GEM
delayed_job (> 2.0.3) delayed_job (> 2.0.3)
rack-protection (>= 1.5.5) rack-protection (>= 1.5.5)
sinatra (>= 1.4.4) sinatra (>= 1.4.4)
devise (4.8.1) devise (4.9.3)
bcrypt (~> 3.0) bcrypt (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (>= 4.1.0) railties (>= 4.1.0)
responders responders
warden (~> 1.2.3) warden (~> 1.2.3)
drb (2.2.1)
erubi (1.12.0) erubi (1.12.0)
execjs (2.8.1) execjs (2.9.1)
globalid (1.1.0) globalid (1.2.1)
activesupport (>= 5.0) activesupport (>= 6.1)
i18n (1.12.0) i18n (1.14.4)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
influxdb (0.8.1) influxdb (0.8.1)
influxdb-rails (1.0.3) influxdb-rails (1.0.3)
influxdb (~> 0.6, >= 0.6.4) influxdb (~> 0.6, >= 0.6.4)
railties (>= 5.0) railties (>= 5.0)
io-console (0.7.2)
irb (1.12.0)
rdoc
reline (>= 0.4.2)
jbuilder (2.11.5) jbuilder (2.11.5)
actionview (>= 5.0.0) actionview (>= 5.0.0)
activesupport (>= 5.0.0) activesupport (>= 5.0.0)
jquery-rails (4.5.1) jquery-rails (4.6.0)
rails-dom-testing (>= 1, < 3) rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (2.6.3) json (2.7.1)
loofah (2.19.1) language_server-protocol (3.17.0.3)
loofah (2.22.0)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.12.0)
mail (2.8.0.1) mail (2.8.1)
mini_mime (>= 0.1.1) mini_mime (>= 0.1.1)
net-imap net-imap
net-pop net-pop
net-smtp net-smtp
marcel (1.0.2) marcel (1.0.4)
method_source (1.0.0) mini_mime (1.1.5)
mini_mime (1.1.2) minitest (5.22.2)
minitest (5.17.0)
mustermann (3.0.0) mustermann (3.0.0)
ruby2_keywords (~> 0.0.1) ruby2_keywords (~> 0.0.1)
mysql2 (0.5.5) mutex_m (0.2.0)
net-imap (0.3.4) mysql2 (0.5.6)
net-imap (0.4.10)
date date
net-protocol net-protocol
net-pop (0.1.2) net-pop (0.1.2)
net-protocol net-protocol
net-protocol (0.2.1) net-protocol (0.2.2)
timeout timeout
net-smtp (0.3.3) net-smtp (0.4.0.1)
net-protocol net-protocol
newrelic_rpm (8.15.0) newrelic_rpm (9.7.1)
nio4r (2.5.8) nio4r (2.7.0)
nokogiri (1.14.1-x86_64-linux) nokogiri (1.16.2-aarch64-linux)
racc (~> 1.4)
nokogiri (1.16.2-arm-linux)
racc (~> 1.4)
nokogiri (1.16.2-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.2-x86-linux)
racc (~> 1.4)
nokogiri (1.16.2-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.2-x86_64-linux)
racc (~> 1.4) racc (~> 1.4)
orm_adapter (0.5.0) orm_adapter (0.5.0)
parallel (1.22.1) parallel (1.24.0)
parser (3.2.0.0) parser (3.3.0.5)
ast (~> 2.4.1) ast (~> 2.4.1)
passenger (6.0.17) racc
passenger (6.0.20)
rack rack
rake (>= 0.8.1) rake (>= 0.8.1)
psych (5.0.2) psych (5.1.2)
stringio stringio
puma (6.0.2) puma (6.4.2)
nio4r (~> 2.0) nio4r (~> 2.0)
racc (1.6.2) racc (1.7.3)
rack (2.2.6.2) rack (3.0.9.1)
rack-protection (3.0.5) rack-protection (4.0.0)
rack base64 (>= 0.1.0)
rack-test (2.0.2) rack (>= 3.0.0, < 4)
rack-session (2.0.0)
rack (>= 3.0.0)
rack-test (2.1.0)
rack (>= 1.3) rack (>= 1.3)
rails (6.1.7.2) rackup (2.1.0)
actioncable (= 6.1.7.2) rack (>= 3)
actionmailbox (= 6.1.7.2) webrick (~> 1.8)
actionmailer (= 6.1.7.2) rails (7.1.3.2)
actionpack (= 6.1.7.2) actioncable (= 7.1.3.2)
actiontext (= 6.1.7.2) actionmailbox (= 7.1.3.2)
actionview (= 6.1.7.2) actionmailer (= 7.1.3.2)
activejob (= 6.1.7.2) actionpack (= 7.1.3.2)
activemodel (= 6.1.7.2) actiontext (= 7.1.3.2)
activerecord (= 6.1.7.2) actionview (= 7.1.3.2)
activestorage (= 6.1.7.2) activejob (= 7.1.3.2)
activesupport (= 6.1.7.2) activemodel (= 7.1.3.2)
activerecord (= 7.1.3.2)
activestorage (= 7.1.3.2)
activesupport (= 7.1.3.2)
bundler (>= 1.15.0) bundler (>= 1.15.0)
railties (= 6.1.7.2) railties (= 7.1.3.2)
sprockets-rails (>= 2.0.0) rails-dom-testing (2.2.0)
rails-dom-testing (2.0.3) activesupport (>= 5.0.0)
activesupport (>= 4.2.0) minitest
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.5.0) rails-html-sanitizer (1.6.0)
loofah (~> 2.19, >= 2.19.1) loofah (~> 2.21)
nokogiri (~> 1.14)
rails_12factor (0.0.3) rails_12factor (0.0.3)
rails_serve_static_assets rails_serve_static_assets
rails_stdout_logging rails_stdout_logging
rails_serve_static_assets (0.0.5) rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5) rails_stdout_logging (0.0.5)
railties (6.1.7.2) railties (7.1.3.2)
actionpack (= 6.1.7.2) actionpack (= 7.1.3.2)
activesupport (= 6.1.7.2) activesupport (= 7.1.3.2)
method_source irb
rackup (>= 1.0.0)
rake (>= 12.2) rake (>= 12.2)
thor (~> 1.0) thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6)
rainbow (3.1.1) rainbow (3.1.1)
rake (13.0.6) rake (13.1.0)
rb-readline (0.5.5) rb-readline (0.5.5)
rdoc (6.5.0) rdoc (6.6.2)
psych (>= 4.0.0) psych (>= 4.0.0)
regexp_parser (2.6.2) regexp_parser (2.9.0)
responders (3.0.1) reline (0.4.3)
actionpack (>= 5.0) io-console (~> 0.5)
railties (>= 5.0) responders (3.1.1)
rexml (3.2.5) actionpack (>= 5.2)
round_robin_tournament (0.1.1) railties (>= 5.2)
rubocop (1.44.1) rexml (3.2.6)
round_robin_tournament (0.1.2)
rubocop (1.62.1)
json (~> 2.3) json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 3.2.0.0) parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0) rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0) regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0) rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.24.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0) unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.24.1) rubocop-ast (1.31.2)
parser (>= 3.1.1.0) parser (>= 3.3.0.4)
ruby-progressbar (1.11.0) ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5) ruby2_keywords (0.0.5)
sdoc (2.6.0) sdoc (2.6.1)
rdoc (>= 5.0) rdoc (>= 5.0)
sinatra (3.0.5) sinatra (4.0.0)
mustermann (~> 3.0) mustermann (~> 3.0)
rack (~> 2.2, >= 2.2.4) rack (>= 3.0.0, < 4)
rack-protection (= 3.0.5) rack-protection (= 4.0.0)
rack-session (>= 2.0.0, < 3)
tilt (~> 2.0) tilt (~> 2.0)
spring (4.1.1) spring (4.1.3)
sprockets (4.2.0) sprockets (4.2.1)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4) rack (>= 2.2.4, < 4)
sprockets-rails (3.4.2) sprockets-rails (3.4.2)
actionpack (>= 5.2) actionpack (>= 5.2)
activesupport (>= 5.2) activesupport (>= 5.2)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
sqlite3 (1.6.0-x86_64-linux) sqlite3 (1.7.2-aarch64-linux)
stringio (3.0.4) sqlite3 (1.7.2-arm-linux)
thor (1.2.1) sqlite3 (1.7.2-arm64-darwin)
tilt (2.0.11) sqlite3 (1.7.2-x86-linux)
timeout (0.3.1) sqlite3 (1.7.2-x86_64-darwin)
sqlite3 (1.7.2-x86_64-linux)
stringio (3.1.0)
thor (1.3.1)
tilt (2.3.0)
timeout (0.4.1)
turbolinks (5.2.1) turbolinks (5.2.1)
turbolinks-source (~> 5.2) turbolinks-source (~> 5.2)
turbolinks-source (5.2.0) turbolinks-source (5.2.0)
tzinfo (2.0.6) tzinfo (2.0.6)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
tzinfo-data (1.2022.7) tzinfo-data (1.2024.1)
tzinfo (>= 1.0.0) tzinfo (>= 1.0.0)
uglifier (4.2.0) uglifier (4.2.0)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
unicode-display_width (2.4.2) unicode-display_width (2.5.0)
uniform_notifier (1.16.0) uniform_notifier (1.16.0)
warden (1.2.9) warden (1.2.9)
rack (>= 2.0.9) rack (>= 2.0.9)
websocket-driver (0.7.5) webrick (1.8.1)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5) websocket-extensions (0.1.5)
zeitwerk (2.6.6) zeitwerk (2.6.13)
PLATFORMS PLATFORMS
aarch64-linux
arm-linux
arm64-darwin
x86-linux
x86_64-darwin
x86_64-linux x86_64-linux
DEPENDENCIES DEPENDENCIES
@@ -277,20 +337,22 @@ DEPENDENCIES
newrelic_rpm newrelic_rpm
passenger passenger
puma puma
rails (= 6.1.7.2) rails (= 7.1.3.2)
rails-html-sanitizer
rails_12factor rails_12factor
rb-readline rb-readline
round_robin_tournament round_robin_tournament
rubocop rubocop
sdoc sdoc
spring spring
sprockets-rails
sqlite3 sqlite3
turbolinks turbolinks
tzinfo-data tzinfo-data
uglifier uglifier
RUBY VERSION RUBY VERSION
ruby 3.0.4p208 ruby 3.1.4p223
BUNDLED WITH BUNDLED WITH
2.2.30 2.5.6

View File

@@ -13,8 +13,8 @@ This application is being created to run a wrestling tournament.
**Public Production Url:** [https://wrestlingdev.com](http://wrestlingdev.com) **Public Production Url:** [https://wrestlingdev.com](http://wrestlingdev.com)
**App Info** **App Info**
* Ruby 3.0.0 * Ruby 3.1.4
* Rails 6.1.2 * Rails 7.1.3.2
* DB mysql or mariadb * DB mysql or mariadb
* Memcached * Memcached
* Delayed Jobs * Delayed Jobs

0
bin/bundle Normal file → Executable file
View File

6
bin/rails Normal file → Executable file
View File

@@ -1,4 +1,4 @@
#!/usr/bin/env ruby #!/usr/bin/env ruby
APP_PATH = File.expand_path('../../config/application', __FILE__) APP_PATH = File.expand_path("../config/application", __dir__)
require_relative '../config/boot' require_relative "../config/boot"
require 'rails/commands' require "rails/commands"

4
bin/rake Normal file → Executable file
View File

@@ -1,4 +1,4 @@
#!/usr/bin/env ruby #!/usr/bin/env ruby
require_relative '../config/boot' require_relative "../config/boot"
require 'rake' require "rake"
Rake.application.run Rake.application.run

0
bin/run-tests-with-docker.sh Normal file → Executable file
View File

33
bin/setup Executable file
View File

@@ -0,0 +1,33 @@
#!/usr/bin/env ruby
require "fileutils"
# path to your application root.
APP_ROOT = File.expand_path("..", __dir__)
def system!(*args)
system(*args, exception: true)
end
FileUtils.chdir APP_ROOT do
# This script is a way to set up or update your development environment automatically.
# This script is idempotent, so that you can run it at any time and get an expectable outcome.
# Add necessary setup steps to this file.
puts "== Installing dependencies =="
system! "gem install bundler --conservative"
system("bundle check") || system!("bundle install")
# puts "\n== Copying sample files =="
# unless File.exist?("config/database.yml")
# FileUtils.cp "config/database.yml.sample", "config/database.yml"
# end
puts "\n== Preparing database =="
system! "bin/rails db:prepare"
puts "\n== Removing old logs and tempfiles =="
system! "bin/rails log:clear tmp:clear"
puts "\n== Restarting application server =="
system! "bin/rails restart"
end

View File

@@ -21,9 +21,6 @@ module Wrestling
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
# config.i18n.default_locale = :de # config.i18n.default_locale = :de
#Add Bootstrap SAAS to asset pipeline
config.assets.initialize_on_precompile = false
config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif)
#gzip assets #gzip assets
config.middleware.use Rack::Deflater config.middleware.use Rack::Deflater
@@ -33,11 +30,14 @@ module Wrestling
DeviseController.respond_to :html, :json DeviseController.respond_to :html, :json
end end
config.autoload_paths += %W(#{config.root}/app/services/tournament_services) config.autoload_paths << "#{config.root}/app/services/tournament_services"
config.autoload_paths += %W(#{config.root}/app/services/wrestler_services) config.autoload_paths << "#{config.root}/app/services/wrestler_services"
config.autoload_paths += %W(#{config.root}/app/services/weight_services) config.autoload_paths << "#{config.root}/app/services/weight_services"
config.autoload_paths += %W(#{config.root}/app/services/bracket_advancement) config.autoload_paths << "#{config.root}/app/services/bracket_advancement"
config.autoload_paths += %W(#{config.root}/app/services/school_services) config.autoload_paths << "#{config.root}/app/services/school_services"
config.add_autoload_paths_to_load_path = false
config.active_support.cache_format_version = 7.1
# config.load_defaults 7.1
end end
end end

View File

@@ -1,4 +1,3 @@
# Set up gems listed in the Gemfile. ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE']) require "bundler/setup" # Set up gems listed in the Gemfile.

10
config/cable.yml Normal file
View File

@@ -0,0 +1,10 @@
development:
adapter: async
test:
adapter: test
production:
adapter: redis
url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
channel_prefix: wrestling_production

View File

@@ -1,5 +1,5 @@
# Load the Rails application. # Load the Rails application.
require File.expand_path('../application', __FILE__) require_relative "application"
# Initialize the Rails application. # Initialize the Rails application.
Wrestling::Application.initialize! Rails.application.initialize!

View File

@@ -25,11 +25,6 @@ Wrestling::Application.configure do
# Raise an error on page load if there are pending migrations # Raise an error on page load if there are pending migrations
config.active_record.migration_error = :page_load config.active_record.migration_error = :page_load
# Debug mode disables concatenation and preprocessing of assets.
# This option may cause significant delays in view rendering with a large
# number of complex assets.
config.assets.debug = true
config.after_initialize do config.after_initialize do
#Bullet.enable = true #Bullet.enable = true
#Bullet.alert = true #Bullet.alert = true

View File

@@ -19,23 +19,6 @@ Wrestling::Application.configure do
# For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid. # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
# config.action_dispatch.rack_cache = true # config.action_dispatch.rack_cache = true
# Disable Rails's static asset server (Apache or nginx will already do this).
#This is deprecated
#config.serve_static_assets = false
# Compress JavaScripts and CSS.
config.assets.js_compressor = :uglifier
# config.assets.css_compressor = :sass
# Do not fallback to assets pipeline if a precompiled asset is missed.
config.assets.compile = false
# Generate digests for assets URLs.
config.assets.digest = true
# Version of your assets, change this if you want to expire all your assets.
config.assets.version = '1.0'
# Specifies the header that your server uses for sending files. # Specifies the header that your server uses for sending files.
# config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
# config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
@@ -91,7 +74,11 @@ Wrestling::Application.configure do
#THESE ADDED BY ME TO GET RAILS 4 WORKING IN HEROKU #THESE ADDED BY ME TO GET RAILS 4 WORKING IN HEROKU
config.cache_classes = true config.cache_classes = true
config.public_file_server.enabled = true config.public_file_server.enabled = true
## Using default asset pipeline sprockets
#Live compile with sprockets instead of: rails assets:precompile
config.assets.compile = true config.assets.compile = true
# Generate digests for assets URLs.
config.assets.digest = true config.assets.digest = true
#Added by me to force SSL in production on heroku #Added by me to force SSL in production on heroku

View File

@@ -0,0 +1,25 @@
# Be sure to restart your server when you modify this file.
# Define an application-wide content security policy.
# See the Securing Rails Applications Guide for more information:
# https://guides.rubyonrails.org/security.html#content-security-policy-header
# Rails.application.configure do
# config.content_security_policy do |policy|
# policy.default_src :self, :https
# policy.font_src :self, :https, :data
# policy.img_src :self, :https, :data
# policy.object_src :none
# policy.script_src :self, :https
# policy.style_src :self, :https
# # Specify URI for violation reports
# # policy.report_uri "/csp-violation-report-endpoint"
# end
#
# # Generate session nonces for permitted importmap, inline scripts, and inline styles.
# config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
# config.content_security_policy_nonce_directives = %w(script-src style-src)
#
# # Report violations without enforcing the policy.
# # config.content_security_policy_report_only = true
# end

View File

@@ -1,4 +1,8 @@
# Be sure to restart your server when you modify this file. # Be sure to restart your server when you modify this file.
# Configure sensitive parameters which will be filtered from the log file. # Configure parameters to be partially matched (e.g. passw matches password) and filtered from the log file.
Rails.application.config.filter_parameters += [:password] # Use this to limit dissemination of sensitive information.
# See the ActiveSupport::ParameterFilter documentation for supported notations and behaviors.
Rails.application.config.filter_parameters += [
:passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
]

View File

@@ -4,13 +4,13 @@
# are locale specific, and you may define rules for as many different # are locale specific, and you may define rules for as many different
# locales as you wish. All of these examples are active by default: # locales as you wish. All of these examples are active by default:
# ActiveSupport::Inflector.inflections(:en) do |inflect| # ActiveSupport::Inflector.inflections(:en) do |inflect|
# inflect.plural /^(ox)$/i, '\1en' # inflect.plural /^(ox)$/i, "\\1en"
# inflect.singular /^(ox)en/i, '\1' # inflect.singular /^(ox)en/i, "\\1"
# inflect.irregular 'person', 'people' # inflect.irregular "person", "people"
# inflect.uncountable %w( fish sheep ) # inflect.uncountable %w( fish sheep )
# end # end
# These inflection rules are supported but not enabled by default: # These inflection rules are supported but not enabled by default:
# ActiveSupport::Inflector.inflections(:en) do |inflect| # ActiveSupport::Inflector.inflections(:en) do |inflect|
# inflect.acronym 'RESTful' # inflect.acronym "RESTful"
# end # end

View File

@@ -0,0 +1,275 @@
# Be sure to restart your server when you modify this file.
#
# This file eases your Rails 7.1 framework defaults upgrade.
#
# Uncomment each configuration one by one to switch to the new default.
# Once your application is ready to run with all new defaults, you can remove
# this file and set the `config.load_defaults` to `7.1`.
#
# Read the Guide for Upgrading Ruby on Rails for more info on each option.
# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html
###
# Remove the default X-Download-Options headers since it is used only by Internet Explorer.
# If you need to support Internet Explorer, add back `"X-Download-Options" => "noopen"`.
#++
Rails.application.config.action_dispatch.default_headers = {
"X-Frame-Options" => "SAMEORIGIN",
"X-XSS-Protection" => "0",
"X-Content-Type-Options" => "nosniff",
"X-Permitted-Cross-Domain-Policies" => "none",
"Referrer-Policy" => "strict-origin-when-cross-origin"
}
###
# Do not treat an `ActionController::Parameters` instance
# as equal to an equivalent `Hash` by default.
#++
Rails.application.config.action_controller.allow_deprecated_parameters_hash_equality = false
###
# Active Record Encryption now uses SHA-256 as its hash digest algorithm.
#
# There are 3 scenarios to consider.
#
# 1. If you have data encrypted with previous Rails versions, and you have
# +config.active_support.key_generator_hash_digest_class+ configured as SHA1 (the default
# before Rails 7.0), you need to configure SHA-1 for Active Record Encryption too:
#++
# Rails.application.config.active_record.encryption.hash_digest_class = OpenSSL::Digest::SHA1
#
# 2. If you have +config.active_support.key_generator_hash_digest_class+ configured as SHA256 (the new default
# in 7.0), then you need to configure SHA-256 for Active Record Encryption:
#++
# Rails.application.config.active_record.encryption.hash_digest_class = OpenSSL::Digest::SHA256
#
# 3. If you don't currently have data encrypted with Active Record encryption, you can disable this setting to
# configure the default behavior starting 7.1+:
#++
Rails.application.config.active_record.encryption.support_sha1_for_non_deterministic_encryption = false
###
# No longer run after_commit callbacks on the first of multiple Active Record
# instances to save changes to the same database row within a transaction.
# Instead, run these callbacks on the instance most likely to have internal
# state which matches what was committed to the database, typically the last
# instance to save.
#++
Rails.application.config.active_record.run_commit_callbacks_on_first_saved_instances_in_transaction = false
###
# Configures SQLite with a strict strings mode, which disables double-quoted string literals.
#
# SQLite has some quirks around double-quoted string literals.
# It first tries to consider double-quoted strings as identifier names, but if they don't exist
# it then considers them as string literals. Because of this, typos can silently go unnoticed.
# For example, it is possible to create an index for a non existing column.
# See https://www.sqlite.org/quirks.html#double_quoted_string_literals_are_accepted for more details.
#++
Rails.application.config.active_record.sqlite3_adapter_strict_strings_by_default = true
###
# Disable deprecated singular associations names.
#++
Rails.application.config.active_record.allow_deprecated_singular_associations_name = false
###
# Enable the Active Job `BigDecimal` argument serializer, which guarantees
# roundtripping. Without this serializer, some queue adapters may serialize
# `BigDecimal` arguments as simple (non-roundtrippable) strings.
#
# When deploying an application with multiple replicas, old (pre-Rails 7.1)
# replicas will not be able to deserialize `BigDecimal` arguments from this
# serializer. Therefore, this setting should only be enabled after all replicas
# have been successfully upgraded to Rails 7.1.
#++
Rails.application.config.active_job.use_big_decimal_serializer = true
###
# Specify if an `ArgumentError` should be raised if `Rails.cache` `fetch` or
# `write` are given an invalid `expires_at` or `expires_in` time.
# Options are `true`, and `false`. If `false`, the exception will be reported
# as `handled` and logged instead.
#++
Rails.application.config.active_support.raise_on_invalid_cache_expiration_time = true
###
# Specify whether Query Logs will format tags using the SQLCommenter format
# (https://open-telemetry.github.io/opentelemetry-sqlcommenter/), or using the legacy format.
# Options are `:legacy` and `:sqlcommenter`.
#++
Rails.application.config.active_record.query_log_tags_format = :sqlcommenter
###
# Specify the default serializer used by `MessageEncryptor` and `MessageVerifier`
# instances.
#
# The legacy default is `:marshal`, which is a potential vector for
# deserialization attacks in cases where a message signing secret has been
# leaked.
#
# In Rails 7.1, the new default is `:json_allow_marshal` which serializes and
# deserializes with `ActiveSupport::JSON`, but can fall back to deserializing
# with `Marshal` so that legacy messages can still be read.
#
# In Rails 7.2, the default will become `:json` which serializes and
# deserializes with `ActiveSupport::JSON` only.
#
# Alternatively, you can choose `:message_pack` or `:message_pack_allow_marshal`,
# which serialize with `ActiveSupport::MessagePack`. `ActiveSupport::MessagePack`
# can roundtrip some Ruby types that are not supported by JSON, and may provide
# improved performance, but it requires the `msgpack` gem.
#
# For more information, see
# https://guides.rubyonrails.org/v7.1/configuring.html#config-active-support-message-serializer
#
# If you are performing a rolling deploy of a Rails 7.1 upgrade, wherein servers
# that have not yet been upgraded must be able to read messages from upgraded
# servers, first deploy without changing the serializer, then set the serializer
# in a subsequent deploy.
#++
Rails.application.config.active_support.message_serializer = :json_allow_marshal
###
# Enable a performance optimization that serializes message data and metadata
# together. This changes the message format, so messages serialized this way
# cannot be read by older versions of Rails. However, messages that use the old
# format can still be read, regardless of whether this optimization is enabled.
#
# To perform a rolling deploy of a Rails 7.1 upgrade, wherein servers that have
# not yet been upgraded must be able to read messages from upgraded servers,
# leave this optimization off on the first deploy, then enable it on a
# subsequent deploy.
#++
Rails.application.config.active_support.use_message_serializer_for_metadata = true
###
# Set the maximum size for Rails log files.
#
# `config.load_defaults 7.1` does not set this value for environments other than
# development and test.
#++
if Rails.env.local?
Rails.application.config.log_file_size = 100 * 1024 * 1024
end
###
# Enable raising on assignment to attr_readonly attributes. The previous
# behavior would allow assignment but silently not persist changes to the
# database.
#++
Rails.application.config.active_record.raise_on_assign_to_attr_readonly = true
###
# Enable validating only parent-related columns for presence when the parent is mandatory.
# The previous behavior was to validate the presence of the parent record, which performed an extra query
# to get the parent every time the child record was updated, even when parent has not changed.
#++
Rails.application.config.active_record.belongs_to_required_validates_foreign_key = false
###
# Enable precompilation of `config.filter_parameters`. Precompilation can
# improve filtering performance, depending on the quantity and types of filters.
#++
Rails.application.config.precompile_filter_parameters = true
###
# Enable before_committed! callbacks on all enrolled records in a transaction.
# The previous behavior was to only run the callbacks on the first copy of a record
# if there were multiple copies of the same record enrolled in the transaction.
#++
Rails.application.config.active_record.before_committed_on_all_records = true
###
# Disable automatic column serialization into YAML.
# To keep the historic behavior, you can set it to `YAML`, however it is
# recommended to explicitly define the serialization method for each column
# rather than to rely on a global default.
#++
Rails.application.config.active_record.default_column_serializer = nil
###
# Enable a performance optimization that serializes Active Record models
# in a faster and more compact way.
#
# To perform a rolling deploy of a Rails 7.1 upgrade, wherein servers that have
# not yet been upgraded must be able to read caches from upgraded servers,
# leave this optimization off on the first deploy, then enable it on a
# subsequent deploy.
#++
Rails.application.config.active_record.marshalling_format_version = 7.1
###
# Run `after_commit` and `after_*_commit` callbacks in the order they are defined in a model.
# This matches the behaviour of all other callbacks.
# In previous versions of Rails, they ran in the inverse order.
#++
Rails.application.config.active_record.run_after_transaction_callbacks_in_order_defined = true
###
# Whether a `transaction` block is committed or rolled back when exited via `return`, `break` or `throw`.
#++
Rails.application.config.active_record.commit_transaction_on_non_local_return = true
###
# Controls when to generate a value for <tt>has_secure_token</tt> declarations.
#++
Rails.application.config.active_record.generate_secure_token_on = :initialize
###
# ** Please read carefully, this must be configured in config/application.rb **
#
# Change the format of the cache entry.
#
# Changing this default means that all new cache entries added to the cache
# will have a different format that is not supported by Rails 7.0
# applications.
#
# Only change this value after your application is fully deployed to Rails 7.1
# and you have no plans to rollback.
# When you're ready to change format, add this to `config/application.rb` (NOT
# this file):
# config.active_support.cache_format_version = 7.1
###
# Configure Action View to use HTML5 standards-compliant sanitizers when they are supported on your
# platform.
#
# `Rails::HTML::Sanitizer.best_supported_vendor` will cause Action View to use HTML5-compliant
# sanitizers if they are supported, else fall back to HTML4 sanitizers.
#
# In previous versions of Rails, Action View always used `Rails::HTML4::Sanitizer` as its vendor.
#++
Rails.application.config.action_view.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor
###
# Configure Action Text to use an HTML5 standards-compliant sanitizer when it is supported on your
# platform.
#
# `Rails::HTML::Sanitizer.best_supported_vendor` will cause Action Text to use HTML5-compliant
# sanitizers if they are supported, else fall back to HTML4 sanitizers.
#
# In previous versions of Rails, Action Text always used `Rails::HTML4::Sanitizer` as its vendor.
#++
Rails.application.config.action_text.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor
###
# Configure the log level used by the DebugExceptions middleware when logging
# uncaught exceptions during requests.
#++
Rails.application.config.action_dispatch.debug_exception_log_level = :error
###
# Configure the test helpers in Action View, Action Dispatch, and rails-dom-testing to use HTML5
# parsers.
#
# Nokogiri::HTML5 isn't supported on JRuby, so JRuby applications must set this to :html4.
#
# In previous versions of Rails, these test helpers always used an HTML4 parser.
#++
Rails.application.config.dom_testing_default_html_version = :html5

View File

@@ -0,0 +1,13 @@
# Be sure to restart your server when you modify this file.
# Define an application-wide HTTP permissions policy. For further
# information see: https://developers.google.com/web/updates/2018/06/feature-policy
# Rails.application.config.permissions_policy do |policy|
# policy.camera :none
# policy.gyroscope :none
# policy.microphone :none
# policy.usb :none
# policy.fullscreen :self
# policy.payment :self, "https://secure.example.com"
# end

View File

@@ -0,0 +1,22 @@
# This migration comes from active_storage (originally 20190112182829)
class AddServiceNameToActiveStorageBlobs < ActiveRecord::Migration[6.0]
def up
return unless table_exists?(:active_storage_blobs)
unless column_exists?(:active_storage_blobs, :service_name)
add_column :active_storage_blobs, :service_name, :string
if configured_service = ActiveStorage::Blob.service.name
ActiveStorage::Blob.unscoped.update_all(service_name: configured_service)
end
change_column :active_storage_blobs, :service_name, :string, null: false
end
end
def down
return unless table_exists?(:active_storage_blobs)
remove_column :active_storage_blobs, :service_name
end
end

View File

@@ -0,0 +1,27 @@
# This migration comes from active_storage (originally 20191206030411)
class CreateActiveStorageVariantRecords < ActiveRecord::Migration[6.0]
def change
return unless table_exists?(:active_storage_blobs)
# Use Active Record's configured type for primary key
create_table :active_storage_variant_records, id: primary_key_type, if_not_exists: true do |t|
t.belongs_to :blob, null: false, index: false, type: blobs_primary_key_type
t.string :variation_digest, null: false
t.index %i[ blob_id variation_digest ], name: "index_active_storage_variant_records_uniqueness", unique: true
t.foreign_key :active_storage_blobs, column: :blob_id
end
end
private
def primary_key_type
config = Rails.configuration.generators
config.options[config.orm][:primary_key_type] || :primary_key
end
def blobs_primary_key_type
pkey_name = connection.primary_key(:active_storage_blobs)
pkey_column = connection.columns(:active_storage_blobs).find { |c| c.name == pkey_name }
pkey_column.bigint? ? :bigint : pkey_column.type
end
end

View File

@@ -0,0 +1,8 @@
# This migration comes from active_storage (originally 20211119233751)
class RemoveNotNullOnActiveStorageBlobsChecksum < ActiveRecord::Migration[6.0]
def change
return unless table_exists?(:active_storage_blobs)
change_column_null(:active_storage_blobs, :checksum, true)
end
end

View File

@@ -10,20 +10,19 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 2023_02_02_130918) do ActiveRecord::Schema[7.1].define(version: 2024_03_11_103416) do
create_table "delayed_jobs", force: :cascade do |t| create_table "delayed_jobs", force: :cascade do |t|
t.integer "priority", default: 0, null: false t.integer "priority", default: 0, null: false
t.integer "attempts", default: 0, null: false t.integer "attempts", default: 0, null: false
t.text "handler", null: false t.text "handler"
t.text "last_error" t.text "last_error"
t.datetime "run_at" t.datetime "run_at", precision: nil
t.datetime "locked_at" t.datetime "locked_at", precision: nil
t.datetime "failed_at" t.datetime "failed_at", precision: nil
t.string "locked_by" t.string "locked_by"
t.string "queue" t.string "queue"
t.datetime "created_at" t.datetime "created_at", precision: nil
t.datetime "updated_at" t.datetime "updated_at", precision: nil
t.integer "job_owner_id" t.integer "job_owner_id"
t.string "job_owner_type" t.string "job_owner_type"
t.index ["priority", "run_at"], name: "delayed_jobs_priority" t.index ["priority", "run_at"], name: "delayed_jobs_priority"
@@ -37,8 +36,8 @@ ActiveRecord::Schema.define(version: 2023_02_02_130918) do
t.integer "winner_id" t.integer "winner_id"
t.string "win_type" t.string "win_type"
t.string "score" t.string "score"
t.datetime "created_at" t.datetime "created_at", precision: nil
t.datetime "updated_at" t.datetime "updated_at", precision: nil
t.integer "tournament_id" t.integer "tournament_id"
t.integer "round" t.integer "round"
t.integer "finished" t.integer "finished"
@@ -59,22 +58,22 @@ ActiveRecord::Schema.define(version: 2023_02_02_130918) do
create_table "mats", force: :cascade do |t| create_table "mats", force: :cascade do |t|
t.string "name" t.string "name"
t.integer "tournament_id" t.integer "tournament_id"
t.datetime "created_at" t.datetime "created_at", precision: nil
t.datetime "updated_at" t.datetime "updated_at", precision: nil
t.index ["tournament_id"], name: "index_mats_on_tournament_id" t.index ["tournament_id"], name: "index_mats_on_tournament_id"
end end
create_table "school_delegates", force: :cascade do |t| create_table "school_delegates", force: :cascade do |t|
t.integer "user_id" t.integer "user_id"
t.integer "school_id" t.integer "school_id"
t.datetime "created_at", null: false t.datetime "created_at", precision: nil, null: false
t.datetime "updated_at", null: false t.datetime "updated_at", precision: nil, null: false
end end
create_table "schools", force: :cascade do |t| create_table "schools", force: :cascade do |t|
t.string "name" t.string "name"
t.datetime "created_at" t.datetime "created_at", precision: nil
t.datetime "updated_at" t.datetime "updated_at", precision: nil
t.integer "tournament_id" t.integer "tournament_id"
t.decimal "score", precision: 15, scale: 1 t.decimal "score", precision: 15, scale: 1
t.index ["tournament_id"], name: "index_schools_on_tournament_id" t.index ["tournament_id"], name: "index_schools_on_tournament_id"
@@ -83,8 +82,8 @@ ActiveRecord::Schema.define(version: 2023_02_02_130918) do
create_table "teampointadjusts", force: :cascade do |t| create_table "teampointadjusts", force: :cascade do |t|
t.integer "points" t.integer "points"
t.integer "wrestler_id" t.integer "wrestler_id"
t.datetime "created_at", null: false t.datetime "created_at", precision: nil, null: false
t.datetime "updated_at", null: false t.datetime "updated_at", precision: nil, null: false
t.integer "school_id" t.integer "school_id"
t.index ["wrestler_id"], name: "index_teampointadjusts_on_wrestler_id" t.index ["wrestler_id"], name: "index_teampointadjusts_on_wrestler_id"
end end
@@ -92,8 +91,8 @@ ActiveRecord::Schema.define(version: 2023_02_02_130918) do
create_table "tournament_delegates", force: :cascade do |t| create_table "tournament_delegates", force: :cascade do |t|
t.integer "user_id" t.integer "user_id"
t.integer "tournament_id" t.integer "tournament_id"
t.datetime "created_at", null: false t.datetime "created_at", precision: nil, null: false
t.datetime "updated_at", null: false t.datetime "updated_at", precision: nil, null: false
end end
create_table "tournaments", force: :cascade do |t| create_table "tournaments", force: :cascade do |t|
@@ -101,8 +100,8 @@ ActiveRecord::Schema.define(version: 2023_02_02_130918) do
t.string "address" t.string "address"
t.string "director" t.string "director"
t.string "director_email" t.string "director_email"
t.datetime "created_at" t.datetime "created_at", precision: nil
t.datetime "updated_at" t.datetime "updated_at", precision: nil
t.text "tournament_type" t.text "tournament_type"
t.text "weigh_in_ref" t.text "weigh_in_ref"
t.integer "user_id" t.integer "user_id"
@@ -116,23 +115,23 @@ ActiveRecord::Schema.define(version: 2023_02_02_130918) do
t.string "email", default: "", null: false t.string "email", default: "", null: false
t.string "encrypted_password", default: "", null: false t.string "encrypted_password", default: "", null: false
t.string "reset_password_token" t.string "reset_password_token"
t.datetime "reset_password_sent_at" t.datetime "reset_password_sent_at", precision: nil
t.datetime "remember_created_at" t.datetime "remember_created_at", precision: nil
t.integer "sign_in_count", default: 0, null: false t.integer "sign_in_count", default: 0, null: false
t.datetime "current_sign_in_at" t.datetime "current_sign_in_at", precision: nil
t.datetime "last_sign_in_at" t.datetime "last_sign_in_at", precision: nil
t.string "current_sign_in_ip" t.string "current_sign_in_ip"
t.string "last_sign_in_ip" t.string "last_sign_in_ip"
t.datetime "created_at" t.datetime "created_at", precision: nil
t.datetime "updated_at" t.datetime "updated_at", precision: nil
t.index ["email"], name: "index_users_on_email", unique: true t.index ["email"], name: "index_users_on_email", unique: true
t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
end end
create_table "weights", force: :cascade do |t| create_table "weights", force: :cascade do |t|
t.decimal "max", precision: 15, scale: 1 t.decimal "max", precision: 15, scale: 1
t.datetime "created_at" t.datetime "created_at", precision: nil
t.datetime "updated_at" t.datetime "updated_at", precision: nil
t.integer "tournament_id" t.integer "tournament_id"
t.index ["tournament_id"], name: "index_weights_on_tournament_id" t.index ["tournament_id"], name: "index_weights_on_tournament_id"
end end
@@ -143,8 +142,8 @@ ActiveRecord::Schema.define(version: 2023_02_02_130918) do
t.integer "weight_id" t.integer "weight_id"
t.integer "bracket_line" t.integer "bracket_line"
t.integer "original_seed" t.integer "original_seed"
t.datetime "created_at" t.datetime "created_at", precision: nil
t.datetime "updated_at" t.datetime "updated_at", precision: nil
t.integer "season_win" t.integer "season_win"
t.integer "season_loss" t.integer "season_loss"
t.string "criteria" t.string "criteria"

View File

@@ -11,9 +11,10 @@ export PASSENGER_POOL_SIZE=$(expr $PASSENGER_POOL_FACTOR '*' 1)
docker-compose -f ${project_dir}/deploy/docker-compose-test.yml kill docker-compose -f ${project_dir}/deploy/docker-compose-test.yml kill
docker-compose -f ${project_dir}/deploy/docker-compose-test.yml build docker-compose -f ${project_dir}/deploy/docker-compose-test.yml build
docker-compose -f ${project_dir}/deploy/docker-compose-test.yml up -d docker-compose -f ${project_dir}/deploy/docker-compose-test.yml up -d
sleep 30s
# echo Make sure your local mysql database has a wrestlingtourney db # echo Make sure your local mysql database has a wrestlingtourney db
docker exec -i deploy_app_1 rake db:create docker-compose -f ${project_dir}/deploy/docker-compose-test.yml exec -T app rake db:create
docker exec -i deploy_app_1 rake db:migrate docker-compose -f ${project_dir}/deploy/docker-compose-test.yml exec -T app rake db:migrate
echo Resetting the db with seed data echo Resetting the db with seed data
docker exec -i deploy_app_1 bash -c "DISABLE_DATABASE_ENVIRONMENT_CHECK=1 rake db:reset" docker-compose -f ${project_dir}/deploy/docker-compose-test.yml exec -T app bash -c "DISABLE_DATABASE_ENVIRONMENT_CHECK=1 rake db:reset"

View File

@@ -51,6 +51,12 @@ services:
restart: always restart: always
networks: networks:
database: database:
healthcheck:
test: mysqladmin ping -h 127.0.0.1 -u root --password=$$MYSQL_PASSWORD
start_period: 5s
interval: 5s
timeout: 5s
retries: 10
worker: worker:
image: wrestlingdev image: wrestlingdev

View File

@@ -1,4 +1,4 @@
FROM ruby:3.0.4 FROM ruby:3.1.4
RUN apt-get -qq update \ RUN apt-get -qq update \
&& apt-get -qq install -y \ && apt-get -qq install -y \

View File

@@ -1,8 +1,8 @@
FROM ruby:3.0.4-slim FROM ruby:3.1.4-slim
#HEALTHCHECK --start-period=60s CMD curl http://127.0.0.1/ #HEALTHCHECK --start-period=60s CMD curl http://127.0.0.1/
ENV TINI_VERSION v0.18.0 ENV TINI_VERSION v0.19.0
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
RUN chmod +x /tini RUN chmod +x /tini

View File

@@ -3,7 +3,7 @@ require File.expand_path('../../config/environment', __FILE__)
require 'rails/test_help' require 'rails/test_help'
class ActiveSupport::TestCase class ActiveSupport::TestCase
ActiveRecord::Migration.check_pending! ActiveRecord::Migration.check_all_pending!
# Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
# #