effective_logging 3.1.6 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e32cf9d12897b60563d0ad588e0ebea30255433ec2cc7e4479b52f4c890267af
-  data.tar.gz: 26aebcdf742dd9b3676a5d33fb924f33651b87c156e481fa19480f05ae306f04
+  metadata.gz: c41ed5f5f39a3dc24c63161bf07ea763351a611bee78aceb325c5a09126b5f60
+  data.tar.gz: fb4bc4163aca3521fcf0bfa23a8253950743fd16696224911d8b431dd1f37cf0
 SHA512:
-  metadata.gz: 87671373f8f9b4022aa6a587e49744cd3accb149493b4f48eb52451b0ff9f24e13fdcf38e01349076bf9dcb2e33181723e92213c0c4888424aed6e211af01f0e
-  data.tar.gz: 7c64f534e0cf14b48b59ab0f03559c324f4f4bf8470e736cb0e30032c9609138f0918647d0c265ce1e87c029a8967c70a3fe39f6c6b93f5fd368a3c83bc2984f
+  metadata.gz: 171973db5f9b0be2b3e2e91923df44767ed9cf787c629833370bbfb45ee8d31301edb6e5a2212768825a1742a87bd39a84915045a5badabded05cb66fc86ff1a
+  data.tar.gz: b858a335ca8fc2f780fdfb5c056078ea40a0113d6f19078942a179fb54c690cf3ab9f090ec684a94d7e1d4d51cdf51b4622b2af1a3efc0c38ceccd469c340aca

data/lib/effective_logging/email_logger.rb

@@ -9,30 +9,30 @@ module EffectiveLogging
 
       # Add a log header to your mailer to pass some objects or additional things to EffectiveLogger
       # mail(to: 'admin@example.com', subject: @post.title, log: @post)
+      log = if message.header['log'].present?
+        value = message.header['log'].instance_variable_get(:@unparsed_value)
+        value ||= message.header['log'].instance_variable_get(:@value)
+        message.header['log'] = nil
+        value
+      end
 
-      if message.header['log'].present?
-        obj = message.header['log'].instance_variable_get(:@unparsed_value)
-        obj ||= message.header['log'].instance_variable_get(:@value)
-
-        if obj.kind_of?(ActiveRecord::Base)
-          fields.merge!(associated: obj)
-        elsif obj.kind_of?(Hash)
-          fields.merge!(obj)
+      if log.present?
+        if log.kind_of?(ActiveRecord::Base)
+          fields.merge!(associated: log)
+        elsif log.kind_of?(Hash)
+          fields.merge!(log)
         else
           raise('log expected an ActiveRecord object or Hash')
         end
-
-        # Get rid of the extra header, as it should not be set in the real mail message.
-        message.header['log'] = nil
       end
 
       # Pass a tenant to your mailer
       # mail(to: 'admin@example.com', subject: @post.title, tenant: Tenant.current)
-      tenant = if message.header['tenant'].present?
+      tenant = if message.header['tenant'].present? && defined?(Tenant)
         value = message.header['tenant'].to_s.to_sym # OptionalField, not a String here
         message.header['tenant'] = nil
         value
-      end || (Tenant.current if defined?(Tenant))
+      end
 
       user_klass = "#{tenant.to_s.classify}::User".safe_constantize
 

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '3.1.6'.freeze
+  VERSION = '3.1.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.1.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails