effective_logging 4.1.2 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e070e874fc63fecb6464d0c4648cc15e09e88fbcc7a30110654070dfcfadac9
-  data.tar.gz: e0cca60b349ad639ecbc98eb7f51262baa266e23fa79c6c05250db55d38c1ea3
+  metadata.gz: bd43bfe19f220a08425b7f93f3160ef4d2fa4107e6eb8c7d00d7e92dff2ede90
+  data.tar.gz: 3d0a977bcff9579e325523aa03472b107d028f2076197e947913b6b4d64df4c7
 SHA512:
-  metadata.gz: 94ed4840cca24c47b64024f652ec7e2374fee2d2b83c393b801e623b92472c903e93aa743f8573dbe7677c615d5e393a614080602c5900738b587eb9535c6654
-  data.tar.gz: 063274f9e2bff0309335b557ca3777aa8612cc03ac8860a8b9a8dc15535ddaa89b43535a9f0687d3f53f534a92071c42ce72ca23861809381b4dca90e6e93003
+  metadata.gz: 004220be5d784fce7fb075b9eac6a6f344d4416bfe1c9d64af6edb895b6ed1802e62cca9b52364746a2eba6b9b7b3a4418d3508f912954048d520a0e8106a5a1
+  data.tar.gz: d02dee405d04dd01b1bb135ecf90b7241e2feae917c911ad5785e8474eb04b5821a02e2478924c64a8b8458984c3691129bbd0265a326fef1f16350487f06ee7

data/README.md

@@ -318,8 +318,7 @@ We can also use a similar method to create a datatable of logs for just one user
 When initialized with :for, the logs are scoped to any log where this id matches the User or Associated column.
 
 ```ruby
-EffectiveLogsDatatable.new(for: @user.id)
-EffectiveLogsDatatable.new(for: [1, 2, 3])  # Users with ID 1, 2 and 3
+EffectiveLogsDatatable.new(for: @user)
 ```
 
 ### Upgrade from 2.0

data/app/controllers/effective/logs_controller.rb

@@ -43,7 +43,7 @@ module Effective
     # This is the User index event
     def index
       EffectiveResources.authorize!(self, :index, resource_scope.new(user: current_user, user_id: current_user.id))
-      @datatable = EffectiveLogsDatatable.new(self, for: current_user.id)
+      @datatable = EffectiveLogsDatatable.new(self, for: current_user)
     end
 
     def html_part

data/app/datatables/effective_logs_datatable.rb

@@ -44,24 +44,19 @@ class EffectiveLogsDatatable < Effective::Datatable
   collection do
     scope = EffectiveLogging.Log.deep.all
 
-    # 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]
       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]))
+    elsif attributes[:for] # Older syntax, pass by integer
+      user_ids = Array(attributes[:for])
+      scope = scope.where('user_id IN (?) OR (associated_id IN (?) AND associated_type = ?)', user_ids, user_ids, 'User')
     end
 
     if attributes[:associated_id] && attributes[:associated_type]
       scope = scope.where(associated_id: attributes[:associated_id], associated_type: attributes[:associated_type])
-    end
-
-    if attributes[:associated]
+    elsif attributes[:associated]
       scope = scope.where(associated: attributes[:associated])
     end
 

data/app/models/concerns/acts_as_loggable.rb

@@ -20,7 +20,7 @@ module ActsAsLoggable
   end
 
   included do
-    has_many :logged_changes, -> { EffectiveLogging.Log.order(:id).where(status: EffectiveLogging.log_changes_status) }, as: :changes_to
+    has_many :logged_changes, -> { where(status: EffectiveLogging.log_changes_status).order(:id) }, as: :changes_to, class_name: 'Effective::Log'
 
     log_changes_options = {
       to: @acts_as_loggable_options[:to],
@@ -35,15 +35,15 @@ module ActsAsLoggable
 
     self.send(:define_method, :log_changes_options) { log_changes_options }
 
-    after_create(unless: -> { EffectiveLogging.supressed? }) do
+    after_create(if: -> { log_changes? }, unless: -> { EffectiveLogging.supressed? }) do
       ::EffectiveLogging::ActiveRecordLogger.new(self, log_changes_options).created!
     end
 
-    after_destroy(unless: -> { EffectiveLogging.supressed? }) do
+    after_destroy(if: -> { log_changes? }, unless: -> { EffectiveLogging.supressed? }) do
       ::EffectiveLogging::ActiveRecordLogger.new(self, log_changes_options).destroyed!
     end
 
-    after_update(unless: -> { EffectiveLogging.supressed? }) do
+    after_update(if: -> { log_changes? }, unless: -> { EffectiveLogging.supressed? }) do
       ::EffectiveLogging::ActiveRecordLogger.new(self, log_changes_options).updated!
     end
   end
@@ -54,6 +54,11 @@ module ActsAsLoggable
 
   # Regular instance methods
 
+  # Disable logging of changes for this resource
+  def log_changes?
+    true # Can be overridden to suppress logging
+  end
+
   # Format the title of this attribute. Return nil to use the default attribute.titleize
   def log_changes_formatted_attribute(attribute)
     'Roles' if attribute == :roles_mask && defined?(EffectiveRoles) && respond_to?(:roles)

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '4.1.2'.freeze
+  VERSION = '4.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.2.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-01 00:00:00.000000000 Z
+date: 2024-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails