multi-tenant-support 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7761ff1721fab8904557ae7af54aca1875d19fb6076bbe5038493c945009eec
-  data.tar.gz: 43df41f9e15014829828918d4703e77fe6f321bad2f10495e103860abe57cbbf
+  metadata.gz: f6c137c5f91a50070226bf5943aa074b8efb8041493e022b194e950c4a828900
+  data.tar.gz: 75981d65c8fcaee0be43716a4cd98529425847ff88c7dc428348fd557fb3ab89
 SHA512:
-  metadata.gz: 7103aec88b69d628baed7e783495cc5e06b8fe49f5751d40aa5e676f2586aa7a0fcfe4d4f6015bfa4409017e533a3fff3a71b945d5426feb2ba5d7ba177f1ede
-  data.tar.gz: f2e5c63298eee511690622da0d0c47bf0fcdeb80aff543704da2a2a7a047165d5d6eebfda3d44862003329fcc739a3d8278d3ffb7616667087d540c7f9e49006
+  metadata.gz: 648bafb81bc655e8b5e5ce5f69cb5396c3d462e6ac67f6d95492a8f23063869c2202457fc76e944d5059bf9cd7fc6d77e898550851e40af5a88c2a912bb4d25c
+  data.tar.gz: 984a0ab95e23d14bbe45f4814d265c5afb7b90a05147d7a3e31f2d2eec587c2e088a1a57adfea8316bf7137ff7f73d2c0500257cb1eb95fc734b7c94888d7b04

data/lib/multi_tenant_support/active_job.rb

@@ -1,4 +1,5 @@
 module MultiTenantSupport
+
   module ActiveJob
     extend ActiveSupport::Concern
 
@@ -6,6 +7,24 @@ module MultiTenantSupport
       attr_accessor :current_tenant
     end
 
+    class_methods do
+      if Gem::Version.new(Rails.version) < Gem::Version.new("7.0.0.alpha1")
+        def perform_now(*args)
+          job = job_or_instantiate(*args)
+          job.current_tenant = MultiTenantSupport.current_tenant
+          job.perform_now
+        end
+      else
+        eval("
+          def perform_now(...)
+            job = job_or_instantiate(...)
+            job.current_tenant = MultiTenantSupport.current_tenant
+            job.perform_now
+          end
+        ")
+      end
+    end
+
     def perform_now
       MultiTenantSupport.under_tenant(current_tenant) do
         super
@@ -43,6 +62,25 @@ module MultiTenantSupport
       tenant_klass.find tenant_id
     end
   end
+
+  module ConfiguredJob
+    if Gem::Version.new(Rails.version) < Gem::Version.new("7.0.0.alpha1")
+      def perform_now(*args)
+        job = @job_class.new(*args)
+        job.current_tenant = MultiTenantSupport.current_tenant
+        job.perform_now
+      end
+    else
+      eval("
+        def perform_now(...)
+          job = @job_class.new(...)
+          job.current_tenant = MultiTenantSupport.current_tenant
+          job.perform_now
+        end
+      ")
+    end
+  end
 end
 
-ActiveJob::Base.include(MultiTenantSupport::ActiveJob)
+ActiveJob::Base.include(MultiTenantSupport::ActiveJob)
+ActiveJob::ConfiguredJob.prepend(MultiTenantSupport::ConfiguredJob)

data/lib/multi_tenant_support/version.rb

@@ -1,3 +1,3 @@
 module MultiTenantSupport
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi-tenant-support
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Hopper Gee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-06 00:00:00.000000000 Z
+date: 2021-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails