acts_as_multi_tenant 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14e72db4db911ca0e43798db62f98a5e67382854dacea598ee6e6a16803b156f
-  data.tar.gz: fd548e99029862dd91832605f1d315d25778f80836fe883886b7dc217e59a292
+  metadata.gz: 6c71beedb1daf50d84359687c3cd836db5a164b9155dec367cc7fa2603da30b3
+  data.tar.gz: d1e4917dd3aa6c00adacf881aba8f8416ced51e062ad3943b26d07e53e89dcd9
 SHA512:
-  metadata.gz: 0ce9937e616e3ad74bcf85f75453edb755c478ce6d2864b6a3b0dd0f2d059ff301c6c99929c90b26a4ca62ba1ec7e2d89510952bf5e8abc3b98ab1166ca9581c
-  data.tar.gz: 54c16fd1e4b5d1df10876ac451ae5e5dd50a99cd617f29806539a7d108c41d39220fc18d0647c4c9991a972d94173232206737b48061c7ce57147a2ea2faf443
+  metadata.gz: 32e329436b4f368e8488552a82c50d16669212f43eebbf8728089e9b8104e72894251003c918dc1a66007761266366f29376c378d85a7cb0cd9076d18c8ce308
+  data.tar.gz: dc3529111832862ad25020c62a3be7574e4b372b554ba37c3f31609d88cc73db8b5c0426cf2a0a0b85e2bf54ddb3c661a44a1761037da5c4f6f430923999aaeb

data/lib/acts_as_multi_tenant.rb

@@ -8,4 +8,29 @@ require_relative 'multi_tenant/middleware'
 
 module MultiTenant
   NotImplemented = Class.new(StandardError)
+
+  class TenantsNotFound < RuntimeError
+    attr_reader :tenant_class
+
+    def initialize(tenant_class, identifiers, found_records)
+      @tenant_class = tenant_class
+      @identifiers = identifiers
+      @found_records = found_records
+    end
+
+    # Returns an array of the tenant identifiers that could not be found
+    def not_found
+      @not_found ||= @identifiers.map(&:to_s) - @found_records.map { |tenant|
+        tenant.send(@tenant_class.tenant_identifier).to_s
+      }
+    end
+
+    def to_s
+      message
+    end
+
+    def message
+      "The following #{@tenant_class.name} tenants could not be found: #{not_found.join ", "}"
+    end
+  end
 end

data/lib/multi_tenant/acts_as_tenant.rb

@@ -12,9 +12,10 @@ module MultiTenant
     # @param using [String] (optional) column that contains the unique lookup identifier. Defaults to :code.
     #
     def acts_as_tenant(using: :code)
-      cattr_accessor :tenant_identifier, :tenant_thread_var
+      cattr_accessor :tenant_identifier, :tenant_thread_var, :raise_on_tenant_not_found
       self.tenant_identifier = using
       self.tenant_thread_var = "current_tenant_#{object_id}".freeze # allows there to be multiple tenant classes
+      self.raise_on_tenant_not_found = true
       self.extend MultiTenant::ActsAsTenant::TenantGetters
       self.extend MultiTenant::ActsAsTenant::TenantSetters
       self.extend MultiTenant::ActsAsTenant::TenantHelpers
@@ -102,11 +103,15 @@ module MultiTenant
       # @param records_or_identifiers array of the records or identifiers in the 'tenant_identifier' column.
       #
       def current_tenants=(records_or_identifiers)
-        records, identifiers = Array(records_or_identifiers).partition { |x|
+        records, identifiers = Array(records_or_identifiers.uniq).partition { |x|
           x.class.respond_to?(:table_name) && x.class.table_name == self.table_name
         }
         tenants = if identifiers.any?
-                    records + where({tenant_identifier => identifiers}).to_a
+                    queried_records = where({tenant_identifier => identifiers}).to_a
+                    if queried_records.size != identifiers.size and raise_on_tenant_not_found
+                      raise ::MultiTenant::TenantsNotFound.new(self, identifiers, queried_records)
+                    end
+                    records + queried_records
                   else
                     records
                   end

data/lib/multi_tenant/middleware.rb

@@ -96,6 +96,10 @@ module MultiTenant
         ids = identifiers records_or_identifiers
         return not_found.(id_resp.is_a?(Array) ? ids : ids[0])
       end
+
+    rescue ::MultiTenant::TenantsNotFound => e
+      ids = e.not_found
+      not_found.(id_resp.is_a?(Array) ? ids : ids[0])
     ensure
       tenant_class.current = nil
     end

data/lib/multi_tenant/proxies_to_tenant.rb

@@ -1,4 +1,7 @@
 module MultiTenant
+  # An exception indicating a tenant with a missing or invalid proxy identifier
+  NilProxyError = Class.new(RuntimeError)
+
   #
   # Helpers for setting a proxy model to your tenant model. So your records can `acts_as_tenant` to the proxy model instead of directly to the tenant.
   #
@@ -84,7 +87,14 @@ module MultiTenant
       def current_tenants
         proxied_tenant_class
           .current_tenants
-          .map(&proxied_tenant_inverse_assoc)
+          .map { |tenant|
+            if (proxy = tenant.send(proxied_tenant_inverse_assoc))
+              proxy
+            else
+              tenant_id = tenant.send(proxied_tenant_class.primary_key)
+              raise ::MultiTenant::NilProxyError, "Missing proxy for tenant #{proxied_tenant_class.name}##{tenant_id}"
+            end
+          }
       end
     end
 

data/lib/multi_tenant/version.rb

@@ -1,4 +1,4 @@
 module MultiTenant
   # Gem version
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.1.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_multi_tenant
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Jordan Hollinger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-23 00:00:00.000000000 Z
+date: 2019-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: An ActiveRecord plugin for multi-tenant databases