effective_resources 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c677c888d40faa747d421ffbeecbf1452e5328db
-  data.tar.gz: 2bf38b93293b53d35a86f1e9c551b1cfec07489f
+  metadata.gz: ab07e09ae92fa3b5b45c6aaea043524311cf55ee
+  data.tar.gz: a1932eebb584d966fc283bde64a4ccef8da30fc2
 SHA512:
-  metadata.gz: ab530180ab92b4e5a866b34d38941d0234e73564c4291b02b661f675eb399d4bbd5fcf4445b6db935734da154a36f1a120255fe05839fcc7b814d92784a61cf2
-  data.tar.gz: dd14ce62821ee55c08ded91a33fca6a57a17ecf3a857d9aad138b7586b8590a0304252f652dc7ebb519799836dc3c100699e9b640bf42b014e74d7a45c11aa9e
+  metadata.gz: fa2a85a3c35493d374fbd6ecc681edb1e33db170adc18e3b9839d2d5968c6f2b47cfa9fa862798d9e8b92e68b17da2a24c27b1aa8bdf2785851e3a1621a3102e
+  data.tar.gz: 035d29dfab61fd4de301630257e82f5022cc31bc57515065e17303eb703b1a000c524806961c189ee9265d29a6d6611f4fdc6932f4b35e8f6c930922936cdf5b

data/app/helpers/effective_resources_private_helper.rb

@@ -48,7 +48,7 @@ module EffectiveResourcesPrivateHelper
 
       # Replace resource name in any token strings
       if opts['data-confirm']
-        opts['data-confirm'].gsub!('@resource', (resource.to_s.presence || effective_resource.human_name))
+        opts['data-confirm'].gsub!('@resource', (resource.to_s.presence || effective_resource.human_name).to_s)
       end
 
       opts.except(:default, :only, :except, :if, :unless, :redirect, :success, :danger)

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

@@ -9,8 +9,8 @@ module Effective
         @instance || klass.new
       end
 
-      # called by effective_trash as defaults, and effective_logging sometimes with true or false
-      def instance_attributes(include_associated: true)
+      # called by effective_trash and effective_logging
+      def instance_attributes(include_associated: true, include_nested: true)
         return {} unless instance.present?
 
         attributes = { attributes: instance.attributes }
@@ -20,16 +20,22 @@ module Effective
           belong_tos.each do |association|
             attributes[association.name] = instance.send(association.name).to_s
           end
+        end
 
+        if include_associated || include_nested
           nested_resources.each do |association|
             attributes[association.name] ||= {}
 
+            next if association.options[:through]
+
             Array(instance.send(association.name)).each_with_index do |child, index|
               resource = Effective::Resource.new(child)
-              attributes[association.name][index] = resource.instance_attributes
+              attributes[association.name][index] = resource.instance_attributes(include_associated: include_associated, include_nested: include_nested)
             end
           end
+        end
 
+        if include_associated
           has_ones.each do |association|
             attributes[association.name] = instance.send(association.name).to_s
           end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-15 00:00:00.000000000 Z
+date: 2018-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails