eager_eye 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecc47488d2632329805448f55dfafc1f6670efd02b04a3dd0464c22ef9a3a4ba
-  data.tar.gz: b37b1be91854abeea6a11d33f28df1ada2a3fb0a427b28a892cb1249c22a7e67
+  metadata.gz: f7ebed3daa9046b0b6bbda1cbb7a9cce182af014ac31334973b4d98a5a1059bc
+  data.tar.gz: 61e220f6737089f52ab495d422cac8b91bf4720d6551c6a42abad7801c7d3c79
 SHA512:
-  metadata.gz: 19adae5e3c000cfa658f5d2615da31c9a702ff031766240b86968d69165445bbbc7b630b5a1596822eaa9683c23db84379127d0c83ed4a59366475b3585972b7
-  data.tar.gz: a87d19f36dcaf9bd7a360b31051ed32da241e7c0b867815e8e17962f4b29bdd43d6983d84981e54a350ba4d415a076a84a8b1abc6852311277f25398c51d6a1a
+  metadata.gz: 198f7d4c064f940a73e2ac41f401869274482f1388f9031f405c89cdeddd3e8e1cf829f8d107c7c3fa1a88fa1a5de07fe44a3d08acf4cb269aa063ebfafae729
+  data.tar.gz: 814ce257bfc024ca1d83b61cddd3df9b56ed877dfb40d9eaf5564c951bebf11f4351d0c4965ff1510509f62aad3f97af8f0e4933b5a23b4daf048b186d5c748b

data/CHANGELOG.md

@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.0.4] - 2025-12-21
+
+### Fixed
+
+- Fixed false positive N+1 warnings when associations are preloaded via `includes`, `preload`, or `eager_load` on a separate line
+  - Now correctly tracks variable assignments with preload methods (e.g., `posts = Post.includes(:author)`)
+  - Supports both local variables and instance variables
+  - Works with all three preload methods: `includes`, `preload`, `eager_load`
+
 ## [1.0.3] - 2025-12-20
 
 ### Fixed

data/README.md

@@ -1,7 +1,7 @@
 # EagerEye
 
 [![CI](https://github.com/hamzagedikkaya/eager_eye/actions/workflows/main.yml/badge.svg)](https://github.com/hamzagedikkaya/eager_eye/actions/workflows/main.yml)
-[![Gem Version](https://img.shields.io/badge/gem-v1.0.3-red.svg)](https://rubygems.org/gems/eager_eye)
+[![Gem Version](https://img.shields.io/badge/gem-v1.0.4-red.svg)](https://rubygems.org/gems/eager_eye)
 [![Coverage](https://img.shields.io/badge/coverage-95%25-brightgreen.svg)](https://github.com/hamzagedikkaya/eager_eye)
 [![Ruby](https://img.shields.io/badge/ruby-%3E%3D%203.1-ruby.svg)](https://www.ruby-lang.org/)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
@@ -99,11 +99,21 @@ posts.each do |post|
   post.comments.count   # Another query for each post!
 end
 
-# Good - Eager load associations
+# Good - Eager load associations (chained)
 posts.includes(:author, :comments).each do |post|
   post.author.name      # No additional query
   post.comments.count   # No additional query
 end
+
+# Good - Eager load on separate line (also detected correctly!)
+@posts = Post.includes(:author)
+@posts.each do |post|
+  post.author.name      # No warning - EagerEye tracks the preload
+end
+
+# Also works with preload and eager_load
+posts = Post.preload(:comments)
+posts.each { |post| post.comments.size }  # No warning
 ```
 
 ### 2. Serializer Nesting (N+1 in serializers)

data/lib/eager_eye/detectors/loop_association.rb

@@ -4,6 +4,7 @@ module EagerEye
   module Detectors
     class LoopAssociation < Base
       ITERATION_METHODS = %i[each map collect select find find_all reject filter filter_map flat_map].freeze
+      PRELOAD_METHODS = %i[includes preload eager_load].freeze
 
       # Common singular association names (belongs_to pattern)
       SINGULAR_ASSOCIATIONS = %w[
@@ -23,12 +24,10 @@ module EagerEye
 
       # Methods that should NOT be treated as associations
       EXCLUDED_METHODS = %i[
-        id to_s to_h to_a to_json to_xml inspect class object_id
-        nil? blank? present? empty? any? none? size count length
-        save save! update update! destroy destroy! delete delete!
-        valid? invalid? errors new? persisted? changed? frozen?
-        name title body content text description value key type status state
-        created_at updated_at deleted_at
+        id to_s to_h to_a to_json to_xml inspect class object_id nil? blank? present? empty?
+        any? none? size count length save save! update update! destroy destroy! delete delete!
+        valid? invalid? errors new? persisted? changed? frozen? name title body content text
+        description value key type status state created_at updated_at deleted_at
       ].freeze
 
       def self.detector_name
@@ -40,6 +39,9 @@ module EagerEye
 
         issues = []
 
+        # Build a map of variable names to their preloaded associations
+        @variable_preloads = build_variable_preloads_map(ast)
+
         traverse_ast(ast) do |node|
           next unless iteration_block?(node)
 
@@ -49,10 +51,14 @@ module EagerEye
           block_body = node.children[2]
           next unless block_body
 
-          # Check if the collection already has includes
+          # Check if the collection already has includes (both chained and from variable assignment)
           collection_node = node.children[0]
           included_associations = extract_included_associations(collection_node)
 
+          # Also check if the collection comes from a variable that was assigned with preloads
+          variable_preloads = extract_variable_preloads(collection_node)
+          included_associations.merge(variable_preloads)
+
           find_association_calls(block_body, block_var, file_path, issues, included_associations)
         end
 
@@ -86,11 +92,11 @@ module EagerEye
         included = Set.new
         return included unless collection_node&.type == :send
 
-        # Traverse through chained method calls to find includes()
+        # Traverse through chained method calls to find includes/preload/eager_load
         current = collection_node
         while current&.type == :send
           method_name = current.children[1]
-          extract_includes_from_method(current, included) if method_name == :includes
+          extract_includes_from_method(current, included) if PRELOAD_METHODS.include?(method_name)
 
           current = current.children[0]
         end
@@ -98,6 +104,52 @@ module EagerEye
         included
       end
 
+      def build_variable_preloads_map(ast)
+        preloads_map = {}
+
+        traverse_ast(ast) do |node|
+          case node.type
+          when :lvasgn
+            record_variable_preloads(preloads_map, :lvar, node)
+          when :ivasgn
+            record_variable_preloads(preloads_map, :ivar, node)
+          end
+        end
+
+        preloads_map
+      end
+
+      def record_variable_preloads(preloads_map, var_type, node)
+        var_name = node.children[0]
+        value_node = node.children[1]
+        return unless value_node
+
+        preloaded = extract_included_associations(value_node)
+        preloads_map[[var_type, var_name]] = preloaded unless preloaded.empty?
+      end
+
+      def extract_variable_preloads(collection_node)
+        preloads = Set.new
+        return preloads unless @variable_preloads
+
+        key = variable_key_for_node(collection_node)
+        merge_preloads_for_key(preloads, key) if key
+
+        preloads
+      end
+
+      def variable_key_for_node(node)
+        case node&.type
+        when :lvar then [:lvar, node.children[0]]
+        when :ivar then [:ivar, node.children[0]]
+        when :send then variable_key_for_node(node.children[0])
+        end
+      end
+
+      def merge_preloads_for_key(preloads, key)
+        preloads.merge(@variable_preloads[key]) if @variable_preloads[key]
+      end
+
       def extract_includes_from_method(method_node, included_set)
         args = method_node.children[2..]
         args&.each do |arg|

data/lib/eager_eye/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EagerEye
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eager_eye
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - hamzagedikkaya
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-12-20 00:00:00.000000000 Z
+date: 2025-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast