pg_rls 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5296cf19938df79d340f6da931acf0aee13e967720d964ec979773189634c155
-  data.tar.gz: ebf0278848a707e692198346dc734e8da9024c3b5e1325da760c4d7f7cdc30f2
+  metadata.gz: 0e0133ebb0867d0bfeeea122f6ddef47f861c6b17e2b8b65a07acdca4768c66a
+  data.tar.gz: 5bd700b9dd72150b01e72086f07795772cbb3f3b512e7106dbf58b2850713414
 SHA512:
-  metadata.gz: 97465ed5ea998a4c6e6ae39aae82d08ae0663733ef0f442d4716431adb607f13b96fb44139d5c5be83696cbb044cfa778a918a74aa842906ae798869f0fb3145
-  data.tar.gz: c85948bfbcd16f610b2095f2900fee54d3abc3cd27b581eb282144e4b444341a0cfb50c2b1ef98e8cd9d395c22e6218d81fa19d2281df956bb3d8e5cf4e39204
+  metadata.gz: af0c6529cd940354cbaf1432c7086e1ae336f0d160df036108820873f31699c580833b7b153956e1b599b26946de15e8bfd5eda2dc94e10fa8b0b757fc94bcf1
+  data.tar.gz: 04feda60ca3f7fa0e98f096246db9ba2d4eecac158af08f719631e7f078b224e5dc33b660e92129a6eb70e217bb7e550fdf74843015b1df988272954d756192c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pg_rls (0.1.2)
+    pg_rls (0.1.1)
       bundler (~> 2.2)
 
 GEM

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.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rls
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  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: []