pg_rls 0.0.2.6.1 → 0.0.2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b766acd4413c9b9fad35fbc7f79e8f50cbcd97abf6644a1c2976584174db33ca
-  data.tar.gz: 8aa3f8df6e04599b94c3677e58db9bb99c8207fbe2a195f5da92555cad52e758
+  metadata.gz: 995d9d7741a7402f3a17cf8737bdbad60cdb1aae96460058ed1e02eba59af374
+  data.tar.gz: 013bc7af4c7ffabf0d9cde928882efa3a35af791673b51539c9957f4a54d6786
 SHA512:
-  metadata.gz: d059f46edf63a45f3ebf2fb4cbacd53b3342d52a627edd596cacfb289857adcc8a0be3ff39c1e7f6a9fe268d280df119487c1760f884e87b784d9d945138509f
-  data.tar.gz: b431079863091428e09272154e91bdffe50e7e375e35f03984698857b4e80983171cee4fb0db3674b054da299d551135e585c090f356c17e16642edf1262eb88
+  metadata.gz: 3624e007d9826575c5713285b7c21c6410853c9970f0cf8f79b2ec71c5d99aa0f009fc32c9756de6131801e5cbc190b27b431714e036c2a139217c4f150f7a19
+  data.tar.gz: 8631b721048d4478da8d30f1cc294452cfd9a48f22e6eab8bf9748e345b3a5d26f886c92400035e3ff5c1ab993fc7759b26bbb1675b6f90b536dfcf271fe3b96

data/lib/pg_rls/middleware/sidekiq/client.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# :nocov:
+module PgRls
+  module Middleware
+    module Sidekiq
+      # Set PgRls Policies
+      class Client
+        def call(_job_class, msg, _queue, _redis_pool)
+          msg['pg_rls'] = PgRls::Tenant.fetch.id
+          yield
+        end
+      end
+    end
+  end
+end

data/lib/pg_rls/middleware/sidekiq/server.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# :nocov:
+module PgRls
+  module Middleware
+    module Sidekiq
+      # Set PgRls Policies
+      class Server
+        def call(_job_instance, msg, _queue)
+          PgRls::Tenant.with_tenant(msg['pg_rls']) do
+            process_class = msg['args'].first['job_class']
+            yield
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pg_rls/middleware/sidekiq.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require_relative 'sidekiq/client'
+require_relative 'sidekiq/server'
+
+module PgRls
+  module Middleware
+    module Sidekiq
+    end
+  end
+end

data/lib/pg_rls/middleware.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require_relative 'middleware/sidekiq'
+
+module PgRls
+  module Middleware
+  end
+end

data/lib/pg_rls/multi_tenancy.rb

@@ -5,18 +5,23 @@ module PgRls
   module MultiTenancy
     def self.included(base)
       base.class_eval do
-        before_action :switch_tenant!
+        around_action :switch_tenant!
+
+        def current_tenant
+          @current_tenant ||= request.subdomain
+        end
+        helper_method :current_tenant
       end
     end
 
     private
 
-    def switch_tenant!
-      tenant = request.subdomain
-      Tenant.switch!(tenant)
-      session[:_tenant] = tenant
-    rescue PgRls::Errors::TenantNotFound, ActiveRecord::RecordNotFound
-      Tenant.switch(session[:_tenant])
+    def switch_tenant!(&block)
+      fetched_tenant = session[:_tenant] || current_tenant
+      Tenant.with_tenant(fetched_tenant) do |tenant|
+        session[:_tenant] = tenant
+        block.call(tenant)
+      end
     rescue NoMethodError
       session[:_tenant] = nil
       redirect_to '/'

data/lib/pg_rls/tenant.rb

@@ -7,34 +7,50 @@ module PgRls
       attr_reader :tenant
 
       def switch(resource)
-        switch_tenant!(resource)
+        tenant = switch_tenant!(resource)
+
+        "RLS changed to '#{tenant.id}'"
       rescue StandardError => e
         Rails.logger.info('connection was not made')
         Rails.logger.info(e)
+        nil
       end
 
       def switch!(resource)
-        switch_tenant!(resource)
+        tenant = switch_tenant!(resource)
+
+        "RLS changed to '#{tenant.id}'"
       rescue StandardError => e
         Rails.logger.info('connection was not made')
         raise e
       end
 
-      def with_tenant(resource)
-        switch_tenant!(resource)
-        yield
+      def find_each(&block)
+        PgRls.main_model.find_each do |tenant|
+          with_tenant(tenant, &block)
+        end
+      end
+
+      def with_tenant(resource, &block)
+        tenant = switch_tenant!(resource)
+
+        block.call(tenant) if block_given?
       ensure
         reset_rls!
       end
 
       def fetch
+        fetch!
+      rescue ActiveRecord::StatementInvalid
+        'no tenant is selected'
+      end
+
+      def fetch!
         @fetch ||= PgRls.main_model.find_by!(
           tenant_id: PgRls.connection_class.connection.execute(
             "SELECT current_setting('rls.tenant_id')"
           ).getvalue(0, 0)
         )
-      rescue ActiveRecord::StatementInvalid
-        'no tenant is selected'
       end
 
       def find_main_model
@@ -62,9 +78,12 @@ module PgRls
 
         raise PgRls::Errors::TenantNotFound if tenant.blank?
 
-        connection_adapter.connection.execute(format('SET rls.tenant_id = %s',
-                                                     connection_adapter.connection.quote(tenant.tenant_id)))
-        "RLS changed to '#{tenant.send(@method)}'"
+        connection_adapter.connection.transaction do
+          connection_adapter.connection.execute(format('SET rls.tenant_id = %s',
+                                                      connection_adapter.connection.quote(tenant.tenant_id)))
+        end
+
+        tenant
       end
 
       def find_tenant(resource)

data/lib/pg_rls/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRls
-  VERSION = '0.0.2.6.1'
+  VERSION = '0.0.2.6.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rls
 version: !ruby/object:Gem::Version
-  version: 0.0.2.6.1
+  version: 0.0.2.6.3
 platform: ruby
 authors:
 - Daniel Laloush
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-13 00:00:00.000000000 Z
+date: 2023-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,6 +64,10 @@ files:
 - lib/pg_rls/database/prepared.rb
 - lib/pg_rls/database/tasks/admin_database.rake
 - lib/pg_rls/errors/tenant_not_found.rb
+- lib/pg_rls/middleware.rb
+- lib/pg_rls/middleware/sidekiq.rb
+- lib/pg_rls/middleware/sidekiq/client.rb
+- lib/pg_rls/middleware/sidekiq/server.rb
 - lib/pg_rls/multi_tenancy.rb
 - lib/pg_rls/railtie.rb
 - lib/pg_rls/schema/down_statements.rb