effective_logging 3.1.9 → 3.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a934f053c5eb5652b1be8a1a25f870d451b879e9db308a328cea52d831983c30
-  data.tar.gz: 3fbcedccfc0538a6d5983dcc2974e6d9ab0934c007156e7b5f8eb102542cbbb9
+  metadata.gz: 87ac414e0b9beae468f3c40f13ef35bdbb9ad8150ff4ed1bc375860d8ca50ad3
+  data.tar.gz: 9d63d60750990e0e35076efdc426c7ae9265419f3a279f46d388f60c3fbf9f4e
 SHA512:
-  metadata.gz: eae94d3706df77c4efe6f5167c95067ad69b0dce0a836110da37a6140c46124d523ac8d07118aca23513f8524997abb56fd5612089189e6a816bc611651471f9
-  data.tar.gz: 8df803dea152be5e5e36e642499b98c881d356ac30a2a7bf115496964c8abf1dc093767bd7f314bad25287956db132da809f978848fe35e36457d6a6f78728c2
+  metadata.gz: d374f3383c45f423ca451015421ebcc2abbe3384176fd996fb70e05007bed61b136c3d1693969402bb8383ea7a2e3b4176cd4d47eae3bda70b3e1de989daa349
+  data.tar.gz: 943beaaeed181e7bc5c5d51d0b826ff37d0937ee27d669f35ad00e96c7cb4589729338a30a05753af24eae168935a3684bf84d19e053c5ef0277437d27df8eef

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/email_logger.rb

@@ -29,22 +29,21 @@ 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?
-        value = message.header['tenant'].to_s.to_sym # OptionalField, not a String here
+        value = Array(message.header['tenant']).first.to_s.to_sym # OptionalField, not a String here
         message.header['tenant'] = nil
         value
       end
 
-      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? && defined?(Tenant)
+        user_klass = (Tenant.engine_user(tenant) rescue nil)
         Tenant.as_if(tenant) { log_email(message, fields, user_klass) }
       else
-        log_email(message, fields, user_klass)
+        log_email(message, fields, 'User'.safe_constantize)
       end
 
       true

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.9'.freeze
+  VERSION = '3.1.13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 3.1.9
+  version: 3.1.13
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-23 00:00:00.000000000 Z
+date: 2021-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails