effective_logging 3.2.3 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cf124ab295a06273bd2919bb83ac462b8fbfa818e9aa885b1ff28d2d6653c03
-  data.tar.gz: cc4c72088ca283c6dd119674f620451d7836f4c93dc1f47d47da732527a8ea57
+  metadata.gz: bb0a8d92372b22e941fa595e0f50219682d53a54cdb3ec2d4d819ca43140d42e
+  data.tar.gz: e4363f68cbb8b53f3616a2681885920b3574e643ab5244d324137ea94e147c28
 SHA512:
-  metadata.gz: d84b6d8d5994a03d3854f467c13fb3acc4eab9e6cdfb8058d246d4bafe636be1503da248deacf90acb5c41fa8c2d765590dc085776a25cbcfcb7e1d6799bf37a
-  data.tar.gz: 523e669b584b3d7c9beecffb62dfee791a67f4d107b2e9a942f474e17150ab82056dbc081eaa426cb254a29138931e990b3c232eb33e3a4ad907d8ec11d902dd
+  metadata.gz: c1fcd0044cb28eaee999297d9b08b9d491fbf7b59938a3097674303d1283816f350d9eed44efca72b8a7c53abff9d38dc299be25d07e90604854ef523846f335
+  data.tar.gz: e21aa1f2ceaa6c3291c385a8c50e83ac2d164fde593472554a432b2cc458e4740f1fa9f56bd72b089727cf3cee9bc93ae750a017d4edf4229cefb12deb0eba8d

data/app/datatables/effective_log_changes_datatable.rb

@@ -2,7 +2,7 @@
 
 class EffectiveLogChangesDatatable < Effective::Datatable
   datatable do
-    order :updated_at
+    order :id, :desc
 
     col :updated_at, label: 'Date'
     col :id, visible: false
@@ -14,12 +14,12 @@ class EffectiveLogChangesDatatable < Effective::Datatable
     col :associated_to_s, visible: false, label: 'Associated'
 
     col :message, sort: false do |log|
-      (log.message || '').gsub!("\n", '<br>')
+      message = (log.message || '').gsub("\n", '<br>')
 
       if log.associated_id == attributes[:changes_to_id] && log.associated_type == attributes[:changes_to_type]
-        log.message
+        message
       else
-        "#{log.associated_type} #{log.associated_to_s} - #{log.message}"
+        "#{log.associated_type} #{log.associated_to_s} - #{message}"
       end
 
     end.search do |collection, term, column, sql_column|

data/app/datatables/effective_logs_datatable.rb

@@ -1,6 +1,6 @@
 class EffectiveLogsDatatable < Effective::Datatable
   datatable do
-    order :updated_at
+    order :id, :desc
 
     col :updated_at, label: 'Date'
     col :id, visible: false
@@ -15,6 +15,9 @@ class EffectiveLogsDatatable < Effective::Datatable
       col :status, search: { collection: EffectiveLogging.statuses }
     end
 
+    col :changes_to_type, visible: false
+    col :changes_to_id, visible: false
+
     col :associated_type, visible: false
     col :associated_id, visible: false, label: 'Associated Id'
     col :associated_to_s, label: 'Associated'
@@ -35,13 +38,21 @@ class EffectiveLogsDatatable < Effective::Datatable
   # A nil attributes[:log_id] means give me all the top level log entries
   # If we set a log_id then it's for sub logs
   collection do
-    scope = Effective::Log.deep.where(parent_id: attributes[:log_id])
+    scope = Effective::Log.includes(:user).where(parent_id: attributes[:log_id])
 
+    # Older syntax, pass by integer
     if attributes[:for]
       user_ids = Array(attributes[:for])
       scope = scope.where('user_id IN (?) OR (associated_id IN (?) AND associated_type = ?)', user_ids, user_ids, 'User')
     end
 
+    # Newer syntax, pass by object
+    if attributes[:for_id] && attributes[:for_type]
+      for_scope = scope.where(associated_id: attributes[:for_id], associated_type: attributes[:for_type])
+        .or(scope.where(changes_to_id: attributes[:for_id], changes_to_type: attributes[:for_type]))
+        .or(scope.where(user_id: attributes[:for_id], user_type: attributes[:for_type]))
+    end
+
     if attributes[:associated_id] && attributes[:associated_type]
       scope = scope.where(associated_id: attributes[:associated_id], associated_type: attributes[:associated_type])
     end

data/app/models/concerns/acts_as_loggable.rb

@@ -64,8 +64,12 @@ module ActsAsLoggable
     EffectiveRoles.roles_for(value) if attribute == :roles_mask && defined?(EffectiveRoles) && respond_to?(:roles)
   end
 
+  def logs_datatable
+    EffectiveLogsDatatable.new(for: self) if persisted?
+  end
+
   def log_changes_datatable
-    EffectiveLogChangesDatatable.new(changes_to_id: id, changes_to_type: self.class.name) if persisted?
+    EffectiveLogChangesDatatable.new(changes_to: self) if persisted?
   end
 
 end

data/lib/effective_logging/engine.rb

@@ -17,7 +17,7 @@ module EffectiveLogging
     # Automatically Log Emails
     initializer 'effective_logging.emails' do |app|
       if EffectiveLogging.email_enabled == true
-        Rails.application.config.to_prepare do
+        app.config.to_prepare do
           ActionMailer::Base.register_interceptor(EffectiveLogging::EmailLogger)
         end
       end
@@ -25,15 +25,17 @@ module EffectiveLogging
 
     # Include acts_as_loggable concern and allow any ActiveRecord object to call it with log_changes()
     initializer 'effective_logging.active_record' do |app|
-      ActiveSupport.on_load :active_record do
-        ActiveRecord::Base.extend(ActsAsLoggable::Base)
+      app.config.to_prepare do
+        ActiveSupport.on_load :active_record do
+          ActiveRecord::Base.extend(ActsAsLoggable::Base)
+        end
       end
     end
 
     # Log all ActiveStorage downloads
     initializer 'effective_logging.active_storage' do |app|
       if EffectiveLogging.active_storage_enabled == true && defined?(ActiveStorage)
-        Rails.application.config.to_prepare do
+        app.config.to_prepare do
           ActiveStorage::DiskController.include(EffectiveLogging::ActiveStorageLogger)
           ActiveStorage::DiskController.class_eval { after_action(:track_downloads, only: :show) }
         end
@@ -42,7 +44,7 @@ module EffectiveLogging
 
     # Register the log_page_views concern so that it can be called in ActionController or elsewhere
     initializer 'effective_logging.log_changes_action_controller' do |app|
-      Rails.application.config.to_prepare do
+      app.config.to_prepare do
         ActiveSupport.on_load :action_controller do
           ActionController::Base.include(EffectiveLogging::SetCurrentUser::ActionController)
         end
@@ -51,8 +53,10 @@ module EffectiveLogging
 
     # Register the log_page_views concern so that it can be called in ActionController or elsewhere
     initializer 'effective_logging.action_controller' do |app|
-      ActiveSupport.on_load :action_controller do
-        ActionController::Base.extend(EffectiveLogging::LogPageViews::ActionController)
+      app.config.to_prepare do
+        ActiveSupport.on_load :action_controller do
+          ActionController::Base.extend(EffectiveLogging::LogPageViews::ActionController)
+        end
       end
     end
 

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '3.2.3'.freeze
+  VERSION = '3.4.0'.freeze
 end

data/lib/effective_logging.rb

@@ -52,8 +52,9 @@ module EffectiveLogging
 
   def self.supressed(&block)
     Thread.current[:effective_logging_supressed] = true
-    yield
+    value = yield
     Thread.current[:effective_logging_supressed] = nil
+    value
   end
 
   def self.supressed?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.4.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-01 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails