acts_as_trackable 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe57cd1a0aa59befd8065f81bc9a7800072c6779775ce3e0f03205128bb09c0b
-  data.tar.gz: 339d18abf2766051d60d2bddba1939b2d6b0fa5ffd07d249508ded87f12224ef
+  metadata.gz: 2a7d07c3e789702cf675c58c1228f05eada87d244a6026eaf2fdc0da02dc8252
+  data.tar.gz: c2e5d21b078655af1c99e3eb2aad715097358d56b270e3966b6d837d74b70585
 SHA512:
-  metadata.gz: 3fa0b497529b74d0cc9a328c777dea23c2b7b946e8c9a18d6b3d93d83cd2d4d678783f295b3cd622e8a0366445a16fdfe5889e81159cc25a45ad85b918ba3938
-  data.tar.gz: 4d83c9daeafa0944bb92fcde1b014bdeff9cff1e898f074f6594901dd8880144dd50ea1cca803779013b8471b47c874562e0c38174507eaec1bd8059dbe904db
+  metadata.gz: 4c931b3512e64bd8b3c81c4cf643c1a18d88590f5ed373a6827dcd46ea7aced9ae5eb5e88735ff31bdd16971630cfc1bd978bbcd24ee551fdbae7b752c0b1ab1
+  data.tar.gz: b957972825b35a55434ff794ca1c77222b46bfc8c51f393c46c15d83fa28f3953f2d02669c284d1af450f99ed771b967ee1b95e4483d0ef411685cc2f5b00388

data/Gemfile.lock

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

data/changelog.md

@@ -1,4 +1,11 @@
 # 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.

data/lib/acts_as_trackable/trackable.rb

@@ -16,14 +16,17 @@ 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]
       )
@@ -37,12 +40,12 @@ module Trackable
       return @created_by if defined?(@created_by)
 
       # Check if created_by is preloaded on the object_activity
-      if object_activity.association(:created_by).loaded?
-        @created_by = object_activity.association(:created_by).target
-      else
-        # Fallback to default association behavior
-        @created_by = object_activity.created_by
-      end
+      @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
@@ -53,12 +56,12 @@ module Trackable
       return @updated_by if defined?(@updated_by)
 
       # Check if updated_by is preloaded on the object_activity
-      if object_activity.association(:updated_by).loaded?
-        @updated_by = object_activity.association(:updated_by).target
-      else
-        # Fallback to default association behavior
-        @updated_by = object_activity.updated_by
-      end
+      @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.3'.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.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Ahmad Keewan
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-10-05 00:00:00.000000000 Z
+date: 2025-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: generator_spec