bullet 8.0.8 → 8.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac2296e419c6f32f6ed2e2dbe92a344884d1197b8287bb6c67783a1587c31c72
-  data.tar.gz: 523f4b66265e7ca8b4d67b19ecd13a547f7ad55acbdbd8190ec1e48a1cb4993e
+  metadata.gz: 4f10d7c7ed8bf9cb6e6b3f0d8d2757bfa71a66d8c4f90da0ce708cfce06eddb8
+  data.tar.gz: 4986e5b6390339bd6034a598a5f24678dd98c1db907f07de3a2aac1cef4501fd
 SHA512:
-  metadata.gz: 463b978de4299a651821f4bf66ce219ba3def30f32d8fbb790086d10b869526578c2f5b441a1c0c5d368c03906e833a86b5ed88cda1a2f983e5769c04bf7efb2
-  data.tar.gz: 5ab230e714c07790210516fbb760007fbbb49875a4021950b8e5d2c8ab77e132240f632ee50a62ee25dc58f629663f6d9802bee626d870d456284e3d4130ed3e
+  metadata.gz: 323f11d8aee1ba3175eb02795aafb800ad1262f4da84333698fa2f73011b5f9912ad7c38fe37f347ac1b492e90cff87db322433fc6ef55262ab1ecf2e6cc02d7
+  data.tar.gz: e44277b7412ff505bb3c21047f8eeff5774f367375989192ef27367102eae91f04eb6625f89110160181690ab440051ae6dc2db39d0b5eb89b30fe47a164eab9

data/CHANGELOG.md

@@ -1,4 +1,14 @@
-## Next Release
+## 8.1.1 (04/23/2026)
+
+* Fix ActiveRecord 8.1 patch-level method signature compatibility; test against Rails 8.1.3.
+* Handle string associations in safelist for Action Text
+* Enhance N+1 query detection by including caller stack in association calls
+* Update external links in README.md
+
+## 8.1.0 (10/23/2025)
+
+* Make `get_relation` private
+* Support Rails 8.1
 
 ## 8.0.8 (05/30/2025)
 

data/README.md

@@ -17,10 +17,9 @@ If you use activerecord 3.x, please use bullet < 5.5.0
 
 ## External Introduction
 
-* [http://railscasts.com/episodes/372-bullet](http://railscasts.com/episodes/372-bullet)
-* [http://ruby5.envylabs.com/episodes/9-episode-8-september-8-2009](http://ruby5.envylabs.com/episodes/9-episode-8-september-8-2009)
-* [http://railslab.newrelic.com/2009/10/23/episode-19-on-the-edge-part-1](http://railslab.newrelic.com/2009/10/23/episode-19-on-the-edge-part-1)
 * [https://rubyonrails.org/2009/10/22/community-highlights](https://rubyonrails.org/2009/10/22/community-highlights)
+* [https://www.shakacode.com/blog/eliminate-N-1-queries-with-bullet/](https://www.shakacode.com/blog/eliminate-N-1-queries-with-bullet/)
+* [https://reinteractive.com/articles/ruby-on-rails-community/elevating-your-code-quality-bullet-gem-and-query-prevention-in-testing](https://reinteractive.com/articles/ruby-on-rails-community/elevating-your-code-quality-bullet-gem-and-query-prevention-in-testing)
 
 ## Install
 
@@ -71,10 +70,14 @@ config.after_initialize do
   Bullet.rollbar = true
   Bullet.add_footer = true
   Bullet.skip_html_injection = false
+  Bullet.skip_http_headers = false
   Bullet.stacktrace_includes = [ 'your_gem', 'your_middleware' ]
   Bullet.stacktrace_excludes = [ 'their_gem', 'their_middleware', ['my_file.rb', 'my_method'], ['my_file.rb', 16..20] ]
   Bullet.slack = { webhook_url: 'http://some.slack.url', channel: '#default', username: 'notifier' }
   Bullet.opentelemetry = true
+  Bullet.raise = false
+  Bullet.always_append_html_body = false
+  Bullet.skip_user_in_notification = false
 end
 ```
 
@@ -82,6 +85,7 @@ The notifier of Bullet is a wrap of [uniform_notifier](https://github.com/flyerh
 
 The code above will enable all of the Bullet notification systems:
 * `Bullet.enable`: enable Bullet gem, otherwise do nothing
+* `Bullet.sentry`: add notifications to sentry
 * `Bullet.alert`: pop up a JavaScript alert in the browser
 * `Bullet.bullet_logger`: log to the Bullet log file (Rails.root/log/bullet.log)
 * `Bullet.console`: log warnings to your browser's console.log (Safari/Webkit browsers or Firefox w/Firebug installed)
@@ -89,10 +93,9 @@ The code above will enable all of the Bullet notification systems:
 * `Bullet.rails_logger`: add warnings directly to the Rails log
 * `Bullet.honeybadger`: add notifications to Honeybadger
 * `Bullet.bugsnag`: add notifications to bugsnag
-* `Bullet.airbrake`: add notifications to airbrake
 * `Bullet.appsignal`: add notifications to AppSignal
+* `Bullet.airbrake`: add notifications to airbrake
 * `Bullet.rollbar`: add notifications to rollbar
-* `Bullet.sentry`: add notifications to sentry
 * `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.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.

data/lib/bullet/active_record5.rb

@@ -255,11 +255,10 @@ module Bullet
       ::ActiveRecord::Associations::HasManyAssociation.prepend(
         Module.new do
           def empty?
-            result = super
             if Bullet.start? && !reflection.has_cached_counter?
-              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, caller_locations)
             end
-            result
+            super
           end
 
           def count_records

data/lib/bullet/active_record52.rb

@@ -237,11 +237,10 @@ module Bullet
       ::ActiveRecord::Associations::HasManyAssociation.prepend(
         Module.new do
           def empty?
-            result = super
             if Bullet.start? && !reflection.has_cached_counter?
-              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, caller_locations)
             end
-            result
+            super
           end
 
           def count_records

data/lib/bullet/active_record60.rb

@@ -216,13 +216,13 @@ module Bullet
 
           def empty?
             if Bullet.start? && !reflection.has_cached_counter?
-              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, caller_locations)
             end
             super
           end
 
           def include?(object)
-            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name) if Bullet.start?
+            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, caller_locations) if Bullet.start?
             super
           end
         end
@@ -264,11 +264,10 @@ module Bullet
       ::ActiveRecord::Associations::HasManyAssociation.prepend(
         Module.new do
           def empty?
-            result = super
             if Bullet.start? && !reflection.has_cached_counter?
-              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, caller_locations)
             end
-            result
+            super
           end
 
           def count_records
@@ -291,7 +290,8 @@ module Bullet
               )
               Bullet::Detector::NPlusOneQuery.call_association(
                 proxy_association.owner,
-                proxy_association.reflection.name
+                proxy_association.reflection.name,
+                caller_locations
               )
             end
             super(column_name)

data/lib/bullet/active_record61.rb

@@ -216,13 +216,13 @@ module Bullet
 
           def empty?
             if Bullet.start? && !reflection.has_cached_counter?
-              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, caller_locations)
             end
             super
           end
 
           def include?(object)
-            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name) if Bullet.start?
+            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, caller_locations) if Bullet.start?
             super
           end
         end
@@ -264,11 +264,10 @@ module Bullet
       ::ActiveRecord::Associations::HasManyAssociation.prepend(
         Module.new do
           def empty?
-            result = super
             if Bullet.start? && !reflection.has_cached_counter?
-              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, caller_locations)
             end
-            result
+            super
           end
 
           def count_records
@@ -291,7 +290,8 @@ module Bullet
               )
               Bullet::Detector::NPlusOneQuery.call_association(
                 proxy_association.owner,
-                proxy_association.reflection.name
+                proxy_association.reflection.name,
+                caller_locations
               )
             end
             super(column_name)

data/lib/bullet/active_record70.rb

@@ -232,13 +232,13 @@ module Bullet
 
           def empty?
             if Bullet.start? && !reflection.has_cached_counter?
-              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, caller_locations)
             end
             super
           end
 
           def include?(object)
-            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name) if Bullet.start?
+            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, caller_locations) if Bullet.start?
             super
           end
         end
@@ -280,11 +280,10 @@ module Bullet
       ::ActiveRecord::Associations::HasManyAssociation.prepend(
         Module.new do
           def empty?
-            result = super
             if Bullet.start? && !reflection.has_cached_counter?
-              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, caller_locations)
             end
-            result
+            super
           end
 
           def count_records
@@ -307,7 +306,8 @@ module Bullet
               )
               Bullet::Detector::NPlusOneQuery.call_association(
                 proxy_association.owner,
-                proxy_association.reflection.name
+                proxy_association.reflection.name,
+                caller_locations
               )
             end
             super(column_name)

data/lib/bullet/active_record71.rb

@@ -232,13 +232,13 @@ module Bullet
 
           def empty?
             if Bullet.start? && !reflection.has_cached_counter?
-              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, caller_locations)
             end
             super
           end
 
           def include?(object)
-            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name) if Bullet.start?
+            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, caller_locations) if Bullet.start?
             super
           end
         end
@@ -280,11 +280,10 @@ module Bullet
       ::ActiveRecord::Associations::HasManyAssociation.prepend(
         Module.new do
           def empty?
-            result = super
             if Bullet.start? && !reflection.has_cached_counter?
-              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, caller_locations)
             end
-            result
+            super
           end
 
           def count_records
@@ -307,7 +306,8 @@ module Bullet
               )
               Bullet::Detector::NPlusOneQuery.call_association(
                 proxy_association.owner,
-                proxy_association.reflection.name
+                proxy_association.reflection.name,
+                caller_locations
               )
             end
             super(column_name)

data/lib/bullet/active_record72.rb

@@ -232,13 +232,13 @@ module Bullet
 
           def empty?
             if Bullet.start? && !reflection.has_cached_counter?
-              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, caller_locations)
             end
             super
           end
 
           def include?(object)
-            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name) if Bullet.start?
+            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, caller_locations) if Bullet.start?
             super
           end
         end
@@ -280,11 +280,10 @@ module Bullet
       ::ActiveRecord::Associations::HasManyAssociation.prepend(
         Module.new do
           def empty?
-            result = super
             if Bullet.start? && !reflection.has_cached_counter?
-              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, caller_locations)
             end
-            result
+            super
           end
 
           def count_records
@@ -307,7 +306,8 @@ module Bullet
               )
               Bullet::Detector::NPlusOneQuery.call_association(
                 proxy_association.owner,
-                proxy_association.reflection.name
+                proxy_association.reflection.name,
+                caller_locations
               )
             end
             super(column_name)

data/lib/bullet/active_record80.rb

@@ -232,13 +232,13 @@ module Bullet
 
           def empty?
             if Bullet.start? && !reflection.has_cached_counter?
-              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, caller_locations)
             end
             super
           end
 
           def include?(object)
-            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name) if Bullet.start?
+            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, caller_locations) if Bullet.start?
             super
           end
         end
@@ -280,11 +280,10 @@ module Bullet
       ::ActiveRecord::Associations::HasManyAssociation.prepend(
         Module.new do
           def empty?
-            result = super
             if Bullet.start? && !reflection.has_cached_counter?
-              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, caller_locations)
             end
-            result
+            super
           end
 
           def count_records
@@ -307,7 +306,8 @@ module Bullet
               )
               Bullet::Detector::NPlusOneQuery.call_association(
                 proxy_association.owner,
-                proxy_association.reflection.name
+                proxy_association.reflection.name,
+                caller_locations
               )
             end
             super(column_name)

data/lib/bullet/active_record81.rb

@@ -0,0 +1,321 @@
+# frozen_string_literal: true
+
+module Bullet
+  module SaveWithBulletSupport
+    def _create_record(*)
+      super do
+        Bullet::Detector::NPlusOneQuery.update_inversed_object(self)
+        Bullet::Detector::NPlusOneQuery.add_impossible_object(self)
+        yield(self) if block_given?
+      end
+    end
+  end
+
+  module ActiveRecord
+    def self.enable
+      require 'active_record'
+      ::ActiveRecord::Base.extend(
+        Module.new do
+          def find_by_sql(*args, **kwargs, &block)
+            result = super(*args, **kwargs, &block)
+            if Bullet.start?
+              if result.is_a? Array
+                if result.size > 1
+                  Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
+                  Bullet::Detector::CounterCache.add_possible_objects(result)
+                elsif result.size == 1
+                  Bullet::Detector::NPlusOneQuery.add_impossible_object(result.first)
+                  Bullet::Detector::CounterCache.add_impossible_object(result.first)
+                end
+              elsif result.is_a? ::ActiveRecord::Base
+                Bullet::Detector::NPlusOneQuery.add_impossible_object(result)
+                Bullet::Detector::CounterCache.add_impossible_object(result)
+              end
+            end
+            result
+          end
+        end
+      )
+
+      ::ActiveRecord::Base.prepend(SaveWithBulletSupport)
+
+      ::ActiveRecord::Relation.prepend(
+        Module.new do
+          # if select a collection of objects, then these objects have possible to cause N+1 query.
+          # if select only one object, then the only one object has impossible to cause N+1 query.
+          def records
+            result = super
+            if Bullet.start?
+              if result.first.class.name !~ /^HABTM_/
+                if result.size > 1
+                  Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
+                  Bullet::Detector::CounterCache.add_possible_objects(result)
+                elsif result.size == 1
+                  Bullet::Detector::NPlusOneQuery.add_impossible_object(result.first)
+                  Bullet::Detector::CounterCache.add_impossible_object(result.first)
+                end
+              end
+            end
+            result
+          end
+        end
+      )
+
+      ::ActiveRecord::Associations::Preloader::Batch.prepend(
+        Module.new do
+          def call
+            if Bullet.start?
+              @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
+      )
+
+      ::ActiveRecord::Associations::Preloader::Branch.prepend(
+        Module.new do
+          def preloaders_for_reflection(reflection, reflection_records)
+            if Bullet.start?
+              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
+          end
+        end
+      )
+
+      ::ActiveRecord::Associations::Preloader::ThroughAssociation.prepend(
+        Module.new do
+          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
+        end
+      )
+
+      ::ActiveRecord::Associations::JoinDependency.prepend(
+        Module.new do
+          def instantiate(*args, **kwargs, &block)
+            @bullet_eager_loadings = {}
+            records = super(*args, **kwargs, &block)
+
+            if Bullet.start?
+              @bullet_eager_loadings.each do |_klazz, eager_loadings_hash|
+                objects = eager_loadings_hash.keys
+                Bullet::Detector::UnusedEagerLoading.add_eager_loadings(
+                  objects,
+                  eager_loadings_hash[objects.first].to_a
+                )
+              end
+            end
+            records
+          end
+
+          def construct(*args, **kwargs, &block)
+            ar_parent, parent, row = args
+            if Bullet.start?
+              unless ar_parent.nil?
+                parent.children.each do |node|
+                  key = aliases.column_alias(node, node.primary_key)
+                  id = row[key]
+                  next unless id.nil?
+
+                  associations = [node.reflection.name]
+                  if node.reflection.through_reflection?
+                    associations << node.reflection.through_reflection.name
+                  end
+                  associations.each do |association|
+                    Bullet::Detector::Association.add_object_associations(ar_parent, association)
+                    Bullet::Detector::NPlusOneQuery.call_association(ar_parent, association)
+                    @bullet_eager_loadings[ar_parent.class] ||= {}
+                    @bullet_eager_loadings[ar_parent.class][ar_parent] ||= Set.new
+                    @bullet_eager_loadings[ar_parent.class][ar_parent] << association
+                  end
+                end
+              end
+            end
+
+            super(*args, **kwargs, &block)
+          end
+
+          # call join associations
+          def construct_model(*args, **kwargs, &block)
+            record, node = args
+            result = super(*args, **kwargs, &block)
+
+            if Bullet.start?
+              associations = [node.reflection.name]
+              if node.reflection.through_reflection?
+                associations << node.reflection.through_reflection.name
+              end
+              associations.each do |association|
+                Bullet::Detector::Association.add_object_associations(record, association)
+                Bullet::Detector::NPlusOneQuery.call_association(record, association)
+                @bullet_eager_loadings[record.class] ||= {}
+                @bullet_eager_loadings[record.class][record] ||= Set.new
+                @bullet_eager_loadings[record.class][record] << association
+              end
+            end
+
+            result
+          end
+        end
+      )
+
+      ::ActiveRecord::Associations::Association.prepend(
+        Module.new do
+          def inversed_from(record)
+            if Bullet.start?
+              Bullet::Detector::NPlusOneQuery.add_inversed_object(owner, reflection.name)
+            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
+      )
+
+      ::ActiveRecord::Associations::CollectionAssociation.prepend(
+        Module.new do
+          def load_target
+            records = super
+
+            if Bullet.start?
+              if is_a? ::ActiveRecord::Associations::ThroughAssociation
+                association = owner.association(reflection.through_reflection.name)
+                if association.loaded?
+                  Bullet::Detector::NPlusOneQuery.call_association(owner, 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
+                end
+              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)
+                  Bullet::Detector::CounterCache.add_possible_objects(records)
+                elsif records.size == 1
+                  Bullet::Detector::NPlusOneQuery.add_impossible_object(records.first)
+                  Bullet::Detector::CounterCache.add_impossible_object(records.first)
+                end
+              end
+            end
+            records
+          end
+
+          def empty?
+            if Bullet.start? && !reflection.has_cached_counter?
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, caller_locations)
+            end
+            super
+          end
+
+          def include?(object)
+            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, caller_locations) if Bullet.start?
+            super
+          end
+        end
+      )
+
+      ::ActiveRecord::Associations::SingularAssociation.prepend(
+        Module.new do
+          # call has_one and belongs_to associations
+          def reader
+            result = super
+
+            if Bullet.start?
+              if owner.class.name !~ /^HABTM_/
+                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
+                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
+            result
+          end
+        end
+      )
+
+      ::ActiveRecord::Associations::HasManyAssociation.prepend(
+        Module.new do
+          def empty?
+            if Bullet.start? && !reflection.has_cached_counter?
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name, caller_locations)
+            end
+            super
+          end
+
+          def count_records
+            result = reflection.has_cached_counter?
+            if Bullet.start? && !result && !is_a?(::ActiveRecord::Associations::ThroughAssociation)
+              Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name)
+            end
+            super
+          end
+        end
+      )
+
+      ::ActiveRecord::Associations::CollectionProxy.prepend(
+        Module.new do
+          def count(column_name = nil)
+            if Bullet.start? && !proxy_association.is_a?(::ActiveRecord::Associations::ThroughAssociation)
+              Bullet::Detector::CounterCache.add_counter_cache(
+                proxy_association.owner,
+                proxy_association.reflection.name
+              )
+              Bullet::Detector::NPlusOneQuery.call_association(
+                proxy_association.owner,
+                proxy_association.reflection.name,
+                caller_locations
+              )
+            end
+            super(column_name)
+          end
+        end
+      )
+    end
+  end
+end

data/lib/bullet/dependency.rb

@@ -37,6 +37,8 @@ module Bullet
             'active_record72'
           elsif active_record80?
             'active_record80'
+          elsif active_record81?
+            'active_record81'
           else
             raise "Bullet does not support active_record #{::ActiveRecord::VERSION::STRING} yet"
           end
@@ -132,6 +134,10 @@ module Bullet
       active_record8? && ::ActiveRecord::VERSION::MINOR == 0
     end
 
+    def active_record81?
+      active_record8? && ::ActiveRecord::VERSION::MINOR == 1
+    end
+
     def mongoid4x?
       mongoid? && ::Mongoid::VERSION =~ /\A4/
     end

data/lib/bullet/detector/n_plus_one_query.rb

@@ -13,13 +13,14 @@ module Bullet
         # first, it keeps this method call for object.association.
         # then, it checks if this associations call is unpreload.
         #   if it is, keeps this unpreload associations and caller.
-        def call_association(object, associations)
+        def call_association(object, associations, caller_stack = nil)
           return unless Bullet.start?
           return unless Bullet.n_plus_one_query_enable?
           return unless object.bullet_primary_key_value
           return if inversed_objects.include?(object.bullet_key, associations)
 
           add_call_object_associations(object, associations)
+          call_stacks.add(object.bullet_key, caller_stack) if caller_stack
 
           Bullet.debug(
             'Detector::NPlusOneQuery#call_association',

data/lib/bullet/mongoid4x.rb

@@ -46,6 +46,8 @@ module Bullet
       ::Mongoid::Relations::Accessors.class_eval do
         alias_method :origin_get_relation, :get_relation
 
+        private
+
         def get_relation(name, metadata, object, reload = false)
           result = origin_get_relation(name, metadata, object, reload)
           Bullet::Detector::NPlusOneQuery.call_association(self, name) if metadata.macro !~ /embed/

data/lib/bullet/mongoid5x.rb

@@ -46,6 +46,8 @@ module Bullet
       ::Mongoid::Relations::Accessors.class_eval do
         alias_method :origin_get_relation, :get_relation
 
+        private
+
         def get_relation(name, metadata, object, reload = false)
           result = origin_get_relation(name, metadata, object, reload)
           Bullet::Detector::NPlusOneQuery.call_association(self, name) if metadata.macro !~ /embed/

data/lib/bullet/mongoid6x.rb

@@ -46,6 +46,8 @@ module Bullet
       ::Mongoid::Relations::Accessors.class_eval do
         alias_method :origin_get_relation, :get_relation
 
+        private
+
         def get_relation(name, metadata, object, reload = false)
           result = origin_get_relation(name, metadata, object, reload)
           Bullet::Detector::NPlusOneQuery.call_association(self, name) if metadata.macro !~ /embed/

data/lib/bullet/mongoid7x.rb

@@ -61,6 +61,8 @@ module Bullet
       ::Mongoid::Association::Accessors.class_eval do
         alias_method :origin_get_relation, :get_relation
 
+        private
+
         def get_relation(name, association, object, reload = false)
           result = origin_get_relation(name, association, object, reload)
           Bullet::Detector::NPlusOneQuery.call_association(self, name) unless association.embedded?

data/lib/bullet/mongoid8x.rb

@@ -46,6 +46,8 @@ module Bullet
       ::Mongoid::Association::Accessors.class_eval do
         alias_method :origin_get_relation, :get_relation
 
+        private
+
         def get_relation(name, association, object, reload = false)
           result = origin_get_relation(name, association, object, reload)
           unless association.embedded?

data/lib/bullet/mongoid9x.rb

@@ -61,6 +61,8 @@ module Bullet
       ::Mongoid::Association::Accessors.class_eval do
         alias_method :origin_get_relation, :get_relation
 
+        private
+
         def get_relation(name, association, object, reload = false)
           result = origin_get_relation(name, association, object, reload)
           Bullet::Detector::NPlusOneQuery.call_association(self, name) unless association.embedded?

data/lib/bullet/registry/call_stack.rb

@@ -4,8 +4,13 @@ module Bullet
   module Registry
     class CallStack < Base
       # remembers found association backtrace
-      def add(key)
-        @registry[key] ||= Thread.current.backtrace
+      # if backtrace is provided, it will be used and override any existing value
+      def add(key, backtrace = nil)
+        if backtrace
+          @registry[key] = backtrace
+        else
+          @registry[key] ||= Thread.current.backtrace
+        end
       end
     end
   end

data/lib/bullet/version.rb

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

data/lib/bullet.rb

@@ -123,7 +123,7 @@ module Bullet
     end
 
     def get_safelist_associations(type, class_name)
-      Array.wrap(@safelist[type][class_name])
+      Array.wrap(@safelist[type][class_name]).flat_map { |a| [a, a.to_s] }
     end
 
     def reset_safelist

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 8.0.8
+  version: 8.1.1
 platform: ruby
 authors:
 - Richard Huang
@@ -60,6 +60,7 @@ files:
 - lib/bullet/active_record71.rb
 - lib/bullet/active_record72.rb
 - lib/bullet/active_record80.rb
+- lib/bullet/active_record81.rb
 - lib/bullet/bullet_xhr.js
 - lib/bullet/dependency.rb
 - lib/bullet/detector.rb
@@ -112,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: help to kill N+1 queries and unused eager loading.
 test_files: []