effective_logging 3.1.8 → 3.1.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 776c1106826280f8941053f903533221832f31ff27a9d10539d3c87592901751
4
- data.tar.gz: c1bb69734cb95ad4b697f95a6a941454d5b95786c76a0da7e8c60ec549b732f4
3
+ metadata.gz: 2de9873c0c39e432aecfff8c85f158cb08397d3996f779068b0640907b56ce86
4
+ data.tar.gz: 706e83a433709ce13a26379374370a06877ee51488a5eef53a1d6299184fcc94
5
5
  SHA512:
6
- metadata.gz: 90861c78a3b12000910586f4f1dd9d6b7762a3aaf39f6ec2fced0288cb7eb8242f27fc4c6f88f77e55f2dd7e67b76ddca55f66596d62edc3da81a006bd91c648
7
- data.tar.gz: c3377cb8d5894847d2e0a6dbc692706262a14e38fb53f47758cee716145d6d8529a676952eea8e9f112d7e5781571a2d83963a45e56f73f0f4e5d3a7e63e9a98
6
+ metadata.gz: a0f4e0589f9bc9a4ca21887de9cac7065ae4d1270135e9100c69e7220b4154d73f11a39afb4115a861538c0e1c0bb68f0d317a0c50784c0e4a01b11e40f5a3b0
7
+ data.tar.gz: d9c8c3a67d227503ce3f824e5a3e5ea0aaea5b7e24c114afb2df345d4c801e0f03ed26c1f0d027a85fb4bbc6425061d0fe0d9fb2ce2b227bec94e73fb45ee6fd
@@ -20,7 +20,7 @@ class EffectiveLogsDatatable < Effective::Datatable
20
20
  col :associated_to_s, label: 'Associated'
21
21
 
22
22
  col :message do |log|
23
- log.message.gsub("\n", '<br>')
23
+ (log.message || '').gsub("\n", '<br>')
24
24
  end
25
25
 
26
26
  col :logs_count, visible: false
@@ -34,19 +34,16 @@ module EffectiveLogging
34
34
  value
35
35
  end
36
36
 
37
- user_klass = "#{tenant.to_s.classify}::User".safe_constantize
38
-
39
- body = (message.body.try(:parts) || []).find { |part| part.content_type.to_s.downcase.include?('text/html') }
40
- body ||= message.body
37
+ parts = (message.body.try(:parts) || []).map { |part| [part, (part.parts if part.respond_to?(:parts))] }.flatten
38
+ body = parts.find { |part| part.content_type.to_s.downcase.include?('text/html') } || message.body
41
39
 
42
40
  fields[:email] = "#{message.header}<hr>#{body}"
43
41
 
44
- if defined?(Tenant) && Tenant.current.present?
45
- log_email(message, fields, user_klass)
46
- elsif defined?(Tenant) && tenant.present?
47
- Tenant.as(tenant) { log_email(message, fields, user_klass) }
42
+ if tenant.present? && defined?(Tenant)
43
+ user_klass = (Tenant.engine_user(tenant) rescue nil)
44
+ Tenant.as_if(tenant) { log_email(message, fields, user_klass) }
48
45
  else
49
- log_email(message, fields, user_klass)
46
+ log_email(message, fields, 'User'.safe_constantize)
50
47
  end
51
48
 
52
49
  true
@@ -37,7 +37,7 @@ module EffectiveLogging
37
37
  def effective_logging_log_page_view
38
38
  return if EffectiveLogging.supressed?
39
39
  return if @_effective_logging_skip_log_page_view == true
40
- return if (self.class.log_page_views_opts[:skip_namespace] || []).include?(self.class.parent)
40
+ return if (self.class.log_page_views_opts[:skip_namespace] || []).include?(self.class.ancestors.first)
41
41
 
42
42
  user = EffectiveLogging.current_user || (current_user if respond_to?(:current_user))
43
43
 
@@ -1,3 +1,3 @@
1
1
  module EffectiveLogging
2
- VERSION = '3.1.8'.freeze
2
+ VERSION = '3.1.12'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_logging
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.8
4
+ version: 3.1.12
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-03-17 00:00:00.000000000 Z
11
+ date: 2021-11-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails