rails_multitenant 0.18.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 695a8b94b4a25b3861271091cdd21ba92dd4c8bf6bd18d38c3b419646de1c268
-  data.tar.gz: 20cdce2df8969538ee33a144d8f2083e9dd81b129b1ef1220c52780564526257
+  metadata.gz: 3336c472e8e9f781be0c82a83859dd33c9566a4753c590a8527804974384a5ce
+  data.tar.gz: 9963126e661148092ec99d18a431b6049ddbb2cc8448bd10503bea2765567750
 SHA512:
-  metadata.gz: c221b74528939f2ae81d3547ade6c8f7193c1d0837c4a84b50fd3d73ef536a5998c16d5ec1f4f9bda6160642aa3356def927b4150849af718b2c5a7c6fcda761
-  data.tar.gz: 637d3d5c728fbe5c951c6bc0342007fc28dc59a0435f9f7311037515c708796a4ad443ba9bc72f87e9874fd1d94c88152219fd1508e0b5dea1b76bb5f35333c8
+  metadata.gz: 443db952a9e4b0d8769eac2a58d7b004fba3391fdc08ff1883a5a05c37a43fbebc1237c78c16c104aad8da67c896e9ac253073a8627b9c13a129d092d0d21995
+  data.tar.gz: ee3d3bbb473467c6d49a8c7b388a1e6eb236a4b5cad84753a88eecb0786896039478b91a68b2cba07deb04eaefa3848464bf4385d36fa996271ce2c50d27a9bd

data/lib/rails_multitenant/global_context_registry/current.rb

@@ -34,8 +34,9 @@ module RailsMultitenant
           current || raise("No current #{name} set")
         end
 
-        def clear_current!
+        def clear_current!(cleared = nil)
           GlobalContextRegistry.delete(current_registry_obj)
+          __clear_dependents!(cleared)
         end
 
         def as_current(object)
@@ -73,8 +74,13 @@ module RailsMultitenant
           end
         end
 
-        def __clear_dependents!
-          GlobalContextRegistry.send(:dependencies_for, __key_class).each(&:clear_current!)
+        def __clear_dependents!(initial_cleared = nil)
+          GlobalContextRegistry.send(:dependencies_for, __key_class).tap do |dependencies|
+            next unless dependencies.present?
+
+            (cleared = initial_cleared || []) << self
+            dependencies.each { |obj| obj.clear_current!(cleared) unless cleared.include?(obj) }
+          end
         end
 
         def __key_class

data/lib/rails_multitenant/global_context_registry/current_instance.rb

@@ -60,15 +60,22 @@ module RailsMultitenant
           self.current = old_model
         end
 
-        def clear_current!
+        def clear_current!(cleared = nil)
           GlobalContextRegistry.delete(current_instance_registry_obj)
+          __clear_dependents!(cleared)
         end
 
         private
 
-        def __clear_dependents!
+        def __clear_dependents!(initial_cleared = nil)
           key_class = respond_to?(:base_class) ? base_class : self
-          GlobalContextRegistry.send(:dependencies_for, key_class).each(&:clear_current!)
+
+          GlobalContextRegistry.send(:dependencies_for, key_class).tap do |dependencies|
+            next unless dependencies.present?
+
+            (cleared = initial_cleared || []) << self
+            dependencies.each { |obj| obj.clear_current!(cleared) unless cleared.include?(obj) }
+          end
         end
 
         def current_instance_registry_id

data/lib/rails_multitenant/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsMultitenant
-  VERSION = '0.18.0'
+  VERSION = '0.18.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_multitenant
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Pat Breault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-10 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord