effective_logging 3.1.1 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1dc7b7f4024ac664b211eba56892cd43828ec911f37361b91f1ac6496f87fb7
-  data.tar.gz: 512c990d5a8dddfcc665e28ff7dd6ef66302ce4f855d68d87fa89af44ef79ed4
+  metadata.gz: e32cf9d12897b60563d0ad588e0ebea30255433ec2cc7e4479b52f4c890267af
+  data.tar.gz: 26aebcdf742dd9b3676a5d33fb924f33651b87c156e481fa19480f05ae306f04
 SHA512:
-  metadata.gz: 612a1bed2cc27c80ee726a023a079e0a5a2dcf80b7d390e07bb9a692bf60da43c974d754bc29f99a17bc95d589e18457aa52261564da19e509947b47046a8f3c
-  data.tar.gz: 798375484126e11a779eaffbdf1c53e26a5530f701440b4190660948b52ee9c728e1e7f300684b088a636d4b9df1d08087b71dc3477a434a23c2422b576b27c7
+  metadata.gz: 87671373f8f9b4022aa6a587e49744cd3accb149493b4f48eb52451b0ff9f24e13fdcf38e01349076bf9dcb2e33181723e92213c0c4888424aed6e211af01f0e
+  data.tar.gz: 7c64f534e0cf14b48b59ab0f03559c324f4f4bf8470e736cb0e30032c9609138f0918647d0c265ce1e87c029a8967c70a3fe39f6c6b93f5fd368a3c83bc2984f

data/app/controllers/admin/logs_controller.rb

@@ -10,11 +10,5 @@ module Admin
       layout(config.kind_of?(Hash) ? config[:admin] : config)
     end
 
-    def index
-      EffectiveResources.authorize!(self, :index, Effective::Log)
-      @datatable = EffectiveLogsDatatable.new(self)
-      @page_title = 'Logs'
-    end
-
   end
 end

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/config/routes.rb

@@ -1,5 +1,5 @@
 EffectiveLogging::Engine.routes.draw do
-  scope :module => 'effective' do
+  scope module: 'effective' do
     # Create is our javascript POST event for EffectiveLogging from JS side
     # The show and index routes are for user specific logs
     resources :logs, only: [:create, :index, :show] do

data/lib/effective_logging/active_record_logger.rb

@@ -33,6 +33,9 @@ module EffectiveLogging
       return true if changes.blank? # If you just click save and change nothing, don't log it.
 
       message = (['Updated'] + changes.map do |attribute, (before, after)|
+        before = "HTML content (#{before.length})" if before.kind_of?(String) && before.include?('<div')
+        after = "HTML content (#{after.length})" if after.kind_of?(String) && after.include?('<div')
+
         "#{attribute}: #{before.presence || BLANK} &rarr; #{after.presence || BLANK}"
       end).join("\n")
 

data/lib/effective_logging/active_storage_logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EffectiveLogging
   module ActiveStorageLogger
 
@@ -6,16 +8,20 @@ module EffectiveLogging
 
       key = decode_verified_key()
       return unless key.present?
+      return if (key[:content_type] || '').starts_with?('image')
 
       blob = ActiveStorage::Blob.where(key: key[:key]).first
       return unless blob.present?
 
       blob.attachments.each do |attachment|
+        next if attachment.name == 'embeds'
+        next if attachment.record_type == 'ActionText::RichText'
+
         associated = attachment.record
         filename = blob.filename.to_s
         message = [associated.to_s, filename.to_s].uniq.join(' ')
 
-        EffectiveLogger.download(message, associated: associated, filename: filename, user: user)
+        EffectiveLogger.download(message, associated: associated, associated_to_s: filename, filename: filename, user: user)
       end
     end
 

data/lib/effective_logging/email_logger.rb

@@ -8,10 +8,19 @@ 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 })
+      # mail(to: 'admin@example.com', subject: @post.title, log: @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) || {})
+        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)
+        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
@@ -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.1'.freeze
+  VERSION = '3.1.6'.freeze
 end

metadata

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