consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5867 from consuldemocracy/dependabot/bundler/ros-apartment-3.2.0

Browse Source 
Bump ros-apartment from 2.11.0 to 3.2.0
This commit is contained in:
Sebastia
2025-05-05 16:42:04 +02:00
committed by GitHub
parent 2ed07ded67 b07e429356
commit e93d303b1e
3 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -48,7 +48,7 @@ gem "recipient_interceptor", "~> 0.3.3"
gem "redcarpet", "~> 3.6.0" gem "redcarpet", "~> 3.6.0"
gem "responders", "~> 3.1.1" gem "responders", "~> 3.1.1"
gem "rinku", "~> 2.0.6", require: "rails_rinku" gem "rinku", "~> 2.0.6", require: "rails_rinku"
gem "ros-apartment", "~> 2.11.0", require: "apartment" # Remove ConnectionHandling monkey patch when upgrading gem "ros-apartment", "~> 3.2.0", require: "apartment"
gem "sassc-embedded", "~> 1.77.5" gem "sassc-embedded", "~> 1.77.5"
gem "sassc-rails", "~> 2.1.2" gem "sassc-rails", "~> 2.1.2"
gem "savon", "~> 2.15.1" gem "savon", "~> 2.15.1"

13
Gemfile.lock
View File

@@ -471,7 +471,7 @@ GEM
rugged (>= 0.24, < 2.0) rugged (>= 0.24, < 2.0)
psych (5.1.2) psych (5.1.2)
stringio stringio
public_suffix (4.0.7) public_suffix (6.0.1)
puma (5.6.9) puma (5.6.9)
nio4r (~> 2.0) nio4r (~> 2.0)
racc (1.8.1) racc (1.8.1)
@@ -534,11 +534,12 @@ GEM
railties (>= 5.2) railties (>= 5.2)
rexml (3.4.1) rexml (3.4.1)
rinku (2.0.6) rinku (2.0.6)
ros-apartment (2.11.0) ros-apartment (3.2.0)
activerecord (>= 5.0.0, < 7.1) activerecord (>= 6.1.0, < 8.1)
activesupport (>= 6.1.0, < 8.1)
parallel (< 2.0) parallel (< 2.0)
public_suffix (>= 2.0.5, < 5.0) public_suffix (>= 2.0.5, <= 6.0.1)
rack (>= 1.3.6, < 3.0) rack (>= 1.3.6, < 4.0)
rspec-core (3.13.3) rspec-core (3.13.3)
rspec-support (~> 3.13.0) rspec-support (~> 3.13.0)
rspec-expectations (3.13.3) rspec-expectations (3.13.3)
@@ -788,7 +789,7 @@ DEPENDENCIES
redcarpet (~> 3.6.0) redcarpet (~> 3.6.0)
responders (~> 3.1.1) responders (~> 3.1.1)
rinku (~> 2.0.6) rinku (~> 2.0.6)
ros-apartment (~> 2.11.0) ros-apartment (~> 3.2.0)
rspec-rails (~> 7.1.1) rspec-rails (~> 7.1.1)
rubocop (~> 1.71.2) rubocop (~> 1.71.2)
rubocop-capybara (~> 2.21.0) rubocop-capybara (~> 2.21.0)

17
config/initializers/apartment.rb
View File

@@ -1,20 +1,3 @@
module ActiveRecord # TODO: Remove after upgrading ros-apartment
# Code based on the current (as of March 2024) development version of the apartment gem
module ConnectionHandling
def connected_to_with_rails7_tenant(role: nil, prevent_writes: false, &blk)
current_tenant = Apartment::Tenant.current
# The connected_to_without_tenant method is defined by Apartment
connected_to_without_tenant(role: role, prevent_writes: prevent_writes) do
Apartment::Tenant.switch!(current_tenant)
yield(blk)
end
end
alias connected_to connected_to_with_rails7_tenant
end
end
# You can have Apartment route to the appropriate Tenant by adding some Rack middleware. # You can have Apartment route to the appropriate Tenant by adding some Rack middleware.
# Apartment can support many different "Elevators" that can take care of this routing to your data. # Apartment can support many different "Elevators" that can take care of this routing to your data.
# Require whichever Elevator you're using below or none if you have a custom one. # Require whichever Elevator you're using below or none if you have a custom one.