effective_logging 3.1.15 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 153343d7143b4f2705fc5a5fefcafc5f6832d128bc5f4f6273247cad0f88fb6a
-  data.tar.gz: d27a82f669877cdd3cce6c37426c03243b1255f03748070874527c921ffdf363
+  metadata.gz: 5c2e94f69a8e4af73fc5d6d3239ebd4750e40804b1a2475ecbe98ecda7576488
+  data.tar.gz: b9e68a40d4a189e526c87549b8653de86531963c44b90f135f011facc4333b95
 SHA512:
-  metadata.gz: 0be67e23da9dd7d63c720fd624efcc759c3a361eda73f1c0934c939ceefd555043c7b45fef2285f668e57109c2dcf18a0d470c02b13173d16a6edfa9d90ef3fd
-  data.tar.gz: f0c790dbb208cf6249d82acbf2ab6b4a79f7587e8520b3c98133c56c3708b287219253077ee2f4d6b7581eb767d435ed444384211932a803f2c721a9bcaa5c7c
+  metadata.gz: 54403622ac92045242ae2bc22788a7f350caa4f11d8ec04581d5cfaa0e7fa5e48b35c1b9298021a901893f463c9c499be82d55734679e618892b0272145d37ee
+  data.tar.gz: 3cf771ad58cf9f4d09dce54a87104f466fa3b8116fe383d38de66bffa7c6ea2c89e974afdb2b562091df213e2913228a5f42722152b3042ca3fd1d4f0c7e3670

data/lib/effective_logging/email_logger.rb

@@ -6,17 +6,16 @@ module EffectiveLogging
       return unless ActiveRecord::Base.connection.table_exists?(:logs)
 
       # collect a Hash of arguments used to invoke EffectiveLogger.success
-      fields = { from: message.from.join(','), to: message.to, subject: message.subject, cc: message.cc, bcc: message.bcc }
+      fields = { from: Array(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)
       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
+        message.header['log'].instance_variable_get(:@unparsed_value) ||
+        message.header['log'].instance_variable_get(:@value)
       end
 
+      # If we have a logged object, associate it
       if log.present?
         if log.kind_of?(ActiveRecord::Base)
           fields.merge!(associated: log)
@@ -27,25 +26,24 @@ module EffectiveLogging
         end
       end
 
-      # Pass a tenant to your mailer
-      # mail(to: 'admin@example.com', subject: @post.title, tenant: Tenant.current)
-      tenant = if message.header['tenant'].present?
-        value = Array(message.header['tenant']).first.to_s.to_sym # OptionalField, not a String here
-        message.header['tenant'] = nil
-        value
+      # Read the current app's Tenant if defined
+      tenant = if defined?(Tenant)
+        Tenant.current || raise("Missing tenant in effective_logging email logger")
       end
 
+      # Clean up the header
+      message.header.fields.delete_if { |field| ['tenant', 'log'].include?(field) }
+
+      # Parse the content for logging
       parts = (message.body.try(:parts) || []).map { |part| [part, (part.parts if part.respond_to?(:parts))] }.flatten
       body = parts.find { |part| part.content_type.to_s.downcase.include?('text/html') } || message.body
-
       fields[:email] = "#{message.header}<hr>#{body}"
 
-      if tenant.present? && defined?(Tenant)
-        user_klass = (Tenant.engine_user(tenant) rescue nil)
-        Tenant.as_if(tenant) { log_email(message, fields, user_klass) }
-      else
-        log_email(message, fields, 'User'.safe_constantize)
-      end
+      # Find the user to associate it with
+      user_klass = (tenant ? Tenant.engine_user(tenant) : 'User'.safe_constantize)
+
+      # Log the email
+      log_email(message, fields, user_klass)
 
       true
     end
@@ -65,6 +63,8 @@ module EffectiveLogging
       if tos.blank? && (message.cc.present? || message.bcc.present?)
         ::EffectiveLogger.email("#{message.subject} - multiple recipients", fields)
       end
+
+      true
     end
 
   end

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '3.1.15'.freeze
+  VERSION = '3.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 3.1.15
+  version: 3.2.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails