composable-tenant 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 876aa27d3aa66bac41721e6df1882f55b984939a260763ec9851aad8e70d1773
-  data.tar.gz: 69de9074be96fe457a016af2a92447e647c9e505148e51e8f3057a1e9460c73f
+  metadata.gz: 9ac28d848a33cbdf2b98f377b61a1aba16c36b628899a7db9f70bf763614fe83
+  data.tar.gz: 0e50ddb91145765338c8caad529b01d1d6eb384dafd923060597ef5f85c6b8c3
 SHA512:
-  metadata.gz: 595f21923606b423a418c630796cabb746c8e2377666526a2ab05d281e25a2f04b79061b7b9aed7a36538ac2e63b88a609f4554aca9abbc95bcb96ad2bedbdd4
-  data.tar.gz: 792f4378c8d3cef43a6c896260ead1cb842bd797627dbde4b446ea67c922147f9fe78f9fde0b4ca947c92a1d50c57dd57fc28977015264b416ebad325f779d9d
+  metadata.gz: 12dfe27c94919769ac59a492dfdcdb3ff00eb4e7c29283956ca24b7ae68e05833f30dacb9e46d44617dc73f350d159c3e0049fef76ac90256bcbb20b58b4bf68
+  data.tar.gz: 40969548de1a1edb3cdd81a29f7b5a1240d92e7fa35e69a972686edf3d68ba80a2f38af3445e02f185688d1c01817380b24cc665694c395f5befb0b27b0aa40c

data/lib/composable/tenant/data_set.rb

@@ -3,9 +3,25 @@ module Composable
     class DataSet < ActiveSupport::CurrentAttributes
       attribute :excluded_tenants
 
+      resets { tenants.clear }
+
       def excluded_tenants
         super || Set.new
       end
+
+      def tenant=(array)
+        tenants[array.first.to_sym] = array.last
+      end
+
+      def tenant(tenant)
+        tenants[tenant.to_sym]
+      end
+
+      private
+
+      def tenants
+        @tenants ||= {}
+      end
     end
   end
 end

data/lib/composable/tenant/gem_version.rb

@@ -10,7 +10,7 @@ module Composable
     module VERSION
       MAJOR = 0
       MINOR = 0
-      TINY  = 6
+      TINY  = 7
       PRE   = nil
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

data/lib/composable/tenant/model_extensions.rb

@@ -1,16 +1,21 @@
 module Composable
   module Tenant
+    def self.without_tenant(*tenants)
+      old_excluded_tenants = Composable::Tenant::DataSet.excluded_tenants
+      Composable::Tenant::DataSet.excluded_tenants = Set.new(tenants.map(&:to_sym))
+      yield
+    ensure
+      Composable::Tenant::DataSet.excluded_tenants = old_excluded_tenants
+    end
+
+    def self.set_tenant(tenant, record)
+      Composable::Tenant::DataSet.tenant = [tenant, record]
+      record
+    end
+
     module ModelExtensions
       extend ActiveSupport::Concern
 
-      def self.without_tenant(*tenants)
-        old_excluded_tenants = Composable::Tenant::DataSet.excluded_tenants
-        Composable::Tenant::DataSet.excluded_tenants = Set.new(tenants.map(&:to_sym))
-        yield
-      ensure
-        Composable::Tenant::DataSet.excluded_tenants = old_excluded_tenants
-      end
-
       module ClassMethods
         def tenant(tenant, scope = nil, **options)
           # Create the association
@@ -21,16 +26,16 @@ module Composable
 
           default_scope lambda {
             return if Composable::Tenant::DataSet.excluded_tenants.include?(tenant.to_sym)
-            raise Composable::Tenant::NoTenantSet.new(tenant: tenant) unless Current.send(tenant)
+            raise Composable::Tenant::NoTenantSet.new(tenant: tenant) unless Composable::Tenant::DataSet.tenant(tenant)
 
-            where(foreign_key => Current.send(tenant).send(primary_key))
+            where(foreign_key => Composable::Tenant::DataSet.tenant(tenant).send(primary_key))
           }, all_queries: true
 
           # Makes sure new instances have tenant set
           before_validation lambda { |record|
             return if Composable::Tenant::DataSet.excluded_tenants.include?(tenant.to_sym)
 
-            record.send("#{foreign_key}=", Current.send(tenant).send(primary_key))
+            record.send("#{foreign_key}=", Composable::Tenant::DataSet.tenant(tenant).send(primary_key))
           }, on: :create
 
           # Rewrite the accessors to make tenant immutable

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composable-tenant
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Jairo Vazquez
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-15 00:00:00.000000000 Z
+date: 2022-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord