effective_resources 2.18.3 → 2.18.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea57d3f23e61f43abd4e0ff00964090ad1bfb395c5373d8b00fe6c0eddf6cd90
-  data.tar.gz: 18ff0a66af3512a12ab8feb4742aea894b5be29a84347990c1d1fb8d9a31324f
+  metadata.gz: 15aae84ff3fea90339f7efe098d2866a9d2bc88b335b9655546106a08c4d1bed
+  data.tar.gz: 88309bf5bd6c7d80c17e879047646ab92ab49780db7e07e1df4bba525702226d
 SHA512:
-  metadata.gz: 33196e45ae8c5505267223ab4d16cc90204c70360df828d4edbc26dca946bb1ff3b49e2ec4bc234118f7bed95aeecf34ef13ea4f2296e80f134b07012a51c583
-  data.tar.gz: cbbc3a05bbb0e78cd0c1039a80b8c55855918945c8e3d2e2fb9d697ab62e3342d45b140d33aa4f672ef8aa1445748c56a8c70d618c073853814f971ddd5428c1
+  metadata.gz: a632db851e6c74e33f4e7ff5daccc7990df2009a6f1fd18bce165e94a88bf14b31d5272c446b4e2dc8efbc09f2efc40aea2eab46a2ac5171bde47988c037db2b
+  data.tar.gz: 18b551721691c45be04f467855fd8c28f333c856fb0f30b3cc06615068ef84b6e16dad213a1cafbc10cc5836ba79f90e0a2728be50e2845022bceb7e6c16a457

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

@@ -13,7 +13,7 @@ module Effective
       end
 
       # called by effective_trash and effective_logging
-      def instance_attributes(only: nil, except: nil)
+      def instance_attributes(only: nil, except: nil, associations: true)
         return {} unless instance.present?
 
         # Build up our only and except
@@ -34,43 +34,45 @@ module Effective
           attributes[association.name] = instance.send(association.name).to_s
         end
 
-        # Grab the instance attributes of each nested resource
-        nested_resources.each do |association|
-          next if except.present? && except.include?(association.name)
-          next unless only.blank? || only.include?(association.name)
+        if associations 
+          # Grab the instance attributes of each nested resource
+          nested_resources.each do |association|
+            next if except.present? && except.include?(association.name)
+            next unless only.blank? || only.include?(association.name)
 
-          next if association.options[:through]
+            next if association.options[:through]
 
-          attributes[association.name] ||= {}
+            attributes[association.name] ||= {}
 
-          Array(instance.send(association.name)).each_with_index do |child, index|
-            next unless child.present?
+            Array(instance.send(association.name)).each_with_index do |child, index|
+              next unless child.present?
 
-            resource = Effective::Resource.new(child)
-            attributes[association.name][index] = resource.instance_attributes(only: only, except: except)
+              resource = Effective::Resource.new(child)
+              attributes[association.name][index] = resource.instance_attributes(only: only, except: except)
+            end
           end
-        end
 
-        (action_texts + has_ones).each do |association|
-          next if except.present? && except.include?(association.name)
-          next unless only.blank? || only.include?(association.name)
+          (action_texts + has_ones).each do |association|
+            next if except.present? && except.include?(association.name)
+            next unless only.blank? || only.include?(association.name)
 
-          attributes[association.name] = instance.send(association.name).to_s
-        end
+            attributes[association.name] = instance.send(association.name).to_s
+          end
 
-        has_manys.each do |association|
-          next if except.present? && except.include?(association.name)
-          next unless only.blank? || only.include?(association.name)
+          has_manys.each do |association|
+            next if except.present? && except.include?(association.name)
+            next unless only.blank? || only.include?(association.name)
 
-          next if BLACKLIST.include?(association.name)
-          attributes[association.name] = instance.send(association.name).map { |obj| obj.to_s }
-        end
+            next if BLACKLIST.include?(association.name)
+            attributes[association.name] = instance.send(association.name).map { |obj| obj.to_s }
+          end
 
-        has_and_belongs_to_manys.each do |association|
-          next if except.present? && except.include?(association.name)
-          next unless only.blank? || only.include?(association.name)
+          has_and_belongs_to_manys.each do |association|
+            next if except.present? && except.include?(association.name)
+            next unless only.blank? || only.include?(association.name)
 
-          attributes[association.name] = instance.send(association.name).map { |obj| obj.to_s }
+            attributes[association.name] = instance.send(association.name).map { |obj| obj.to_s }
+          end
         end
 
         attributes.delete_if { |_, value| value.blank? }

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.18.3'.freeze
+  VERSION = '2.18.5'.freeze
 end

data/lib/effective_resources.rb

@@ -16,9 +16,9 @@ module EffectiveResources
 
   include EffectiveGem
 
-  # We use the newer syntax for serialize calls in rails 7+
+  # We use the newer syntax for serialize calls in rails 7.1 but it changes behaviour
   def self.serialize_with_coder?
-    Gem::Version.new(Gem.loaded_specs['rails'].version.to_s) >= Gem::Version.new('7')
+    Gem::Version.new(Gem.loaded_specs['rails'].version.to_s) >= Gem::Version.new('7.1')
   end
 
   def self.authorized?(controller, action, resource)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.18.3
+  version: 2.18.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-29 00:00:00.000000000 Z
+date: 2023-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails