acts_as_trackable 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba1f9f6e084d46878fcc2c2a9449c44599571ded79f960778109215bd2e6e974
-  data.tar.gz: d5e4eb2b78cd9b4e72887e71cc074e6ebcf7864a1650c409aef1545c3c5fa2cf
+  metadata.gz: 2a7d07c3e789702cf675c58c1228f05eada87d244a6026eaf2fdc0da02dc8252
+  data.tar.gz: c2e5d21b078655af1c99e3eb2aad715097358d56b270e3966b6d837d74b70585
 SHA512:
-  metadata.gz: '08711912e524e757253b670f3dc7f47c412c8df79f01339b3a7c7b91e47b89a92226134a9d88a1e5fd35e15b5a38a63fbb67511532a348358682327348dcf3e5'
-  data.tar.gz: ee9f1b3365713c4eadd7fdc7c4fd690e18c7a3a79f8398fc4dd84a0a046a646a9246f6fd6abc035e27771795554783e18dd5ba3c8efd7e74a9def988dd430397
+  metadata.gz: 4c931b3512e64bd8b3c81c4cf643c1a18d88590f5ed373a6827dcd46ea7aced9ae5eb5e88735ff31bdd16971630cfc1bd978bbcd24ee551fdbae7b752c0b1ab1
+  data.tar.gz: b957972825b35a55434ff794ca1c77222b46bfc8c51f393c46c15d83fa28f3953f2d02669c284d1af450f99ed771b967ee1b95e4483d0ef411685cc2f5b00388

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    acts_as_trackable (0.4.2)
+    acts_as_trackable (0.4.4)
 
 GEM
   remote: https://rubygems.org/

data/changelog.md

@@ -1,4 +1,20 @@
 # acts_as_trackable Changelog
+## Version: 0.4.4
+  ### Patch
+    - Critical Fix: Properly cache `nil` when `object_activity` is preloaded but doesn't exist (old records).
+    - Prevents N+1 queries when accessing `created_by`/`updated_by` on records without `object_activity`.
+    - Previously, the fallback query would execute for each record even when using `includes(object_activity: [:created_by, :updated_by])`.
+    - Now correctly returns `nil` without database queries when association is preloaded and empty.
+
+## Version: 0.4.3
+  ### Patch
+    - Performance Fix: Fixed N+1 query issue when accessing `created_by` and `updated_by` after eager loading.
+
+    - The `created_by` and `updated_by` methods now properly respect preloaded associations.
+    - When using `includes(object_activity: [:created_by, :updated_by])` or `Preloader.new(records: records, associations: { object_activity: %i[created_by updated_by] })`, the methods now use the preloaded data instead of triggering additional database queries.
+
+    - Added comprehensive test coverage for N+1 query prevention scenarios.
+    - Migration Note: This is a non-breaking change. Existing code will continue to work, but performance will improve when using nested eager loading.
 ## Version: 0.4.2
   ### Patch
     - Upgraded dependencies to patch CVE-2025-55193.

data/lib/acts_as_trackable/trackable.rb

@@ -16,21 +16,53 @@ module Trackable
       if association(:object_activity).loaded?
         loaded = association(:object_activity).target
 
-        if loaded&.object_id == id &&
-          [self.class.name, self.class.base_class.name].include?(loaded.object_type)
-          @object_activity = loaded
+        # Cache the loaded value (even if nil) to avoid fallback query
+        if loaded.nil?
+          return @object_activity = nil
+        elsif loaded[:object_id] == id &&
+              [self.class.name, self.class.base_class.name].include?(loaded.object_type)
+          return @object_activity = loaded
         end
       end
 
       # Fallback to DB query if not preloaded or not matched
-      @object_activity ||= ObjectActivity.find_by(
+      @object_activity = ObjectActivity.find_by(
         object_id: id,
         object_type: [self.class.name, self.class.base_class.name]
       )
     end
 
+    # Custom created_by method that respects preloading
+    define_method :created_by do
+      return nil unless object_activity
 
-    delegate :created_by, :updated_by, to: :object_activity, allow_nil: true
+      # Return cached value if already set
+      return @created_by if defined?(@created_by)
+
+      # Check if created_by is preloaded on the object_activity
+      @created_by = if object_activity.association(:created_by).loaded?
+                      object_activity.association(:created_by).target
+                    else
+                      # Fallback to default association behavior
+                      object_activity.created_by
+                    end
+    end
+
+    # Custom updated_by method that respects preloading
+    define_method :updated_by do
+      return nil unless object_activity
+
+      # Return cached value if already set
+      return @updated_by if defined?(@updated_by)
+
+      # Check if updated_by is preloaded on the object_activity
+      @updated_by = if object_activity.association(:updated_by).loaded?
+                      object_activity.association(:updated_by).target
+                    else
+                      # Fallback to default association behavior
+                      object_activity.updated_by
+                    end
+    end
 
     after_commit :log_object_activity, on: %i[create update], if: -> { modifier.present? }
 

data/lib/acts_as_trackable/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTrackable
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.4.4'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_trackable
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors:
 - Ahmad Keewan
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-25 00:00:00.000000000 Z
+date: 2025-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: generator_spec