pg_rls 0.0.2 → 0.0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ee45b6831bde44dff2a29fa6dd8e832e1e55970833bbbd52a9a30982f6b987a
-  data.tar.gz: 83013597d4b42fb6b808c8c1b7e90c58eeb3e8dc231923523a01e6454b52507d
+  metadata.gz: 96f6c928e78088e4781845c1243c1af8ceee143f99863af133f0aae2d40b1df8
+  data.tar.gz: 4bb596321621511c913d8ee98a71918df75b84e3c4738ae44e9f1ee0974c74af
 SHA512:
-  metadata.gz: fae8b1317628ddc17c19753eab39937bfc237cda1c0df9b60a9c91bbe58e5203316e305fbe3175d803531e09fc9e43b0e63941cd2153aa9a363a4d4f35e0d308
-  data.tar.gz: a42e6f8ebc4a93739ab3475a9d436748f1c63fc2e4878011a37d9bb46db17fff79bf66bfb4f374f5cabf8496d93bcac024a285687f19bca5f19f3717fd65f05e
+  metadata.gz: 6ab1085addd4d796fb221e2850459b26c0e520192916a7285fe5c7f0ddd6298cb5576f826d133f06bd9be5c2d89d0895c9446ebcc7b6c5413e0d86b9972b2721
+  data.tar.gz: f0b744bc68654c77afeabadf2af756fe5787602b2f26262172acd6ddca51928a405b75f46f0c7824dfdfbe5c3fde0d4b03bec45c803680b37ce4a903947f06c9

data/lib/pg_rls/tenant.rb

@@ -9,19 +9,26 @@ module PgRls
       def switch(resource)
         switch_tenant!(resource)
       rescue StandardError => e
-        puts 'connection was not made'
-        puts e
+        Rails.logger.info('connection was not made')
+        Rails.logger.info(e)
       end
 
       def switch!(resource)
         switch_tenant!(resource)
       rescue StandardError => e
-        puts 'connection was not made'
+        Rails.logger.info('connection was not made')
         raise e
       end
 
+      def with_tenant(resource)
+        switch_tenant!(resource)
+        yield
+      ensure
+        reset_rls!
+      end
+
       def fetch
-        @fetch ||= PgRls.main_model.find_by_tenant_id(
+        @fetch ||= PgRls.main_model.find_by_tenant_id!(
           PgRls.connection_class.connection.execute(
             "SELECT current_setting('rls.tenant_id')"
           ).getvalue(0, 0)
@@ -30,10 +37,15 @@ module PgRls
         'no tenant is selected'
       end
 
+      def reset_rls!
+        @fetch = nil
+        @tenant = nil
+        PgRls.connection_class.connection.execute('RESET rls.tenant_id')
+      end
+
       private
 
       def switch_tenant!(resource)
-        @fetch = nil
         connection_adapter = PgRls.connection_class
         find_tenant(resource)
 
@@ -45,14 +57,21 @@ module PgRls
       end
 
       def find_tenant(resource)
-        @tenant = nil
+        reset_rls!
 
         PgRls.search_methods.each do |method|
+          return if @tenant.present?
+
           @method = method
-          @tenant ||= PgRls.main_model.send("find_by_#{method}!", resource)
-        rescue NoMethodError, ActiveRecord::RecordNotFound => e
-          @error = e
+          @tenant = find_tenant_by_method(resource, method)
         end
+
+        raise PgRls::Errors::TenantNotFound if tenant.nil?
+      end
+
+      def find_tenant_by_method(resource, method)
+        PgRls.main_model.send("find_by_#{method}!", resource)
+      rescue ActiveRecord::RecordNotFound => e
       end
     end
   end

data/lib/pg_rls/version.rb

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

data/lib/pg_rls.rb

@@ -48,9 +48,9 @@ module PgRls
     end
 
     def establish_new_connection
-      connection_class.establish_connection(
-        **database_configuration
-      )
+      ActiveRecord::Base.connection.disconnect!
+
+      connection_class.establish_connection(**database_configuration)
     end
 
     def admin_execute(query = nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rls
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.2.1
 platform: ruby
 authors:
 - Daniel Laloush
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-02 00:00:00.000000000 Z
+date: 2022-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler