and_one 0.1.0 → 0.3.0

data/lib/and_one/dev_ui.rb

@@ -5,12 +5,10 @@ module AndOne
   # session. Mount at `/__and_one` in development to get a mini dashboard
   # for N+1 queries with fix suggestions.
   #
-  # Requires `aggregate_mode = true` to collect detections across requests.
-  #
   # Usage (manual):
   #   app.middleware.use AndOne::DevUI
   #
-  # Or it's auto-mounted by the Railtie in development when aggregate_mode is on.
+  # Or it's auto-mounted by the Railtie in development.
   class DevUI
     MOUNT_PATH = "/__and_one"
 
@@ -28,8 +26,8 @@ module AndOne
 
     private
 
-    def serve_dashboard(env)
-      entries = AndOne.aggregate_mode ? AndOne.aggregate.detections : {}
+    def serve_dashboard(_env)
+      entries = AndOne.aggregate.detections
 
       html = render_html(entries)
       [200, { "content-type" => "text/html; charset=utf-8" }, [html]]
@@ -37,49 +35,48 @@ module AndOne
 
     def render_html(entries)
       rows = if entries.empty?
-        <<~HTML
-          <tr>
-            <td colspan="6" class="empty">
-              No N+1 queries detected yet.
-              #{AndOne.aggregate_mode ? "" : "<br><strong>Tip:</strong> Set <code>AndOne.aggregate_mode = true</code> to collect detections across requests."}
-            </td>
-          </tr>
-        HTML
-      else
-        entries.map.with_index do |(fp, entry), i|
-          det = entry.detection
-          suggestion = begin
-            AndOne::AssociationResolver.resolve(det, det.raw_caller_strings)
-          rescue
-            nil
-          end
-          fix = suggestion&.actionable? ? h(suggestion.fix_hint) : "—"
-          strict_hint = suggestion&.strict_loading_hint ? h(suggestion.strict_loading_hint) : ""
-          loading_hint = suggestion&.loading_strategy_hint ? h(suggestion.loading_strategy_hint) : ""
+               <<~HTML
+                 <tr>
+                   <td colspan="6" class="empty">
+                     No N+1 queries detected yet.
+                   </td>
+                 </tr>
+               HTML
+             else
+               entries.map.with_index do |(fp, entry), i|
+                 det = entry.detection
+                 suggestion = begin
+                   AndOne::AssociationResolver.resolve(det, det.raw_caller_strings)
+                 rescue StandardError
+                   nil
+                 end
+                 fix = suggestion&.actionable? ? h(suggestion.fix_hint) : "—"
+                 strict_hint = suggestion&.strict_loading_hint ? h(suggestion.strict_loading_hint) : ""
+                 loading_hint = suggestion&.loading_strategy_hint ? h(suggestion.loading_strategy_hint) : ""
 
-          origin = det.origin_frame ? format_frame(det.origin_frame) : "—"
-          fix_loc = det.fix_location ? format_frame(det.fix_location) : "—"
+                 origin = det.origin_frame ? format_frame(det.origin_frame) : "—"
+                 fix_loc = det.fix_location ? format_frame(det.fix_location) : "—"
 
-          <<~HTML
-            <tr>
-              <td>#{i + 1}</td>
-              <td><code>#{h(det.table_name || 'unknown')}</code></td>
-              <td>#{entry.occurrences}</td>
-              <td><code class="sql">#{h(truncate(det.sample_query, 200))}</code></td>
-              <td>
-                <div class="origin">#{h(origin)}</div>
-                <div class="fix-loc">⇒ #{h(fix_loc)}</div>
-              </td>
-              <td>
-                <div class="suggestion">#{fix}</div>
-                #{"<div class=\"strategy\">#{loading_hint}</div>" unless loading_hint.empty?}
-                #{"<div class=\"strict\">#{strict_hint}</div>" unless strict_hint.empty?}
-                <div class="fingerprint">#{h(fp)}</div>
-              </td>
-            </tr>
-          HTML
-        end.join
-      end
+                 <<~HTML
+                   <tr>
+                     <td>#{i + 1}</td>
+                     <td><code>#{h(det.table_name || "unknown")}</code></td>
+                     <td>#{entry.occurrences}</td>
+                     <td><code class="sql">#{h(truncate(det.sample_query, 200))}</code></td>
+                     <td>
+                       <div class="origin">#{h(origin)}</div>
+                       <div class="fix-loc">⇒ #{h(fix_loc)}</div>
+                     </td>
+                     <td>
+                       <div class="suggestion">#{fix}</div>
+                       #{"<div class=\"strategy\">#{loading_hint}</div>" unless loading_hint.empty?}
+                       #{"<div class=\"strict\">#{strict_hint}</div>" unless strict_hint.empty?}
+                       <div class="fingerprint">#{h(fp)}</div>
+                     </td>
+                   </tr>
+                 HTML
+               end.join
+             end
 
       <<~HTML
         <!DOCTYPE html>
@@ -114,7 +111,7 @@ module AndOne
         </head>
         <body>
           <h1>🏀 AndOne — N+1 Dashboard</h1>
-          <p class="subtitle">#{entries.size} unique N+1 pattern#{'s' if entries.size != 1} detected this session</p>
+          <p class="subtitle">#{entries.size} unique N+1 pattern#{"s" if entries.size != 1} detected this session</p>
           <div class="actions">
             <a href="#{MOUNT_PATH}">↻ Refresh</a>
           </div>
@@ -140,14 +137,15 @@ module AndOne
 
     def h(text)
       text.to_s
-        .gsub("&", "&amp;")
-        .gsub("<", "&lt;")
-        .gsub(">", "&gt;")
-        .gsub('"', "&quot;")
+          .gsub("&", "&amp;")
+          .gsub("<", "&lt;")
+          .gsub(">", "&gt;")
+          .gsub('"', "&quot;")
     end
 
     def truncate(text, max)
       return text if text.length <= max
+
       "#{text[0...max]}..."
     end
 

data/lib/and_one/fingerprint.rb

@@ -22,7 +22,7 @@ module AndOne
       normalized.gsub!(/`(\w+)`/, '\1')
 
       # Normalize single-quoted string literals
-      normalized.gsub!(/\\[']/, "")
+      normalized.gsub!("\\'", "")
       normalized.gsub!(/'(?:[^'\\]|\\.)*'/m, "?")
 
       # Normalize numbers (standalone, not part of identifiers)

data/lib/and_one/formatter.rb

@@ -23,7 +23,8 @@ module AndOne
       parts = []
       parts << ""
       parts << colorize(SEPARATOR, :red)
-      parts << colorize(" 🏀 And One! #{detections.size} N+1 quer#{detections.size == 1 ? 'y' : 'ies'} detected", :red, :bold)
+      parts << colorize(" 🏀 And One! #{detections.size} N+1 quer#{detections.size == 1 ? "y" : "ies"} detected", :red,
+                        :bold)
       parts << colorize(SEPARATOR, :red)
 
       detections.each_with_index do |detection, i|
@@ -38,12 +39,13 @@ module AndOne
 
     private
 
-    def format_detection(detection, index)
+    def format_detection(detection, index) # rubocop:disable Metrics
       lines = []
       cleaned_bt = clean_backtrace(detection.raw_caller_strings)
 
       # Header with count and fingerprint
-      lines << colorize("  #{index}) #{detection.count}x repeated query on `#{detection.table_name || 'unknown'}`", :yellow, :bold)
+      lines << colorize("  #{index}) #{detection.count}x repeated query on `#{detection.table_name || "unknown"}`",
+                        :yellow, :bold)
       lines << colorize("     fingerprint: #{detection.fingerprint}", :dim)
       lines << ""
 
@@ -68,9 +70,8 @@ module AndOne
 
       # Abbreviated call stack
       lines << colorize("  Call stack:", :cyan)
-      cleaned_bt.first(6).each_with_index do |frame, fi|
-        prefix = fi == 0 ? "    " : "    "
-        lines << colorize("#{prefix}#{frame}", :dim)
+      cleaned_bt.first(6).each_with_index do |frame, _fi|
+        lines << colorize("    #{frame}", :dim)
       end
       lines << colorize("    ... (#{cleaned_bt.size - 6} more frames)", :dim) if cleaned_bt.size > 6
       lines << ""
@@ -80,12 +81,8 @@ module AndOne
       if suggestion&.actionable?
         lines << colorize("  💡 Suggestion:", :cyan, :bold)
         lines << colorize("    #{suggestion.fix_hint}", :green)
-        if suggestion.loading_strategy_hint
-          lines << colorize("    #{suggestion.loading_strategy_hint}", :green)
-        end
-        if suggestion.strict_loading_hint
-          lines << colorize("    #{suggestion.strict_loading_hint}", :dim)
-        end
+        lines << colorize("    #{suggestion.loading_strategy_hint}", :green) if suggestion.loading_strategy_hint
+        lines << colorize("    #{suggestion.strict_loading_hint}", :dim) if suggestion.strict_loading_hint
       end
 
       # Ignore hint
@@ -98,7 +95,7 @@ module AndOne
 
     def resolve_suggestion(detection, cleaned_backtrace)
       AssociationResolver.resolve(detection, cleaned_backtrace)
-    rescue
+    rescue StandardError
       nil
     end
 
@@ -121,6 +118,7 @@ module AndOne
 
     def truncate_query(sql, max_length: 200)
       return sql if sql.length <= max_length
+
       "#{sql[0...max_length]}..."
     end
 

data/lib/and_one/ignore_file.rb

@@ -23,7 +23,7 @@ module AndOne
   #   fingerprint:abc123def456
   #
   class IgnoreFile
-    Rule = Struct.new(:type, :pattern, keyword_init: true)
+    Rule = Struct.new(:type, :pattern)
 
     attr_reader :rules
 
@@ -90,8 +90,8 @@ module AndOne
     def matches_path?(glob, raw_caller_strings)
       # Convert glob to regex: * -> [^/]*, ** -> .*
       regex_str = Regexp.escape(glob)
-                        .gsub('\*\*', '.*')
-                        .gsub('\*', '[^/]*')
+                        .gsub('\*\*', ".*")
+                        .gsub('\*', "[^/]*")
       regex = Regexp.new(regex_str)
       raw_caller_strings.any? { |frame| frame.match?(regex) }
     end

data/lib/and_one/json_formatter.rb

@@ -69,7 +69,7 @@ module AndOne
 
     def resolve_suggestion(detection)
       AssociationResolver.resolve(detection, detection.raw_caller_strings)
-    rescue
+    rescue StandardError
       nil
     end
 

data/lib/and_one/matchers.rb

@@ -15,25 +15,25 @@ module AndOne
   #
   module MinitestHelper
     # Assert that the block does NOT trigger any N+1 queries.
-    def assert_no_n_plus_one(message = nil, &block)
-      detections = scan_for_n_plus_ones(&block)
-
-      if detections.any?
-        formatter = Formatter.new(
-          backtrace_cleaner: AndOne.backtrace_cleaner || AndOne.send(:default_backtrace_cleaner)
-        )
-        detail = formatter.format(detections)
-        summary = detections.map { |d|
-          "#{d.count} queries to `#{d.table_name || 'unknown'}` (expected 1)"
-        }.join("; ")
-        msg = message || "Expected no N+1 queries, but #{detections.size} detected: #{summary}\n#{detail}"
-        flunk(msg)
-      end
+    def assert_no_n_plus_one(message = nil, &)
+      detections = scan_for_n_plus_ones(&)
+
+      return unless detections.any?
+
+      formatter = Formatter.new(
+        backtrace_cleaner: AndOne.backtrace_cleaner || AndOne.send(:default_backtrace_cleaner)
+      )
+      detail = formatter.format(detections)
+      summary = detections.map do |d|
+        "#{d.count} queries to `#{d.table_name || "unknown"}` (expected 1)"
+      end.join("; ")
+      msg = message || "Expected no N+1 queries, but #{detections.size} detected: #{summary}\n#{detail}"
+      flunk(msg)
     end
 
     # Assert that the block DOES trigger N+1 queries (useful for documenting known issues).
-    def assert_n_plus_one(message = nil, &block)
-      detections = scan_for_n_plus_ones(&block)
+    def assert_n_plus_one(message = nil, &)
+      detections = scan_for_n_plus_ones(&)
 
       if detections.empty?
         msg = message || "Expected N+1 queries, but none were detected"
@@ -45,7 +45,7 @@ module AndOne
 
     private
 
-    def scan_for_n_plus_ones(&block)
+    def scan_for_n_plus_ones(&)
       # Temporarily disable raise_on_detect so scan returns detections
       # instead of raising
       previous_raise = AndOne.raise_on_detect
@@ -54,7 +54,7 @@ module AndOne
       AndOne.notifications_callback = nil
 
       begin
-        AndOne.scan(&block) || []
+        AndOne.scan(&) || []
       ensure
         AndOne.raise_on_detect = previous_raise
         AndOne.notifications_callback = previous_callback
@@ -100,9 +100,9 @@ module AndOne
           backtrace_cleaner: AndOne.backtrace_cleaner || AndOne.send(:default_backtrace_cleaner)
         )
         detail = formatter.format(@detections)
-        summary = @detections.map { |d|
-          "#{d.count} queries to `#{d.table_name || 'unknown'}` (expected 1)"
-        }.join("; ")
+        summary = @detections.map do |d|
+          "#{d.count} queries to `#{d.table_name || "unknown"}` (expected 1)"
+        end.join("; ")
         "expected no N+1 queries, but #{@detections.size} detected: #{summary}\n#{detail}"
       end
 

data/lib/and_one/middleware.rb

@@ -5,6 +5,10 @@ module AndOne
   # Designed to NOT interfere with error propagation —
   # if the app raises, we cleanly stop scanning without adding
   # to or corrupting the original backtrace.
+  #
+  # When `AndOne.dev_toast` is enabled (default in development),
+  # detected N+1s are injected as a toast notification into HTML responses
+  # with a link to the DevUI dashboard.
   class Middleware
     include ScanHelper
 
@@ -13,7 +17,41 @@ module AndOne
     end
 
     def call(env)
-      and_one_wrap { @app.call(env) }
+      return @app.call(env) if !AndOne.enabled? || AndOne.scanning?
+
+      begin
+        AndOne.scan
+        status, headers, body = @app.call(env)
+        detections = AndOne.finish
+
+        if AndOne.dev_toast && detections&.any? && html_response?(headers) && status == 200
+          body = inject_toast(body, detections)
+          # Recalculate Content-Length since we modified the body
+          headers.delete("content-length")
+          headers.delete("Content-Length")
+        end
+
+        [status, headers, body]
+      rescue Exception # rubocop:disable Lint/RescueException
+        and_one_quietly_stop
+        raise
+      end
+    end
+
+    private
+
+    def html_response?(headers)
+      content_type = headers["content-type"] || headers["Content-Type"]
+      content_type&.include?("text/html")
+    end
+
+    def inject_toast(body, detections)
+      full_body = +""
+      body.each { |chunk| full_body << chunk }
+      body.close if body.respond_to?(:close)
+
+      injected = DevToast.inject(full_body, detections)
+      [injected]
     end
   end
 end

data/lib/and_one/railtie.rb

@@ -13,9 +13,12 @@ module AndOne
         # Rack middleware for web requests
         app.middleware.insert_before(0, AndOne::Middleware)
 
-        # Dev UI dashboard for N+1 overview (requires aggregate_mode)
         if Rails.env.development?
+          # Dev UI dashboard for N+1 overview
           app.middleware.use(AndOne::DevUI)
+
+          # Dev toast: show in-page N+1 notifications (default on in development)
+          AndOne.dev_toast = true if AndOne.dev_toast.nil?
         end
 
         # ActiveJob hook — covers all job backends (Sidekiq, GoodJob, SolidQueue, etc.)

data/lib/and_one/rspec.rb

@@ -13,6 +13,8 @@
 
 require "and_one"
 
-RSpec.configure do |config|
-  config.include AndOne::RSpecHelper
-end if defined?(RSpec)
+if defined?(RSpec)
+  RSpec.configure do |config|
+    config.include AndOne::RSpecHelper
+  end
+end

data/lib/and_one/scan_helper.rb

@@ -15,7 +15,7 @@ module AndOne
         result = yield
         AndOne.finish
         result
-      rescue Exception
+      rescue Exception # rubocop:disable Lint/RescueException
         and_one_quietly_stop
         raise
       end
@@ -25,7 +25,7 @@ module AndOne
       Thread.current[:and_one_detector]&.send(:unsubscribe)
       Thread.current[:and_one_detector] = nil
       Thread.current[:and_one_paused] = false
-    rescue
+    rescue StandardError
       nil
     end
   end

data/lib/and_one/sidekiq_middleware.rb

@@ -19,8 +19,8 @@ module AndOne
   class SidekiqMiddleware
     include ScanHelper
 
-    def call(_worker, _msg, _queue)
-      and_one_wrap { yield }
+    def call(_worker, _msg, _queue, &)
+      and_one_wrap(&)
     end
   end
 end

data/lib/and_one/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AndOne
-  VERSION = "0.1.0"
+  VERSION = "0.3.0"
 end

data/lib/and_one.rb

@@ -14,8 +14,9 @@ module AndOne
   class << self
     attr_accessor :enabled, :raise_on_detect, :backtrace_cleaner,
                   :allow_stack_paths, :ignore_queries, :ignore_callers,
-                  :min_n_queries, :notifications_callback, :aggregate_mode,
-                  :ignore_file_path, :json_logging, :env_thresholds
+                  :min_n_queries, :notifications_callback,
+                  :ignore_file_path, :json_logging, :env_thresholds,
+                  :dev_toast
 
     def configure
       yield self
@@ -33,19 +34,19 @@ module AndOne
 
       start_scan
 
-      if block_given?
-        begin
-          yield
-          detections = detector.finish
-          stop_scan
-          report(detections) if detections.any?
-          detections
-        rescue Exception => e
-          # On error, clean up without reporting — don't add noise to real errors
-          detector&.send(:unsubscribe)
-          stop_scan
-          raise
-        end
+      return unless block_given?
+
+      begin
+        yield
+        detections = detector.finish
+        stop_scan
+        report(detections) if detections.any?
+        detections
+      rescue Exception # rubocop:disable Lint/RescueException
+        # On error, clean up without reporting — don't add noise to real errors
+        detector&.send(:unsubscribe)
+        stop_scan
+        raise
       end
     end
 
@@ -133,7 +134,7 @@ module AndOne
       if defined?(Rails) && Rails.respond_to?(:env)
         Rails.env.to_s
       else
-        ENV["RAILS_ENV"] || ENV["RACK_ENV"]
+        ENV["RAILS_ENV"] || ENV.fetch("RACK_ENV", nil)
       end
     end
 
@@ -150,7 +151,7 @@ module AndOne
       Thread.current
     end
 
-    def report(detections)
+    def report(detections) # rubocop:disable Metrics
       # Filter out ignored detections
       detections = detections.reject do |d|
         ignore_list.ignored?(d, d.raw_caller_strings) ||
@@ -159,11 +160,9 @@ module AndOne
 
       return if detections.empty?
 
-      # In aggregate mode, only report NEW unique detections
-      if aggregate_mode
-        detections = detections.select { |d| aggregate.record(d) }
-        return if detections.empty?
-      end
+      # Record to aggregate and only report NEW unique detections
+      detections = detections.select { |d| aggregate.record(d) }
+      return if detections.empty?
 
       cleaner = backtrace_cleaner || default_backtrace_cleaner
 
@@ -181,7 +180,7 @@ module AndOne
           if defined?(Rails) && Rails.respond_to?(:logger) && Rails.logger
             Rails.logger.warn(json_output)
           else
-            $stderr.puts(json_output)
+            warn(json_output)
           end
         end
 
@@ -191,7 +190,7 @@ module AndOne
         if ENV["GITHUB_ACTIONS"]
           detections.each do |d|
             file, line = parse_frame_location(d.fix_location || d.origin_frame)
-            query_count = "#{d.count} queries to `#{d.table_name || 'unknown'}`"
+            query_count = "#{d.count} queries to `#{d.table_name || "unknown"}`"
             if file
               $stdout.puts "::warning file=#{file},line=#{line || 1}::N+1 detected: #{query_count}. Add `.includes(:#{suggest_association_name(d)})` to fix."
             else
@@ -200,15 +199,11 @@ module AndOne
           end
         end
 
-        if raise_on_detect
-          raise NPlus1Error, "\n#{message}"
-        else
-          unless json_logging
-            if defined?(Rails) && Rails.respond_to?(:logger) && Rails.logger
-              Rails.logger.warn("\n#{message}")
-            end
-            $stderr.puts("\n#{message}") if $stderr.tty?
-          end
+        raise NPlus1Error, "\n#{message}" if raise_on_detect
+
+        unless json_logging
+          Rails.logger.warn("\n#{message}") if defined?(Rails) && Rails.respond_to?(:logger) && Rails.logger
+          warn("\n#{message}") if $stderr.tty?
         end
       end
     end
@@ -222,7 +217,7 @@ module AndOne
       return false unless patterns&.any?
 
       raw_caller_strings.any? do |frame|
-        patterns.any? { |pattern| pattern === frame }
+        patterns.any? { |pattern| pattern.match?(frame) }
       end
     end
 
@@ -231,20 +226,24 @@ module AndOne
 
       # Extract file:line from a backtrace frame like "app/controllers/posts_controller.rb:15:in `index'"
       clean = frame
-        .sub(%r{.*/app/}, "app/")
-        .sub(%r{.*/lib/}, "lib/")
-        .sub(%r{.*/test/}, "test/")
-        .sub(%r{.*/spec/}, "spec/")
+              .sub(%r{.*/app/}, "app/")
+              .sub(%r{.*/lib/}, "lib/")
+              .sub(%r{.*/test/}, "test/")
+              .sub(%r{.*/spec/}, "spec/")
 
       if clean =~ /\A(.+?):(\d+)/
-        [$1, $2.to_i]
+        [::Regexp.last_match(1), ::Regexp.last_match(2).to_i]
       else
         [clean, nil]
       end
     end
 
     def suggest_association_name(detection)
-      suggestion = AssociationResolver.resolve(detection, detection.raw_caller_strings) rescue nil
+      suggestion = begin
+        AssociationResolver.resolve(detection, detection.raw_caller_strings)
+      rescue StandardError
+        nil
+      end
       suggestion&.association_name || detection.table_name || "association"
     end
 
@@ -271,6 +270,7 @@ require_relative "and_one/aggregate"
 require_relative "and_one/matchers"
 require_relative "and_one/scan_helper"
 require_relative "and_one/dev_ui"
+require_relative "and_one/dev_toast"
 require_relative "and_one/console"
 require_relative "and_one/middleware"
 require_relative "and_one/active_job_hook"