effective_logging 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad0a757a423a0d5b68a2d92bb665772c2e5ca8c0
-  data.tar.gz: 8d779cd00a570d021e4685dd2c3c6ab4235f97bc
+  metadata.gz: 8f9e1486d4c3bf0fc430ed4f50b803e30afba2fe
+  data.tar.gz: 40e598aba305e9829ebf96629c1b18b2cf1cebcb
 SHA512:
-  metadata.gz: 722d36f2d30fe97be38fb6af0f4d0bde3e27595ebbc25cfe17de3c1805127984dec04e5af9692805639d6dc5e64588700c612c2814f0fdd9b88fd1bc752fd0cb
-  data.tar.gz: 27bf043f29c30a5e71b4ae0e458cc8b1526ce3875879709ddd244681ca9150eb835d732b1db7ac8987640274e5f9ffb6f7333754360c368069b864ebbbe51d10
+  metadata.gz: 3c17e821361ed6f77c7cb934c5a39fdb532371128542e567703bd67d8eb3d1257ae4bee524ccbd1bfad4d909f04c421a19a23282f2b1433eb2d48eeac8092b51
+  data.tar.gz: 86e384b5ebff16315ddf1d7cbf7a325f409eacb63926309b69744b85f50a26951bc09e83aa09466ac55be67b513f5be2d3d4be9ea9e3c32975c3476e3765909c

data/app/views/effective/logs/_log.html.haml

@@ -29,7 +29,7 @@
           %strong User:
            
           = (log.user.to_s.starts_with?('#<User:0x') ? (log.user.email rescue log.user) : log.user)
-        - if log.associated.present?
+        - if (log.associated.present? rescue false)
           %br
           %strong Regarding:
           &nbsp;

data/lib/effective_logging/active_record_logger.rb

@@ -6,12 +6,15 @@ module EffectiveLogging
 
     def initialize(resource, options = {})
       raise ArgumentError.new('options must be a Hash') unless options.kind_of?(Hash)
-      raise ArgumentError.new('logger must respond to logged_changes') unless (options[:logger] || resource).respond_to?(:logged_changes)
 
       @resource = resource
       @logger = options.delete(:logger) || resource
       @depth = options.delete(:depth) || 0
       @options = options
+
+      unless @logger.respond_to?(:logged_changes) || @logger.respond_to?(:trash)
+        raise ArgumentError.new('logger must respond to logged_changes or trash')
+      end
     end
 
     # execute! is called when we recurse, otherwise the following methods are best called individually
@@ -27,7 +30,7 @@ module EffectiveLogging
 
     # before_destroy
     def trashed!
-      log((resource.to_s rescue ''), status: EffectiveLogging.trashable_status, details: applicable(attributes))
+      log_trash((resource.to_s rescue ''), details: applicable(attributes))
     end
 
     # before_destroy
@@ -115,10 +118,19 @@ module EffectiveLogging
 
     private
 
-    def log(message, status: EffectiveLogging.log_changes_status, details: {})
+    def log(message, details: {})
       logger.logged_changes.build(
         user: EffectiveLogging.current_user,
-        status: status,
+        status: EffectiveLogging.log_changes_status,
+        message: "#{"\t" * depth}#{options[:prefix]}#{message}",
+        details: details
+      ).tap { |log| log.save }
+    end
+
+    def log_trash(message, details: {})
+      logger.build_trash(
+        user: EffectiveLogging.current_user,
+        status: EffectiveLogging.trashable_status,
         message: "#{"\t" * depth}#{options[:prefix]}#{message}",
         details: details
       ).tap { |log| log.save }

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '1.7.0'.freeze
+  VERSION = '1.7.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Code and Effect