activerecord-tenant-level-security 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: def87a150a6d3fe15b09121fe3d43aec96e367bde7179acb44ecd61f4d754533
-  data.tar.gz: eb5d065426f49c665ea202160aafcc10e46f82c40e0d951e4457152308261c12
+  metadata.gz: 875e923faf98a07af0be7bee342de4e9706019f96049ad069e5ffd0498749aff
+  data.tar.gz: 30f876d2f357d0213f47a54ed15e4d6a8ce52298e66b07af42c5ffdd205748c8
 SHA512:
-  metadata.gz: 7a4f84edba75ba3152e78b18ab9e356c5b0a756d65892ad8dd83a9fa930088902d8f84b294591394051408315a46e5593505507b3b3bd0cdf50845c056f83067
-  data.tar.gz: e3da985f057236d469825316690c9b5469691196bd6c4fb6973c0db58f133434a118e4ffc8d4dab2db6c0c1fef306bd18d95c09b5c40b2d2358f6e4e86cc9769
+  metadata.gz: b31646aaa832922f12a2e3165d71c814e2c56bd24ad5edca2b42218a2e03b5db9308cf87d1f4e54797ddda324dc5c584296ea26374b5e55f5ca1ed793b06d16f
+  data.tar.gz: d3cd62cc22504af43ed0e10d644af101022de14e684ef8929bd9919fe68db92c53925cbfc01c481e7b5f41bbf34e734068998cb6c11956a50f5257cdbcaa0d5a

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.7.0 (2026-04-07)
+
+### Enhancements
+- [#35](https://github.com/kufu/activerecord-tenant-level-security/pull/35): Preserve RLS context across automatic reconnections
+
 ## v0.6.0 (2026-03-11)
 
 ### Breaking Changes

data/lib/activerecord-tenant-level-security/reconnectable_adapter.rb

@@ -0,0 +1,9 @@
+module TenantLevelSecurity
+  module ReconnectableAdapter
+    def configure_connection
+      super
+
+      TenantLevelSecurity.switch_current_tenant_context!(self)
+    end
+  end
+end

data/lib/activerecord-tenant-level-security/tenant_level_security.rb

@@ -1,6 +1,19 @@
 module TenantLevelSecurity
   DEFAULT_PARTITION_KEY = 'tenant_id'.freeze
 
+  class TenantContext < ActiveSupport::CurrentAttributes
+    attribute :tenant_id
+
+    def tenant_id=(val)
+      super
+      TenantLevelSecurity.switch_with_connection!(ActiveRecord::Base.connection, val)
+    end
+
+    resets do
+      TenantLevelSecurity.switch_with_connection!(ActiveRecord::Base.connection, nil)
+    end
+  end
+
   class << self
     # The current_tenant_id sets the default tenant from the outside.
     # Be sure to register in advance as `TenantLevelSecurity.current_tenant_id { id }` with initializers.
@@ -14,19 +27,19 @@ module TenantLevelSecurity
       end
     end
 
-    def with(tenant_id)
-      old_tenant_id = current_session_tenant_id
-      return yield if old_tenant_id == tenant_id
-      begin
-        switch! tenant_id
-        yield
-      ensure
-        switch! old_tenant_id
-      end
+    def with(tenant_id, &block)
+      TenantContext.with(tenant_id: tenant_id, &block)
     end
 
     def switch!(tenant_id)
-      switch_with_connection!(ActiveRecord::Base.connection, tenant_id)
+      TenantContext.tenant_id = tenant_id
+    end
+
+    def switch_current_tenant_context!(conn = ActiveRecord::Base.connection)
+      TenantLevelSecurity.switch_with_connection!(
+        conn,
+        TenantLevelSecurity::TenantContext.tenant_id || TenantLevelSecurity.current_tenant_id
+      )
     end
 
     def switch_with_connection!(conn, tenant_id)

data/lib/activerecord-tenant-level-security/version.rb

@@ -1,3 +1,3 @@
 module TenantLevelSecurity
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/lib/activerecord-tenant-level-security.rb

@@ -1,4 +1,5 @@
 require 'active_support'
+require 'active_support/current_attributes'
 require 'active_record'
 require 'pg'
 
@@ -7,9 +8,11 @@ require_relative 'activerecord-tenant-level-security/command_recorder'
 require_relative 'activerecord-tenant-level-security/schema_dumper'
 require_relative 'activerecord-tenant-level-security/schema_statements'
 require_relative 'activerecord-tenant-level-security/sidekiq'
+require_relative 'activerecord-tenant-level-security/reconnectable_adapter'
 
 ActiveSupport.on_load(:active_record) do
   ActiveRecord::ConnectionAdapters::AbstractAdapter.include TenantLevelSecurity::SchemaStatements
+  ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend TenantLevelSecurity::ReconnectableAdapter
   ActiveRecord::Migration::CommandRecorder.include TenantLevelSecurity::CommandRecorder
   ActiveRecord::SchemaDumper.prepend TenantLevelSecurity::SchemaDumper
 
@@ -17,6 +20,6 @@ ActiveSupport.on_load(:active_record) do
   # Make sure that TenantLevelSecurity.current_tenant_id does not depend on database connections.
   # If a new connection is needed to get the current_tenant_id, the callback may be invoked recursively.
   ActiveRecord::ConnectionAdapters::AbstractAdapter.set_callback :checkout, :after do |conn|
-    TenantLevelSecurity.switch_with_connection!(conn, TenantLevelSecurity.current_tenant_id)
+    TenantLevelSecurity.switch_current_tenant_context!(conn)
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-tenant-level-security
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - SmartHR
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -121,6 +120,7 @@ files:
 - gemfiles/rails_8.1.gemfile
 - lib/activerecord-tenant-level-security.rb
 - lib/activerecord-tenant-level-security/command_recorder.rb
+- lib/activerecord-tenant-level-security/reconnectable_adapter.rb
 - lib/activerecord-tenant-level-security/schema_dumper.rb
 - lib/activerecord-tenant-level-security/schema_statements.rb
 - lib/activerecord-tenant-level-security/sidekiq.rb
@@ -132,8 +132,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/kufu/activerecord-tenant-level-security
   source_code_uri: https://github.com/kufu/activerecord-tenant-level-security
-  changelog_uri: https://github.com/kufu/activerecord-tenant-level-security/blob/v0.6.0/CHANGELOG.md
-post_install_message:
+  changelog_uri: https://github.com/kufu/activerecord-tenant-level-security/blob/v0.7.0/CHANGELOG.md
 rdoc_options: []
 require_paths:
 - lib
@@ -148,8 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: An Active Record extension for Multitenancy with PostgreSQL Row Level Security
 test_files: []