effective_logging 3.1.7 → 3.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c41ed5f5f39a3dc24c63161bf07ea763351a611bee78aceb325c5a09126b5f60
-  data.tar.gz: fb4bc4163aca3521fcf0bfa23a8253950743fd16696224911d8b431dd1f37cf0
+  metadata.gz: 793f67a081ade00db602453e788de2c7449ddefe2dc3884aa3d2c72046170cdb
+  data.tar.gz: '08531a7570a1258c5709d177fbe7ca3a35448121d4b0bef24da63feba868a35c'
 SHA512:
-  metadata.gz: 171973db5f9b0be2b3e2e91923df44767ed9cf787c629833370bbfb45ee8d31301edb6e5a2212768825a1742a87bd39a84915045a5badabded05cb66fc86ff1a
-  data.tar.gz: b858a335ca8fc2f780fdfb5c056078ea40a0113d6f19078942a179fb54c690cf3ab9f090ec684a94d7e1d4d51cdf51b4622b2af1a3efc0c38ceccd469c340aca
+  metadata.gz: ccc8e31fb99180d15e8ff5de19443ab8c1a4097650f90de6c4555c2776bb47fa4b0f24e6c2c9224d860c32c9b5250f3bcb13abcd01ffb050c4603c7ae30620ba
+  data.tar.gz: 3ea1c48c81d890b7134b25af34667bb54311e30a04e5737bc4331cd9879d03b76dc993bcbbfdeaf35bcf566b9c8849ad8a8293dcc7553f13fa4ebcb23d027ba3

data/app/datatables/effective_logs_datatable.rb

@@ -20,7 +20,7 @@ class EffectiveLogsDatatable < Effective::Datatable
     col :associated_to_s, label: 'Associated'
 
     col :message do |log|
-      log.message.gsub("\n", '<br>')
+      (log.message || '').gsub!("\n", '<br>')
     end
 
     col :logs_count, visible: false

data/lib/effective_logging/active_storage_logger.rb

@@ -4,6 +4,8 @@ module EffectiveLogging
   module ActiveStorageLogger
 
     def track_downloads
+      return if EffectiveLogging.supressed?
+
       user = current_user if respond_to?(:current_user)
 
       key = decode_verified_key()

data/lib/effective_logging/email_logger.rb

@@ -28,7 +28,7 @@ module EffectiveLogging
 
       # Pass a tenant to your mailer
       # mail(to: 'admin@example.com', subject: @post.title, tenant: Tenant.current)
-      tenant = if message.header['tenant'].present? && defined?(Tenant)
+      tenant = if message.header['tenant'].present?
         value = message.header['tenant'].to_s.to_sym # OptionalField, not a String here
         message.header['tenant'] = nil
         value
@@ -36,13 +36,13 @@ module EffectiveLogging
 
       user_klass = "#{tenant.to_s.classify}::User".safe_constantize
 
-      body = (message.body.try(:parts) || []).find { |part| part.content_type.to_s.downcase.include?('text/html') }
-      body ||= message.body
+      parts = (message.body.try(:parts) || []).map { |part| [part, (part.parts if part.respond_to?(:parts))] }.flatten
+      body = parts.find { |part| part.content_type.to_s.downcase.include?('text/html') } || message.body
 
       fields[:email] = "#{message.header}<hr>#{body}"
 
-      if tenant.present?
-        Tenant.as(tenant) { log_email(message, fields, user_klass) }
+      if tenant.present? && defined?(Tenant)
+        Tenant.as_if(tenant) { log_email(message, fields, user_klass) }
       else
         log_email(message, fields, user_klass)
       end

data/lib/effective_logging/log_page_views.rb

@@ -37,7 +37,7 @@ module EffectiveLogging
       def effective_logging_log_page_view
         return if EffectiveLogging.supressed?
         return if @_effective_logging_skip_log_page_view == true
-        return if (self.class.log_page_views_opts[:skip_namespace] || []).include?(self.class.parent)
+        return if (self.class.log_page_views_opts[:skip_namespace] || []).include?(self.class.ancestors.first)
 
         user = EffectiveLogging.current_user || (current_user if respond_to?(:current_user))
 

data/lib/effective_logging/version.rb

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

data/lib/effective_logging.rb

@@ -3,8 +3,6 @@ require 'effective_logging/engine'
 require 'effective_logging/version'
 
 module EffectiveLogging
-  mattr_accessor :supressed
-
   def self.config_keys
     [
       :logs_table_name, :layout, :additional_statuses,
@@ -47,6 +45,11 @@ module EffectiveLogging
     Thread.current[:effective_logging_current_user]
   end
 
+  # Used to supress all logging
+  def self.supressed=(value)
+    Thread.current[:effective_logging_supressed] = value
+  end
+
   def self.supressed(&block)
     Thread.current[:effective_logging_supressed] = true
     yield

metadata

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