rls_multi_tenant 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 397cee677030faceb292bbfbb2eda3bb87f269d6b1b834966b7e6601472b8bcc
-  data.tar.gz: 42dff9f53f1d0ce4e1a59fd44e081bf33b2459083ecc63d6a19560a9c80fd4c9
+  metadata.gz: 7a8043bdc925d9f0e5e05d743f457e9baad7d861ccfa0f649bbc2b07f48c8958
+  data.tar.gz: 2476c3fbd98f58f8eb50be5cfbaeb95c6219a0aba2b77b250617a8d83970e16d
 SHA512:
-  metadata.gz: f99ba4e9128a74857c708e8393d3c8302c900c79c2809c0ad0a8dd1723d7daf1bf5f0ac064376709eb0b73983e14ec4dd3228db053c4f3f063d62c5d7adb4e1e
-  data.tar.gz: 65d310a74e59647771b1d3e37508d2e8b23050ceb501a64b6663c9c1532f5d43bb91e84a4c73c673f91e8a4a06d380db8c0b010ee411cf4b4dea3a746be5b084
+  metadata.gz: 2679ab3b6517e126ac6ba342ed6c1144af54e52bde076385ac73e5fa0d56db98dee75c4a71ad81136c0f11faf3bd1532bd5e9545c741badc34016fc0fb360244
+  data.tar.gz: ce18b2512ba1bbd63fd78388fbf752f66ea9eb4aa44aef8f16ec5ec2982c2f4996a24511f4e613a0b41916219ab557a4b0eb3a4ca70afa7b6e1cef07b6d8f2bf

data/.rubocop.yml

@@ -3,12 +3,14 @@ plugins:
   - rubocop-rspec
 
 AllCops:
+  SuggestExtensions: false
   TargetRubyVersion: 3.0
   NewCops: enable
   Exclude:
     - 'vendor/**/*'
     - 'spec/tmp/**/*'
     - 'tmp/**/*'
+    - 'lib/rls_multi_tenant/generators/**/templates/**/*'
 
 Style/Documentation:
   Enabled: false
@@ -23,13 +25,17 @@ Style/ClassAndModuleChildren:
   Enabled: false
 
 Layout/LineLength:
-  Max: 120
+  Max: 130
 
 Metrics/BlockLength:
+  Max: 50
   Exclude:
     - 'spec/**/*'
     - 'lib/rls_multi_tenant/generators/**/*'
 
+Metrics/MethodLength:
+  Max: 25
+
 RSpec/ExampleLength:
   Max: 20
 
@@ -44,3 +50,6 @@ RSpec/DescribeClass:
 
 RSpec/DescribeMethod:
   Enabled: false
+
+Gemspec/DevelopmentDependencies:
+  Enabled: false

data/lib/rls_multi_tenant/concerns/multi_tenant.rb

@@ -6,7 +6,8 @@ module RlsMultiTenant
       extend ActiveSupport::Concern
 
       included do
-        belongs_to :tenant, class_name: RlsMultiTenant.tenant_class_name, foreign_key: RlsMultiTenant.tenant_id_column
+        belongs_to :tenant, class_name: RlsMultiTenant.tenant_class_name.to_s,
+                            foreign_key: RlsMultiTenant.tenant_id_column
 
         validates RlsMultiTenant.tenant_id_column, presence: true
 
@@ -26,22 +27,6 @@ module RlsMultiTenant
           end
         end
       end
-
-      class_methods do
-        private
-
-        def extract_tenant_id(tenant_or_id)
-          case tenant_or_id
-          when RlsMultiTenant.tenant_class
-            tenant_or_id.id
-          when String, Integer
-            tenant_or_id
-          else
-            raise ArgumentError,
-                  "Expected #{RlsMultiTenant.tenant_class_name} object or tenant_id, got #{tenant_or_id.class}"
-          end
-        end
-      end
     end
   end
 end

data/lib/rls_multi_tenant/concerns/tenant_context.rb

@@ -53,7 +53,7 @@ module RlsMultiTenant
 
         def extract_tenant_id(tenant_or_id)
           case tenant_or_id
-          when RlsMultiTenant.tenant_class
+          when ->(obj) { obj.is_a?(RlsMultiTenant.tenant_class) }
             tenant_or_id.id
           when String, Integer
             tenant_or_id

data/lib/rls_multi_tenant/middleware/subdomain_tenant_selector.rb

@@ -12,35 +12,56 @@ module RlsMultiTenant
         tenant = resolve_tenant_from_subdomain(request)
 
         if tenant
-          # Switch tenant context for the duration of the request
-          if defined?(Rails)
-            Rails.logger.info "[RLS Multi-Tenant] #{request.method} #{request.path} -> Tenant: #{tenant.name} (#{tenant.id})"
-          end
-          RlsMultiTenant.tenant_class.switch(tenant) do
-            @app.call(env)
-          end
+          handle_tenant_request(env, request, tenant)
         else
-          # No tenant found - check if we need tenant context
-          subdomain = extract_subdomain(request.host)
-          if subdomain.present? && subdomain != 'www'
-            # Subdomain exists but no tenant found - this is an error
-            if defined?(Rails)
-              Rails.logger.warn "[RLS Multi-Tenant] #{request.method} #{request.path} -> No tenant found for subdomain '#{subdomain}'"
-            end
-            raise RlsMultiTenant::Error,
-                  "No tenant found for subdomain '#{subdomain}'. Please ensure the tenant exists with the correct subdomain."
-          end
-          # If no subdomain, allow access to public models (models without TenantContext)
-          # Models that include TenantContext will automatically be constrained by RLS
-          if defined?(Rails)
-            Rails.logger.info "[RLS Multi-Tenant] #{request.method} #{request.path} -> Public access (no subdomain)"
-          end
-          @app.call(env)
+          handle_no_tenant_request(env, request)
         end
       end
 
       private
 
+      def handle_tenant_request(env, request, tenant)
+        log_tenant_access(request, tenant)
+        RlsMultiTenant.tenant_class.switch(tenant) do
+          @app.call(env)
+        end
+      end
+
+      def handle_no_tenant_request(env, request)
+        subdomain = extract_subdomain(request.host)
+
+        if subdomain.present? && subdomain != 'www'
+          handle_missing_tenant_error(request, subdomain)
+        else
+          handle_public_access(request)
+          @app.call(env)
+        end
+      end
+
+      def log_tenant_access(request, tenant)
+        return unless defined?(Rails)
+
+        Rails.logger.info "[RLS Multi-Tenant] #{request.method} #{request.path} -> Tenant: #{tenant.name} (#{tenant.id})"
+      end
+
+      def handle_missing_tenant_error(request, subdomain)
+        log_missing_tenant_warning(request, subdomain)
+        raise RlsMultiTenant::Error,
+              "No tenant found for subdomain '#{subdomain}'. Please ensure the tenant exists with the correct subdomain."
+      end
+
+      def log_missing_tenant_warning(request, subdomain)
+        return unless defined?(Rails)
+
+        Rails.logger.warn "[RLS Multi-Tenant] #{request.method} #{request.path} -> No tenant found for subdomain '#{subdomain}'"
+      end
+
+      def handle_public_access(request)
+        return unless defined?(Rails)
+
+        Rails.logger.info "[RLS Multi-Tenant] #{request.method} #{request.path} -> Public access (no subdomain)"
+      end
+
       def resolve_tenant_from_subdomain(request)
         subdomain = extract_subdomain(request.host)
         return nil if subdomain.blank? || subdomain == 'www'
@@ -71,13 +92,10 @@ module RlsMultiTenant
         # Split by dots and get the first part (subdomain)
         parts = host.split('.')
 
-        # Handle localhost development (e.g., foo.localhost:3000)
-        if parts.length == 2 && parts.last == 'localhost'
-          parts.first
-        # Handle standard domains (e.g., foo.example.com)
-        elsif parts.length >= 3
-          parts.first
-        end
+        # Handle localhost development (e.g., foo.localhost:3000) or standard domains (e.g., foo.example.com)
+        return unless (parts.length == 2 && parts.last == 'localhost') || parts.length >= 3
+
+        parts.first
       end
     end
   end

data/lib/rls_multi_tenant/railtie.rb

@@ -31,9 +31,7 @@ module RlsMultiTenant
     end
 
     initializer 'rls_multi_tenant.middleware', after: :load_config_initializers do |app|
-      if RlsMultiTenant.enable_subdomain_middleware
-        app.config.middleware.use RlsMultiTenant::Middleware::SubdomainTenantSelector
-      end
+      app.config.middleware.use RlsMultiTenant::Middleware::SubdomainTenantSelector if RlsMultiTenant.enable_subdomain_middleware
     end
   end
 end

data/lib/rls_multi_tenant/rls_multi_tenant.rb

@@ -14,13 +14,17 @@ module RlsMultiTenant
 
   # Configuration options
   class << self
-    attr_accessor :tenant_class_name, :tenant_id_column, :enable_security_validation, :enable_subdomain_middleware,
-                  :subdomain_field
+    attr_writer :tenant_class_name, :tenant_id_column, :enable_security_validation, :enable_subdomain_middleware,
+                :subdomain_field
 
     def configure
       yield self
     end
 
+    def tenant_class_name
+      @tenant_class_name ||= 'Tenant'
+    end
+
     def tenant_class
       @tenant_class ||= tenant_class_name.constantize
     end

data/lib/rls_multi_tenant/security_validator.rb

@@ -18,7 +18,8 @@ module RlsMultiTenant
 
           if bypassrls_check && bypassrls_check['rolbypassrls']
             raise SecurityError, "Database user '#{username}' has BYPASSRLS privilege. " \
-                                 'In order to use RLS Multi-tenant, you must use a non-privileged user without BYPASSRLS privilege.'
+                                 'In order to use RLS Multi-tenant, you must use a non-privileged user ' \
+                                 'without BYPASSRLS privilege.'
           end
 
           # Log the security check result

data/lib/rls_multi_tenant/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RlsMultiTenant
-  VERSION = '0.2.3'
+  VERSION = '0.2.5'
 end

data/lib/rls_multi_tenant.rb

@@ -16,13 +16,17 @@ module RlsMultiTenant
 
   # Configuration options
   class << self
-    attr_accessor :tenant_class_name, :tenant_id_column, :enable_security_validation, :enable_subdomain_middleware,
-                  :subdomain_field
+    attr_writer :tenant_class_name, :tenant_id_column, :enable_security_validation, :enable_subdomain_middleware,
+                :subdomain_field
 
     def configure
       yield self
     end
 
+    def tenant_class_name
+      @tenant_class_name ||= 'Tenant'
+    end
+
     def tenant_class
       @tenant_class ||= tenant_class_name.constantize
     end

data/rls_multi_tenant.gemspec

@@ -9,7 +9,9 @@ Gem::Specification.new do |spec|
   spec.email = ['info@codingways.com']
 
   spec.summary = 'Rails gem for PostgreSQL Row Level Security (RLS) multi-tenant applications'
-  spec.description = 'A comprehensive gem that provides RLS-based multi-tenancy for Rails applications using PostgreSQL, including automatic tenant context switching, security validations, and migration helpers.'
+  spec.description = 'A comprehensive gem that provides RLS-based multi-tenancy for Rails applications ' \
+                     'using PostgreSQL, including automatic tenant context switching, security ' \
+                     'validations, and migration helpers.'
   spec.homepage = 'https://github.com/codingways/rls_multi_tenant'
   spec.license = 'MIT'
   spec.required_ruby_version = '>= 3.0.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rls_multi_tenant
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Coding Ways