acts_as_tenant 2.0.0 → 2.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/acts_as_tenant/model_extensions.rb +20 -4
- data/lib/acts_as_tenant/version.rb +1 -1
- data/lib/acts_as_tenant.rb +2 -2
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e172e79670c2137d3641f2062a07e351ad5291db58ffabad5cd15e8e52850583
|
|
4
|
+
data.tar.gz: 3445b7da7ef300fbecaa402e351c139f4c994e0ef5c990700ac57d69a9c02c1a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: bf02fcd6565346a41cbdb033952b25c48d79029a496239e2e785386527f0be23acbbe21983b0bc23b39f79c31752857b6eaa2f68bd9a0014f2313e7c8ff7573d
|
|
7
|
+
data.tar.gz: 9d1b38f89c0a0c26733effc2331d6d9adef3a523dd4333204c8c8234d4c92d363e4d923fcc7b854c517a04946362362a30760639ccbf63dbf65513b10c4ef998
|
|
@@ -118,14 +118,30 @@ module ActsAsTenant
|
|
|
118
118
|
|
|
119
119
|
associations.each do |a|
|
|
120
120
|
attr = a.foreign_key.to_sym
|
|
121
|
-
next
|
|
122
|
-
|
|
121
|
+
next if a.name == tenant.to_sym
|
|
122
|
+
|
|
123
|
+
if a.polymorphic?
|
|
124
|
+
next unless record.will_save_change_to_attribute?(attr) || record.will_save_change_to_attribute?(a.foreign_type)
|
|
125
|
+
else
|
|
126
|
+
# Associations sharing a polymorphic foreign key are checked through the polymorphic association
|
|
127
|
+
next if polymorphic_foreign_keys.include?(a.foreign_key)
|
|
128
|
+
next unless record.will_save_change_to_attribute?(attr)
|
|
129
|
+
end
|
|
123
130
|
|
|
124
131
|
value = record.read_attribute_for_validation(attr)
|
|
125
132
|
next if value.nil?
|
|
126
133
|
|
|
127
|
-
|
|
128
|
-
|
|
134
|
+
klass = if a.polymorphic?
|
|
135
|
+
type = record.read_attribute(a.foreign_type)&.safe_constantize
|
|
136
|
+
type if type.is_a?(Class) && type < ActiveRecord::Base
|
|
137
|
+
else
|
|
138
|
+
a.klass
|
|
139
|
+
end
|
|
140
|
+
|
|
141
|
+
associated = if klass
|
|
142
|
+
relation = a.scope ? a.scope_for(klass.all, record) : klass
|
|
143
|
+
relation.find_by(a.association_primary_key(klass) => value)
|
|
144
|
+
end
|
|
129
145
|
|
|
130
146
|
if associated.nil? || tenant_mismatch.call(record, associated)
|
|
131
147
|
record.errors.add attr, "association is invalid [ActsAsTenant]"
|
data/lib/acts_as_tenant.rb
CHANGED
|
@@ -109,7 +109,7 @@ module ActsAsTenant
|
|
|
109
109
|
def self.with_tenant(tenant, &block)
|
|
110
110
|
raise ArgumentError, "block required" if block.nil?
|
|
111
111
|
|
|
112
|
-
Current.set(current_tenant: tenant
|
|
112
|
+
Current.set(current_tenant: tenant) { block.call }
|
|
113
113
|
end
|
|
114
114
|
|
|
115
115
|
def self.without_tenant(&block)
|
|
@@ -118,7 +118,7 @@ module ActsAsTenant
|
|
|
118
118
|
old_test_tenant = test_tenant
|
|
119
119
|
self.test_tenant = nil
|
|
120
120
|
begin
|
|
121
|
-
Current.set(current_tenant: nil, acts_as_tenant_unscoped: true
|
|
121
|
+
Current.set(current_tenant: nil, acts_as_tenant_unscoped: true) { block.call }
|
|
122
122
|
ensure
|
|
123
123
|
self.test_tenant = old_test_tenant
|
|
124
124
|
end
|