bullet 8.1.3 → 8.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebbf526d81da50f5e04ae03c0e33af01ab71071747711f62dd3790a6debc0551
-  data.tar.gz: 7a1551a54344f9c363402854bf8129bc58ec21927b1ee9a9ce2f0b6a5b8f3e16
+  metadata.gz: ce3dc25a18b75ec4068eae5386c39a96ac90775b2b410efd64f9993790205b83
+  data.tar.gz: a777865c06b2b8102a834db3d8a943bd41b2aadf92a91ecbc23f466dcc2bdea6
 SHA512:
-  metadata.gz: 5b24c5aea3986b30399e0456268bdb00462540324b745aa4ccc451f77b0e4d78222fec5c4fb781b72114f5f497c12069ad5daf3b3678ae674ae7c58d688d824a
-  data.tar.gz: 449c1c448f20f778053ec7ea032956f7446c2a14c1ea11293f3bc13cf7cf0d794beecf46dfb8052d58c644f35679a5d671f7def8b6d3b6f8eafd0a4689f7b565
+  metadata.gz: 643e6e91d5cb5a3d1de379b738451e82a3e9e7691f2a78a0d7721bac47deaff49181ac93f54cc8fd3390c34732d2bfdea0f4f0701bfb509e0fa9af789f41c519
+  data.tar.gz: 70982dc3a2e6cfe721ee126dd138f0c3ff9b0401d5376db35bc88f7245fcb6364f00ebae0e11401658a36e28964d7806d90f6eff15dc498b7e4aecdb32969884

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## Unreleased
 
+## 8.3.0 (10/10/2026)
+
+* Add support for ActiveRecord 8.2
+
+## 8.2.0 (08/29/2026)
+
+* Add thread-safe `Bullet.pause`, `Bullet.resume`, `Bullet.paused?`, and `Bullet.skip` APIs
+* Add configurable footer positioning
+* Fix unused eager loading false positives when N+1 detection is disabled
+* Fix unused eager loading false positives for conditional `has_many :through` associations
+* Fix Ruby 4.0 compatibility issues
+* Drop support for ActiveRecord versions older than 7 and Mongoid versions older than 8
+
 ## 8.1.3 (06/02/2026)
 
 * Handle inversed polymorphic belongs_to false positives

data/README.md

@@ -69,6 +69,7 @@ config.after_initialize do
   Bullet.airbrake = true
   Bullet.rollbar = true
   Bullet.add_footer = true
+  Bullet.footer_position = 'bottom_left'  # or 'bottom_right', 'top_left', 'top_right'
   Bullet.skip_html_injection = false
   Bullet.skip_http_headers = false
   Bullet.stacktrace_includes = [ 'your_gem', 'your_middleware' ]
@@ -97,6 +98,7 @@ The code above will enable all of the Bullet notification systems:
 * `Bullet.airbrake`: add notifications to airbrake
 * `Bullet.rollbar`: add notifications to rollbar
 * `Bullet.add_footer`: adds the details in the bottom left corner of the page. Double click the footer or use close button to hide footer.
+* `Bullet.footer_position`: position of the footer on the page. Valid values are 'bottom_left' (default), 'bottom_right', 'top_left', or 'top_right'. This is useful when the default position clashes with browser UI elements like Chrome's URL preview.
 * `Bullet.skip_html_injection`: prevents Bullet from injecting code into the returned HTML. This must be false for receiving alerts, showing the footer or console logging.
 * `Bullet.skip_http_headers`: don't add headers to API requests, and remove the javascript that relies on them. Note that this prevents bullet from logging warnings to the browser console or updating the footer.
 * `Bullet.stacktrace_includes`: include paths with any of these substrings in the stack trace, even if they are not in your main app
@@ -137,23 +139,34 @@ Bullet.add_safelist :type => :unused_eager_loading, :class_name => "Post", :asso
 Bullet.add_safelist :type => :counter_cache, :class_name => "Country", :association => :cities
 ```
 
+## Skip Bullet in specific actions
+
 If you want to skip bullet in some specific controller actions, you can
-do like
+use `Bullet.skip`, which is thread-safe and works correctly in multi-threaded
+environments like Puma.
 
 ```ruby
 class ApplicationController < ActionController::Base
   around_action :skip_bullet, if: -> { defined?(Bullet) }
 
   def skip_bullet
-    previous_value = Bullet.enable?
-    Bullet.enable = false
-    yield
-  ensure
-    Bullet.enable = previous_value
+    Bullet.skip { yield }
   end
 end
 ```
 
+For more granular control, you can also use `Bullet.pause` and `Bullet.resume`:
+
+```ruby
+Bullet.pause   # Temporarily disable detection for current thread
+Bullet.resume  # Re-enable detection for current thread
+Bullet.paused? # Check if detection is paused for current thread
+```
+
+**Note**: Do not toggle `Bullet.enable` at runtime, as it modifies a global
+flag that is not thread-safe. Use `Bullet.skip`, `Bullet.pause`, or
+`Bullet.start_request`/`Bullet.end_request` instead.
+
 ## Log
 
 The Bullet log `log/bullet.log` will look something like this:

data/lib/bullet/active_record70.rb

@@ -109,6 +109,20 @@ module Bullet
               super
             end
           end
+
+          def through_preloaders
+            if Bullet.start? && !defined?(@through_preloaders)
+              preloaders = super
+              preloaders.each do |preloader|
+                reflection_name = preloader.send(:reflection).name
+                preloader.send(:owners).each do |owner|
+                  Bullet::Detector::NPlusOneQuery.call_association(owner, reflection_name)
+                end
+              end
+            else
+              super
+            end
+          end
         end
       )
 

data/lib/bullet/active_record71.rb

@@ -109,6 +109,20 @@ module Bullet
               super
             end
           end
+
+          def through_preloaders
+            if Bullet.start? && !defined?(@through_preloaders)
+              preloaders = super
+              preloaders.each do |preloader|
+                reflection_name = preloader.send(:reflection).name
+                preloader.send(:owners).each do |owner|
+                  Bullet::Detector::NPlusOneQuery.call_association(owner, reflection_name)
+                end
+              end
+            else
+              super
+            end
+          end
         end
       )
 

data/lib/bullet/active_record72.rb

@@ -109,6 +109,20 @@ module Bullet
               super
             end
           end
+
+          def through_preloaders
+            if Bullet.start? && !defined?(@through_preloaders)
+              preloaders = super
+              preloaders.each do |preloader|
+                reflection_name = preloader.send(:reflection).name
+                preloader.send(:owners).each do |owner|
+                  Bullet::Detector::NPlusOneQuery.call_association(owner, reflection_name)
+                end
+              end
+            else
+              super
+            end
+          end
         end
       )
 

data/lib/bullet/active_record80.rb

@@ -109,6 +109,20 @@ module Bullet
               super
             end
           end
+
+          def through_preloaders
+            if Bullet.start? && !defined?(@through_preloaders)
+              preloaders = super
+              preloaders.each do |preloader|
+                reflection_name = preloader.send(:reflection).name
+                preloader.send(:owners).each do |owner|
+                  Bullet::Detector::NPlusOneQuery.call_association(owner, reflection_name)
+                end
+              end
+            else
+              super
+            end
+          end
         end
       )
 

data/lib/bullet/active_record81.rb

@@ -109,6 +109,20 @@ module Bullet
               super
             end
           end
+
+          def through_preloaders
+            if Bullet.start? && !defined?(@through_preloaders)
+              preloaders = super
+              preloaders.each do |preloader|
+                reflection_name = preloader.send(:reflection).name
+                preloader.send(:owners).each do |owner|
+                  Bullet::Detector::NPlusOneQuery.call_association(owner, reflection_name)
+                end
+              end
+            else
+              super
+            end
+          end
         end
       )
 

data/lib/bullet/{active_record60.rb → active_record82.rb}

@@ -16,8 +16,8 @@ module Bullet
       require 'active_record'
       ::ActiveRecord::Base.extend(
         Module.new do
-          def find_by_sql(sql, binds = [], preparable: nil, &block)
-            result = super
+          def find_by_sql(*args, **kwargs, &block)
+            result = super(*args, **kwargs, &block)
             if Bullet.start?
               if result.is_a? Array
                 if result.size > 1
@@ -61,25 +61,32 @@ module Bullet
         end
       )
 
-      ::ActiveRecord::Associations::Preloader.prepend(
+      ::ActiveRecord::Associations::Preloader::Batch.prepend(
         Module.new do
-          def preloaders_for_one(association, records, scope, polymorphic_parent)
+          def call
             if Bullet.start?
-              records.compact!
-              if records.first.class.name !~ /^HABTM_/
-                records.each { |record| Bullet::Detector::Association.add_object_associations(record, association) }
-                Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, association)
+              @preloaders.each do |preloader|
+                preloader.records.each { |record|
+                  Bullet::Detector::Association.add_object_associations(record, preloader.associations)
+                }
+                Bullet::Detector::UnusedEagerLoading.add_eager_loadings(preloader.records, preloader.associations)
               end
             end
             super
           end
+        end
+      )
 
-          def preloaders_for_reflection(reflection, records, scope)
+      ::ActiveRecord::Associations::Preloader::Branch.prepend(
+        Module.new do
+          def preloaders_for_reflection(reflection, reflection_records)
             if Bullet.start?
-              records.compact!
-              if records.first.class.name !~ /^HABTM_/
-                records.each { |record| Bullet::Detector::Association.add_object_associations(record, reflection.name) }
-                Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, reflection.name)
+              reflection_records.compact!
+              if reflection_records.first.class.name !~ /^HABTM_/
+                reflection_records.each { |record|
+                  Bullet::Detector::Association.add_object_associations(record, reflection.name)
+                }
+                Bullet::Detector::UnusedEagerLoading.add_eager_loadings(reflection_records, reflection.name)
               end
             end
             super
@@ -89,25 +96,41 @@ module Bullet
 
       ::ActiveRecord::Associations::Preloader::ThroughAssociation.prepend(
         Module.new do
-          def preloaded_records
-            if Bullet.start? && !defined?(@preloaded_records)
-              source_preloaders.each do |source_preloader|
-                reflection_name = source_preloader.send(:reflection).name
-                source_preloader.send(:owners).each do |owner|
+          def source_preloaders
+            if Bullet.start? && !defined?(@source_preloaders)
+              preloaders = super
+              preloaders.each do |preloader|
+                reflection_name = preloader.send(:reflection).name
+                preloader.send(:owners).each do |owner|
                   Bullet::Detector::NPlusOneQuery.call_association(owner, reflection_name)
                 end
               end
+            else
+              super
+            end
+          end
+
+          def through_preloaders
+            if Bullet.start? && !defined?(@through_preloaders)
+              preloaders = super
+              preloaders.each do |preloader|
+                reflection_name = preloader.send(:reflection).name
+                preloader.send(:owners).each do |owner|
+                  Bullet::Detector::NPlusOneQuery.call_association(owner, reflection_name)
+                end
+              end
+            else
+              super
             end
-            super
           end
         end
       )
 
       ::ActiveRecord::Associations::JoinDependency.prepend(
         Module.new do
-          def instantiate(result_set, &block)
+          def instantiate(*args, **kwargs, &block)
             @bullet_eager_loadings = {}
-            records = super
+            records = super(*args, **kwargs, &block)
 
             if Bullet.start?
               @bullet_eager_loadings.each do |_klazz, eager_loadings_hash|
@@ -121,7 +144,8 @@ module Bullet
             records
           end
 
-          def construct(ar_parent, parent, row, seen, model_cache)
+          def construct(*args, **kwargs, &block)
+            ar_parent, parent, row = args
             if Bullet.start?
               unless ar_parent.nil?
                 parent.children.each do |node|
@@ -144,12 +168,13 @@ module Bullet
               end
             end
 
-            super
+            super(*args, **kwargs, &block)
           end
 
           # call join associations
-          def construct_model(record, node, row, model_cache, id)
-            result = super
+          def construct_model(*args, **kwargs, &block)
+            record, node = args
+            result = super(*args, **kwargs, &block)
 
             if Bullet.start?
               associations = [node.reflection.name]
@@ -178,6 +203,13 @@ module Bullet
             end
             super
           end
+
+          def inversed_from_queries(record)
+            if Bullet.start? && inversable?(record)
+              Bullet::Detector::NPlusOneQuery.add_inversed_object(owner, reflection.name)
+            end
+            super
+          end
         end
       )
 
@@ -200,11 +232,7 @@ module Bullet
                   end
                 end
               end
-              if @inversed
-                Bullet::Detector::Association.add_call_object_associations(owner, reflection.name)
-              else
-                Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
-              end
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
               if records.first.class.name !~ /^HABTM_/
                 if records.size > 1
                   Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
@@ -235,31 +263,28 @@ module Bullet
       ::ActiveRecord::Associations::SingularAssociation.prepend(
         Module.new do
           # call has_one and belongs_to associations
-          def target
-            result = super()
+          def reader
+            result = super
 
             if Bullet.start?
               if owner.class.name !~ /^HABTM_/
-                unless @inversed
-                  if is_a? ::ActiveRecord::Associations::ThroughAssociation
-                    Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.through_reflection.name)
-                    association = owner.association(reflection.through_reflection.name)
-                    Array.wrap(association.target).each do |through_record|
-                      Bullet::Detector::NPlusOneQuery.call_association(through_record, source_reflection.name)
-                    end
+                if is_a? ::ActiveRecord::Associations::ThroughAssociation
+                  Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.through_reflection.name)
+                  association = owner.association(reflection.through_reflection.name)
+                  Array.wrap(association.target).each do |through_record|
+                    Bullet::Detector::NPlusOneQuery.call_association(through_record, source_reflection.name)
+                  end
 
-                    if reflection.through_reflection != through_reflection
-                      Bullet::Detector::NPlusOneQuery.call_association(owner, through_reflection.name)
-                    end
+                  if reflection.through_reflection != through_reflection
+                    Bullet::Detector::NPlusOneQuery.call_association(owner, through_reflection.name)
                   end
                 end
-                Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, inversed: @inversed)
-                unless @inversed
-                  if Bullet::Detector::NPlusOneQuery.impossible?(owner)
-                    Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
-                  else
-                    Bullet::Detector::NPlusOneQuery.add_possible_objects(result) if result
-                  end
+                Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+
+                if Bullet::Detector::NPlusOneQuery.impossible?(owner)
+                  Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
+                else
+                  Bullet::Detector::NPlusOneQuery.add_possible_objects(result) if result
                 end
               end
             end

data/lib/bullet/dependency.rb

@@ -13,22 +13,8 @@ module Bullet
     def active_record_version
       @active_record_version ||=
         begin
-          if active_record40?
-            'active_record4'
-          elsif active_record41?
-            'active_record41'
-          elsif active_record42?
-            'active_record42'
-          elsif active_record50?
-            'active_record5'
-          elsif active_record51?
-            'active_record5'
-          elsif active_record52?
-            'active_record52'
-          elsif active_record60?
-            'active_record60'
-          elsif active_record61?
-            'active_record61'
+          if active_record6_or_older?
+            raise "Bullet no longer supports active_record #{::ActiveRecord::VERSION::STRING}"
           elsif active_record70?
             'active_record70'
           elsif active_record71?
@@ -39,6 +25,8 @@ module Bullet
             'active_record80'
           elsif active_record81?
             'active_record81'
+          elsif active_record82?
+            'active_record82'
           else
             raise "Bullet does not support active_record #{::ActiveRecord::VERSION::STRING} yet"
           end
@@ -66,16 +54,8 @@ module Bullet
         end
     end
 
-    def active_record4?
-      active_record? && ::ActiveRecord::VERSION::MAJOR == 4
-    end
-
-    def active_record5?
-      active_record? && ::ActiveRecord::VERSION::MAJOR == 5
-    end
-
-    def active_record6?
-      active_record? && ::ActiveRecord::VERSION::MAJOR == 6
+    def active_record6_or_older?
+      active_record? && ::ActiveRecord::VERSION::MAJOR < 7
     end
 
     def active_record7?
@@ -86,38 +66,6 @@ module Bullet
       active_record? && ::ActiveRecord::VERSION::MAJOR == 8
     end
 
-    def active_record40?
-      active_record4? && ::ActiveRecord::VERSION::MINOR == 0
-    end
-
-    def active_record41?
-      active_record4? && ::ActiveRecord::VERSION::MINOR == 1
-    end
-
-    def active_record42?
-      active_record4? && ::ActiveRecord::VERSION::MINOR == 2
-    end
-
-    def active_record50?
-      active_record5? && ::ActiveRecord::VERSION::MINOR == 0
-    end
-
-    def active_record51?
-      active_record5? && ::ActiveRecord::VERSION::MINOR == 1
-    end
-
-    def active_record52?
-      active_record5? && ::ActiveRecord::VERSION::MINOR == 2
-    end
-
-    def active_record60?
-      active_record6? && ::ActiveRecord::VERSION::MINOR == 0
-    end
-
-    def active_record61?
-      active_record6? && ::ActiveRecord::VERSION::MINOR == 1
-    end
-
     def active_record70?
       active_record7? && ::ActiveRecord::VERSION::MINOR == 0
     end
@@ -138,6 +86,10 @@ module Bullet
       active_record8? && ::ActiveRecord::VERSION::MINOR == 1
     end
 
+    def active_record82?
+      active_record8? && ::ActiveRecord::VERSION::MINOR == 2
+    end
+
     def mongoid4x?
       mongoid? && ::Mongoid::VERSION =~ /\A4/
     end

data/lib/bullet/detector/association.rb

@@ -8,7 +8,7 @@ module Bullet
       class << self
         def add_object_associations(object, associations)
           return unless Bullet.start?
-          return if !Bullet.n_plus_one_query_enable? && !Bullet.unused_eager_loading_enable?
+          return unless Bullet.n_plus_one_query_enable? || Bullet.unused_eager_loading_enable?
           return unless object.bullet_primary_key_value
 
           Bullet.debug(
@@ -21,7 +21,7 @@ module Bullet
 
         def add_call_object_associations(object, associations)
           return unless Bullet.start?
-          return if !Bullet.n_plus_one_query_enable? && !Bullet.unused_eager_loading_enable?
+          return unless Bullet.n_plus_one_query_enable? || Bullet.unused_eager_loading_enable?
           return unless object.bullet_primary_key_value
 
           Bullet.debug(

data/lib/bullet/detector/n_plus_one_query.rb

@@ -15,7 +15,7 @@ module Bullet
         #   if it is, keeps this unpreload associations and caller.
         def call_association(object, associations, caller_stack = nil, inversed: false)
           return unless Bullet.start?
-          return unless Bullet.n_plus_one_query_enable?
+          return unless Bullet.n_plus_one_query_enable? || Bullet.unused_eager_loading_enable?
           return unless object.bullet_primary_key_value
 
           # Record before early-returns so legitimate reads that bypass SQL

data/lib/bullet/rack.rb

@@ -76,8 +76,9 @@ module Bullet
 
     # Make footer styles work with ContentSecurityPolicy style-src as self
     def footer_style(nonce = nil)
+      position_css = footer_position_css
       css = <<~CSS
-        details#bullet-footer {cursor: pointer; position: fixed; left: 0px; bottom: 0px; z-index: 9999; background: #fdf2f2; color: #9b1c1c; font-size: 12px; border-radius: 0px 8px 0px 0px; border: 1px solid #9b1c1c;}
+        details#bullet-footer {cursor: pointer; position: fixed; #{position_css}; z-index: 9999; background: #fdf2f2; color: #9b1c1c; font-size: 12px; #{footer_border_radius}; border: 1px solid #9b1c1c;}
         details#bullet-footer summary {font-weight: 600; padding: 2px 8px;}
         details#bullet-footer div {padding: 8px; border-top: 1px solid #9b1c1c;}
       CSS
@@ -88,6 +89,38 @@ module Bullet
       end
     end
 
+    private
+
+    def footer_position_css
+      case Bullet.footer_position
+      when 'bottom_left'
+        'left: 0px; bottom: 0px'
+      when 'bottom_right'
+        'right: 0px; bottom: 0px'
+      when 'top_left'
+        'left: 0px; top: 0px'
+      when 'top_right'
+        'right: 0px; top: 0px'
+      else
+        'left: 0px; bottom: 0px'
+      end
+    end
+
+    def footer_border_radius
+      case Bullet.footer_position
+      when 'bottom_left'
+        'border-radius: 0px 8px 0px 0px'
+      when 'bottom_right'
+        'border-radius: 8px 0px 0px 0px'
+      when 'top_left'
+        'border-radius: 0px 0px 8px 0px'
+      when 'top_right'
+        'border-radius: 0px 0px 0px 8px'
+      else
+        'border-radius: 0px 8px 0px 0px'
+      end
+    end
+
     def set_header(headers, header_name, header_array)
       # Many proxy applications such as Nginx and AWS ELB limit
       # the size a header to 8KB, so truncate the list of reports to
@@ -123,7 +156,7 @@ module Bullet
     end
 
     def html_request?(headers, response)
-      headers['Content-Type']&.include?('text/html')
+      headers['Content-Type']&.include?('text/html') || false
     end
 
     def response_body(response)

data/lib/bullet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bullet
-  VERSION = '8.1.3'
+  VERSION = '8.3.0'
 end

data/lib/bullet.rb

@@ -42,6 +42,7 @@ module Bullet
                 :skip_html_injection
     attr_reader :safelist
     attr_accessor :add_footer,
+                  :footer_position,
                   :orm_patches_applied,
                   :skip_http_headers,
                   :always_append_html_body,
@@ -188,6 +189,26 @@ module Bullet
       enable? && Thread.current.thread_variable_get(:bullet_start)
     end
 
+    def pause
+      Thread.current.thread_variable_set(:bullet_start, false)
+    end
+
+    def resume
+      Thread.current.thread_variable_set(:bullet_start, true)
+    end
+
+    def paused?
+      enable? && !Thread.current.thread_variable_get(:bullet_start)
+    end
+
+    def skip
+      bullet_was_started = start?
+      pause if bullet_was_started
+      yield
+    ensure
+      resume if bullet_was_started
+    end
+
     def notification_collector
       Thread.current.thread_variable_get(:bullet_notification_collector)
     end
@@ -259,6 +280,10 @@ module Bullet
       UniformNotifier.active_notifiers.include?(UniformNotifier::JavascriptConsole)
     end
 
+    def footer_position
+      @footer_position || 'bottom_left'
+    end
+
     def inject_into_page?
       return false if defined?(@skip_html_injection) && @skip_html_injection