activerecord-tenant-level-security 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49e28adc009110fdfec7d492b1d41a8dbead74e63197ebc2e5c323235c53f1e3
-  data.tar.gz: 87a0ea6f56141e9111bd1e1b4e775e0c1adc43c821f2fda3a45434e53aef3a3f
+  metadata.gz: 875e923faf98a07af0be7bee342de4e9706019f96049ad069e5ffd0498749aff
+  data.tar.gz: 30f876d2f357d0213f47a54ed15e4d6a8ce52298e66b07af42c5ffdd205748c8
 SHA512:
-  metadata.gz: 76b259532a907957c76f08715c34edfe4d84965f68c2dcd8eae423333b0c53e8b6243b19131008c577b9d4e1f8ac401cb451327bdefc4d33ff5edca73f7f963d
-  data.tar.gz: f918306110bf9757ca1ee5bb84ed85d658c9004410ad45a9932249c4866e8be5814a2594616a98d04e6af590a98c636ddacb6ad2ca01e2d467de951871817e48
+  metadata.gz: b31646aaa832922f12a2e3165d71c814e2c56bd24ad5edca2b42218a2e03b5db9308cf87d1f4e54797ddda324dc5c584296ea26374b5e55f5ca1ed793b06d16f
+  data.tar.gz: d3cd62cc22504af43ed0e10d644af101022de14e684ef8929bd9919fe68db92c53925cbfc01c481e7b5f41bbf34e734068998cb6c11956a50f5257cdbcaa0d5a

data/.circleci/config.yml

@@ -28,6 +28,6 @@ workflows:
       - test:
           matrix:
             parameters:
-              ruby: ['ruby:3.2', 'ruby:3.3', 'ruby:3.4']
+              ruby: ['ruby:3.3', 'ruby:3.4', 'ruby:4.0']
               rails: ['rails_7.2', 'rails_8.0', 'rails_8.1']
-              postgres: ['postgres:14.19', 'postgres:15.14', 'postgres:16.10', 'postgres:17.6', 'postgres:18.0']
+              postgres: ['postgres:14.20', 'postgres:15.15', 'postgres:16.11', 'postgres:17.7', 'postgres:18.1']

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 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
+- [#37](https://github.com/kufu/activerecord-tenant-level-security/pull/37): Drop support for Ruby 3.2. Add support for Ruby 4.0.
+
 ## v0.5.0 (2025-12-12)
 
 ### Breaking Changes

data/README.md

@@ -193,7 +193,25 @@ end
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies.
+
+To run tests locally, start PostgreSQL with Docker Compose and then execute the test suite:
+
+```bash
+docker compose up -d
+bundle exec rake spec
+```
+
+The test helper connects to PostgreSQL at `localhost:5432` with the `postgres` user/password (`postgres`), and creates the app role (`activerecord_tenant_level_security_test`) when needed.
+
+If you want a clean database state (for example, when re-initializing roles), recreate the database volume:
+
+```bash
+docker compose down -v
+docker compose up -d
+```
+
+You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/compose.yml

@@ -0,0 +1,11 @@
+services:
+  db:
+    image: postgres:17
+    ports:
+      - '5432:5432'
+    volumes:
+      - db:/var/lib/postgresql/data
+    environment:
+      POSTGRES_PASSWORD: 'postgres'
+volumes:
+  db:

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.5.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.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - SmartHR
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -115,11 +114,13 @@ files:
 - activerecord-tenant-level-security.gemspec
 - 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
@@ -131,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.5.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
@@ -147,8 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: An Active Record extension for Multitenancy with PostgreSQL Row Level Security
 test_files: []