effective_logging 3.1.5 → 3.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fded3d821985ef83c7634533c8160498abfaef98e23976e1cd1e0df89646bc91
-  data.tar.gz: 4a662a9883fb91fdcadf09969e0f826e5e9e5a339d6a150b3b902b05420fb86c
+  metadata.gz: b6f5721d058755a622fc522fc7a7719e733a1bea00fae1d308c28c60d1bfcac4
+  data.tar.gz: da5b0e20de3dfd5d81eaa6d4867e1f905746179e6e09839347658992d1604bd3
 SHA512:
-  metadata.gz: dfbeda5d1e61db271cc68476f00c31a3ada3ab4fcb6726ee5496f4cd2132cabf5e449def28339dde8533eed82cf0be2ac7b1e69d5c54cdf61b6682fa7ab4d5ed
-  data.tar.gz: cab6daf708f644c173844c3b7b01e8a98145c1afe7f8ba6824f248804f59dc4b4a98250b5d363239549be5f789789c249f21f6eb95fc453183c058f1f3c3c631
+  metadata.gz: 5ded4680a0bdc0153e98dc07fcfd5616b179148f153232fdb31526ac971ceee4223105cde4a2f8a564aa9d7fd05a0da3f0fa8a40184e002e04691657c3b47b74
+  data.tar.gz: 4e82583d2ec520e19b55a9e0e064b978de34194fe70dc193f9e7c3ee7f2ed625dc876b239c7e744d069ede9b5f20e0e721858f198aad5595d1ce39445894ed9e

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

@@ -9,21 +9,21 @@ module EffectiveLogging
 
       # 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
+      end
 
-      if message.header['log'].present?
-        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)
+      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
-
-        # Get rid of the extra header, as it should not be set in the real mail message.
-        message.header['log'] = nil
       end
 
       # Pass a tenant to your mailer
@@ -32,17 +32,17 @@ 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
 
-      body = (message.body.try(:parts) || []).find { |part| part.content_type.to_s.downcase.include?('text/html') }
-      body ||= message.body
+      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?
-        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

data/lib/effective_logging/log_page_views.rb

@@ -37,7 +37,7 @@ module EffectiveLogging
       def effective_logging_log_page_view
         return if EffectiveLogging.supressed?
         return if @_effective_logging_skip_log_page_view == true
-        return if (self.class.log_page_views_opts[:skip_namespace] || []).include?(self.class.parent)
+        return if (self.class.log_page_views_opts[:skip_namespace] || []).include?(self.class.ancestors.first)
 
         user = EffectiveLogging.current_user || (current_user if respond_to?(:current_user))
 

data/lib/effective_logging/version.rb

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

metadata

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