effective_logging 3.1.10 → 3.1.14

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: b6f5721d058755a622fc522fc7a7719e733a1bea00fae1d308c28c60d1bfcac4
4
- data.tar.gz: da5b0e20de3dfd5d81eaa6d4867e1f905746179e6e09839347658992d1604bd3
3
+ metadata.gz: ec15a1e45b985321c55c36d0d22a21ff523d32f2e2aa586c653523f6e7d90c81
4
+ data.tar.gz: 9c557549e502aae21860bda03fdc472ee991b2d083a327628dddd5a709fbe8dd
5
5
  SHA512:
6
- metadata.gz: 5ded4680a0bdc0153e98dc07fcfd5616b179148f153232fdb31526ac971ceee4223105cde4a2f8a564aa9d7fd05a0da3f0fa8a40184e002e04691657c3b47b74
7
- data.tar.gz: 4e82583d2ec520e19b55a9e0e064b978de34194fe70dc193f9e7c3ee7f2ed625dc876b239c7e744d069ede9b5f20e0e721858f198aad5595d1ce39445894ed9e
6
+ metadata.gz: 606664ae1370f19f2bbd673a1e553eecf3563743c214fce8c0b897252265b5f9ae7ac838456367a4b572ece81a5e17f27f6602927e7aef8345a812635de3adb9
7
+ data.tar.gz: fbc00a154257f3be705e0b4238e56dfd045a925b715909128c0a8a61a37db7f040adcf546aa1ceaced228b802134c65016e8e166570d94f4aa61ac1cdb4ecc34
@@ -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
@@ -3,6 +3,7 @@ module EffectiveLogging
3
3
  def self.delivering_email(message)
4
4
  return if EffectiveLogging.supressed?
5
5
  return unless message.present?
6
+ return unless ActiveRecord::Base.connection.table_exists?(:logs)
6
7
 
7
8
  # collect a Hash of arguments used to invoke EffectiveLogger.success
8
9
  fields = { from: message.from.join(','), to: message.to, subject: message.subject, cc: message.cc, bcc: message.bcc }
@@ -29,22 +30,21 @@ module EffectiveLogging
29
30
  # Pass a tenant to your mailer
30
31
  # mail(to: 'admin@example.com', subject: @post.title, tenant: Tenant.current)
31
32
  tenant = if message.header['tenant'].present?
32
- value = message.header['tenant'].to_s.to_sym # OptionalField, not a String here
33
+ value = Array(message.header['tenant']).first.to_s.to_sym # OptionalField, not a String here
33
34
  message.header['tenant'] = nil
34
35
  value
35
36
  end
36
37
 
37
- user_klass = "#{tenant.to_s.classify}::User".safe_constantize
38
-
39
38
  parts = (message.body.try(:parts) || []).map { |part| [part, (part.parts if part.respond_to?(:parts))] }.flatten
40
39
  body = parts.find { |part| part.content_type.to_s.downcase.include?('text/html') } || message.body
41
40
 
42
41
  fields[:email] = "#{message.header}<hr>#{body}"
43
42
 
44
43
  if tenant.present? && defined?(Tenant)
44
+ user_klass = (Tenant.engine_user(tenant) rescue nil)
45
45
  Tenant.as_if(tenant) { log_email(message, fields, user_klass) }
46
46
  else
47
- log_email(message, fields, user_klass)
47
+ log_email(message, fields, 'User'.safe_constantize)
48
48
  end
49
49
 
50
50
  true
@@ -1,3 +1,3 @@
1
1
  module EffectiveLogging
2
- VERSION = '3.1.10'.freeze
2
+ VERSION = '3.1.14'.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.10
4
+ version: 3.1.14
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-06-09 00:00:00.000000000 Z
11
+ date: 2021-12-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails