acts_as_tenant 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a241e056fc0e64709f94c3b8df2d91d192fa904a990bff28e951fceec7071351
-  data.tar.gz: d57c2ebb29e624ccacaa4b031214539a2a28363da65a653a9a75172e9f3a29dd
+  metadata.gz: 83cdd10871addd92f256ed17b6e49a841de127487d7e165011348a40a0185f01
+  data.tar.gz: b45e0af7799acd0fc982c1af602e3384dd2637b930901cfd4f731263a7cf5c7f
 SHA512:
-  metadata.gz: ed5452f120dc6beaafee9952a3850d0378a212a081eecc5783115733e045e3e7658827bc0992e9e97101990751e3cfae5940379cee24d7a272e123ecfa4d51d6
-  data.tar.gz: b4890ebc99294ece2e1e487c088800c7c5374baeee4d67a0e538e71051079589455562452bb1cf62d6f9d910777b29fbc4beab5f93da52250a8817577fbaa090
+  metadata.gz: 5a3373802ec3b706290d9277c7a3704055f15ebd4028d29d3b797b1f228a62f2d8168a0ce357a5ae8a25f8748c63eab735545ba007807fe5c2f96a1dc76ab4a7
+  data.tar.gz: aa31a475db70064a9a8edeae329456b82e7225a000008d5fa93ef2c9c265b7c8ae1e59c0111172d26232e037d19a7e1324f2e176c981fbc070144f0b3c906424

data/README.md

@@ -210,6 +210,20 @@ New records are assigned the current tenant unless they already have one. A reco
 
 When no tenant is set (for example in an admin panel or inside `without_tenant`), `belongs_to` associations to tenanted models are validated to belong to the same tenant as the record. Associated records without a tenant, such as global records, are allowed.
 
+The validation error messages can be overridden in your locale files, using the same lookup as other Active Record errors:
+
+```yaml
+en:
+  activerecord:
+    errors:
+      messages:
+        acts_as_tenant:
+          tenant_mismatch: "must be the current tenant"
+          association_invalid: "is invalid"
+```
+
+Messages can also be overridden for one model or one attribute, such as `activerecord.errors.models.task.acts_as_tenant.association_invalid` or `activerecord.errors.models.task.attributes.project_id.acts_as_tenant.association_invalid`.
+
 ### Validating attribute uniqueness
 
 If you need to validate for uniqueness, chances are that you want to scope this validation to a tenant. You can do so by using:

data/lib/acts_as_tenant/locale/en.yml

@@ -0,0 +1,7 @@
+en:
+  activerecord:
+    errors:
+      messages:
+        acts_as_tenant:
+          tenant_mismatch: "must be the current tenant [ActsAsTenant]"
+          association_invalid: "association is invalid [ActsAsTenant]"

data/lib/acts_as_tenant/model_extensions.rb

@@ -107,7 +107,7 @@ module ActsAsTenant
           matches = record_id.to_s == current_tenant.public_send(pkey).to_s
           matches &&= record_type == current_tenant.class.polymorphic_name if options[:polymorphic]
 
-          record.errors.add(fkey, "must be the current tenant [ActsAsTenant]") unless matches
+          record.errors.add(fkey, :"acts_as_tenant.tenant_mismatch") unless matches
         end
 
         # Associations are looked up at validation time so belongs_to associations
@@ -118,17 +118,33 @@ module ActsAsTenant
 
           associations.each do |a|
             attr = a.foreign_key.to_sym
-            next unless record.will_save_change_to_attribute?(attr)
-            next if a.name == tenant.to_sym || polymorphic_foreign_keys.include?(a.foreign_key)
+            next if a.name == tenant.to_sym
+
+            if a.polymorphic?
+              next unless record.will_save_change_to_attribute?(attr) || record.will_save_change_to_attribute?(a.foreign_type)
+            else
+              # Associations sharing a polymorphic foreign key are checked through the polymorphic association
+              next if polymorphic_foreign_keys.include?(a.foreign_key)
+              next unless record.will_save_change_to_attribute?(attr)
+            end
 
             value = record.read_attribute_for_validation(attr)
             next if value.nil?
 
-            relation = a.scope ? a.scope_for(a.klass.all, record) : a.klass
-            associated = relation.find_by(a.association_primary_key => value)
+            klass = if a.polymorphic?
+              type = record.read_attribute(a.foreign_type)&.safe_constantize
+              type if type.is_a?(Class) && type < ActiveRecord::Base
+            else
+              a.klass
+            end
+
+            associated = if klass
+              relation = a.scope ? a.scope_for(klass.all, record) : klass
+              relation.find_by(a.association_primary_key(klass) => value)
+            end
 
             if associated.nil? || tenant_mismatch.call(record, associated)
-              record.errors.add attr, "association is invalid [ActsAsTenant]"
+              record.errors.add(attr, :"acts_as_tenant.association_invalid")
             end
           end
         end

data/lib/acts_as_tenant/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTenant
-  VERSION = "2.0.1"
+  VERSION = "2.1.0"
 end

data/lib/acts_as_tenant.rb

@@ -137,6 +137,10 @@ module ActsAsTenant
   end
 end
 
+ActiveSupport.on_load(:i18n) do
+  I18n.load_path << File.expand_path("acts_as_tenant/locale/en.yml", __dir__)
+end
+
 ActiveSupport.on_load(:active_record) do |base|
   base.include ActsAsTenant::ModelExtensions
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_tenant
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Erwin Matthijssen
@@ -44,6 +44,7 @@ files:
 - lib/acts_as_tenant/controller_extensions/subdomain.rb
 - lib/acts_as_tenant/controller_extensions/subdomain_or_domain.rb
 - lib/acts_as_tenant/errors.rb
+- lib/acts_as_tenant/locale/en.yml
 - lib/acts_as_tenant/model_extensions.rb
 - lib/acts_as_tenant/sidekiq.rb
 - lib/acts_as_tenant/tenant_helper.rb