and_one 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ee084901a4915dba0065a11cf14a6996f277d6ca5fba2efd388b27ddc2f349a
-  data.tar.gz: 05d02c49d473359e70ba9b300711e6d15f52d391ab48e22ca1ddb8651e3eb7bc
+  metadata.gz: f74cbffeb954bdf743f6028d005244aa5d4f76c229f7543145d3e77f2b468398
+  data.tar.gz: 418273820bcdb2b8a86a3d8b76922ba97b0540bd48b6a6ac5c3e3317fe3ac703
 SHA512:
-  metadata.gz: 5f59a82aac0fc38ef5f9d2d11b633a1b881378124834d8d8ec0dd4ecb85e887d16aec5feee30225205df60ab90cb1577eb02ebca0306685736231faad0e53799
-  data.tar.gz: '0663708679e397440e6e1fe26bee567e868e1909e1138cfb94d3da085cabdc4da8808005f72a610aa6f99fde5f262ffead6ff57bd4bc21e0b685c9c07195df0b'
+  metadata.gz: 159e5753a847aa025f9168c9962cdb47d53489ccd0b81272b81039f6784be1cd2b3ecc9ec7537a19245b030602f539e7578d52d05dcdd28abcc45101a47d2a44
+  data.tar.gz: 9885b04b8ed1b4aded500bb673ac5f4526ea834b96c3beee407a7e3e165fa2a3eea9100edd5d67c4d0c6a78cde3940557b77a2609f283249afd1d6ce7f73b936

data/.githooks/pre-commit

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -e
+
+# Get staged Ruby files
+STAGED_FILES=$(git diff --cached --name-only --diff-filter=ACM | grep '\.rb$' || true)
+
+if [ -n "$STAGED_FILES" ]; then
+  echo "Running RuboCop on staged files..."
+  bundle exec rubocop --force-exclusion $STAGED_FILES
+fi

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [0.2.0] - 2026-03-02
+
+### Added
+
+- **Dev toast notifications** — When an N+1 is detected during a request, a toast notification is injected into the bottom-right corner of the page showing which tables were affected with a link to the `/__and_one` dashboard. Enabled by default in development. Auto-dismisses after 8 seconds; hover to keep open. Only appears on HTML 200 responses. Disable with `AndOne.dev_toast = false`.
+- New `dev_toast` configuration option
+- "Development UI" section in README documenting both the toast and dashboard features
+
 ## [0.1.0] - 2026-02-27
 
 - Initial release

data/README.md

@@ -16,6 +16,7 @@ AndOne stays completely invisible until it detects an N+1 query — then it tell
 - **Ignore file** — `.and_one_ignore` with `gem:`, `path:`, `query:`, and `fingerprint:` rules
 - **Aggregate mode** — report each unique N+1 once per server session with occurrence counts
 - **Test matchers** — Minitest (`assert_no_n_plus_one`) and RSpec (`expect { }.not_to cause_n_plus_one`)
+- **Dev toast notifications** — in-page toast on every page that triggers an N+1, with a link to the dashboard
 - **Dev UI dashboard** — browse `/__and_one` in development for a live N+1 overview
 - **Rails console integration** — auto-scans in `rails console` and prints warnings inline
 - **Structured JSON logging** — JSON output mode for Datadog, Splunk, and other log aggregation services
@@ -148,6 +149,36 @@ AndOne.aggregate.size       # number of unique patterns
 AndOne.aggregate.reset!     # clear and start fresh
 ```
 
+## Development UI
+
+### In-page toast notifications
+
+When an N+1 is detected during a request, AndOne injects a small toast notification into the bottom-right corner of the page. The toast shows which tables were affected and links to the full dashboard for details.
+
+This is enabled by default in development — no configuration needed. The toast auto-dismisses after 8 seconds, but hovering over it keeps it open.
+
+To disable it:
+
+```ruby
+# config/initializers/and_one.rb
+AndOne.dev_toast = false
+```
+
+The toast only appears on HTML responses with a 200 status, so it won't interfere with API endpoints, redirects, or error pages.
+
+### Dashboard
+
+Browse `/__and_one` in development for a full overview of every unique N+1 detected in the current server session. The dashboard shows the query, origin, fix location, and suggested `.includes()` call for each detection.
+
+The dashboard requires aggregate mode to track detections across requests:
+
+```ruby
+# config/initializers/and_one.rb
+AndOne.aggregate_mode = true
+```
+
+Both features work together: the toast gives you immediate feedback on the page you're looking at, and the dashboard link takes you to the full picture.
+
 ## Test Matchers
 
 ### Minitest
@@ -217,6 +248,9 @@ AndOne.configure do |config|
   # Aggregate mode — only report each unique N+1 once per session
   config.aggregate_mode = true
 
+  # In-page toast notifications (default: true in development)
+  config.dev_toast = true
+
   # Path to ignore file (default: Rails.root/.and_one_ignore)
   config.ignore_file_path = Rails.root.join(".and_one_ignore").to_s
 

data/lib/and_one/active_job_hook.rb

@@ -18,8 +18,8 @@ module AndOne
 
     private
 
-    def and_one_scan
-      and_one_wrap { yield }
+    def and_one_scan(&)
+      and_one_wrap(&)
     end
   end
 end

data/lib/and_one/aggregate.rb

@@ -14,7 +14,7 @@ module AndOne
   #   AndOne.aggregate.reset!
   #
   class Aggregate
-    Entry = Struct.new(:detection, :occurrences, :first_seen_at, :last_seen_at, keyword_init: true)
+    Entry = Struct.new(:detection, :occurrences, :first_seen_at, :last_seen_at)
 
     def initialize
       @mutex = Mutex.new
@@ -65,19 +65,19 @@ module AndOne
 
         lines = []
         lines << ""
-        lines << "🏀 AndOne Session Summary: #{@entries.size} unique N+1 pattern#{'s' if @entries.size != 1}"
-        lines << "─" * 60
+        lines << "🏀 AndOne Session Summary: #{@entries.size} unique N+1 pattern#{"s" if @entries.size != 1}"
+        lines << ("─" * 60)
 
         @entries.each_with_index do |(fp, entry), i|
           det = entry.detection
-          lines << "  #{i + 1}) #{det.table_name || 'unknown'} — #{entry.occurrences} occurrence#{'s' if entry.occurrences != 1}"
+          lines << "  #{i + 1}) #{det.table_name || "unknown"} — #{entry.occurrences} occurrence#{"s" if entry.occurrences != 1}"
           lines << "     #{det.sample_query[0, 120]}"
           lines << "     origin: #{det.origin_frame}" if det.origin_frame
           lines << "     fingerprint: #{fp}"
           lines << ""
         end
 
-        lines << "─" * 60
+        lines << ("─" * 60)
         lines.join("\n")
       end
     end

data/lib/and_one/association_resolver.rb

@@ -50,7 +50,7 @@ module AndOne
 
         model = ActiveRecord::Base.descendants.detect do |klass|
           klass.table_name == table_name
-        rescue
+        rescue StandardError
           false
         end
 
@@ -82,11 +82,11 @@ module AndOne
 
         klass.reflect_on_all_associations.each do |assoc|
           matched = if effective_key
-            association_matches?(assoc, target_model, effective_key)
-          else
-            # For through associations, foreign key may not be directly visible
-            through_association_matches?(assoc, target_model)
-          end
+                      association_matches?(assoc, target_model, effective_key)
+                    else
+                      # For through associations, foreign key may not be directly visible
+                      through_association_matches?(assoc, target_model)
+                    end
 
           next unless matched
 
@@ -98,10 +98,10 @@ module AndOne
             fix_hint: build_fix_hint(klass, assoc.name),
             loading_strategy: strategy,
             is_through: assoc.is_a?(ActiveRecord::Reflection::ThroughReflection),
-            is_polymorphic: assoc.respond_to?(:options) && !!assoc.options[:as]
+            is_polymorphic: assoc.respond_to?(:options) && !assoc.options[:as].nil?
           }
         end
-      rescue
+      rescue StandardError
         next
       end
 
@@ -133,27 +133,25 @@ module AndOne
     end
 
     def association_matches?(assoc, target_model, foreign_key)
-      begin
-        case assoc
-        when ActiveRecord::Reflection::ThroughReflection
-          # has_many :through — check if the source association points to our target
-          assoc.klass == target_model
-        when ActiveRecord::Reflection::HasManyReflection,
-             ActiveRecord::Reflection::HasOneReflection
-          if assoc.options[:as]
-            # Polymorphic: has_many :comments, as: :commentable
-            # The foreign key is like "commentable_id" and there's a "commentable_type" column
-            poly_fk = "#{assoc.options[:as]}_id"
-            assoc.klass == target_model && poly_fk == foreign_key
-          else
-            assoc.klass == target_model && assoc.foreign_key.to_s == foreign_key
-          end
+      case assoc
+      when ActiveRecord::Reflection::ThroughReflection
+        # has_many :through — check if the source association points to our target
+        assoc.klass == target_model
+      when ActiveRecord::Reflection::HasManyReflection,
+           ActiveRecord::Reflection::HasOneReflection
+        if assoc.options[:as]
+          # Polymorphic: has_many :comments, as: :commentable
+          # The foreign key is like "commentable_id" and there's a "commentable_type" column
+          poly_fk = "#{assoc.options[:as]}_id"
+          assoc.klass == target_model && poly_fk == foreign_key
         else
-          false
+          assoc.klass == target_model && assoc.foreign_key.to_s == foreign_key
         end
-      rescue NameError
+      else
         false
       end
+    rescue NameError
+      false
     end
 
     def build_fix_hint(parent_model, association_name)
@@ -161,13 +159,10 @@ module AndOne
     end
 
     # Determine the optimal loading strategy based on query patterns
-    def loading_strategy(sql, association_name)
+    def loading_strategy(sql, _association_name)
       # If the query has WHERE conditions on the association table, eager_load
       # is better because it does a LEFT OUTER JOIN allowing WHERE filtering
-      if sql =~ /\bWHERE\b/i && sql =~ /\bJOIN\b/i
-        :eager_load
-      elsif sql =~ /\bWHERE\b.*\b(?:AND|OR)\b/i
-        # Complex WHERE — eager_load with JOIN is more efficient
+      if sql =~ /\bWHERE\b/i && (sql =~ /\bJOIN\b/i || sql =~ /\b(?:AND|OR)\b/i)
         :eager_load
       else
         # Default: preload is generally faster (separate queries, no JOIN overhead)
@@ -202,10 +197,10 @@ module AndOne
       return nil unless actionable? && @parent_model
 
       assoc_type = if @is_through
-        "has_many :#{@association_name}, through: ..."
-      else
-        "has_many :#{@association_name}"
-      end
+                     "has_many :#{@association_name}, through: ..."
+                   else
+                     "has_many :#{@association_name}"
+                   end
 
       "Or prevent at the model level: `#{assoc_type}, strict_loading: true` in #{@parent_model.name}"
     end
@@ -219,8 +214,6 @@ module AndOne
         "Consider `.eager_load(:#{@association_name})` instead — your query filters on the association, so a JOIN is more efficient"
       when :preload
         "Consider `.preload(:#{@association_name})` — separate queries avoid JOIN overhead for simple loading"
-      else
-        nil # :includes is the default, no extra hint needed
       end
     end
   end

data/lib/and_one/console.rb

@@ -49,7 +49,7 @@ module AndOne
 
       def finish_scan
         AndOne.finish if AndOne.scanning?
-      rescue
+      rescue StandardError
         # Don't let cleanup errors interrupt the console
         nil
       end
@@ -79,9 +79,9 @@ module AndOne
 
         # IRB in Rails 7.1+ uses IRB::Context#evaluate with hooks
         # We hook into the SIGINT-safe eval output via an around_eval approach
-        if defined?(::IRB::Context)
-          ::IRB::Context.prepend(IrbContextPatch)
-        end
+        return unless defined?(::IRB::Context)
+
+        ::IRB::Context.prepend(IrbContextPatch)
       end
 
       def remove_irb_hook
@@ -94,15 +94,13 @@ module AndOne
 
         @pry_hook_installed = true
 
-        ::Pry.hooks.add_hook(:after_eval, :and_one_console) do |result, _pry|
+        ::Pry.hooks.add_hook(:after_eval, :and_one_console) do |_result, _pry|
           AndOne::Console.send(:cycle_scan) if AndOne::Console.active?
         end
       end
 
       def remove_pry_hook
-        if defined?(::Pry) && ::Pry.hooks
-          ::Pry.hooks.delete_hook(:after_eval, :and_one_console)
-        end
+        ::Pry.hooks.delete_hook(:after_eval, :and_one_console) if defined?(::Pry) && ::Pry.hooks
         @pry_hook_installed = false
       end
 
@@ -119,7 +117,7 @@ module AndOne
         result = super
         AndOne::Console.send(:cycle_scan) if AndOne::Console.active?
         result
-      rescue => e
+      rescue StandardError
         AndOne::Console.send(:cycle_scan) if AndOne::Console.active?
         raise
       end

data/lib/and_one/detection.rb

@@ -55,9 +55,9 @@ module AndOne
     private
 
     def extract_table_name(sql)
-      if sql =~ /\bFROM\s+["`]?(\w+)["`]?/i
-        $1
-      end
+      return unless sql =~ /\bFROM\s+["`]?(\w+)["`]?/i
+
+      ::Regexp.last_match(1)
     end
 
     def find_origin_frame

data/lib/and_one/detector.rb

@@ -5,8 +5,8 @@ module AndOne
   # Each instance tracks queries for a single request/block scope.
   class Detector
     DEFAULT_ALLOW_LIST = [
-      /active_record\/relation.*preload_associations/,
-      /active_record\/validations\/uniqueness/
+      %r{active_record/relation.*preload_associations},
+      %r{active_record/validations/uniqueness}
     ].freeze
 
     attr_reader :detections
@@ -58,7 +58,7 @@ module AndOne
         name = payload[:name]
 
         next if name == "SCHEMA"
-        next if !sql.include?("SELECT")
+        next unless sql.include?("SELECT")
         next if payload[:cached]
         next if current_detector.send(:ignored?, sql)
 
@@ -79,13 +79,13 @@ module AndOne
       @query_holder[location_key] << sql
 
       # Only store caller on the second occurrence to save memory
-      if @query_counter[location_key] >= 2
-        @query_callers[location_key] = locations
-        @query_metadata[location_key] ||= {
-          connection_adapter: adapter_name,
-          type_casted_binds: payload[:type_casted_binds]
-        }
-      end
+      return unless @query_counter[location_key] >= 2
+
+      @query_callers[location_key] = locations
+      @query_metadata[location_key] ||= {
+        connection_adapter: adapter_name,
+        type_casted_binds: payload[:type_casted_binds]
+      }
     end
 
     def location_fingerprint(locations)
@@ -99,7 +99,7 @@ module AndOne
 
     def adapter_name
       ActiveRecord::Base.connection_db_config.adapter
-    rescue
+    rescue StandardError
       "unknown"
     end
 
@@ -135,7 +135,7 @@ module AndOne
     end
 
     def ignored?(sql)
-      @ignore_queries.any? { |pattern| pattern === sql }
+      @ignore_queries.any? { |pattern| pattern.match?(sql) }
     end
   end
 end

data/lib/and_one/dev_toast.rb

@@ -0,0 +1,149 @@
+# frozen_string_literal: true
+
+module AndOne
+  # Injects a small toast notification into HTML responses when N+1 queries
+  # are detected during the request. Links to the DevUI dashboard for details.
+  #
+  # Activated automatically by the Railtie in development when `dev_toast` is on,
+  # or can be enabled manually:
+  #   AndOne.dev_toast = true
+  #
+  # The toast appears as a fixed-position badge in the bottom-right corner
+  # and auto-dismisses after 8 seconds (click to keep open).
+  module DevToast
+    module_function
+
+    # Injects toast HTML/JS/CSS before </body> in an HTML response.
+    # Returns the modified body string, or the original if not injectable.
+    def inject(body_string, detections)
+      return body_string if detections.nil? || detections.empty?
+      return body_string unless body_string.include?("</body>")
+
+      toast_html = render_toast(detections)
+      body_string.sub("</body>", "#{toast_html}\n</body>")
+    end
+
+    def render_toast(detections)
+      count = detections.size
+      label = "N+1 quer#{count == 1 ? "y" : "ies"}"
+
+      summaries = detections.map do |d|
+        table = escape(d.table_name || "unknown")
+        "#{d.count}x <code>#{table}</code>"
+      end.first(5)
+
+      extra = count > 5 ? "<div class=\"and-one-toast-extra\">...and #{count - 5} more</div>" : ""
+
+      <<~HTML
+        <div id="and-one-toast" class="and-one-toast" role="status" aria-live="polite">
+          <div class="and-one-toast-header">
+            <span class="and-one-toast-icon">🏀</span>
+            <strong>AndOne:</strong> #{count} #{label} detected
+            <button class="and-one-toast-close" onclick="document.getElementById('and-one-toast').remove()" aria-label="Dismiss">&times;</button>
+          </div>
+          <div class="and-one-toast-body">
+            #{summaries.join("<br>")}
+            #{extra}
+          </div>
+          <a class="and-one-toast-link" href="#{DevUI::MOUNT_PATH}">View Dashboard →</a>
+        </div>
+        <style>
+          .and-one-toast {
+            position: fixed;
+            bottom: 1rem;
+            right: 1rem;
+            z-index: 999999;
+            background: #1a1a2e;
+            color: #e0e0e0;
+            border: 2px solid #ff6b6b;
+            border-radius: 8px;
+            padding: 0;
+            font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, monospace;
+            font-size: 13px;
+            max-width: 380px;
+            min-width: 260px;
+            box-shadow: 0 4px 24px rgba(0,0,0,0.4);
+            animation: and-one-slide-in 0.3s ease-out;
+            transition: opacity 0.3s ease;
+          }
+          .and-one-toast-header {
+            display: flex;
+            align-items: center;
+            gap: 0.4rem;
+            padding: 0.5rem 0.75rem;
+            background: #16213e;
+            border-radius: 6px 6px 0 0;
+            border-bottom: 1px solid #2a2a4a;
+            color: #ff6b6b;
+            font-size: 13px;
+          }
+          .and-one-toast-icon { font-size: 16px; }
+          .and-one-toast-close {
+            margin-left: auto;
+            background: none;
+            border: none;
+            color: #888;
+            font-size: 18px;
+            cursor: pointer;
+            padding: 0 0.25rem;
+            line-height: 1;
+          }
+          .and-one-toast-close:hover { color: #ff6b6b; }
+          .and-one-toast-body {
+            padding: 0.5rem 0.75rem;
+            line-height: 1.5;
+            color: #ccc;
+          }
+          .and-one-toast-body code {
+            background: #16213e;
+            padding: 0.1rem 0.3rem;
+            border-radius: 3px;
+            font-size: 12px;
+            color: #ffd93d;
+          }
+          .and-one-toast-extra {
+            color: #888;
+            font-size: 12px;
+            margin-top: 0.25rem;
+          }
+          .and-one-toast-link {
+            display: block;
+            padding: 0.5rem 0.75rem;
+            color: #a8d8ea;
+            text-decoration: none;
+            font-size: 12px;
+            border-top: 1px solid #2a2a4a;
+          }
+          .and-one-toast-link:hover {
+            background: #16213e;
+            border-radius: 0 0 6px 6px;
+            text-decoration: underline;
+          }
+          @keyframes and-one-slide-in {
+            from { transform: translateY(1rem); opacity: 0; }
+            to   { transform: translateY(0);    opacity: 1; }
+          }
+        </style>
+        <script>
+          (function() {
+            var toast = document.getElementById('and-one-toast');
+            if (!toast) return;
+            var timer = setTimeout(function() {
+              toast.style.opacity = '0';
+              setTimeout(function() { toast.remove(); }, 300);
+            }, 8000);
+            toast.addEventListener('mouseenter', function() { clearTimeout(timer); });
+          })();
+        </script>
+      HTML
+    end
+
+    def escape(text)
+      text.to_s
+          .gsub("&", "&amp;")
+          .gsub("<", "&lt;")
+          .gsub(">", "&gt;")
+          .gsub('"', "&quot;")
+    end
+  end
+end

data/lib/and_one/dev_ui.rb

@@ -28,7 +28,7 @@ module AndOne
 
     private
 
-    def serve_dashboard(env)
+    def serve_dashboard(_env)
       entries = AndOne.aggregate_mode ? AndOne.aggregate.detections : {}
 
       html = render_html(entries)
@@ -37,49 +37,49 @@ 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.
+                     #{"<br><strong>Tip:</strong> Set <code>AndOne.aggregate_mode = true</code> to collect detections across requests." unless AndOne.aggregate_mode}
+                   </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 +114,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 +140,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 (requires aggregate_mode)
           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.2.0"
 end

data/lib/and_one.rb

@@ -15,7 +15,8 @@ module AndOne
     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
+                  :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) ||
@@ -181,7 +182,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 +192,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 +201,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 +219,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 +228,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 +272,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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: and_one
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Keith Thompson
@@ -10,7 +10,7 @@ cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -24,7 +24,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '7.0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -38,7 +38,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '7.0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -60,6 +60,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".githooks/pre-commit"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - LICENSE.txt
@@ -73,6 +74,7 @@ files:
 - lib/and_one/console.rb
 - lib/and_one/detection.rb
 - lib/and_one/detector.rb
+- lib/and_one/dev_toast.rb
 - lib/and_one/dev_ui.rb
 - lib/and_one/fingerprint.rb
 - lib/and_one/formatter.rb
@@ -93,6 +95,7 @@ metadata:
   homepage_uri: https://github.com/keiththomps/and_one
   source_code_uri: https://github.com/keiththomps/and_one
   changelog_uri: https://github.com/keiththomps/and_one/blob/main/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib