Skip to content

Commit

Permalink
Rails 7.2.beta (#81)
Browse files Browse the repository at this point in the history 
* increase web concurency

* wip

* update dependencies

* add comment
  • Loading branch information
@adrienpoly
adrienpoly committed Jul 9, 2024
1 parent f3693bc commit 5d1af76
Show file tree
Hide file tree
Showing 24 changed files with 291 additions and 150 deletions.
4 changes: 2 additions & 2 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby "3.3.1"

# Use main development branch of Rails
gem "rails", "~> 7.1.0"
gem "rails", "~> 7.2.0.beta2"

# The modern asset pipeline for Rails [https://github.com/rails/propshaft]
gem "propshaft"

# Use sqlite3 as the database for Active Record
gem "sqlite3", "~> 1.4"
gem "sqlite3", "~> 2.0"

# Use the Puma web server [https://github.com/puma/puma]
gem "puma"
Expand Down
189 changes: 92 additions & 97 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,95 +1,89 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (7.1.3.4)
actionpack (= 7.1.3.4)
activesupport (= 7.1.3.4)
actioncable (7.2.0.beta2)
actionpack (= 7.2.0.beta2)
activesupport (= 7.2.0.beta2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.1.3.4)
actionpack (= 7.1.3.4)
activejob (= 7.1.3.4)
activerecord (= 7.1.3.4)
activestorage (= 7.1.3.4)
activesupport (= 7.1.3.4)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.1.3.4)
actionpack (= 7.1.3.4)
actionview (= 7.1.3.4)
activejob (= 7.1.3.4)
activesupport (= 7.1.3.4)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
actionmailbox (7.2.0.beta2)
actionpack (= 7.2.0.beta2)
activejob (= 7.2.0.beta2)
activerecord (= 7.2.0.beta2)
activestorage (= 7.2.0.beta2)
activesupport (= 7.2.0.beta2)
mail (>= 2.8.0)
actionmailer (7.2.0.beta2)
actionpack (= 7.2.0.beta2)
actionview (= 7.2.0.beta2)
activejob (= 7.2.0.beta2)
activesupport (= 7.2.0.beta2)
mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
actionpack (7.1.3.4)
actionview (= 7.1.3.4)
activesupport (= 7.1.3.4)
actionpack (7.2.0.beta2)
actionview (= 7.2.0.beta2)
activesupport (= 7.2.0.beta2)
nokogiri (>= 1.8.5)
racc
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.4)
actionpack (= 7.1.3.4)
activerecord (= 7.1.3.4)
activestorage (= 7.1.3.4)
activesupport (= 7.1.3.4)
useragent (~> 0.16)
actiontext (7.2.0.beta2)
actionpack (= 7.2.0.beta2)
activerecord (= 7.2.0.beta2)
activestorage (= 7.2.0.beta2)
activesupport (= 7.2.0.beta2)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.1.3.4)
activesupport (= 7.1.3.4)
actionview (7.2.0.beta2)
activesupport (= 7.2.0.beta2)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
active_job-performs (0.3.1)
activejob (>= 6.1)
activejob (7.1.3.4)
activesupport (= 7.1.3.4)
activejob (7.2.0.beta2)
activesupport (= 7.2.0.beta2)
globalid (>= 0.3.6)
activemodel (7.1.3.4)
activesupport (= 7.1.3.4)
activerecord (7.1.3.4)
activemodel (= 7.1.3.4)
activesupport (= 7.1.3.4)
activemodel (7.2.0.beta2)
activesupport (= 7.2.0.beta2)
activerecord (7.2.0.beta2)
activemodel (= 7.2.0.beta2)
activesupport (= 7.2.0.beta2)
timeout (>= 0.4.0)
activerecord-enhancedsqlite3-adapter (0.8.0)
activerecord (>= 7.1)
sqlite3 (>= 1.6)
activestorage (7.1.3.4)
actionpack (= 7.1.3.4)
activejob (= 7.1.3.4)
activerecord (= 7.1.3.4)
activesupport (= 7.1.3.4)
activestorage (7.2.0.beta2)
actionpack (= 7.2.0.beta2)
activejob (= 7.2.0.beta2)
activerecord (= 7.2.0.beta2)
activesupport (= 7.2.0.beta2)
marcel (~> 1.0)
activesupport (7.1.3.4)
activesupport (7.2.0.beta2)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
ahoy_matey (4.2.1)
activesupport (>= 5.2)
device_detector
safely_block (>= 0.2.1)
annotate (3.2.0)
activerecord (>= 3.2, < 8.0)
rake (>= 10.4, < 14.0)
appsignal (3.7.6)
appsignal (3.10.0)
rack
ast (2.4.2)
authentication-zero (2.16.36)
Expand Down Expand Up @@ -128,8 +122,8 @@ GEM
debug (1.9.2)
irb (~> 1.10)
reline (>= 0.3.8)
device_detector (1.1.2)
dockerfile-rails (1.6.16)
device_detector (1.1.3)
dockerfile-rails (1.6.17)
rails (>= 3.0.0)
dotenv (3.1.2)
dotenv-rails (3.1.2)
Expand All @@ -140,7 +134,7 @@ GEM
dry-core (1.0.1)
concurrent-ruby (~> 1.0)
zeitwerk (~> 2.6)
dry-inflector (1.0.0)
dry-inflector (1.1.0)
dry-initializer (3.1.1)
dry-initializer-rails (3.1.1)
dry-initializer (>= 2.4, < 4)
Expand Down Expand Up @@ -172,16 +166,16 @@ GEM
raabro (~> 1.4)
globalid (1.2.1)
activesupport (>= 6.1)
google-protobuf (4.27.1-aarch64-linux)
google-protobuf (4.27.2-aarch64-linux)
bigdecimal
rake (>= 13)
google-protobuf (4.27.1-arm64-darwin)
google-protobuf (4.27.2-arm64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.27.1-x86_64-darwin)
google-protobuf (4.27.2-x86_64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.27.1-x86_64-linux)
google-protobuf (4.27.2-x86_64-linux)
bigdecimal
rake (>= 13)
groupdate (6.4.0)
Expand Down Expand Up @@ -209,16 +203,16 @@ GEM
json (2.7.2)
language_server-protocol (3.17.0.3)
lint_roller (1.1.0)
litestream (0.10.3)
litestream (0.10.4)
logfmt (>= 0.0.10)
sqlite3
litestream (0.10.3-arm64-darwin)
litestream (0.10.4-arm64-darwin)
logfmt (>= 0.0.10)
sqlite3
litestream (0.10.3-x86_64-darwin)
litestream (0.10.4-x86_64-darwin)
logfmt (>= 0.0.10)
sqlite3
litestream (0.10.3-x86_64-linux)
litestream (0.10.4-x86_64-linux)
logfmt (>= 0.0.10)
sqlite3
logfmt (0.0.10)
Expand Down Expand Up @@ -250,10 +244,9 @@ GEM
msgpack (1.7.2)
multi_xml (0.7.1)
bigdecimal (~> 3.1)
mutex_m (0.2.0)
net-http (0.3.2)
uri
net-imap (0.4.12)
net-imap (0.4.14)
date
net-protocol
net-pop (0.1.2)
Expand Down Expand Up @@ -284,7 +277,7 @@ GEM
railties (>= 7.0.0)
psych (5.1.2)
stringio
public_suffix (5.0.5)
public_suffix (6.0.0)
puma (6.4.2)
nio4r (~> 2.0)
raabro (1.4.0)
Expand All @@ -301,20 +294,20 @@ GEM
rackup (2.1.0)
rack (>= 3)
webrick (~> 1.8)
rails (7.1.3.4)
actioncable (= 7.1.3.4)
actionmailbox (= 7.1.3.4)
actionmailer (= 7.1.3.4)
actionpack (= 7.1.3.4)
actiontext (= 7.1.3.4)
actionview (= 7.1.3.4)
activejob (= 7.1.3.4)
activemodel (= 7.1.3.4)
activerecord (= 7.1.3.4)
activestorage (= 7.1.3.4)
activesupport (= 7.1.3.4)
rails (7.2.0.beta2)
actioncable (= 7.2.0.beta2)
actionmailbox (= 7.2.0.beta2)
actionmailer (= 7.2.0.beta2)
actionpack (= 7.2.0.beta2)
actiontext (= 7.2.0.beta2)
actionview (= 7.2.0.beta2)
activejob (= 7.2.0.beta2)
activemodel (= 7.2.0.beta2)
activerecord (= 7.2.0.beta2)
activestorage (= 7.2.0.beta2)
activesupport (= 7.2.0.beta2)
bundler (>= 1.15.0)
railties (= 7.1.3.4)
railties (= 7.2.0.beta2)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
Expand All @@ -330,10 +323,10 @@ GEM
actionview (> 3.1)
activesupport (> 3.1)
railties (> 3.1)
railties (7.1.3.4)
actionpack (= 7.1.3.4)
activesupport (= 7.1.3.4)
irb
railties (7.2.0.beta2)
actionpack (= 7.2.0.beta2)
activesupport (= 7.2.0.beta2)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0, >= 1.2.2)
Expand All @@ -347,7 +340,7 @@ GEM
regexp_parser (2.9.2)
reline (0.5.9)
io-console (~> 0.5)
rexml (3.3.0)
rexml (3.3.1)
strscan
rubocop (1.64.1)
json (~> 2.3)
Expand All @@ -362,21 +355,22 @@ GEM
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.3)
parser (>= 3.3.1.0)
rubocop-performance (1.21.0)
rubocop-performance (1.21.1)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-lsp (0.17.3)
ruby-lsp (0.17.5)
language_server-protocol (~> 3.17.0)
prism (>= 0.29.0, < 0.31)
rbs (>= 3, < 4)
sorbet-runtime (>= 0.5.10782)
ruby-lsp-rails (0.3.7)
ruby-lsp (>= 0.17.0, < 0.18.0)
ruby-lsp-rails (0.3.8)
ruby-lsp (>= 0.17.2, < 0.18.0)
ruby-progressbar (1.13.0)
rubyzip (2.3.2)
safely_block (0.4.0)
selenium-webdriver (4.21.1)
selenium-webdriver (4.22.0)
base64 (~> 0.2)
logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
Expand All @@ -393,12 +387,12 @@ GEM
concurrent-ruby (>= 1.3.1)
fugit (~> 1.11.0)
railties (>= 7.1)
sorbet-runtime (0.5.11432)
sqlite3 (1.7.3-aarch64-linux)
sqlite3 (1.7.3-arm64-darwin)
sqlite3 (1.7.3-x86_64-darwin)
sqlite3 (1.7.3-x86_64-linux)
standard (1.37.0)
sorbet-runtime (0.5.11475)
sqlite3 (2.0.2-aarch64-linux-gnu)
sqlite3 (2.0.2-arm64-darwin)
sqlite3 (2.0.2-x86_64-darwin)
sqlite3 (2.0.2-x86_64-linux-gnu)
standard (1.39.1)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.64.0)
Expand Down Expand Up @@ -426,6 +420,7 @@ GEM
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
uri (0.13.0)
useragent (0.16.10)
vcr (6.2.0)
view_component (3.12.1)
activesupport (>= 5.2.0, < 8.0)
Expand All @@ -448,7 +443,7 @@ GEM
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.8.1)
websocket (1.2.10)
websocket (1.2.11)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
Expand Down Expand Up @@ -495,15 +490,15 @@ DEPENDENCIES
propshaft
puma
rack-mini-profiler
rails (~> 7.1.0)
rails (~> 7.2.0.beta2)
rails-controller-testing
rails_autolink (~> 1.1)
ruby-lsp-rails
selenium-webdriver
sitemap_generator (~> 6.3)
solid_cache
solid_queue
sqlite3 (~> 1.4)
sqlite3 (~> 2.0)
standardrb (~> 1.0)
turbo-rails
tzinfo-data
Expand Down
4 changes: 2 additions & 2 deletions app/models/organisation.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ class Organisation < ApplicationRecord
validates :name, presence: true

# enums
enum kind: {conference: 0, meetup: 1}
enum frequency: {unknown: 0, yearly: 1, monthly: 2}
enum :kind, {conference: 0, meetup: 1}
enum :frequency, {unknown: 0, yearly: 1, monthly: 2}

def edition
"#{name} 2022"
Expand Down
2 changes: 1 addition & 1 deletion app/models/suggestion.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class Suggestion < ApplicationRecord
# callbacks

# enums
enum status: {pending: 0, approved: 1, rejected: 2}
enum :status, {pending: 0, approved: 1, rejected: 2}

def approved!
suggestable.update!(content)
Expand Down

0 comments on commit 5d1af76

Please sign in to comment.