pg_rls 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b51a33bf2c5a0518a96142e8b07e303b32419719dfce1715ee237a0348d19c9
-  data.tar.gz: 3bba1aaa681ab9a6d0defff9110c5f2077b08ff6a07332ad429cd040d8c84a7a
+  metadata.gz: 0e0133ebb0867d0bfeeea122f6ddef47f861c6b17e2b8b65a07acdca4768c66a
+  data.tar.gz: 5bd700b9dd72150b01e72086f07795772cbb3f3b512e7106dbf58b2850713414
 SHA512:
-  metadata.gz: 3ff073704aeca1d9e1b3e8673353deeca756d06b95a32f62fe85ac65cd3f145007c68d6b0b980b78221bdd0f4330421fc540d8efdc7e11600d8adaada1aa105c
-  data.tar.gz: 11711ea29d21eef5d0dccbdfc5916074fe1a98089752f7fc0095ca1d514b40f5c40cb4b0a7a56688160a8afeb67414c3902d88152732774ad62fcbd6c7294140
+  metadata.gz: af0c6529cd940354cbaf1432c7086e1ae336f0d160df036108820873f31699c580833b7b153956e1b599b26946de15e8bfd5eda2dc94e10fa8b0b757fc94bcf1
+  data.tar.gz: 04feda60ca3f7fa0e98f096246db9ba2d4eecac158af08f719631e7f078b224e5dc33b660e92129a6eb70e217bb7e550fdf74843015b1df988272954d756192c

data/lib/generators/pg_rls/install_generator.rb

@@ -16,6 +16,8 @@ module PgRls
         end
         super
       end
+      ENVIRONMENT_PATH = 'config/environment.rb'
+
       APPLICATION_LINE = 'class Application < Rails::Application'
       APPLICATION_PATH = 'config/application.rb'
 
@@ -50,6 +52,12 @@ module PgRls
         template 'pg_rls.rb.tt', 'config/initializers/pg_rls.rb'
       end
 
+      def inject_include_to_environment
+        return if environment_already_included?
+
+        prepend_to_file(ENVIRONMENT_PATH, "\nrequire_relative 'initializers/pg_rls'\n")
+      end
+
       def inject_include_to_application
         return if aplication_already_included?
 
@@ -74,6 +82,10 @@ module PgRls
         File.readlines(APPLICATION_PATH).grep(/config.active_record.schema_format = :sql/).any?
       end
 
+      def environment_already_included?
+        File.readlines(ENVIRONMENT_PATH).grep(/require_relative 'initializers\/pg_rls'/).any?
+      end
+
       def initialize_error_text
         <<~ERROR
           TO DO

data/lib/pg_rls/multi_tenancy.rb

@@ -28,19 +28,5 @@ module PgRls
       session[:_tenant] = nil
       raise PgRls::Errors::TenantNotFound, 'No tenant was found'
     end
-
-    def switch_tenant_by_resource!(resource = nil)
-      Tenant.switch!(resource)
-      session[:_tenant] = resource
-    rescue PgRls::Errors::TenantNotFound
-      Tenant.switch(session[:_tenant])
-    rescue NoMethodError
-      session[:tenant] = nil
-      redirect_to '/'
-    end
-
-    def tenant_match_session_cookies?
-      session[:_tenant] == request.subdomain
-    end
   end
 end

data/lib/pg_rls/tenant.rb

@@ -4,15 +4,9 @@ module PgRls
   # Tenant Controller
   module Tenant
     class << self
-      attr_reader :tenant
-
       def switch(resource)
-        tenant = switch_tenant!(resource)
-
-        "RLS changed to '#{tenant.id}'"
-      rescue StandardError => e
-        Rails.logger.info('connection was not made')
-        Rails.logger.info(e)
+        switch!(resource)
+      rescue PgRls::Errors::TenantNotFound
         nil
       end
 
@@ -22,15 +16,18 @@ module PgRls
         "RLS changed to '#{tenant.id}'"
       rescue StandardError => e
         Rails.logger.info('connection was not made')
-        raise e
+        raise PgRls::Errors::TenantNotFound
       end
 
+
       def with_tenant!(resource)
-        tenant = switch_tenant!(resource)
+        PgRls.main_model.connection_pool.with_connection do
+          tenant = switch_tenant!(resource)
 
-        yield(tenant) if block_given?
-      ensure
-        reset_rls! unless PgRls.test_inline_tenant == true
+          yield(tenant).presence if block_given?
+        ensure
+          reset_rls! unless PgRls.test_inline_tenant == true
+        end
       end
 
       def fetch
@@ -39,19 +36,15 @@ module PgRls
         nil
       end
 
-      def tenant!
-        @tenant ||= PgRls.main_model.find_by!(
+      def fetch!
+        PgRls.main_model.find_by!(
           tenant_id: PgRls.connection_class.connection.execute(
             "SELECT current_setting('rls.tenant_id')"
           ).getvalue(0, 0)
         )
       end
-      alias fetch! tenant!
 
       def reset_rls!
-        return if @tenant.blank?
-
-        @tenant = nil
         PgRls.execute_rls_in_shards do |connection_class|
           connection_class.transaction do
             connection_class.connection.execute('RESET rls.tenant_id')
@@ -68,7 +61,7 @@ module PgRls
         PgRls.main_model.ignored_columns = []
         # rubocop: enable Rails/IgnoredColumnsAssignment
 
-        find_tenant(resource)
+        tenant = find_tenant(resource)
 
         PgRls.execute_rls_in_shards do |connection_class|
           connection_class.transaction do
@@ -78,6 +71,8 @@ module PgRls
         end
 
         tenant
+      rescue NoMethodError
+        raise PgRls::Errors::TenantNotFound
       end
 
       def find_tenant(resource)
@@ -85,14 +80,17 @@ module PgRls
 
         reset_rls!
 
+        tenant = nil
+
         PgRls.search_methods.each do |method|
-          break if @tenant.present?
+          break if tenant.present?
 
-          @method = method
-          @tenant = find_tenant_by_method(resource, method)
+          tenant = find_tenant_by_method(resource, method)
         end
 
         raise PgRls::Errors::TenantNotFound if tenant.blank?
+
+        tenant
       end
 
       def find_tenant_by_method(resource, method)

data/lib/pg_rls/version.rb

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

data/lib/pg_rls.rb

@@ -62,20 +62,19 @@ module PgRls
 
     def admin_execute(query = nil, &)
       current_tenant = PgRls::Tenant.fetch
-
-      self.as_db_admin = true
-      establish_new_connection!
+      establish_new_connection!(admin: true)
 
       return ensure_block_execution(&) if block_given?
 
       execute(query)
     ensure
-      self.as_db_admin = false
       establish_new_connection!
       PgRls::Tenant.switch(current_tenant) if current_tenant.present?
     end
 
-    def establish_new_connection!
+    def establish_new_connection!(admin: false)
+      self.as_db_admin = admin
+
       execute_rls_in_shards do |connection_class, pool|
         connection_class.remove_connection
         connection_class.establish_connection(pool.db_config)
@@ -87,24 +86,20 @@ module PgRls
     end
 
     def on_each_tenant(&)
-      set_rls_connection! if admin_connection?
+      with_rls_connection do
+        result = []
 
-      result = []
-      main_model.find_each do |tenant|
-        allowed_search_fields = search_methods.map(&:to_s).intersection(main_model.column_names)
-        Tenant.switch tenant.send(allowed_search_fields.first)
-
-        result << { tenant:, result: ensure_block_execution(tenant, &) }
-      end
+        main_model.find_each do |tenant|
+          allowed_search_fields = search_methods.map(&:to_s).intersection(main_model.column_names)
+          Tenant.switch tenant.send(allowed_search_fields.first)
 
-      PgRls::Tenant.reset_rls!
+          result << { tenant:, result: ensure_block_execution(tenant, &) }
+        end
 
-      result
-    end
+        PgRls::Tenant.reset_rls!
 
-    def set_rls_connection!
-      self.as_db_admin = false
-      establish_new_connection!
+        result
+      end
     end
 
     def execute_rls_in_shards
@@ -138,6 +133,15 @@ module PgRls
 
     attr_writer :as_db_admin
 
+    def with_rls_connection(&)
+      reset_connection = admin_connection?
+
+      establish_new_connection! if reset_connection
+      ensure_block_execution(&)
+    ensure
+      establish_new_connection!(admin: true) if reset_connection
+    end
+
     def ensure_block_execution(*, **)
       yield(*, **).presence
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rls
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Daniel Laloush
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-14 00:00:00.000000000 Z
+date: 2023-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,7 +85,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -100,8 +100,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Write a short summary, because RubyGems requires one.
 test_files: []