effective_logging 3.1.15 → 3.2.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/effective_logging/email_logger.rb +18 -18
- data/lib/effective_logging/engine.rb +3 -1
- data/lib/effective_logging/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5074701cbb58cd227dceafd5a89ac3daadc20806a1e84092302705f98470403e
|
4
|
+
data.tar.gz: 3643ad7b6ab045ca00e1b1db3b14a7da680137d2f2a99cae410dfef5c6515363
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4a680ccf5c23354b6ce1248b647b58eabbd6290191b7bb46ea7a8555c7551ceb667fdd6628ffdda85f9eb6fc062619c51b8459c7258a040586399559c3e19506
|
7
|
+
data.tar.gz: 5c447ba4666a8f5c0fc18c04dc36d7f7ad5fc043bc79156b38ac90df9d9e060a1a5c985eb48c0361638ea1254acd27fd757c66f40a7502faba51265302c485a8
|
@@ -6,17 +6,16 @@ module EffectiveLogging
|
|
6
6
|
return unless ActiveRecord::Base.connection.table_exists?(:logs)
|
7
7
|
|
8
8
|
# collect a Hash of arguments used to invoke EffectiveLogger.success
|
9
|
-
fields = { from: message.from.join(','), to: message.to, subject: message.subject, cc: message.cc, bcc: message.bcc }
|
9
|
+
fields = { from: Array(message.from).join(','), to: message.to, subject: message.subject, cc: message.cc, bcc: message.bcc }
|
10
10
|
|
11
11
|
# Add a log header to your mailer to pass some objects or additional things to EffectiveLogger
|
12
12
|
# mail(to: 'admin@example.com', subject: @post.title, log: @post)
|
13
13
|
log = if message.header['log'].present?
|
14
|
-
|
15
|
-
|
16
|
-
message.header['log'] = nil
|
17
|
-
value
|
14
|
+
message.header['log'].instance_variable_get(:@unparsed_value) ||
|
15
|
+
message.header['log'].instance_variable_get(:@value)
|
18
16
|
end
|
19
17
|
|
18
|
+
# If we have a logged object, associate it
|
20
19
|
if log.present?
|
21
20
|
if log.kind_of?(ActiveRecord::Base)
|
22
21
|
fields.merge!(associated: log)
|
@@ -27,25 +26,24 @@ module EffectiveLogging
|
|
27
26
|
end
|
28
27
|
end
|
29
28
|
|
30
|
-
#
|
31
|
-
|
32
|
-
|
33
|
-
value = Array(message.header['tenant']).first.to_s.to_sym # OptionalField, not a String here
|
34
|
-
message.header['tenant'] = nil
|
35
|
-
value
|
29
|
+
# Read the current app's Tenant if defined
|
30
|
+
tenant = if defined?(Tenant)
|
31
|
+
Tenant.current || raise("Missing tenant in effective_logging email logger")
|
36
32
|
end
|
37
33
|
|
34
|
+
# Clean up the header
|
35
|
+
message.header.fields.delete_if { |field| ['tenant', 'log'].include?(field.name) }
|
36
|
+
|
37
|
+
# Parse the content for logging
|
38
38
|
parts = (message.body.try(:parts) || []).map { |part| [part, (part.parts if part.respond_to?(:parts))] }.flatten
|
39
39
|
body = parts.find { |part| part.content_type.to_s.downcase.include?('text/html') } || message.body
|
40
|
-
|
41
40
|
fields[:email] = "#{message.header}<hr>#{body}"
|
42
41
|
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
end
|
42
|
+
# Find the user to associate it with
|
43
|
+
user_klass = (tenant ? Tenant.engine_user(tenant) : 'User'.safe_constantize)
|
44
|
+
|
45
|
+
# Log the email
|
46
|
+
log_email(message, fields, user_klass)
|
49
47
|
|
50
48
|
true
|
51
49
|
end
|
@@ -65,6 +63,8 @@ module EffectiveLogging
|
|
65
63
|
if tos.blank? && (message.cc.present? || message.bcc.present?)
|
66
64
|
::EffectiveLogger.email("#{message.subject} - multiple recipients", fields)
|
67
65
|
end
|
66
|
+
|
67
|
+
true
|
68
68
|
end
|
69
69
|
|
70
70
|
end
|
@@ -17,7 +17,9 @@ module EffectiveLogging
|
|
17
17
|
# Automatically Log Emails
|
18
18
|
initializer 'effective_logging.emails' do |app|
|
19
19
|
if EffectiveLogging.email_enabled == true
|
20
|
-
|
20
|
+
Rails.application.config.to_prepare do
|
21
|
+
ActionMailer::Base.register_interceptor(EffectiveLogging::EmailLogger)
|
22
|
+
end
|
21
23
|
end
|
22
24
|
end
|
23
25
|
|
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.
|
4
|
+
version: 3.2.2
|
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:
|
11
|
+
date: 2022-04-01 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|