eager_eye 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c1781e66205a83557a9751b64f19c44d70f90efbd04423d63e847d4e4a06c6e
-  data.tar.gz: eac8bb2e4a8b86017804b2c9662074ece08346a5303b5760bdba6dc7d939b3d9
+  metadata.gz: 251f5ec97df15b5f85cbea7b1be3b7c95961f6ed133f4a69b721d76ebd7ad40e
+  data.tar.gz: ce06033abc65e06113af34789bf17a97badcfe8076675a45bf5ee59f5e19af79
 SHA512:
-  metadata.gz: 9a9fec60ec826824ef8b331f95f33918265f51ea027b43f60852656a0b1420622b9405a78f0fdc4ba3e32c9a30159deb5104fe7432b35fdf9bdea8e5325aa120
-  data.tar.gz: fe4032176ada8b10c84ee56c48a8ee60aadbf7c6547e98e0f36def0226a119a7383e6258a060a197b4b6276667fd65f30707dbaeda155ff9410551b2111167ed
+  metadata.gz: 9f24578b9ec1a121b1698e3d53d78ec570b12b3f5092289ca42adc421c89cd1a94566e5de6ff45309803c0be2b8bafc76b1ea3e9f78599da32aef87503c51c38
+  data.tar.gz: 3f9dd3a3a3d4116840d8de2392e06afa78486ae049505f8706a7e5c9303d25e7efcf0ba7522b256bb9e504c1d8b709d93e06e92b1d0391cfd0e3bafdb7e00536

data/lib/eager_eye/detectors/custom_method_query.rb

@@ -21,6 +21,9 @@ module EagerEye
         maximum
       ].freeze
 
+      # Array-only methods that should not be flagged when collection is clearly an array
+      ARRAY_METHODS = %i[first last take].freeze
+
       ITERATION_METHODS = %i[each map select find_all reject collect detect find_index flat_map].freeze
 
       def self.detector_name
@@ -33,8 +36,9 @@ module EagerEye
         @issues = []
         @file_path = file_path
 
-        find_iteration_blocks(ast) do |block_body, block_var|
-          check_block_for_query_methods(block_body, block_var)
+        find_iteration_blocks(ast) do |block_body, block_var, collection|
+          is_array_collection = collection_is_array?(collection)
+          check_block_for_query_methods(block_body, block_var, is_array_collection)
         end
 
         @issues
@@ -48,7 +52,8 @@ module EagerEye
         if iteration_block?(node)
           block_var = extract_block_variable(node)
           block_body = extract_block_body(node)
-          yield(block_body, block_var) if block_var && block_body
+          collection = extract_collection(node)
+          yield(block_body, block_var, collection) if block_var && block_body
         end
 
         node.children.each do |child|
@@ -66,26 +71,40 @@ module EagerEye
         ITERATION_METHODS.include?(method_name)
       end
 
-      def check_block_for_query_methods(node, block_var)
+      def check_block_for_query_methods(node, block_var, is_array_collection = false) # rubocop:disable Style/OptionalBooleanParameter
         return unless node.is_a?(Parser::AST::Node)
 
-        add_issue(node) if query_chain_on_association?(node, block_var)
+        add_issue(node) if query_chain_on_association?(node, block_var, is_array_collection)
 
         node.children.each do |child|
-          check_block_for_query_methods(child, block_var)
+          check_block_for_query_methods(child, block_var, is_array_collection)
         end
       end
 
-      def query_chain_on_association?(node, block_var)
+      def query_chain_on_association?(node, block_var, is_array_collection = false) # rubocop:disable Style/OptionalBooleanParameter
         return false unless node.type == :send
 
         method_name = node.children[1]
         return false unless QUERY_METHODS.include?(method_name)
 
+        # Skip array-only methods when collection is clearly an array (.map result)
+        # AND the receiver is only the block variable (not chained)
+        if is_array_collection && ARRAY_METHODS.include?(method_name) &&
+           receiver_is_only_block_var?(node.children[0], block_var)
+          return false
+        end
+
         receiver = node.children[0]
         receiver_chain_starts_with?(receiver, block_var)
       end
 
+      def receiver_is_only_block_var?(node, block_var)
+        # Returns true only if receiver is EXACTLY the block variable, not a chain
+        node.is_a?(Parser::AST::Node) &&
+          node.type == :lvar &&
+          node.children[0] == block_var
+      end
+
       def receiver_chain_starts_with?(node, block_var)
         return false unless node.is_a?(Parser::AST::Node)
 
@@ -113,6 +132,31 @@ module EagerEye
         block_node.children[2]
       end
 
+      def extract_collection(block_node)
+        # Extract the collection being iterated on
+        # For: collection.each { |item| ... }
+        # Returns: the send node representing the collection method call
+        block_node.children[0]
+      end
+
+      def collection_is_array?(collection_node)
+        return false unless collection_node.is_a?(Parser::AST::Node)
+
+        case collection_node.type
+        when :array
+          # Literal array: [1, 2, 3].each { |item| ... }
+          true
+        when :send
+          # Only consider these methods as definitely returning arrays when iterating
+          method_name = collection_node.children[1]
+          # map, select, collect, etc. on anything return arrays for iteration
+          %i[map select collect flat_map to_a uniq compact].include?(method_name)
+        else
+          # Block variable itself won't tell us if it's an array
+          false
+        end
+      end
+
       def add_issue(node)
         method_name = node.children[1]
         association_chain = reconstruct_chain(node.children[0])

data/lib/eager_eye/detectors/loop_association.rb

@@ -49,7 +49,11 @@ module EagerEye
           block_body = node.children[2]
           next unless block_body
 
-          find_association_calls(block_body, block_var, file_path, issues)
+          # Check if the collection already has includes
+          collection_node = node.children[0]
+          included_associations = extract_included_associations(collection_node)
+
+          find_association_calls(block_body, block_var, file_path, issues, included_associations)
         end
 
         issues
@@ -78,7 +82,44 @@ module EagerEye
         first_arg.children[0]
       end
 
-      def find_association_calls(node, block_var, file_path, issues)
+      def extract_included_associations(collection_node)
+        included = Set.new
+        return included unless collection_node&.type == :send
+
+        # Traverse through chained method calls to find includes()
+        current = collection_node
+        while current&.type == :send
+          method_name = current.children[1]
+          extract_includes_from_method(current, included) if method_name == :includes
+
+          current = current.children[0]
+        end
+
+        included
+      end
+
+      def extract_includes_from_method(method_node, included_set)
+        args = method_node.children[2..]
+        args&.each do |arg|
+          case arg&.type
+          when :sym
+            # includes(:product)
+            included_set.add(arg.children[0])
+          when :hash
+            # includes(product: :manufacturer)
+            extract_from_hash(arg, included_set)
+          end
+        end
+      end
+
+      def extract_from_hash(hash_node, included_set)
+        hash_node.children.each do |pair|
+          key = pair.children[0]
+          included_set.add(key.children[0]) if key&.type == :sym
+        end
+      end
+
+      def find_association_calls(node, block_var, file_path, issues, included_associations = Set.new)
         reported_associations = Set.new
 
         traverse_ast(node) do |child|
@@ -91,6 +132,9 @@ module EagerEye
           next unless direct_call_on_block_var?(receiver, block_var)
           next unless likely_association?(method_name)
 
+          # Skip if association is already included
+          next if included_associations.include?(method_name)
+
           # Avoid duplicate reports for same association on same line
           report_key = "#{child.loc.line}:#{method_name}"
           next if reported_associations.include?(report_key)

data/lib/eager_eye/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eager_eye
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - hamzagedikkaya