activerecord-tenant-level-security 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: def87a150a6d3fe15b09121fe3d43aec96e367bde7179acb44ecd61f4d754533
-  data.tar.gz: eb5d065426f49c665ea202160aafcc10e46f82c40e0d951e4457152308261c12
+  metadata.gz: 81fecc5ddf88902ee6cee67a10993252adde65b960a65fe9a98de17cb2068d8c
+  data.tar.gz: 5e00c87015dc059b04cd1d6bf53937ad5c85c600f4f03f2054070aa38b61371d
 SHA512:
-  metadata.gz: 7a4f84edba75ba3152e78b18ab9e356c5b0a756d65892ad8dd83a9fa930088902d8f84b294591394051408315a46e5593505507b3b3bd0cdf50845c056f83067
-  data.tar.gz: e3da985f057236d469825316690c9b5469691196bd6c4fb6973c0db58f133434a118e4ffc8d4dab2db6c0c1fef306bd18d95c09b5c40b2d2358f6e4e86cc9769
+  metadata.gz: 776a2762a6723583c82c0ae8429dc5cb84ad68d4ab8d1629d89f754ef1a0ff2b09856600282542daa1853b76b03b6d90a068c00884d372dbe9c638bf59157de6
+  data.tar.gz: 7c16407104591d25471693009c1c76f3d50bbe742f83efa9036defdf50e891c1eae79a8029f10af122be8be4ccb1f0f51e1d63b4b0220ad1b806fab2b2dae9cf

data/.circleci/config.yml

@@ -29,5 +29,5 @@ workflows:
           matrix:
             parameters:
               ruby: ['ruby:3.3', 'ruby:3.4', 'ruby:4.0']
-              rails: ['rails_7.2', 'rails_8.0', 'rails_8.1']
-              postgres: ['postgres:14.20', 'postgres:15.15', 'postgres:16.11', 'postgres:17.7', 'postgres:18.1']
+              rails: ['rails_8.0', 'rails_8.1']
+              postgres: ['postgres:14.24', 'postgres:15.19', 'postgres:16.15', 'postgres:17.11', 'postgres:18.6']

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v0.8.0 (2026-09-07)
+
+### Breaking Changes
+- [#39](https://github.com/kufu/activerecord-tenant-level-security/pull/39): Drop support for Rails 7.2 (EOL)
+
+## 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/activerecord-tenant-level-security.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 7.2"
-  spec.add_dependency "activesupport", ">= 7.2"
+  spec.add_dependency "activerecord", ">= 8.0"
+  spec.add_dependency "activesupport", ">= 8.0"
   spec.add_dependency "pg", ">= 1.0"
 
   spec.add_development_dependency "bundler", ">= 2.0"

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.8.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.8.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
@@ -16,28 +15,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -116,11 +115,11 @@ files:
 - bin/console
 - bin/setup
 - compose.yml
-- gemfiles/rails_7.2.gemfile
 - gemfiles/rails_8.0.gemfile
 - 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 +131,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.8.0/CHANGELOG.md
 rdoc_options: []
 require_paths:
 - lib
@@ -148,8 +146,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: []

data/gemfiles/rails_7.2.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gem "rails", "~> 7.2.2"
-
-gemspec path: "../"