effective_logging 3.1.4 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58a1c50df31d737cfd39e21a51ed64ab49bd9ec13ede06aaa16e047799abe431
-  data.tar.gz: 28d0db5308e8a8559d05951ac9ee325cdaf3ca3f24ee046ba975f403427ae4ba
+  metadata.gz: fded3d821985ef83c7634533c8160498abfaef98e23976e1cd1e0df89646bc91
+  data.tar.gz: 4a662a9883fb91fdcadf09969e0f826e5e9e5a339d6a150b3b902b05420fb86c
 SHA512:
-  metadata.gz: 7cc96831bcbf17fd3307f0b5f66b5a3e17cee77a753b0dbe635184e2f678cbdb80f4fc5fd962d21ec0ca05c6ee98c353a6eddd7075ca2d3860f41ffbc7cb1445
-  data.tar.gz: ca38d82b8e4b814bc39087b52ebddb78d5e83ced0198799eda8e082b6180fe5ca9ed215f9299e2c02af4d11a227b925f17a5a58c91d69b07675b47a66589b5d6
+  metadata.gz: dfbeda5d1e61db271cc68476f00c31a3ada3ab4fcb6726ee5496f4cd2132cabf5e449def28339dde8533eed82cf0be2ac7b1e69d5c54cdf61b6682fa7ab4d5ed
+  data.tar.gz: cab6daf708f644c173844c3b7b01e8a98145c1afe7f8ba6824f248804f59dc4b4a98250b5d363239549be5f789789c249f21f6eb95fc453183c058f1f3c3c631

data/lib/effective_logging/email_logger.rb

@@ -8,10 +8,19 @@ module EffectiveLogging
       fields = { from: message.from.join(','), to: message.to, subject: message.subject, cc: message.cc, bcc: message.bcc }
 
       # 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: @post })
+      # mail(to: 'admin@example.com', subject: @post.title, log: @post)
+
       if message.header['log'].present?
-        # This is a bit sketchy, but gives access to the object in Rails 4.2 anyway
-        fields.merge!(message.header['log'].instance_variable_get(:@value) || {})
+        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)
+        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
@@ -49,7 +58,7 @@ module EffectiveLogging
       tos.each do |to|
         user = (user_klass.where(email: to.downcase).first if user_klass.present?)
 
-        user_fields = fields.merge(to: to, user: user, associated: user)
+        user_fields = fields.merge(to: to, user: user)
         ::EffectiveLogger.email("#{message.subject} - #{tos.join(', ')}", user_fields)
       end
 

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '3.1.4'.freeze
+  VERSION = '3.1.5'.freeze
 end

metadata

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