pg_rls 0.0.2.6.7 → 0.0.2.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6783ec3471dcba6dbad4e13ab33933d5f02e4ea336956f1a88d568a0ac4f7943
-  data.tar.gz: 72d651c7863a7fc8de7df9441b849b58894e37833334d445df814aad402cf8e1
+  metadata.gz: '03856745d3bc5307b2e0c0709a39f46d983292b5660cd82fbd5f2f71fce62626'
+  data.tar.gz: 5d4401f7ba755c2c640b311434d0aff47139d8212352326b4bc76150e19c2561
 SHA512:
-  metadata.gz: ef6b9d2c986f307fe286e7289fd6059a1255f029c1bc4c88d47da7547d5e2a30d1e43fa0bf7161dfbd307e78f996527f015800fc9c1ce44c80ecb2e7720f36fb
-  data.tar.gz: 15f5f316a234d82bbc6712ba78aaa33edc329ac7e7027d228fddd9aa6ea750a66c2585921e31b83d48e4906ae5ed36169ad57954c49e3ae52dc9158cc17dee34
+  metadata.gz: 042f6141b1ea3bdefa87f590893a12564d9aa4f36140aa5e97e062ddc1a4bd7d457fe5a858b6784239bc743b8afcfa7f571b3964cee0b7b59305f69d601a8ec1
+  data.tar.gz: df7541a0733e6898558e8e54b0c45c1886ae116e5bba6efe39e3d9b303382bbfec4492ed4c4f9893822485305ef9894e2a80b544e850bedbb306825ad053e8f3

data/lib/pg_rls/errors/tenant_not_found.rb

@@ -4,13 +4,14 @@ module PgRls
   module Errors
     # Raise Tenant Not found and ensure that the tenant is resetted
     class TenantNotFound < StandardError
-      def initialize
+      def initialize(msg = nil)
         reset_tenant_id
-        super
+        @msg = msg
+        super(msg)
       end
 
       def message
-        "Tenant Doesn't exist"
+        @msg || "Tenant Doesn't exist"
       end
 
       def reset_tenant_id

data/lib/pg_rls/middleware/set_reset_connection.rb

@@ -13,7 +13,9 @@ module PgRls
 
         return @app.call(env) if tenant.blank?
 
-        PgRls::Tenant.with_tenant(tenant) { @app.call(env) }
+        PgRls::Tenant.with_tenant!(tenant) { @app.call(env) }
+      rescue PgRls::Erorrs::TenantNotFound
+        @app.call(env)
       rescue ActiveRecord::RecordNotFound => e
         raise e unless rails_active_storage_request?(env)
 

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

@@ -7,8 +7,7 @@ module PgRls
       # 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']
+          PgRls::Tenant.with_tenant!(msg['pg_rls']) do
             yield
           end
         end

data/lib/pg_rls/multi_tenancy.rb

@@ -18,13 +18,15 @@ module PgRls
 
     def switch_tenant!(&block)
       fetched_tenant = session[:_tenant] || current_tenant
-      Tenant.with_tenant(fetched_tenant) do |tenant|
+      return block.call if PgRls::Tenant.fetch.present?
+
+      Tenant.with_tenant!(fetched_tenant) do |tenant|
         session[:_tenant] = tenant
         block.call(tenant)
       end
     rescue NoMethodError
       session[:_tenant] = nil
-      redirect_to '/'
+      raise PgRls::Errors::TenantNotFound, 'No tenant was found'
     end
 
     def switch_tenant_by_resource!(resource = nil)

data/lib/pg_rls/tenant.rb

@@ -27,11 +27,11 @@ module PgRls
 
       def find_each(&)
         PgRls.main_model.find_each do |tenant|
-          with_tenant(tenant, &)
+          with_tenant!(tenant, &)
         end
       end
 
-      def with_tenant(resource, &block)
+      def with_tenant!(resource, &block)
         tenant = switch_tenant!(resource)
 
         block.call(tenant) if block_given?

data/lib/pg_rls/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_rls
 version: !ruby/object:Gem::Version
-  version: 0.0.2.6.7
+  version: 0.0.2.6.9
 platform: ruby
 authors:
 - Daniel Laloush