bullematic 0.1.0 → 0.2.0

data/lib/bullematic/notifier.rb

@@ -6,71 +6,166 @@ module Bullematic
     class << self
       #: () -> void
       def setup
-        return unless defined?(Bullet)
+        return if compatible?
 
-        setup_notification_hook
+        Bullematic.configuration&.logger&.warn(
+          "[Bullematic] Disabled: Bullet notification API is unavailable"
+        )
       end
 
-      #: () -> void
-      def process_notifications
-        return unless defined?(Bullet) && Bullet.notification?
+      #: () -> bool
+      def compatible?
+        return false unless defined?(Bullet)
+
+        Bullet.respond_to?(:notification?, true) &&
+          Bullet.respond_to?(:notification_collector, true) &&
+          !defined?(Bullet::Notification::NPlusOneQuery).nil?
+      end
+
+      # @rbs context_id: untyped
+      # @rbs return: void
+      def process_notifications(context_id: nil)
+        return unless compatible? && Bullet.notification?
+
+        context_id ||= Object.new.object_id
+
+        config = Bullematic.configuration
+        if config&.logger && config.debug
+          config.logger.debug "[Bullematic] Processing notifications..."
+        end
+
+        collector = Bullet.send(:notification_collector)
+        return unless collector&.respond_to?(:collection)
 
-        notifications = Bullet.send(:notification_collector)&.collection || {}
+        notifications = collector.collection
 
-        notifications.each_value do |notification_set|
-          notification_set.each do |notification|
-            next unless notification.is_a?(Bullet::Notification::NPlusOneQuery)
+        if config&.logger && config.debug
+          config.logger.debug "[Bullematic] Notifications collection type: #{notifications.class}"
+          config.logger.debug "[Bullematic] Notifications count: #{notifications.respond_to?(:size) ? notifications.size : 'unknown'}"
+        end
+
+        n_plus_one_count = 0
+        unused_eager_loading_count = 0
 
-            process_n_plus_one(notification)
+        case notifications
+        when Hash
+          notifications.each_value do |notification_set|
+            notification_set = [notification_set] unless notification_set.respond_to?(:each)
+            notification_set.each do |notification|
+              type = process_notification(notification, context_id)
+              n_plus_one_count += 1 if type == :n_plus_one
+              unused_eager_loading_count += 1 if type == :unused_eager_loading
+            end
+          end
+        when Enumerable
+          notifications.each do |notification|
+            type = process_notification(notification, context_id)
+            n_plus_one_count += 1 if type == :n_plus_one
+            unused_eager_loading_count += 1 if type == :unused_eager_loading
           end
         end
+
+        if config&.logger && config.debug
+          config.logger.debug "[Bullematic] Processed #{n_plus_one_count} N+1 notifications"
+          config.logger.debug "[Bullematic] Processed #{unused_eager_loading_count} UnusedEagerLoading notifications"
+          config.logger.debug "[Bullematic] Detection queue size: #{Fixer.detection_queue.size}"
+        end
+      rescue StandardError => error
+        begin
+          Bullematic.configuration&.logger&.warn(
+            "[Bullematic] Failed to process Bullet notifications: #{error.message}"
+          )
+        rescue StandardError
+          nil
+        end
       end
 
       private
 
-      #: () -> void
-      def setup_notification_hook
-        Bullet::Notification::NPlusOneQuery.prepend(NotificationHook)
+      # @rbs notification: untyped
+      # @rbs context_id: untyped
+      # @rbs return: Symbol?
+      def process_notification(notification, context_id)
+        if notification.is_a?(Bullet::Notification::NPlusOneQuery)
+          process_n_plus_one(notification, context_id)
+          :n_plus_one
+        elsif defined?(Bullet::Notification::UnusedEagerLoading) &&
+              notification.is_a?(Bullet::Notification::UnusedEagerLoading)
+          process_unused_eager_loading(notification, context_id)
+          :unused_eager_loading
+        end
+      rescue StandardError => error
+        Bullematic.configuration&.logger&.warn(
+          "[Bullematic] Skipped invalid Bullet notification: #{error.message}"
+        )
+        nil
       end
 
       # @rbs notification: untyped
+      # @rbs context_id: untyped
       # @rbs return: void
-      def process_n_plus_one(notification)
+      def process_n_plus_one(notification, context_id)
         detection = Detection.new(
           type: :n_plus_one,
           base_class: notification.base_class,
           associations: notification.associations,
-          call_stack: extract_call_stack(notification)
+          call_stack: extract_call_stack(notification),
+          context_id: context_id
         )
 
-        Fixer.queue(detection) if detection.fixable?
-      end
+        config = Bullematic.configuration
+        if config&.logger && config.debug
+          config.logger.debug "[Bullematic] N+1 Detection created:"
+          config.logger.debug "  Base class: #{notification.base_class}"
+          config.logger.debug "  Associations: #{notification.associations.inspect}"
+          config.logger.debug "  Source file: #{detection.source_file}"
+          config.logger.debug "  Line number: #{detection.line_number}"
+          config.logger.debug "  Method name: #{detection.method_name}"
+          config.logger.debug "  Call stack: #{detection.call_stack.inspect}"
+          config.logger.debug "  Fixable: #{detection.fixable?}"
+          config.logger.debug "  Queue size before: #{Fixer.detection_queue.size}"
+        end
 
-      # @rbs notification: untyped
-      # @rbs return: Array[String]
-      def extract_call_stack(notification)
-        notification.instance_variable_get(:@callers) || caller
+        if detection.fixable?
+          Fixer.queue(detection)
+          if config&.logger && config.debug
+            config.logger.debug "  Queue size after: #{Fixer.detection_queue.size}"
+          end
+        end
       end
-    end
 
-    module NotificationHook
-      # @rbs base_class: untyped
-      # @rbs associations: untyped
-      # @rbs path: untyped
+      # @rbs notification: untyped
+      # @rbs context_id: untyped
       # @rbs return: void
-      def initialize(base_class, associations, path = nil)
-        super
-        return unless Bullematic.enabled?
+      def process_unused_eager_loading(notification, context_id)
+        config = Bullematic.configuration
+        return unless config
 
-        detection = Detection.new(
-          type: :n_plus_one,
-          base_class: base_class,
-          associations: associations,
-          call_stack: caller
-        )
+        if EvidenceStore.recording?
+          detection = Detection.new(
+            type: :unused_eager_loading,
+            base_class: notification.base_class,
+            associations: notification.associations,
+            call_stack: extract_call_stack(notification),
+            context_id: context_id
+          )
+          Fixer.queue(detection) if detection.fixable?
+        end
+
+        if config.logger && config.debug
+          config.logger.debug "[Bullematic] UnusedEagerLoading detected:"
+          config.logger.debug "  Base class: #{notification.base_class}"
+          config.logger.debug "  Unused associations: #{notification.associations.inspect}"
+        end
+      end
 
-        Fixer.queue(detection) if detection.fixable?
+      # @rbs notification: untyped
+      # @rbs return: Array[String]
+      def extract_call_stack(notification)
+        callers = notification.instance_variable_get(:@callers)
+        callers.is_a?(Array) ? callers.map(&:to_s) : []
       end
     end
+
   end
 end

data/lib/bullematic/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Bullematic
-  VERSION = "0.1.0" #: String
+  VERSION = "0.2.0" #: String
 end

data/lib/bullematic.rb

@@ -1,10 +1,13 @@
 # rbs_inline: enabled
 # frozen_string_literal: true
 
+require "bullet"
+
 require_relative "bullematic/version"
 require_relative "bullematic/configuration"
 require_relative "bullematic/logger"
 require_relative "bullematic/detection"
+require_relative "bullematic/evidence_store"
 require_relative "bullematic/ast/parser"
 require_relative "bullematic/ast/finder"
 require_relative "bullematic/ast/rewriter"
@@ -19,9 +22,15 @@ module Bullematic
   # @rbs @configuration: Configuration?
 
   class << self
-    # @rbs!
-    #   attr_accessor configuration: Configuration?
-    attr_accessor :configuration
+    #: () -> Configuration?
+    def configuration
+      @configuration
+    end
+
+    #: (Configuration?) -> Configuration?
+    def configuration=(configuration)
+      @configuration = configuration
+    end
 
     #: () { (Configuration) -> void } -> void
     def configure
@@ -46,7 +55,6 @@ module Bullematic
     def reset!
       @configuration = nil
       Fixer.clear
-      AST::Parser.clear_cache
     end
   end
 end

data/sig/generated/bullematic/ast/finder.rbs

@@ -5,7 +5,7 @@ module Bullematic
     class Finder
       QUERY_METHODS: Array[Symbol]
 
-      type query_location = { node: untyped, location: untyped, receiver: untyped, method_name: Symbol }
+      type query_location = { node: untyped, location: untyped, receiver: untyped, method_name: Symbol, target_name: Symbol? }
 
       class QueryLocation < Struct[untyped]
         attr_accessor node(): untyped
@@ -16,8 +16,10 @@ module Bullematic
 
         attr_accessor method_name(): untyped
 
-        def self.new: (?node: untyped, ?location: untyped, ?receiver: untyped, ?method_name: untyped) -> instance
-                    | ({ ?node: untyped, ?location: untyped, ?receiver: untyped, ?method_name: untyped }) -> instance
+        attr_accessor target_name(): untyped
+
+        def self.new: (?node: untyped, ?location: untyped, ?receiver: untyped, ?method_name: untyped, ?target_name: untyped) -> instance
+                    | ({ ?node: untyped, ?location: untyped, ?receiver: untyped, ?method_name: untyped, ?target_name: untyped }) -> instance
       end
 
       @parse_result: untyped
@@ -35,9 +37,17 @@ module Bullematic
       # @rbs return: Array[QueryLocation]
       def find_model_queries: (String model_class_name, ?line_number: Integer?) -> Array[QueryLocation]
 
+      # @rbs model_class_name: String
       # @rbs line_number: Integer
-      # @rbs return: QueryLocation?
-      def find_query_at_line: (Integer line_number) -> QueryLocation?
+      # @rbs associations: Array[Symbol]
+      # @rbs return: Array[QueryLocation]
+      def find_model_queries_for_variables_at_line: (String model_class_name, Integer line_number, Array[Symbol] associations) -> Array[QueryLocation]
+
+      # @rbs parent_association: Symbol
+      # @rbs child_associations: Array[Symbol]
+      # @rbs line_number: Integer?
+      # @rbs return: bool
+      def nested_association?: (Symbol parent_association, Array[Symbol] child_associations, Integer? line_number) -> bool
 
       private
 
@@ -54,12 +64,6 @@ module Bullematic
       # @rbs return: void
       def mark_descendant_calls: (untyped node, Set[Integer] skip_nodes) -> void
 
-      # @rbs node: untyped
-      # @rbs queries: Array[QueryLocation]
-      # @rbs target_line: Integer?
-      # @rbs return: void
-      def visit_all_queries: (untyped node, Array[QueryLocation] queries, Integer? target_line) -> void
-
       # @rbs node: untyped
       # @rbs queries: Array[QueryLocation]
       # @rbs model_class_name: String
@@ -74,6 +78,37 @@ module Bullematic
       # @rbs return: bool
       def check_assignment_node: (untyped node, Array[QueryLocation] queries, String model_class_name, Integer? target_line) -> bool
 
+      # @rbs node: untyped
+      # @rbs line_number: Integer
+      # @rbs associations: Array[Symbol]
+      # @rbs return: Array[Symbol]
+      def association_receiver_names_at_line: (untyped node, Integer line_number, Array[Symbol] associations) -> Array[Symbol]
+
+      # @rbs node: untyped
+      # @rbs line_number: Integer
+      # @rbs names: Array[Symbol]
+      # @rbs return: void
+      def add_block_receiver_names: (untyped node, Integer line_number, Array[Symbol] names) -> void
+
+      # @rbs node: untyped
+      # @rbs name: Symbol
+      # @rbs line_number: Integer
+      # @rbs return: bool
+      def block_parameter_at_line?: (untyped node, Symbol name, Integer line_number) -> bool
+
+      # @rbs node: untyped
+      # @rbs line_number: Integer
+      # @rbs return: untyped
+      def method_scope_at_line: (untyped node, Integer line_number) -> untyped
+
+      # @rbs node: untyped
+      # @rbs name: Symbol
+      # @rbs start_line: Integer
+      # @rbs end_line: Integer
+      # @rbs scope: untyped
+      # @rbs return: bool
+      def variable_written_between?: (untyped node, Symbol name, Integer start_line, Integer end_line, untyped scope) -> bool
+
       # @rbs node: untyped
       # @rbs return: untyped
       def find_root_receiver: (untyped node) -> untyped
@@ -86,6 +121,30 @@ module Bullematic
       # @rbs method_name: Symbol
       # @rbs return: bool
       def query_method?: (Symbol method_name) -> bool
+
+      # @rbs node: untyped
+      # @rbs parent_association: Symbol
+      # @rbs child_associations: Array[Symbol]
+      # @rbs line_number: Integer
+      # @rbs return: bool
+      def nested_association_in_node?: (untyped node, Symbol parent_association, Array[Symbol] child_associations, Integer line_number) -> bool
+
+      # @rbs node: untyped
+      # @rbs method_name: Symbol
+      # @rbs names: Array[Symbol]
+      # @rbs line_number: Integer
+      # @rbs return: bool
+      def call_on_variable_at_line?: (untyped node, Symbol method_name, Array[Symbol] names, Integer line_number) -> bool
+
+      # @rbs node: untyped
+      # @rbs method_name: Symbol
+      # @rbs return: bool
+      def receiver_calls?: (untyped node, Symbol method_name) -> bool
+
+      # @rbs node: untyped
+      # @rbs names: Array[Symbol]
+      # @rbs return: bool
+      def variable_written?: (untyped node, Array[Symbol] names) -> bool
     end
   end
 end

data/sig/generated/bullematic/ast/parser.rbs

@@ -7,12 +7,6 @@ module Bullematic
 
       @filepath: String?
 
-      # : () -> Hash[String, untyped]
-      def self.cache: () -> Hash[String, untyped]
-
-      # : () -> void
-      def self.clear_cache: () -> void
-
       # @rbs filepath: String
       # @rbs return: untyped
       def self.parse_file: (String filepath) -> untyped

data/sig/generated/bullematic/ast/rewriter.rbs

@@ -20,10 +20,10 @@ module Bullematic
                     | ({ ?type: untyped, ?offset: untyped, ?byte_length: untyped, ?new_text: untyped, ?associations: untyped }) -> instance
       end
 
-      @source: String
-
       @modifications: Array[Modification]
 
+      @source: String
+
       # @rbs!
       #   attr_reader source: String
       #   attr_reader modifications: Array[Modification]
@@ -39,9 +39,9 @@ module Bullematic
       def initialize: (String source) -> void
 
       # @rbs query_location: Finder::QueryLocation
-      # @rbs associations: Array[Symbol]
-      # @rbs return: void
-      def add_includes: (Finder::QueryLocation query_location, Array[Symbol] associations) -> void
+      # @rbs associations: Array[untyped]
+      # @rbs return: Symbol
+      def add_includes: (Finder::QueryLocation query_location, Array[untyped] associations) -> Symbol
 
       # : () -> String
       def rewrite: () -> String
@@ -57,21 +57,38 @@ module Bullematic
       def find_chain_insert_point: (untyped node) -> Integer
 
       # @rbs query_location: Finder::QueryLocation
-      # @rbs associations: Array[Symbol]
+      # @rbs associations: Array[untyped]
       # @rbs return: bool
-      def already_has_includes?: (Finder::QueryLocation query_location, Array[Symbol] associations) -> bool
+      def already_has_includes?: (Finder::QueryLocation query_location, Array[untyped] associations) -> bool
 
       # @rbs node: untyped
       # @rbs return: Array[Symbol]
       def find_existing_includes: (untyped node) -> Array[Symbol]
 
       # @rbs call_node: untyped
-      # @rbs return: Array[Symbol]
-      def extract_associations_from_call: (untyped call_node) -> Array[Symbol]
+      # @rbs return: Array[untyped]
+      def extract_associations_from_call: (untyped call_node) -> Array[untyped]
+
+      # @rbs node: untyped
+      # @rbs associations: Array[untyped]
+      # @rbs return: void
+      def collect_literal_associations: (untyped node, Array[untyped] associations) -> void
+
+      # @rbs node: untyped
+      # @rbs return: untyped
+      def literal_association: (untyped node) -> untyped
 
-      # @rbs associations: Array[Symbol]
+      # @rbs associations: Array[untyped]
       # @rbs return: String
-      def format_associations: (Array[Symbol] associations) -> String
+      def format_associations: (Array[untyped] associations) -> String
+
+      # @rbs association: untyped
+      # @rbs braces: bool
+      # @rbs return: String
+      def format_association: (untyped association, ?bool braces) -> String
+
+      # : () -> void
+      def validate_modifications!: () -> void
     end
   end
 end

data/sig/generated/bullematic/cli.rbs

@@ -0,0 +1,56 @@
+# Generated from lib/bullematic/cli.rb with RBS::Inline
+
+module Bullematic
+  class CLI
+    # @rbs argv: Array[String]
+    # @rbs return: Integer
+    def self.run: (Array[String] argv) -> Integer
+
+    # @rbs argv: Array[String]
+    # @rbs return: Array[String]
+    private def self.command_args: (Array[String] argv) -> Array[String]
+
+    # @rbs command: Array[String]
+    # @rbs return: Integer
+    private def self.record: (Array[String] command) -> Integer
+
+    # @rbs dry_run: bool
+    # @rbs return: Integer
+    private def self.apply: (dry_run: bool) -> Integer
+
+    # @rbs argv: Array[String]
+    # @rbs return: Integer
+    private def self.fix: (Array[String] argv) -> Integer
+
+    # @rbs command: Array[String]
+    # @rbs return: Integer
+    private def self.verify: (Array[String] command) -> Integer
+
+    # : () -> Integer
+    private def self.doctor: () -> Integer
+
+    # @rbs command: Array[String]
+    # @rbs evidence_path: String
+    # @rbs return: Integer
+    private def self.run_command: (Array[String] command, String evidence_path) -> Integer
+
+    # : () -> void
+    private def self.load_application: () -> void
+
+    # @rbs dry_run: bool
+    # @rbs return: void
+    private def self.configure: (bool dry_run) -> void
+
+    # @rbs evidence_path: String
+    # @rbs command: Array[String]
+    # @rbs return: void
+    private def self.write_command: (String evidence_path, Array[String] command) -> void
+
+    # @rbs evidence_path: String
+    # @rbs return: Array[String]
+    private def self.read_command: (String evidence_path) -> Array[String]
+
+    # : (String, Integer) { (File) -> untyped } -> untyped
+    private def self.open_command: (String, Integer) { (File) -> untyped } -> untyped
+  end
+end

data/sig/generated/bullematic/configuration.rbs

@@ -2,26 +2,28 @@
 
 module Bullematic
   class Configuration
+    VALID_FIX_STRATEGIES: Array[Symbol]
+
     # @rbs skip: to avoid empty array warning
     DEFAULTS: untyped
 
-    @enabled: bool
+    @logger: Logger?
 
-    @auto_fix: bool
+    @debug: bool
 
-    @target_paths: Array[String]
+    @fix_strategy: Symbol
 
-    @skip_paths: Array[String]
+    @backup: bool
 
     @dry_run: bool
 
-    @backup: bool
+    @skip_paths: Array[String]
 
-    @fix_strategy: Symbol
+    @target_paths: Array[String]
 
-    @debug: bool
+    @auto_fix: bool
 
-    @logger: Logger?
+    @enabled: bool
 
     # @rbs!
     #   attr_accessor enabled: bool
@@ -95,18 +97,6 @@ module Bullematic
     #   attr_writer logger: Logger?
     attr_accessor backup: untyped
 
-    # @rbs!
-    #   attr_accessor enabled: bool
-    #   attr_accessor auto_fix: bool
-    #   attr_accessor target_paths: Array[String]
-    #   attr_accessor skip_paths: Array[String]
-    #   attr_accessor dry_run: bool
-    #   attr_accessor backup: bool
-    #   attr_accessor fix_strategy: Symbol
-    #   attr_accessor debug: bool
-    #   attr_writer logger: Logger?
-    attr_accessor fix_strategy: untyped
-
     # @rbs!
     #   attr_accessor enabled: bool
     #   attr_accessor auto_fix: bool
@@ -119,6 +109,8 @@ module Bullematic
     #   attr_writer logger: Logger?
     attr_accessor debug: untyped
 
+    attr_reader fix_strategy: untyped
+
     attr_writer logger: untyped
 
     # : () -> void
@@ -127,6 +119,10 @@ module Bullematic
     # : () -> Logger
     def logger: () -> Logger
 
+    # @rbs strategy: Symbol
+    # @rbs return: Symbol
+    def fix_strategy=: (Symbol strategy) -> Symbol
+
     private
 
     # : () -> Logger