effective_resources 1.8.33 → 1.8.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60cb47028d5031c44e6a833fd1750d6e9435ace75de88ffec3756378079ba13c
-  data.tar.gz: 9ceb601f1fdf5ab0784abe83b6f7d8071f66e079d7c5a3c7352dee0dda9b1abb
+  metadata.gz: 3a3ce02ada5c7878e2c6fab4642ba84c4ba7dbb7fb5986c7f8bc135ea8e3258c
+  data.tar.gz: 375b538d786b4730626c5b7fb64a522ec04c789b750b25b2d4235f4617398e46
 SHA512:
-  metadata.gz: 9fe4309ff79c01a66217aee696f3bfa45d11d429d7a3dad84977351be8e0f9efd1091b6bc8398fcc46d131cc69a57d2251a2b365ddbd7fd4f0a4576c51ba6a5f
-  data.tar.gz: a88750936ed0d46ee4a8faa8a591fbd04dd9eef2eeedaa7f36c01a80bbeaff72690eed324974cdbaf12ed68b2f156ea91058c5250d5b415e80040f4edf0d9060
+  metadata.gz: 65954757632e43d089f173c0e09e421c8c6528d4aa7da4fe70c7b2f24ce0f4ee90646ec8908a778e356846643cfe9d8b924dc7af2fb800a1b4040b8876a05889
+  data.tar.gz: a1c6e51cba33a5489746a1d0954d547f4065fc75c69a87adaae35faca338c51ba91b36788c34729af74394b5d29ceeb9532b1d6acd7b8ffae06bf1ff29374f2b

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

@@ -55,6 +55,8 @@ module Effective
           input
         when ActiveRecord::Relation
           input.klass
+        when (ActiveRecord::Reflection::BelongsToReflection rescue :nil)
+          _klass_by_name(input.class_name)
         when (ActiveRecord::Reflection::AbstractReflection rescue :nil)
           ((input.klass rescue nil).presence || _klass_by_name(input.class_name)) unless input.options[:polymorphic]
         when ActiveRecord::Reflection::MacroReflection

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

@@ -91,9 +91,11 @@ module Effective
 
           if term == 'nil'
             relation.where(is_null("#{sql_column}_id")).where(is_null("#{sql_column}_type"))
-          elsif type.present? && id.present?
+          elsif type.present? && id.present? # This was from a polymorphic select
             relation.where("#{sql_column}_id = ?", id).where("#{sql_column}_type = ?", type)
-          else
+          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))
           end
@@ -213,8 +215,10 @@ module Effective
 
         # key: the id, or associated_id on my table
         # keys: the ids themselves as per the target table
-
-        if association.macro == :belongs_to
+        if association.macro == :belongs_to && association.options[:polymorphic]
+          key = sql_column(association.foreign_key)
+          keys = relation.pluck((relation.klass.primary_key rescue nil))
+        elsif association.macro == :belongs_to
           key = sql_column(association.foreign_key)
           keys = relation.pluck(association.klass.primary_key)
         elsif association.macro == :has_and_belongs_to_many

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.8.33'.freeze
+  VERSION = '1.8.34'.freeze
 end

metadata

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