tenant_realm 1.0.2 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b8289d86354fe7ee75ca07d9b04ca4f7193a2bdb12f97e90f06757f6ee4103d
-  data.tar.gz: 8bedca7bab527dd404765ac3d46db39364b9cce22416445f0e701760efdbc757
+  metadata.gz: f56cfdfd284637b5719004202b048e9cef47965b4779c83ae3ba535accafc66f
+  data.tar.gz: ab7d2ec8e9e488452beea19bca1864c31cf7ad9cf2fe402f1a434d5d1562016c
 SHA512:
-  metadata.gz: 60b01860846cc2db01b93c8701751bdb5b41f8fc3689b781b5b4a1a88985f7043246c89dd6527e87089560eb04c547cf0e51cd2d221d4c2997e73c524e440808
-  data.tar.gz: 16452e0151f60519c4137730503573b8bc965bb918f00f00805e02ae05584c1c4a7e7942c5ad92f08a5e0b48a0b169a7658cd67dc3b902c07f78a9614193c441
+  metadata.gz: a318c3b234e5f969a672cf71672e64ad16a61572cfcaa43e4530664f5b37a15ce78b9326d23d6064b684be76f68b9e0d187cbce389e14acca6bf2f42be704884
+  data.tar.gz: '0856cc04c9643827791df478fd74a7c7e62becd51502c82bd05e150b3cecf50bdf9f0e333be5bbcb69d5c701f69e34d3c7d2b092ea37a43e69fdb63f4904c4c2'

data/lib/tasks/rollback.rake

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+namespace :tenant_realm do
+  desc 'Rollback db for all tenants'
+  task rollback: :environment do
+    tenants = TenantRealm::Tenant.tenants
+
+    puts 'Rollback primary'
+    Rake::Task['db:rollback:primary'].invoke
+    Rake::Task['db:rollback:primary'].reenable
+
+    tenants.each do |tenant|
+      shard = TenantRealm::Utils.shard_name_from_tenant(tenant:)
+
+      puts "Rollback #{shard}"
+
+      db_config = TenantRealm::Utils.dig_db_config(tenant:)
+
+      if db_config.blank?
+        puts "Skip Rollback #{shard}"
+
+        next
+      end
+
+      Rake::Task["db:rollback:#{shard}"].invoke
+      Rake::Task["db:rollback:#{shard}"].reenable
+    end
+  end
+end

data/lib/tenant_realm/cache/base_cache.rb

@@ -4,7 +4,7 @@ module TenantRealm
   module Cache
     class BaseCache
       class << self
-        def cache_tenants(_tenants)
+        def cache_tenants(tenants:)
           raise NotImplementedError
         end
 
@@ -12,11 +12,11 @@ module TenantRealm
           raise NotImplementedError
         end
 
-        def cache_tenant(_tenant)
+        def cache_tenant(tenant:)
           raise NotImplementedError
         end
 
-        def tenant(_identifier)
+        def tenant(identifier:)
           raise NotImplementedError
         end
 

data/lib/tenant_realm/cache/kredis_cache.rb

@@ -9,7 +9,7 @@ module TenantRealm
   module Cache
     class KredisCache < BaseCache
       class << self
-        def cache_tenants(tenants)
+        def cache_tenants(tenants:)
           return if tenants.blank?
 
           cached_tenants = tenants_kredis
@@ -22,7 +22,7 @@ module TenantRealm
           cached_tenants.value&.map(&:deep_symbolize_keys) || []
         end
 
-        def cache_tenant(tenant)
+        def cache_tenant(tenant:)
           return tenant if tenant.blank?
 
           tenant_unique_keys(tenant).each do |key|
@@ -33,7 +33,7 @@ module TenantRealm
           tenant
         end
 
-        def tenant(identifier)
+        def tenant(identifier:)
           cached_tenant = tenant_kredis(identifier)
           cached_tenant.value&.deep_symbolize_keys
         end

data/lib/tenant_realm/helpers.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# internal usage
+# no need hash parameters
 module TenantRealm
   class Helpers
     class << self

data/lib/tenant_realm/tenant.rb

@@ -10,42 +10,46 @@ module TenantRealm
     }
 
     class << self
-      def tenants
+      def tenants(force_load: false)
         if cache.present?
-          tenants = cache.tenants
-          return tenants if tenants.present?
+          unless force_load
+            tenants = cache.tenants
+            return tenants if tenants.present?
+          end
 
           tenants = Utils.fetch_tenants
-          cache.cache_tenants(tenants)
+          cache.cache_tenants(tenants:)
           tenants
         else
           Utils.fetch_tenants
         end
       end
 
-      def tenant(identifier)
+      def tenant(identifier:, force_load: false)
         if cache.present?
-          tenant = cache.tenant(identifier)
-          return tenant if tenant.present?
+          unless force_load
+            tenant = cache.tenant(identifier:)
+            return tenant if tenant.present?
+          end
 
-          tenant = Utils.fetch_tenant(identifier)
-          cache.cache_tenant(tenant)
+          tenant = Utils.fetch_tenant(identifier:)
+          cache.cache_tenant(tenant:)
           tenant
         else
-          Utils.fetch_tenant
+          Utils.fetch_tenant(identifier:)
         end
       end
 
-      def cache_tenants(tenants)
+      def cache_tenants(tenants:)
         return Helpers.dev_log('Tenant Realm: Skip cache tenants because cache not configured') if cache.blank?
 
-        cache.cache_tenants(tenants)
+        cache.cache_tenants(tenants:)
       end
 
-      def cache_tenant(tenant)
+      def cache_tenant(tenant:)
         return Helpers.dev_log('Tenant Realm: Skip cache tenant because cache not configured') if cache.blank?
 
-        cache.cache_tenant(tenant)
+        cache.cache_tenant(tenant:)
       end
 
       private

data/lib/tenant_realm/utils.rb

@@ -13,7 +13,7 @@ module TenantRealm
         (Config.fetch_tenants.call.presence || []).map(&:deep_symbolize_keys)
       end
 
-      def fetch_tenant(identifier)
+      def fetch_tenant(identifier:)
         Helpers.raise_if_not_proc(Config.fetch_tenant, 'config.fetch_tenant')
 
         Config.fetch_tenant.call(identifier)&.deep_symbolize_keys
@@ -41,7 +41,7 @@ module TenantRealm
         shard.underscore
       end
 
-      def identifier_resolver(request)
+      def identifier_resolver(request:)
         raise Error, 'config.identifier_resolver must be provided' if Config.identifier_resolver.blank?
 
         Helpers.raise_if_not_proc(Config.identifier_resolver, 'config.identifier_resolver')

data/lib/tenant_realm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TenantRealm
-  VERSION = '1.0.2'
+  VERSION = '1.1.1'
 end

data/lib/tenant_realm.rb

@@ -30,8 +30,8 @@ module TenantRealm
 
         return :primary if skip_switch_db
 
-        identifier = Utils.identifier_resolver(request)
-        tenant = Tenant.tenant(identifier)
+        identifier = Utils.identifier_resolver(request:)
+        tenant = Tenant.tenant(identifier:)
         db_config = Utils.dig_db_config(tenant:)
 
         return :primary if db_config.blank?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenant_realm
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.1
 platform: ruby
 authors:
 - Alpha
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-29 00:00:00.000000000 Z
+date: 2024-03-20 00:00:00.000000000 Z
 dependencies: []
 description: Ruby on Rails gem to support multi-tenant
 email:
@@ -23,6 +23,7 @@ files:
 - lib/generators/templates/tenant_realm.tt
 - lib/generators/tenant_realm_generator.rb
 - lib/tasks/migrate.rake
+- lib/tasks/rollback.rake
 - lib/tenant_realm.rb
 - lib/tenant_realm/cache/base_cache.rb
 - lib/tenant_realm/cache/kredis_cache.rb