effective_logging 3.1.0 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91790ca464dd429fb345fcbef0d15cbdebefdbd56f8685aaa8206653a7cd4350
-  data.tar.gz: fccd38fd9967c82487436ed7a25154bc7b84a4fc30c129691ce532683a951717
+  metadata.gz: fded3d821985ef83c7634533c8160498abfaef98e23976e1cd1e0df89646bc91
+  data.tar.gz: 4a662a9883fb91fdcadf09969e0f826e5e9e5a339d6a150b3b902b05420fb86c
 SHA512:
-  metadata.gz: 57df8caf9cf1a316d2a4591f28ca072b08fa2fae0da1bf71cdd72474971e16637d60337eeb9ce903bfe35033c1fcf68fb7ed76e022aab47a8a7503289fd8cbbc
-  data.tar.gz: 0b6106eade70761e9d71602846c5000308533de2058a6f8097e8aec22439155e5e55c83fafeeaf6a7e9c9339ec19cdd17cb15b372e3b3d79a1dc623eaf8b8bdf
+  metadata.gz: dfbeda5d1e61db271cc68476f00c31a3ada3ab4fcb6726ee5496f4cd2132cabf5e449def28339dde8533eed82cf0be2ac7b1e69d5c54cdf61b6682fa7ab4d5ed
+  data.tar.gz: cab6daf708f644c173844c3b7b01e8a98145c1afe7f8ba6824f248804f59dc4b4a98250b5d363239549be5f789789c249f21f6eb95fc453183c058f1f3c3c631

data/app/controllers/admin/logs_controller.rb

@@ -10,25 +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
-
-    def show
-      @log = Effective::Log.includes(:logs).find(params[:id])
-      EffectiveResources.authorize!(self, :show, @log)
-
-      @log.next_log = Effective::Log.order(:id).where(parent_id: @log.parent_id).where('id > ?', @log.id).first
-      @log.prev_log = Effective::Log.order(:id).where(parent_id: @log.parent_id).where('id < ?', @log.id).last
-
-      @page_title = "Log ##{@log.to_param}"
-
-      if @log.logs.present?
-        @log.datatable = EffectiveLogsDatatable.new(self, log_id: @log.id)
-      end
-
-    end
   end
 end

data/app/controllers/effective/logs_controller.rb

@@ -41,26 +41,9 @@ module Effective
     # This is the User index event
     def index
       EffectiveResources.authorize!(self, :index, Effective::Log.new(user_id: current_user.id))
-
       @datatable = EffectiveLogsDatatable.new(self, user_id: current_user.id)
     end
 
-    # This is the User show event
-    def show
-      @log = Effective::Log.includes(:logs).find(params[:id])
-
-      EffectiveLogging.authorize!(self, :show, @log)
-
-      @log.next_log = Effective::Log.unscoped.order(:id).where(parent_id: @log.parent_id).where('id > ?', @log.id).first
-      @log.prev_log = Effective::Log.unscoped.order(:id).where(parent_id: @log.parent_id).where('id < ?', @log.id).last
-
-      @page_title = "Log ##{@log.to_param}"
-
-      if @log.logs.present?
-        @log.datatable = EffectiveLogsDatatable.new(self, log_id: @log.id)
-      end
-    end
-
     def html_part
       @log = Effective::Log.find(params[:id])
 

data/app/datatables/effective_log_changes_datatable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class EffectiveLogChangesDatatable < Effective::Datatable
   datatable do
     order :updated_at
@@ -5,19 +7,19 @@ class EffectiveLogChangesDatatable < Effective::Datatable
     col :updated_at, label: 'Date'
     col :id, visible: false
 
-    col :user, sort: false
+    col :user, search: :string, sort: false
 
     col :associated_type, visible: false
-    col :associated_id, visible: false
-    col :associated_to_s, visible: false
+    col :associated_id, visible: false, label: 'Associated Id'
+    col :associated_to_s, visible: false, label: 'Associated'
 
     col :message, sort: false do |log|
-      message = log.message.gsub("\n", '<br>')
+      (log.message || '').gsub!("\n", '<br>')
 
       if log.associated_id == attributes[:changes_to_id] && log.associated_type == attributes[:changes_to_type]
-        message
+        log.message
       else
-        "#{log.associated_type} #{log.associated_to_s} - #{message}"
+        "#{log.associated_type} #{log.associated_to_s} - #{log.message}"
       end
 
     end.search do |collection, term, column, sql_column|
@@ -29,9 +31,7 @@ class EffectiveLogChangesDatatable < Effective::Datatable
       tableize_hash(log.details)
     end
 
-    unless attributes[:actions] == false
-      actions_col partial: 'admin/logs/actions', partial_as: :log
-    end
+    actions_col
   end
 
   # A nil attributes[:log_id] means give me all the top level log entries

data/app/datatables/effective_logs_datatable.rb

@@ -8,16 +8,16 @@ class EffectiveLogsDatatable < Effective::Datatable
     if attributes[:user] == false
       # Do not include
     else
-      col :user, search: :string
+      col :user, search: :string, sort: false
     end
 
     unless attributes[:status] == false
       col :status, search: { collection: EffectiveLogging.statuses }
     end
 
-    col :associated_type, search: { as: :string }
-    col :associated_id, search: { as: :integer }, visible: false, label: 'Associated Id'
-    col :associated_to_s, search: { as: :string }, label: 'Associated'
+    col :associated_type, visible: false
+    col :associated_id, visible: false, label: 'Associated Id'
+    col :associated_to_s, label: 'Associated'
 
     col :message do |log|
       log.message.gsub("\n", '<br>')
@@ -29,9 +29,7 @@ class EffectiveLogsDatatable < Effective::Datatable
       tableize_hash(log.details.except(:email))
     end
 
-    unless attributes[:actions] == false
-      actions_col partial: 'admin/logs/actions', partial_as: :log
-    end
+    actions_col
   end
 
   # A nil attributes[:log_id] means give me all the top level log entries

data/app/models/effective/log.rb

@@ -2,11 +2,6 @@ module Effective
   class Log < ActiveRecord::Base
     self.table_name = EffectiveLogging.logs_table_name.to_s
 
-    # These 3 attr_accessors are set on the controller #show actions
-    attr_accessor :datatable
-    attr_accessor :next_log
-    attr_accessor :prev_log
-
     # Self-Referencing relationship
     belongs_to :parent, class_name: 'Effective::Log', counter_cache: true, optional: true
     has_many :logs, class_name: 'Effective::Log', foreign_key: :parent_id
@@ -58,6 +53,18 @@ module Effective
       self[:details] || {}
     end
 
+    def next_log
+      Log.order(id: :asc).where(parent_id: parent_id).where('id > ?', id).first
+    end
+
+    def prev_log
+      Log.order(id: :desc).where(parent_id: parent_id).where('id < ?', id).first
+    end
+
+    def child_logs_datatable
+      EffectiveLogsDatatable.new(log_id: id)
+    end
+
     # Dynamically add logging methods based on the defined statuses
     # EffectiveLogging.info 'my message'
     (EffectiveLogging.statuses || []).each do |status|

data/app/views/effective/logs/_log.html.haml

@@ -8,18 +8,22 @@
         %p= log.message.to_s.gsub("\n", '<br>').html_safe
 
       .col-md-4.text-right
-        - if log.prev_log
-          = link_to 'Prev', request.fullpath.sub('/' + log.to_param, '/' + log.prev_log.to_param), class: 'btn btn-primary'
+        - prev_log = log.prev_log
+        - next_log = log.next_log
 
-        - if log.next_log
-          = link_to 'Next', request.fullpath.sub('/' + log.to_param, '/' + log.next_log.to_param), class: 'btn btn-primary'
+        - if prev_log.present?
+          = link_to 'Prev', request.fullpath.sub('/' + log.to_param, '/' + prev_log.to_param), class: 'btn btn-primary'
+
+        - if next_log.present?
+          = link_to 'Next', request.fullpath.sub('/' + log.to_param, '/' + next_log.to_param), class: 'btn btn-primary'
 
   .panel-body.card-body
     .row
       .col-md-6
         %p
           - status_class = bootstrap_class_for_status(log.status)
-          %span{:class => (defined?(EffectiveBootstrap) ? "badge badge-#{status_class}" : "label label-#{status_class}")}= log.status
+          %span{class: (defined?(EffectiveBootstrap) ? "badge badge-#{status_class}" : "label label-#{status_class}")}= log.status
+
           = log.created_at.strftime("%F %H:%M:%S")
           = '(' + time_ago_in_words(log.created_at) + ' ago)'
 
@@ -28,7 +32,8 @@
           %p
             %strong User:
             = (log.user.to_s.starts_with?('#<User:0x') ? (log.user.email rescue log.user) : log.user)
-        - if (log.associated.present? rescue false)
+
+        - if log.associated_id.present? && log.associated_type.present? && (log.associated.present? rescue false)
           %p
             %strong Associated:
             - if log.associated.to_s.starts_with?('#<')
@@ -47,6 +52,4 @@
     - if log.logs.present?
       %hr
       %p This log contains #{log.logs_count} additional sub entries:
-
-      - unless log.datatable.nil?
-        = render_datatable(log.datatable)
+      = render_datatable(log.child_logs_datatable)

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.0'.freeze
+  VERSION = '3.1.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-18 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -98,10 +98,8 @@ files:
 - app/datatables/effective_logs_datatable.rb
 - app/helpers/effective_logging_helper.rb
 - app/models/concerns/acts_as_loggable.rb
-- app/models/effective/access_denied.rb
 - app/models/effective/log.rb
 - app/models/effective_logger.rb
-- app/views/admin/logs/_actions.html.haml
 - app/views/admin/logs/index.html.haml
 - app/views/admin/logs/show.html.haml
 - app/views/effective/logs/_log.html.haml

data/app/models/effective/access_denied.rb

@@ -1,17 +0,0 @@
-unless defined?(Effective::AccessDenied)
-  module Effective
-    class AccessDenied < StandardError
-      attr_reader :action, :subject
-
-      def initialize(message = nil, action = nil, subject = nil)
-        @message = message
-        @action = action
-        @subject = subject
-      end
-
-      def to_s
-        @message || I18n.t(:'unauthorized.default', :default => 'Access Denied')
-      end
-    end
-  end
-end

data/app/views/admin/logs/_actions.html.haml

@@ -1,8 +0,0 @@
-- show_path = (datatable.admin_namespace? ? effective_logging.admin_log_path(log) : effective_logging.log_path(log))
-
-- if defined?(EffectiveBootstrap)
-  = dropdown(variation: :dropleft) do
-    = dropdown_link_to 'View', show_path
-- else
-  = link_to show_path, title: 'View' do
-    %span.glyphicon.glyphicon-eye-open