effective_logging 3.1.2 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4344957c306f7c50e24fe0d3f81718f16490e20cbc08be10337355c4c7ec70e
-  data.tar.gz: cb820069940ce334d50785382387dec7e51e4fd326efaeaa5b8b3ebcf072dbc2
+  metadata.gz: c41ed5f5f39a3dc24c63161bf07ea763351a611bee78aceb325c5a09126b5f60
+  data.tar.gz: fb4bc4163aca3521fcf0bfa23a8253950743fd16696224911d8b431dd1f37cf0
 SHA512:
-  metadata.gz: fe14ba483a5fe14b2cf97e8f00724068b82b595ea7d5f302d2a688bfa0e710a0d7eb835fe2818469c2522386f479964b00bec68198b9ee306bef2cd732bffdc9
-  data.tar.gz: 69a4ac6778ed57501732537811d23fb205cdbe72a2c6cd264c0f98c5167b4521d2220599da947eda6f72be3a2f6e8e1b19d261b1bf243077c74b90e588c014e4
+  metadata.gz: 171973db5f9b0be2b3e2e91923df44767ed9cf787c629833370bbfb45ee8d31301edb6e5a2212768825a1742a87bd39a84915045a5badabded05cb66fc86ff1a
+  data.tar.gz: b858a335ca8fc2f780fdfb5c056078ea40a0113d6f19078942a179fb54c690cf3ab9f090ec684a94d7e1d4d51cdf51b4622b2af1a3efc0c38ceccd469c340aca

data/app/controllers/effective/logs_controller.rb

@@ -47,7 +47,7 @@ module Effective
     def html_part
       @log = Effective::Log.find(params[:id])
 
-      EffectiveLogging.authorize!(self, :show, @log)
+      EffectiveResources.authorize!(self, :show, @log)
 
       value = @log.details[(params[:key] || '').to_sym].to_s
 

data/lib/effective_logging/active_record_logger.rb

@@ -33,6 +33,9 @@ module EffectiveLogging
       return true if changes.blank? # If you just click save and change nothing, don't log it.
 
       message = (['Updated'] + changes.map do |attribute, (before, after)|
+        before = "HTML content (#{before.length})" if before.kind_of?(String) && before.include?('<div')
+        after = "HTML content (#{after.length})" if after.kind_of?(String) && after.include?('<div')
+
         "#{attribute}: #{before.presence || BLANK} &rarr; #{after.presence || BLANK}"
       end).join("\n")
 

data/lib/effective_logging/active_storage_logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EffectiveLogging
   module ActiveStorageLogger
 
@@ -6,6 +8,7 @@ module EffectiveLogging
 
       key = decode_verified_key()
       return unless key.present?
+      return if (key[:content_type] || '').starts_with?('image')
 
       blob = ActiveStorage::Blob.where(key: key[:key]).first
       return unless blob.present?

data/lib/effective_logging/email_logger.rb

@@ -8,22 +8,31 @@ module EffectiveLogging
       fields = { from: message.from.join(','), to: message.to, subject: message.subject, cc: message.cc, bcc: message.bcc }
 
       # Add a log header to your mailer to pass some objects or additional things to EffectiveLogger
-      # mail(to: 'admin@example.com', subject: @post.title, log: { post: @post })
-      if message.header['log'].present?
-        # This is a bit sketchy, but gives access to the object in Rails 4.2 anyway
-        fields.merge!(message.header['log'].instance_variable_get(:@value) || {})
-
-        # Get rid of the extra header, as it should not be set in the real mail message.
+      # mail(to: 'admin@example.com', subject: @post.title, log: @post)
+      log = if message.header['log'].present?
+        value = message.header['log'].instance_variable_get(:@unparsed_value)
+        value ||= message.header['log'].instance_variable_get(:@value)
         message.header['log'] = nil
+        value
+      end
+
+      if log.present?
+        if log.kind_of?(ActiveRecord::Base)
+          fields.merge!(associated: log)
+        elsif log.kind_of?(Hash)
+          fields.merge!(log)
+        else
+          raise('log expected an ActiveRecord object or Hash')
+        end
       end
 
       # Pass a tenant to your mailer
       # mail(to: 'admin@example.com', subject: @post.title, tenant: Tenant.current)
-      tenant = if message.header['tenant'].present?
+      tenant = if message.header['tenant'].present? && defined?(Tenant)
         value = message.header['tenant'].to_s.to_sym # OptionalField, not a String here
         message.header['tenant'] = nil
         value
-      end || (Tenant.current if defined?(Tenant))
+      end
 
       user_klass = "#{tenant.to_s.classify}::User".safe_constantize
 
@@ -49,7 +58,7 @@ module EffectiveLogging
       tos.each do |to|
         user = (user_klass.where(email: to.downcase).first if user_klass.present?)
 
-        user_fields = fields.merge(to: to, user: user, associated: user)
+        user_fields = fields.merge(to: to, user: user)
         ::EffectiveLogger.email("#{message.subject} - #{tos.join(', ')}", user_fields)
       end
 

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '3.1.2'.freeze
+  VERSION = '3.1.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails