acts_as_tenant 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e172e79670c2137d3641f2062a07e351ad5291db58ffabad5cd15e8e52850583
-  data.tar.gz: 3445b7da7ef300fbecaa402e351c139f4c994e0ef5c990700ac57d69a9c02c1a
+  metadata.gz: 83cdd10871addd92f256ed17b6e49a841de127487d7e165011348a40a0185f01
+  data.tar.gz: b45e0af7799acd0fc982c1af602e3384dd2637b930901cfd4f731263a7cf5c7f
 SHA512:
-  metadata.gz: bf02fcd6565346a41cbdb033952b25c48d79029a496239e2e785386527f0be23acbbe21983b0bc23b39f79c31752857b6eaa2f68bd9a0014f2313e7c8ff7573d
-  data.tar.gz: 9d1b38f89c0a0c26733effc2331d6d9adef3a523dd4333204c8c8234d4c92d363e4d923fcc7b854c517a04946362362a30760639ccbf63dbf65513b10c4ef998
+  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
@@ -144,7 +144,7 @@ module ActsAsTenant
             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.2"
+  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.2
+  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
@@ -68,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.21
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Add multi-tenancy to Rails applications using a shared db strategy
 test_files: []