effective_logging 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a608aab5a3d18fc5904353993d99f79d5661512
-  data.tar.gz: f92d295365c081c2fc2656644d9826033dc7208d
+  metadata.gz: f3201ea4f4d500abedd1361c0d1299fea65671f3
+  data.tar.gz: 30cf8d48ed9887a9d52f8338a63f45e71842e015
 SHA512:
-  metadata.gz: 41199b4ae698d4b6204979a76116bafacf9c9d2b25c741631938c174fc18ab090e22d987417dcfcecb3e27ee21ada1cdf40254aca0ebe3921accda85f79daf8b
-  data.tar.gz: 2eb2d0f92b144e7517bd752d927d4f4513f0becf7fa7ba8b34bf0c583d1945002f24c8cee43c20ecde45c0ae06a18405039a4951d9d15b3ac49e2539671d2a22
+  metadata.gz: 1f959e4b05e4cd53ee7a2718eb088506adc0b15a4fa7e88b723f8e9e877e28806f5583ef7bdb3fb06a5a65eb555489c86f80fff0c7345da855f7e73991e20882
+  data.tar.gz: c5a64a3e94683f3f0d2ba554b6babe4f7666307e48fdfa8d29c5c7f6eb3469f9506f9aa28c78b9ca86f2ea42050367dd11b9f80dec15afadc12481f68dba32f2

data/lib/effective_logging/active_record_logger.rb

@@ -1,6 +1,6 @@
 module EffectiveLogging
   class ActiveRecordLogger
-    attr_accessor :object, :resource, :logger, :depth, :include_associated, :include_nested, :options
+    attr_accessor :object, :resource, :logger, :depth, :include_associated, :include_nested, :log_parents, :options
 
     BLANK = "''"
 
@@ -10,10 +10,11 @@ module EffectiveLogging
       @object = object
       @resource = Effective::Resource.new(object)
 
-      @logger = options.delete(:logger) || object
-      @depth = options.delete(:depth) || 0
+      @logger = options.fetch(:logger, object)
+      @depth = options.fetch(:depth, 0)
       @include_associated = options.fetch(:include_associated, true)
       @include_nested = options.fetch(:include_nested, true)
+      @log_parents = options.fetch(:log_parents, true)
       @options = options
 
       raise ArgumentError.new('logger must respond to logged_changes') unless @logger.respond_to?(:logged_changes)
@@ -34,18 +35,18 @@ module EffectiveLogging
     end
 
     def destroyed!
-      log('Deleted', details: applicable(instance_attributes))
+      log('Deleted', applicable(instance_attributes))
     end
 
     def created!
-      log('Created', details: applicable(instance_attributes))
+      log('Created', applicable(instance_attributes))
     end
 
     def updated!
       log_resource_changes!
       log_nested_resources!
 
-      log('Updated', details: applicable(instance_attributes)) if logged? && depth == 0
+      (logged? && depth == 0) ? log('Updated', applicable(instance_attributes)) : true
     end
 
     def log_resource_changes!
@@ -62,7 +63,7 @@ module EffectiveLogging
           object.log_changes_formatted_attribute(attribute)
         end || attribute.titleize
 
-        log("#{attribute}: #{before.presence || BLANK} → #{after.presence || BLANK}", details: { attribute: attribute, before: before, after: after })
+        log("#{attribute}: #{before.presence || BLANK} → #{after.presence || BLANK}", { attribute: attribute, before: before, after: after })
       end
     end
 
@@ -79,36 +80,67 @@ module EffectiveLogging
           child_options = options.merge(logger: logger, depth: depth+1, prefix: "#{title} #{index} - #{child} - ", include_associated: include_associated, include_nested: include_nested)
           child_options = child_options.merge(child.log_changes_options) if child.respond_to?(:log_changes_options)
 
-          @logged = true if ::EffectiveLogging::ActiveRecordLogger.new(child, child_options).execute!
+          @logged = true if ActiveRecordLogger.new(child, child_options).execute!
         end
       end
     end
 
-    private
-
-    def instance_attributes # effective_resources gem
-      resource.instance_attributes(include_associated: include_associated, include_nested: include_nested)
-    end
-
-    def log(message, details: {})
-      @logged = true
-
+    def log(message, details)
       log = logger.logged_changes.build(
         user: EffectiveLogging.current_user,
         status: EffectiveLogging.log_changes_status,
         message: "#{"\t" * depth}#{options[:prefix]}#{message}",
         associated_to_s: (logger.to_s rescue nil),
-        details: details
+        details: (details.presence || {})
       )
 
-      log.save
+      log_changes_to_parents(message, details) if depth == 0 && log_parents
+
+      @logged = log.save!
       log
     end
 
+    def log_changes_to_parents(message, details)
+      log_changes_parents.each do |parent|
+        title = object.class.name.to_s.singularize.titleize
+        parent_options = { logger: parent, prefix: "#{title} - #{object} - " }
+        ActiveRecordLogger.new(parent, parent_options).log(message, details)
+      end
+    end
+
+    private
+
     def logged?
       @logged == true
     end
 
+    def instance_attributes # effective_resources gem
+      resource.instance_attributes(include_associated: include_associated, include_nested: include_nested)
+    end
+
+    # A parent is a belongs_to that accepts_nested_attributes for this resource
+    def log_changes_parents
+      resource.belong_tos.map do |association|
+        parent_klass = (association.options[:polymorphic] ? object.public_send(association.name).class : association.klass)
+
+        # Skip if the parent doesn't log_changes
+        next unless parent_klass.respond_to?(:log_changes)
+
+        # Skip unless the parent accepts_nested_attributes
+        next unless Effective::Resource.new(parent_klass).nested_resources.find { |ass| ass.plural_name == resource.plural_name }
+
+        parent = object.public_send(association.name).presence
+
+        # Sanity check
+        next unless parent.respond_to?(:log_changes_options)
+
+        # Skip if the parent does not log its nested or associated items
+        next unless parent.log_changes_options[:include_nested] || parent.log_changes_options[:include_associated]
+
+        parent
+      end.compact
+    end
+
     # TODO: Make this work better with nested objects
     def applicable(attributes)
       atts = if options[:only].present?

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-09 00:00:00.000000000 Z
+date: 2019-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails