effective_logging 3.1.6 → 3.1.7

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: e32cf9d12897b60563d0ad588e0ebea30255433ec2cc7e4479b52f4c890267af
4
- data.tar.gz: 26aebcdf742dd9b3676a5d33fb924f33651b87c156e481fa19480f05ae306f04
3
+ metadata.gz: c41ed5f5f39a3dc24c63161bf07ea763351a611bee78aceb325c5a09126b5f60
4
+ data.tar.gz: fb4bc4163aca3521fcf0bfa23a8253950743fd16696224911d8b431dd1f37cf0
5
5
  SHA512:
6
- metadata.gz: 87671373f8f9b4022aa6a587e49744cd3accb149493b4f48eb52451b0ff9f24e13fdcf38e01349076bf9dcb2e33181723e92213c0c4888424aed6e211af01f0e
7
- data.tar.gz: 7c64f534e0cf14b48b59ab0f03559c324f4f4bf8470e736cb0e30032c9609138f0918647d0c265ce1e87c029a8967c70a3fe39f6c6b93f5fd368a3c83bc2984f
6
+ metadata.gz: 171973db5f9b0be2b3e2e91923df44767ed9cf787c629833370bbfb45ee8d31301edb6e5a2212768825a1742a87bd39a84915045a5badabded05cb66fc86ff1a
7
+ data.tar.gz: b858a335ca8fc2f780fdfb5c056078ea40a0113d6f19078942a179fb54c690cf3ab9f090ec684a94d7e1d4d51cdf51b4622b2af1a3efc0c38ceccd469c340aca
@@ -9,30 +9,30 @@ module EffectiveLogging
9
9
 
10
10
  # Add a log header to your mailer to pass some objects or additional things to EffectiveLogger
11
11
  # mail(to: 'admin@example.com', subject: @post.title, log: @post)
12
+ log = if message.header['log'].present?
13
+ value = message.header['log'].instance_variable_get(:@unparsed_value)
14
+ value ||= message.header['log'].instance_variable_get(:@value)
15
+ message.header['log'] = nil
16
+ value
17
+ end
12
18
 
13
- if message.header['log'].present?
14
- obj = message.header['log'].instance_variable_get(:@unparsed_value)
15
- obj ||= message.header['log'].instance_variable_get(:@value)
16
-
17
- if obj.kind_of?(ActiveRecord::Base)
18
- fields.merge!(associated: obj)
19
- elsif obj.kind_of?(Hash)
20
- fields.merge!(obj)
19
+ if log.present?
20
+ if log.kind_of?(ActiveRecord::Base)
21
+ fields.merge!(associated: log)
22
+ elsif log.kind_of?(Hash)
23
+ fields.merge!(log)
21
24
  else
22
25
  raise('log expected an ActiveRecord object or Hash')
23
26
  end
24
-
25
- # Get rid of the extra header, as it should not be set in the real mail message.
26
- message.header['log'] = nil
27
27
  end
28
28
 
29
29
  # Pass a tenant to your mailer
30
30
  # mail(to: 'admin@example.com', subject: @post.title, tenant: Tenant.current)
31
- tenant = if message.header['tenant'].present?
31
+ tenant = if message.header['tenant'].present? && defined?(Tenant)
32
32
  value = message.header['tenant'].to_s.to_sym # OptionalField, not a String here
33
33
  message.header['tenant'] = nil
34
34
  value
35
- end || (Tenant.current if defined?(Tenant))
35
+ end
36
36
 
37
37
  user_klass = "#{tenant.to_s.classify}::User".safe_constantize
38
38
 
@@ -1,3 +1,3 @@
1
1
  module EffectiveLogging
2
- VERSION = '3.1.6'.freeze
2
+ VERSION = '3.1.7'.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.6
4
+ version: 3.1.7
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-16 00:00:00.000000000 Z
11
+ date: 2021-03-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails