pg_rls 0.0.2.4 → 0.0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97b8d67f3ffcd5b65cc10db46a9a0b981545881ad1e6ce40152c73feadf18b3f
-  data.tar.gz: fd084b44bc7a6301e196aafeb670071426e8f85bc861a83c1dc7e025386a6ecd
+  metadata.gz: b8738d2e841c3b624b073fce3a496def262acf19cda3edbf138d0f7840a692b3
+  data.tar.gz: fe073b693f792122f84cef65d786ed5d6b727d2d351c146fae6371c45819d8ad
 SHA512:
-  metadata.gz: 461960383dd168e92d23a7d046c9baf521a03dca494f60918cf4712c878ae3d37abd5d3b357c09e59eb4d8cfbbb50b00d18c6110217f2add95f230f767bb58b5
-  data.tar.gz: 0febfe88828a1875c8156a5cd010e5ee25f3b10e7e714e3bbe07233f70e09abb7201ea357f1e22dd3733c48854ef4aa7cfc214775b42365c77ec04a3463113b8
+  metadata.gz: 247e45f3fbe9553746f55bd3f35a62c67087b2628119a6eb019aaaa29350a66ff51de2ab8d194cf6796f3f389fd0a28bfe979e443b8792842ce059149ed9d14e
+  data.tar.gz: d9466802ab4410695da1729b7d6864b57f5b214fa02fc079cea72741b752ec61b00ac4896074c2c0232206ada8df6292ac977d9431520ca06660e2e9f2da47bd

data/lib/pg_rls/multi_tenancy.rb

@@ -5,15 +5,26 @@ module PgRls
   module MultiTenancy
     def self.included(base)
       base.class_eval do
-        before_action :switch_tenant
+        before_action :switch_tenant!
       end
     end
 
     private
 
-    def switch_tenant
-      Tenant.switch!(request.subdomain)
-      session[:_tenant] = request.subdomain
+    def switch_tenant!
+      tenant = request.subdomain
+      Tenant.switch!(tenant)
+      session[:_tenant] = tenant
+    rescue PgRls::Errors::TenantNotFound, ActiveRecord::RecordNotFound
+      Tenant.switch(session[:_tenant])
+    rescue NoMethodError
+      session[:_tenant] = nil
+      redirect_to '/'
+    end
+
+    def switch_tenant_by_resource!(resource = nil)
+      Tenant.switch!(resource)
+      session[:_tenant] = resource
     rescue PgRls::Errors::TenantNotFound, ActiveRecord::RecordNotFound
       Tenant.switch(session[:_tenant])
     rescue NoMethodError

data/lib/pg_rls/secure_connection.rb

@@ -17,7 +17,7 @@ module PgRls
 
     def self.included(base)
       establish_secure_connection
-      base.ignored_columns = %w(tenant_id)
+      base.ignored_columns = %w[tenant_id]
     end
   end
 end

data/lib/pg_rls/tenant.rb

@@ -37,6 +37,15 @@ module PgRls
         'no tenant is selected'
       end
 
+      def find_main_model
+        PgRls.main_model.ignored_columns = []
+        PgRls.main_model.find_by!(
+          tenant_id: PgRls.connection_class.connection.execute(
+            "SELECT current_setting('rls.tenant_id')"
+          ).getvalue(0, 0)
+        )
+      end
+
       def reset_rls!
         @fetch = nil
         @tenant = nil
@@ -46,6 +55,8 @@ module PgRls
       private
 
       def switch_tenant!(resource)
+        PgRls.main_model.ignored_columns = []
+
         connection_adapter = PgRls.connection_class
         find_tenant(resource)
 
@@ -70,7 +81,7 @@ module PgRls
       end
 
       def find_tenant_by_method(resource, method)
-        PgRls.main_model.send("find_by_#{method}!", resource)
+        PgRls.main_model.send("find_by_#{method}!", resource.send(method))
       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.4'
+  VERSION = '0.0.2.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rls
 version: !ruby/object:Gem::Version
-  version: 0.0.2.4
+  version: 0.0.2.6
 platform: ruby
 authors:
 - Daniel Laloush
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-30 00:00:00.000000000 Z
+date: 2023-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,7 +80,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -95,8 +95,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.15
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
 summary: Write a short summary, because RubyGems requires one.
 test_files: []