effective_resources 1.8.34 → 1.8.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a3ce02ada5c7878e2c6fab4642ba84c4ba7dbb7fb5986c7f8bc135ea8e3258c
-  data.tar.gz: 375b538d786b4730626c5b7fb64a522ec04c789b750b25b2d4235f4617398e46
+  metadata.gz: 889c24801967683844b62d1e659862a39e47bfc99cf184ff77b9ecb9f0dbc16a
+  data.tar.gz: a39a146b713bc41482f35df016f3309c8afedef75531c5066479fe8d3ca6100c
 SHA512:
-  metadata.gz: 65954757632e43d089f173c0e09e421c8c6528d4aa7da4fe70c7b2f24ce0f4ee90646ec8908a778e356846643cfe9d8b924dc7af2fb800a1b4040b8876a05889
-  data.tar.gz: a1c6e51cba33a5489746a1d0954d547f4065fc75c69a87adaae35faca338c51ba91b36788c34729af74394b5d29ceeb9532b1d6acd7b8ffae06bf1ff29374f2b
+  metadata.gz: ac2de13588b807efd3fb9c048c0e180701d9b0dff54bf4ff1c44a86eb211b4ab9fc17da5fbea84725ce4c6cdc17fc9d242e749d257dd778209a7127655cc22bc
+  data.tar.gz: a7dd80308162e111383edb92c5964e32c7397116b574df8c20460e9571a705985f3b1d8ef6be28b9d743c08a89500fd34f2a830fa37751452db058fc34918c88

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

@@ -55,10 +55,12 @@ 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]
+          if input.options[:polymorphic]
+            _klass_by_name(input.class_name)
+          else
+            (input.klass rescue nil) || _klass_by_name(input.class_name)
+          end
         when ActiveRecord::Reflection::MacroReflection
           ((input.klass rescue nil).presence || _klass_by_name(input.class_name)) unless input.options[:polymorphic]
         when ActionDispatch::Journey::Route

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

@@ -293,7 +293,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.34'.freeze
+  VERSION = '1.8.35'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.8.34
+  version: 1.8.35
 platform: ruby
 authors:
 - Code and Effect