effective_logging 3.1.15 → 3.2.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 153343d7143b4f2705fc5a5fefcafc5f6832d128bc5f4f6273247cad0f88fb6a
4
- data.tar.gz: d27a82f669877cdd3cce6c37426c03243b1255f03748070874527c921ffdf363
3
+ metadata.gz: 5c2e94f69a8e4af73fc5d6d3239ebd4750e40804b1a2475ecbe98ecda7576488
4
+ data.tar.gz: b9e68a40d4a189e526c87549b8653de86531963c44b90f135f011facc4333b95
5
5
  SHA512:
6
- metadata.gz: 0be67e23da9dd7d63c720fd624efcc759c3a361eda73f1c0934c939ceefd555043c7b45fef2285f668e57109c2dcf18a0d470c02b13173d16a6edfa9d90ef3fd
7
- data.tar.gz: f0c790dbb208cf6249d82acbf2ab6b4a79f7587e8520b3c98133c56c3708b287219253077ee2f4d6b7581eb767d435ed444384211932a803f2c721a9bcaa5c7c
6
+ metadata.gz: 54403622ac92045242ae2bc22788a7f350caa4f11d8ec04581d5cfaa0e7fa5e48b35c1b9298021a901893f463c9c499be82d55734679e618892b0272145d37ee
7
+ data.tar.gz: 3cf771ad58cf9f4d09dce54a87104f466fa3b8116fe383d38de66bffa7c6ea2c89e974afdb2b562091df213e2913228a5f42722152b3042ca3fd1d4f0c7e3670
@@ -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
- value = message.header['log'].instance_variable_get(:@unparsed_value)
15
- value ||= message.header['log'].instance_variable_get(:@value)
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
- # Pass a tenant to your mailer
31
- # mail(to: 'admin@example.com', subject: @post.title, tenant: Tenant.current)
32
- tenant = if message.header['tenant'].present?
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) }
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
- if tenant.present? && defined?(Tenant)
44
- user_klass = (Tenant.engine_user(tenant) rescue nil)
45
- Tenant.as_if(tenant) { log_email(message, fields, user_klass) }
46
- else
47
- log_email(message, fields, 'User'.safe_constantize)
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
@@ -1,3 +1,3 @@
1
1
  module EffectiveLogging
2
- VERSION = '3.1.15'.freeze
2
+ VERSION = '3.2.0'.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.15
4
+ version: 3.2.0
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-12-10 00:00:00.000000000 Z
11
+ date: 2021-12-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails