effective_resources 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 548398bd2a4c2d0b765dbe366a13792a40e2738b
-  data.tar.gz: 0c86f9d641ce9453397ae1f85b9601f0995f45d2
+  metadata.gz: 1383850485a3ad9051e04e93dd836a381b9b1f0c
+  data.tar.gz: e745b62f182c4ea7e7610b0b752d8cc2c5fe525e
 SHA512:
-  metadata.gz: 0d8512be42bc14efb7cbd3683ed59e5a0b8a9f5c8735c9b54c0b2864f6ea4a7932e150f861eac0371cb06e7a3c0b785b46bac565fc69349b23eb6ee11f38fded
-  data.tar.gz: 972f967e8097e08411b32f544bda79e8fdb35508a1cb48112066769a92a5084235c5d859ac2d3113b98c60820048d11c978b7abb34d3c44191227ad8b532d887
+  metadata.gz: 63d8afb4eb59ee8275ab211f58bc4a5fdbf67b2cfcc7fc7ff2edc068456ee7ce558f10d61f0009fd94565dc8022ee34b4d7d231d033144cf8025c9f2f1ba25e2
+  data.tar.gz: 059dd7b7c19f4680c9e58dc4a60ffd412697a498cf28a5104fb1b0be04a174cdb9d2a76d6121c84ae6cd9933d7a8436ee58e3ec800d0e5da0f89d3646f03203b

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

@@ -9,40 +9,44 @@ module Effective
         @instance || klass.new
       end
 
-      def instance_attributes
+      # called by effective_trash as defaults, and effective_logging sometimes with true or false
+      def instance_attributes(include_associated: true)
         return {} unless instance.present?
 
         attributes = { attributes: instance.attributes }
 
         # Collect to_s representations of all belongs_to associations
-        belong_tos.each do |association|
-          attributes[association.name] = instance.send(association.name).to_s
-        end
+        if include_associated
+          belong_tos.each do |association|
+            attributes[association.name] = instance.send(association.name).to_s
+          end
 
-        nested_resources.each do |association|
-          attributes[association.name] ||= {}
+          nested_resources.each do |association|
+            attributes[association.name] ||= {}
 
-          Array(instance.send(association.name)).each_with_index do |child, index|
-            resource = Effective::Resource.new(child)
-            attributes[association.name][index] = resource.instance_attributes
+            Array(instance.send(association.name)).each_with_index do |child, index|
+              resource = Effective::Resource.new(child)
+              attributes[association.name][index] = resource.instance_attributes
+            end
           end
-        end
 
-        has_ones.each do |association|
-          attributes[association.name] = instance.send(association.name).to_s
-        end
+          has_ones.each do |association|
+            attributes[association.name] = instance.send(association.name).to_s
+          end
 
-        has_manys.each do |association|
-          attributes[association.name] = instance.send(association.name).map { |obj| obj.to_s }
-        end
+          has_manys.each do |association|
+            attributes[association.name] = instance.send(association.name).map { |obj| obj.to_s }
+          end
 
-        has_and_belongs_to_manys.each do |association|
-          attributes[association.name] = instance.send(association.name).map { |obj| obj.to_s }
+          has_and_belongs_to_manys.each do |association|
+            attributes[association.name] = instance.send(association.name).map { |obj| obj.to_s }
+          end
         end
 
         attributes.delete_if { |_, value| value.blank? }
       end
 
+      # used by effective_logging
       def instance_changes
         return {} unless (instance.present? && instance.changes.present?)
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.8.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-29 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails