rails_multitenant 0.17.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f12466f03396bc81cc80442aa94dbcc15300b8c6b6455ab10b44fb119d5b0c4a
-  data.tar.gz: 8c0f7cf5d1194a6b203c6f95779ad5deafe030d982d33d812fdf2df89cc6d582
+  metadata.gz: 3336c472e8e9f781be0c82a83859dd33c9566a4753c590a8527804974384a5ce
+  data.tar.gz: 9963126e661148092ec99d18a431b6049ddbb2cc8448bd10503bea2765567750
 SHA512:
-  metadata.gz: 045d489fe1f2b98ac9491434600b0551c695af632753cc27906f172fcf6170c22370dfabca3637041492762a725317d82b59ac90aa050f7c70ad5b71948dfc57
-  data.tar.gz: '075395d1f3d9944640cbc0b3ae4ce01da72ec237f3814233418b4022abf07ed8921591b306cbb5b5c638778683e420da28166835d641d390b7274e2673616bf0'
+  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/global_context_registry/registry_dependent_on.rb

@@ -8,6 +8,12 @@ module RailsMultitenant
       def global_context_dependent_on(*klasses)
         klasses.each { |klass| GlobalContextRegistry.send(:add_dependency, klass, self) }
       end
+
+      # Registers a bi-directional dependency on another class.
+      def global_context_mutually_dependent_on(*klasses)
+        global_context_dependent_on(*klasses)
+        klasses.each { |klass| klass.global_context_dependent_on(self) }
+      end
     end
   end
 end

data/lib/rails_multitenant/global_context_registry.rb

@@ -14,6 +14,8 @@ module RailsMultitenant
   module GlobalContextRegistry
     extend self
 
+    EMPTY_ARRAY = [].freeze
+
     # Set this global
     def set(symbol, value)
       globals[symbol] = value
@@ -114,11 +116,16 @@ module RailsMultitenant
     @dependencies = {}
 
     def add_dependency(parent, dependent)
-      (@dependencies[parent] ||= []) << dependent
+      parent = parent.respond_to?(:name) ? parent.name : parent
+      dependent = dependent.respond_to?(:name) ? dependent.name : dependent
+
+      raise 'dependencies cannot be registered for anonymous classes' if parent.blank? || dependent.blank?
+
+      ((@dependencies[parent] ||= []) << dependent).tap(&:uniq!)
     end
 
     def dependencies_for(klass)
-      @dependencies[klass] || []
+      @dependencies[klass.name]&.map(&:safe_constantize)&.tap(&:compact!) || EMPTY_ARRAY
     end
 
     def globals

data/lib/rails_multitenant/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsMultitenant
-  VERSION = '0.17.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.17.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Pat Breault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-09 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -168,14 +168,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
 description: Handles multiple tenants in a Rails environment
 email:
 - pbreault@salsify.com
@@ -216,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Automatically configures multiple tenants in a Rails environment