effective_logging 3.1.13 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87ac414e0b9beae468f3c40f13ef35bdbb9ad8150ff4ed1bc375860d8ca50ad3
-  data.tar.gz: 9d63d60750990e0e35076efdc426c7ae9265419f3a279f46d388f60c3fbf9f4e
+  metadata.gz: a23b979f527eb3dd28abf6fc248249ed42ea2c89f37812422a55a6d5e77d28d7
+  data.tar.gz: 345eea26ac95e464e3568665ebed017d68dd1d06c62f491e668631d1fdd2c084
 SHA512:
-  metadata.gz: d374f3383c45f423ca451015421ebcc2abbe3384176fd996fb70e05007bed61b136c3d1693969402bb8383ea7a2e3b4176cd4d47eae3bda70b3e1de989daa349
-  data.tar.gz: 943beaaeed181e7bc5c5d51d0b826ff37d0937ee27d669f35ad00e96c7cb4589729338a30a05753af24eae168935a3684bf84d19e053c5ef0277437d27df8eef
+  metadata.gz: 22235f3413f24925720a1f58f38f1a3f8c8aabcc728356275da3679773a9cf5fe65a1e7fa8f6c37d55c3dc5938355e0a499783effc274c77dfba8076cda82155
+  data.tar.gz: 47162b81ab21ff50f614275a08efc9742e4fe7f63ecdc7d1b4f40c443c1f1b3799ee94b46025e808172148b3e4a901b49175482bfa8a18de60959d5443258801

data/app/models/concerns/acts_as_loggable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActsAsLoggable
   extend ActiveSupport::Concern
 

data/app/models/effective/log.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   class Log < ActiveRecord::Base
     self.table_name = EffectiveLogging.logs_table_name.to_s

data/app/models/effective_logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Call EffectiveLog.info or EffectiveLog.success  EffectiveLog.error
 
 class EffectiveLogger

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 EffectiveLogging::Engine.routes.draw do
   scope module: 'effective' do
     # Create is our javascript POST event for EffectiveLogging from JS side

data/lib/effective_logging/email_logger.rb

@@ -3,19 +3,19 @@ module EffectiveLogging
     def self.delivering_email(message)
       return if EffectiveLogging.supressed?
       return unless message.present?
+      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)
@@ -26,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.name) }
+
+      # 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
@@ -64,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.13'.freeze
+  VERSION = '3.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 3.1.13
+  version: 3.2.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-28 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails