pg_rls 0.0.2.6.2 → 0.0.2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87f7139b6e22ced3f4e32092df320ff675a995cfb5139b786da32de98087893e
-  data.tar.gz: 4840e5dcab17c0ed382734fff92d3ddaf9a905b61aeba05a763fcb43fc68fc01
+  metadata.gz: ba75e0b7e721387cf04da5c9b310e514b07bbb5d3159b0a317c92048fe912f9b
+  data.tar.gz: 1c3cee557d24b75a3c61e981f0dc6bcd70859a8361d3b0230be4d9431cad1f20
 SHA512:
-  metadata.gz: 03d7a09af5bf048f6aa0b1473d5b3c6ccc0a83c0068efa2e84dd75a016a4e39c353fa6bdc3e5d213961129860f08c3b9a79f2824b05d33a90fafdfd4d26e3d0b
-  data.tar.gz: 89e3ced934194385d2d851880c4ef675020d5a706135dd4cef4de8127106ddb158385586be559ac84b1648a23965e50e764d76fe5beace11c583912fdc7d30f8
+  metadata.gz: d89f1f6ce97c51e38cd3f0560f5319b8f8da113cb69f7d36df5f5a241917bdd3e6f094f52dcc84595bf42d741edcc4cb63902c95f76b01307616c00f22b8c11c
+  data.tar.gz: 4c1505f44f45c4741e2b71a9a73a4dde81de2c2b0391cfc919363b52985299e272c76ce623f24829d91aa446f9310f23804e4fd5fad16f11bdce91c718d84c46

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

@@ -36,17 +36,21 @@ module PgRls
 
         block.call(tenant) if block_given?
       ensure
-        reset_rls!
+        reset_rls! unless PgRls.test_inline_tenant == true
       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

data/lib/pg_rls/version.rb

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

data/lib/pg_rls.rb

@@ -145,6 +145,9 @@ module PgRls
   mattr_accessor :solo_mode
   @@solo_mode = false
 
+  mattr_accessor :test_inline_tenant
+  @@test_inline_tenant = false
+
   mattr_accessor :search_methods
   @@search_methods = %i[subdomain id tenant_id]
 end

metadata

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