effective_logging 3.1.11 → 3.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 793f67a081ade00db602453e788de2c7449ddefe2dc3884aa3d2c72046170cdb
-  data.tar.gz: '08531a7570a1258c5709d177fbe7ca3a35448121d4b0bef24da63feba868a35c'
+  metadata.gz: 153343d7143b4f2705fc5a5fefcafc5f6832d128bc5f4f6273247cad0f88fb6a
+  data.tar.gz: d27a82f669877cdd3cce6c37426c03243b1255f03748070874527c921ffdf363
 SHA512:
-  metadata.gz: ccc8e31fb99180d15e8ff5de19443ab8c1a4097650f90de6c4555c2776bb47fa4b0f24e6c2c9224d860c32c9b5250f3bcb13abcd01ffb050c4603c7ae30620ba
-  data.tar.gz: 3ea1c48c81d890b7134b25af34667bb54311e30a04e5737bc4331cd9879d03b76dc993bcbbfdeaf35bcf566b9c8849ad8a8293dcc7553f13fa4ebcb23d027ba3
+  metadata.gz: 0be67e23da9dd7d63c720fd624efcc759c3a361eda73f1c0934c939ceefd555043c7b45fef2285f668e57109c2dcf18a0d470c02b13173d16a6edfa9d90ef3fd
+  data.tar.gz: f0c790dbb208cf6249d82acbf2ab6b4a79f7587e8520b3c98133c56c3708b287219253077ee2f4d6b7581eb767d435ed444384211932a803f2c721a9bcaa5c7c

data/app/datatables/effective_logs_datatable.rb

@@ -20,7 +20,7 @@ class EffectiveLogsDatatable < Effective::Datatable
     col :associated_to_s, label: 'Associated'
 
     col :message do |log|
-      (log.message || '').gsub!("\n", '<br>')
+      (log.message || '').gsub("\n", '<br>')
     end
 
     col :logs_count, visible: false

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,6 +3,7 @@ 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 }
@@ -29,22 +30,21 @@ module EffectiveLogging
       # Pass a tenant to your mailer
       # mail(to: 'admin@example.com', subject: @post.title, tenant: Tenant.current)
       tenant = if message.header['tenant'].present?
-        value = message.header['tenant'].to_s.to_sym # OptionalField, not a String here
+        value = Array(message.header['tenant']).first.to_s.to_sym # OptionalField, not a String here
         message.header['tenant'] = nil
         value
       end
 
-      user_klass = "#{tenant.to_s.classify}::User".safe_constantize
-
       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_klass)
+        log_email(message, fields, 'User'.safe_constantize)
       end
 
       true

data/lib/effective_logging/version.rb

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

metadata

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