pg_rls 0.0.2.6.2 → 0.0.2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87f7139b6e22ced3f4e32092df320ff675a995cfb5139b786da32de98087893e
-  data.tar.gz: 4840e5dcab17c0ed382734fff92d3ddaf9a905b61aeba05a763fcb43fc68fc01
+  metadata.gz: 995d9d7741a7402f3a17cf8737bdbad60cdb1aae96460058ed1e02eba59af374
+  data.tar.gz: 013bc7af4c7ffabf0d9cde928882efa3a35af791673b51539c9957f4a54d6786
 SHA512:
-  metadata.gz: 03d7a09af5bf048f6aa0b1473d5b3c6ccc0a83c0068efa2e84dd75a016a4e39c353fa6bdc3e5d213961129860f08c3b9a79f2824b05d33a90fafdfd4d26e3d0b
-  data.tar.gz: 89e3ced934194385d2d851880c4ef675020d5a706135dd4cef4de8127106ddb158385586be559ac84b1648a23965e50e764d76fe5beace11c583912fdc7d30f8
+  metadata.gz: 3624e007d9826575c5713285b7c21c6410853c9970f0cf8f79b2ec71c5d99aa0f009fc32c9756de6131801e5cbc190b27b431714e036c2a139217c4f150f7a19
+  data.tar.gz: 8631b721048d4478da8d30f1cc294452cfd9a48f22e6eab8bf9748e345b3a5d26f886c92400035e3ff5c1ab993fc7759b26bbb1675b6f90b536dfcf271fe3b96

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

@@ -40,13 +40,17 @@ module PgRls
       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.3'
 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.3
 platform: ruby
 authors:
 - Daniel Laloush