activerecord-multi-tenant 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6da68db2d8d58cc00bc0fd9de50b85544fff943596c4ed7fb9211380419e1b1b
-  data.tar.gz: a5126bdd3b733a6e58c0c5d1e63e7bfe27b76a18fd790219ee08641379019336
+  metadata.gz: 29d653eb35952bb70e983799cae4b5c88fdcbf852e1ba16a730362a01f18d327
+  data.tar.gz: 6fa61c33ed3f99eff5d214f195544547ac67bf4d81d60adbe18c4d1ecb7432a9
 SHA512:
-  metadata.gz: 69be1d704a41ee78b28c9f23cb8bb1f606a97146c979ca087eeef1d43fa4a482bacedc21317677862f427567d98abcc4199f029eb04719b2dab363bb29a2160d
-  data.tar.gz: a6495adf22bbd72f03e15f8056e57c9dbabfaab9dde1b15fc3365794a1a8c25f624e094e82de2b7ed1648dcad990b410b6f3b97e6369534aa7ea6ee528505360
+  metadata.gz: 0f9b6bc791de06c8c3cfef7cd4f458cebe9412bbe0baf01f3ff102636810a3fa6b2f1ec63aacfd9c4989956f14fa78b4a29d862d399ae634cf44def50db7f594
+  data.tar.gz: 46dcda19e38662c310d4c149f01151422461157c16012a07060f64735667d75ff1040956db0b7428ff7a76c2ee84b56facd77c86b063bfffed65e44341a37323

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 2.1.3      2022-10-27
+* Error when calling a method that takes keyword arguments with MultiTenant.wrap_methods [#164](https://github.com/citusdata/activerecord-multi-tenant/pull/164)
+
 ## 2.1.2      2022-10-26
 * Fixes issue when wraping methods that require a block [#162](https://github.com/citusdata/activerecord-multi-tenant/pull/162)
 

data/lib/activerecord-multi-tenant/multi_tenant.rb

@@ -110,19 +110,37 @@ module MultiTenant
   end
 
   # Wrap calls to any of `method_names` on an instance Class `klass` with MultiTenant.with when `'owner'` (evaluated in context of the klass instance) is a ActiveRecord model instance that is multi-tenant
-  def self.wrap_methods(klass, owner, *method_names)
-    method_names.each do |method_name|
-      original_method_name = :"_mt_original_#{method_name}"
-      klass.class_eval <<-CODE, __FILE__, __LINE__ + 1
+  if Gem::Version.create(RUBY_VERSION) < Gem::Version.new("2.7.0")
+    def self.wrap_methods(klass, owner, *method_names)
+      method_names.each do |method_name|
+        original_method_name = :"_mt_original_#{method_name}"
+        klass.class_eval <<-CODE, __FILE__, __LINE__ + 1
+          alias_method :#{original_method_name}, :#{method_name}
+          def #{method_name}(*args, &block)
+            if MultiTenant.multi_tenant_model_for_table(#{owner}.class.table_name).present? && #{owner}.persisted? && MultiTenant.current_tenant_id.nil?
+              MultiTenant.with(#{owner}.public_send(#{owner}.class.partition_key)) { #{original_method_name}(*args, &block) }
+            else
+              #{original_method_name}(*args, &block)
+            end
+          end
+        CODE
+      end
+    end
+  else
+    def self.wrap_methods(klass, owner, *method_names)
+      method_names.each do |method_name|
+        original_method_name = :"_mt_original_#{method_name}"
+        klass.class_eval <<-CODE, __FILE__, __LINE__ + 1
         alias_method :#{original_method_name}, :#{method_name}
-        def #{method_name}(*args, &block)
+        def #{method_name}(...)
           if MultiTenant.multi_tenant_model_for_table(#{owner}.class.table_name).present? && #{owner}.persisted? && MultiTenant.current_tenant_id.nil?
-            MultiTenant.with(#{owner}.public_send(#{owner}.class.partition_key)) { #{original_method_name}(*args, &block) }
+            MultiTenant.with(#{owner}.public_send(#{owner}.class.partition_key)) { #{original_method_name}(...) }
           else
-            #{original_method_name}(*args, &block)
+            #{original_method_name}(...)
           end
         end
-      CODE
+        CODE
+      end
     end
   end
 

data/lib/activerecord-multi-tenant/version.rb

@@ -1,3 +1,3 @@
 module MultiTenant
-  VERSION = '2.1.2'
+  VERSION = '2.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-multi-tenant
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Citus Data
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-26 00:00:00.000000000 Z
+date: 2022-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails