effective_logging 4.4.2 → 4.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7bac7403fbf98334aec2088cfa01217d5dd884774afa6109e3f811f655c2c69
-  data.tar.gz: 790a9e516abce2ce182e7f9bea7490bf3558fc5fde95bd9e45a43c683c9a076b
+  metadata.gz: 3f638d885c609b3d6692821281b2a53da5ec21a4a99d71f7ec4295967b77c8dd
+  data.tar.gz: ab44aff2629b633235b9ce5468d9543c95ca6a79fb48fba14876f1fd09d5358e
 SHA512:
-  metadata.gz: 58a3dff33d97a45fddeedde616ba8ac8ed0ad3daa4d02bd9281ef861da648a100852e2fc3958ab54afd67dc174345727206ad66bad097fdb37eed7df9ba61137
-  data.tar.gz: 933ec6e95c0bf5b025b4984c2bfa0cacf6593aa7fe2ab578b8f3eeb82fc5f302cf5f1e458aa05fba7e9ea7474477a1b5ef463ccdafa7227cf4c3f54509b37a1b
+  metadata.gz: 5df219f0750704939d8aa6dec5c732c0df6a7e9120739fa2ffd5222a74d4012c63305309a761979942d5aa61a9fb46b2fda325dc9817203027e8caa9011866b0
+  data.tar.gz: 3b0552d07840260c40613a321c590aa811cce6c37ca7e0be16e9ff3ec1eee9fe000c8047a55f08b0dd0f9291652aa33fcda0cdce6df2d08f4ec27537300b4f86

data/app/datatables/effective_logs_datatable.rb

@@ -26,7 +26,13 @@ class EffectiveLogsDatatable < Effective::Datatable
 
     col :associated_type, visible: false, sort: false
     col :associated_id, visible: false, label: 'Associated Id', sort: false
-    col :associated_to_s, label: 'Associated'
+    col :associated_to_s, label: 'Item'
+
+    col(:associated, visible: false).search do |collection, term, column, sql_column|
+      collection.where("associated_to_s ILIKE ?", "%#{term}%")
+    end.sort do |collection, direction, column, sql_column|
+      collection.order(associated_to_s: direction)
+    end
 
     col :message, sort: false do |log|
       (log.message || '').gsub("\n", '<br>')

data/app/models/effective_logger.rb

@@ -17,22 +17,24 @@ class EffectiveLogger
     end
 
     if options[:request].present? && options[:request].respond_to?(:referrer)
-      request = options.delete(:request)
+      request = options[:request]
 
       options[:ip] ||= request.ip
       options[:referrer] ||= request.referrer
       options[:user_agent] ||= request.user_agent
     end
 
+    details = options.except(:request, :user_id, :user_type, :user, :associated_id, :associated_type, :associated, :associated_to_s)
+
     log = EffectiveLogging.Log.new(
       message: message,
       status: status,
-      user_id: options.delete(:user_id),
-      user_type: options.delete(:user_type),
-      user: options.delete(:user),
-      associated: options.delete(:associated),
-      associated_to_s: options.delete(:associated_to_s),
-      details: options
+      user_id: options[:user_id],
+      user_type: options[:user_type],
+      user: options[:user],
+      associated: options[:associated],
+      associated_to_s: options[:associated_to_s],
+      details: details
     )
 
     if log.associated.present?

data/config/effective_logging.rb

@@ -17,6 +17,20 @@ EffectiveLogging.setup do |config|
   # Log all active storage downloads
   config.active_storage_enabled = true
 
+  # Only log active storage downloads for these attachment record types
+  # config.active_storage_only = []
+
+  # Don't log active storage downloads for these attachment record types
+  # config.active_storage_except = [
+  #   'ActionText::RichText'
+  #   'Effective::BannerAd',
+  #   'Effective::CarouselItem', 
+  #   'Effective::PageBanner', 
+  #   'Effective::PageSection', 
+  #   'Effective::Permalink',
+  #   'Effective::Post',
+  # ]
+
   # Log all sent emails
   config.email_enabled = true
 

data/lib/effective_logging/active_storage_logger.rb

@@ -3,29 +3,49 @@
 module EffectiveLogging
   module ActiveStorageLogger
 
-    def track_downloads
-      return if EffectiveLogging.supressed?
+    def track_active_storage_download
+      @blob || set_download_blob()
+      track_active_storage_blob(@blob)
+    end
 
-      user = current_user if respond_to?(:current_user)
+    def track_active_storage_redirect
+      @blob || set_blob()
+      track_active_storage_blob(@blob)
+    end
 
-      key = decode_verified_key()
-      return unless key.present?
-      return if (key[:content_type] || '').starts_with?('image')
+    private
 
-      blob = ActiveStorage::Blob.where(key: key[:key]).first
+    def track_active_storage_blob(blob)
+      return if EffectiveLogging.supressed?
       return unless blob.present?
 
+      onlies = EffectiveLogging.active_storage_onlies
+      excepts = EffectiveLogging.active_storage_excepts
+
       blob.attachments.each do |attachment|
         next if attachment.name == 'embeds'
-        next if attachment.record_type == 'ActionText::RichText'
+        next if attachment.record_type.blank?
+
+        # Process except and only
+        next if excepts.present? && excepts.any? { |type| attachment.record_type.start_with?(type) || attachment.record_type.end_with?(type) }
+        next if onlies.present? && !onlies.any? { |type| attachment.record_type.start_with?(type) || attachment.record_type.end_with?(type) }
 
         associated = attachment.record
         filename = blob.filename.to_s
         message = [associated.to_s, filename.to_s].uniq.join(' ')
+        user = current_user
 
         EffectiveLogger.download(message, associated: associated, associated_to_s: filename, filename: filename, user: user)
       end
     end
 
+    def set_download_blob
+      @blob ||= ActiveStorage::Blob.where(key: decode_verified_key().try(:dig, :key)).first
+    end
+
+    def current_user
+      (defined?(Tenant) ? send("current_#{Tenant.current}_user") : super)
+    end
+
   end
 end

data/lib/effective_logging/engine.rb

@@ -38,8 +38,21 @@ module EffectiveLogging
     initializer 'effective_logging.active_storage' do |app|
       if EffectiveLogging.active_storage_enabled == true && defined?(ActiveStorage)
         app.config.to_prepare do
-          ActiveStorage::DiskController.include(EffectiveLogging::ActiveStorageLogger)
-          ActiveStorage::DiskController.class_eval { after_action(:track_downloads, only: :show) }
+          ActiveStorage::BaseController.class_eval do
+            include ActiveStorageLogger
+          end
+
+          ActiveStorage::DiskController.class_eval do
+            after_action :track_active_storage_download, only: [:show]
+          end
+
+          ActiveStorage::Blobs::RedirectController.class_eval do
+            after_action :track_active_storage_redirect, only: [:show]
+          end
+
+          ActiveStorage::Representations::RedirectController.class_eval do
+            after_action :track_active_storage_redirect, only: [:show]
+          end
         end
       end
     end

data/lib/effective_logging/log_page_views.rb

@@ -42,14 +42,15 @@ module EffectiveLogging
         user = EffectiveLogging.current_user || (current_user if respond_to?(:current_user))
 
         if self.class.log_page_views_opts[:details] == false
-          ::EffectiveLogger.view("#{request.request_method} #{request.path}", user: user)
+          ::EffectiveLogger.view("#{request.request_method} #{request.path}", user: user, associated: try(:resource))
         else
           ::EffectiveLogger.view(
             "#{request.request_method} #{request.path}",
             user: user,
             format: (request.format.to_s == 'text/html' ? nil : request.format.to_s),
             params: request.filtered_parameters.reject { |k, v| (k == 'controller' || k == 'action') },
-            request: request
+            request: request,
+            associated: try(:resource)
           )
         end
       end

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '4.4.2'.freeze
+  VERSION = '4.4.3'.freeze
 end

data/lib/effective_logging.rb

@@ -7,7 +7,8 @@ module EffectiveLogging
     [
       :logs_table_name, :tracks_table_name, :layout, :additional_statuses,
       :log_class_name,
-      :active_storage_enabled, :email_enabled, :sign_in_enabled, :sign_out_enabled
+      :active_storage_enabled, :active_storage_only, :active_storage_except, 
+      :email_enabled, :sign_in_enabled, :sign_out_enabled
     ]
   end
 
@@ -66,4 +67,17 @@ module EffectiveLogging
     Thread.current[:effective_logging_supressed] == true
   end
 
+  # For ActiveStorageLogger
+  def self.active_storage_onlies
+    onlies = Array(active_storage_only) - [nil, '', ' ']
+    raise("effective_logging.active_storage_only should be an Array of Strings") if onlies.present? && !onlies.all? { |type| type.kind_of?(String) }
+    onlies
+  end
+
+  def self.active_storage_excepts
+    excepts = Array(active_storage_except) - [nil, '', ' ']
+    raise("effective_logging.active_storage_except should be an Array of Strings") if excepts.present? && !excepts.all? { |type| type.kind_of?(String) }
+    excepts
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 4.4.2
+  version: 4.4.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-29 00:00:00.000000000 Z
+date: 2025-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails