effective_logging 3.1.4 → 3.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58a1c50df31d737cfd39e21a51ed64ab49bd9ec13ede06aaa16e047799abe431
-  data.tar.gz: 28d0db5308e8a8559d05951ac9ee325cdaf3ca3f24ee046ba975f403427ae4ba
+  metadata.gz: a934f053c5eb5652b1be8a1a25f870d451b879e9db308a328cea52d831983c30
+  data.tar.gz: 3fbcedccfc0538a6d5983dcc2974e6d9ab0934c007156e7b5f8eb102542cbbb9
 SHA512:
-  metadata.gz: 7cc96831bcbf17fd3307f0b5f66b5a3e17cee77a753b0dbe635184e2f678cbdb80f4fc5fd962d21ec0ca05c6ee98c353a6eddd7075ca2d3860f41ffbc7cb1445
-  data.tar.gz: ca38d82b8e4b814bc39087b52ebddb78d5e83ced0198799eda8e082b6180fe5ca9ed215f9299e2c02af4d11a227b925f17a5a58c91d69b07675b47a66589b5d6
+  metadata.gz: eae94d3706df77c4efe6f5167c95067ad69b0dce0a836110da37a6140c46124d523ac8d07118aca23513f8524997abb56fd5612089189e6a816bc611651471f9
+  data.tar.gz: 8df803dea152be5e5e36e642499b98c881d356ac30a2a7bf115496964c8abf1dc093767bd7f314bad25287956db132da809f978848fe35e36457d6a6f78728c2

data/app/controllers/effective/logs_controller.rb

@@ -47,7 +47,7 @@ module Effective
     def html_part
       @log = Effective::Log.find(params[:id])
 
-      EffectiveLogging.authorize!(self, :show, @log)
+      EffectiveResources.authorize!(self, :show, @log)
 
       value = @log.details[(params[:key] || '').to_sym].to_s
 

data/lib/effective_logging.rb

@@ -3,8 +3,6 @@ require 'effective_logging/engine'
 require 'effective_logging/version'
 
 module EffectiveLogging
-  mattr_accessor :supressed
-
   def self.config_keys
     [
       :logs_table_name, :layout, :additional_statuses,
@@ -47,6 +45,11 @@ module EffectiveLogging
     Thread.current[:effective_logging_current_user]
   end
 
+  # Used to supress all logging
+  def self.supressed=(value)
+    Thread.current[:effective_logging_supressed] = value
+  end
+
   def self.supressed(&block)
     Thread.current[:effective_logging_supressed] = true
     yield

data/lib/effective_logging/active_storage_logger.rb

@@ -4,6 +4,8 @@ module EffectiveLogging
   module ActiveStorageLogger
 
     def track_downloads
+      return if EffectiveLogging.supressed?
+
       user = current_user if respond_to?(:current_user)
 
       key = decode_verified_key()

data/lib/effective_logging/email_logger.rb

@@ -8,13 +8,22 @@ 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 })
-      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) || {})
-
-        # Get rid of the extra header, as it should not be set in the real mail message.
+      # 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 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
       end
 
       # Pass a tenant to your mailer
@@ -23,7 +32,7 @@ module EffectiveLogging
         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
 
@@ -32,8 +41,8 @@ module EffectiveLogging
 
       fields[:email] = "#{message.header}<hr>#{body}"
 
-      if tenant.present?
-        Tenant.as(tenant) { log_email(message, fields, user_klass) }
+      if tenant.present? && defined?(Tenant)
+        Tenant.as_if(tenant) { log_email(message, fields, user_klass) }
       else
         log_email(message, fields, user_klass)
       end
@@ -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.9'.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.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails