effective_resources 1.9.10 → 1.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36829df631b235ec0cb1a9cc26616fd15c100bfcb2314f57edd1a70f5eda3f86
-  data.tar.gz: 3b93094b4d501b4d737f0011b337d806eb67305642b4bb4f2e6263672c5b9267
+  metadata.gz: 7fa555e65ca74d65ab0bfbeef9b7dc8817e12951daf8ae8de6328512391a61aa
+  data.tar.gz: 5a19481dee889d9b75d93523c2a8c8b3899c60eecb1496637cb7bf3c592f4421
 SHA512:
-  metadata.gz: 032ca3f256846e3b666bc33f5452fb7aefefd910abc9b4c1d9f068ec04b82e6b5c61999e0107a4feb03509921b0f333ce43b9a155c2fcb04eebe7a4d955544db
-  data.tar.gz: 2d1c59030ea9e8ec2d78efe2d5c9b15571abc0ec9f86fbc506250af2703b8ad87388e2ebc3f517c1d47101b31fcbacada059ca94bfdc51fb7d24b363121af5ad
+  metadata.gz: 9c7d741ba719f1255fe53a1aecd195fcc78d70d29387c4a6f2cf8b989999b69effed19e5d18336521476dfc036362ca6c9ca9a829d3832c975f976ac89362208
+  data.tar.gz: 2f363dd0624e8d7ab007e7e9e7446b557f1f8f311d348d4dcafeb8b99bd8cb14de50f24b0a508eae8a1c7f3b22d1c0d2aad25755caf85e649964a89a2f23fbe6

data/app/models/concerns/effective_devise_user.rb

@@ -160,9 +160,7 @@ module EffectiveDeviseUser
       args.last[:tenant] ||= tenant
     end
 
-    wait = (5 if notification == :invitation_instructions && !Rails.env.test?)
-
-    devise_mailer.send(notification, self, *args).deliver_later(wait: wait)
+    devise_mailer.send(notification, self, *args).deliver_now
   end
 
 end

data/app/models/effective/resources/forms.rb

@@ -21,7 +21,11 @@ module Effective
             collection ||= (klass.const_get(constant_pluralized) rescue nil) if defined?("#{klass.name}::#{constant_pluralized}")
           end
 
-          { as: :select, polymorphic: true, collection: (collection || []) }.compact
+          if collection.present?
+            { as: :select, polymorphic: true, collection: (collection || []) }
+          else
+            { as: :string }
+          end
         when :has_and_belongs_to_many
           { as: :select }.merge(search_form_field_collection(has_and_belongs_to_many(name)))
         when :has_many

data/app/models/effective/resources/relation.rb

@@ -98,8 +98,18 @@ module Effective
           elsif name == :user # Polymorphic user
             relation.where(search_by_associated_conditions(association, term, fuzzy: fuzzy))
           else # Maybe from a string field
-            id ||= Effective::Attribute.new(:integer).parse(term)
-            relation.where("#{sql_column}_id = ? OR #{sql_column}_type = ?", id, (type || term))
+            collection = relation.none
+
+            relation.unscoped.distinct("#{name}_type").pluck("#{name}_type").each do |klass_name|
+              next if klass_name.nil?
+
+              resource = Effective::Resource.new(klass_name)
+              next unless resource.klass.present?
+
+              collection = collection.or(relation.where("#{name}_id": resource.search_any(term), "#{name}_type": klass_name))
+            end
+
+            collection
           end
         when :has_and_belongs_to_many, :has_many, :has_one
           relation.where(search_by_associated_conditions(association, term, fuzzy: fuzzy))

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.9.10'.freeze
+  VERSION = '1.9.14'.freeze
 end

data/lib/effective_resources.rb

@@ -52,11 +52,7 @@ module EffectiveResources
   end
 
   def self.transaction(resource = nil, &block)
-    connection = (resource if resource.respond_to?(:transaction))
-    connection ||= (resource.class if resource.class.respond_to?(:transaction))
-    connection ||= '::ApplicationRecord'.safe_constantize
-    connection ||= 'ActiveRecord::Base'.safe_constantize
-
+    connection = 'ActiveRecord::Base'.safe_constantize
     raise('unable to determine transaction class') unless connection.present?
 
     connection.transaction { yield }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.9.10
+  version: 1.9.14
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails