pg_rls 0.0.2.6 → 0.0.2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8738d2e841c3b624b073fce3a496def262acf19cda3edbf138d0f7840a692b3
-  data.tar.gz: fe073b693f792122f84cef65d786ed5d6b727d2d351c146fae6371c45819d8ad
+  metadata.gz: 87f7139b6e22ced3f4e32092df320ff675a995cfb5139b786da32de98087893e
+  data.tar.gz: 4840e5dcab17c0ed382734fff92d3ddaf9a905b61aeba05a763fcb43fc68fc01
 SHA512:
-  metadata.gz: 247e45f3fbe9553746f55bd3f35a62c67087b2628119a6eb019aaaa29350a66ff51de2ab8d194cf6796f3f389fd0a28bfe979e443b8792842ce059149ed9d14e
-  data.tar.gz: d9466802ab4410695da1729b7d6864b57f5b214fa02fc079cea72741b752ec61b00ac4896074c2c0232206ada8df6292ac977d9431520ca06660e2e9f2da47bd
+  metadata.gz: 03d7a09af5bf048f6aa0b1473d5b3c6ccc0a83c0068efa2e84dd75a016a4e39c353fa6bdc3e5d213961129860f08c3b9a79f2824b05d33a90fafdfd4d26e3d0b
+  data.tar.gz: 89e3ced934194385d2d851880c4ef675020d5a706135dd4cef4de8127106ddb158385586be559ac84b1648a23965e50e764d76fe5beace11c583912fdc7d30f8

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/tenant.rb

@@ -7,22 +7,34 @@ 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
@@ -62,9 +74,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)
@@ -81,7 +96,8 @@ module PgRls
       end
 
       def find_tenant_by_method(resource, method)
-        PgRls.main_model.send("find_by_#{method}!", resource.send(method))
+        look_up_value = resource.is_a?(PgRls.main_model) ? resource.send(method) : resource
+        PgRls.main_model.send("find_by_#{method}!", look_up_value)
       rescue ActiveRecord::RecordNotFound
         nil
       end

data/lib/pg_rls/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rls
 version: !ruby/object:Gem::Version
-  version: 0.0.2.6
+  version: 0.0.2.6.2
 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