bullet 8.1.0.beta1 → 8.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2574a64c0e7be33a0d8ba57e0c23555e70b09999ae9d6d2d8ce0abf30222c782
-  data.tar.gz: 1da3e33d8752367ff389f41f16eff4e7f314084954160a21cc5aac8f1f3b0fca
+  metadata.gz: 4f10d7c7ed8bf9cb6e6b3f0d8d2757bfa71a66d8c4f90da0ce708cfce06eddb8
+  data.tar.gz: 4986e5b6390339bd6034a598a5f24678dd98c1db907f07de3a2aac1cef4501fd
 SHA512:
-  metadata.gz: 4b324a99664cfbc4892cee40c2c80f32a46b313c0ea155de6eb36c4809d372e90c8ed5c3eaf20d90de39fbfe03ce1251d128c56f6a30343a2fa25b9d152cff6d
-  data.tar.gz: 8be2ed0c9d8ce3e9868c554919f9d5e08b04f16876b1f7999470c05a47ffae82f5c896fd38f39518aef3f8f952b44ffe072f3363bd7e7a24b33bdb53cf51e809
+  metadata.gz: 323f11d8aee1ba3175eb02795aafb800ad1262f4da84333698fa2f73011b5f9912ad7c38fe37f347ac1b492e90cff87db322433fc6ef55262ab1ecf2e6cc02d7
+  data.tar.gz: e44277b7412ff505bb3c21047f8eeff5774f367375989192ef27367102eae91f04eb6625f89110160181690ab440051ae6dc2db39d0b5eb89b30fe47a164eab9

data/CHANGELOG.md

@@ -1,9 +1,14 @@
-## Next Release
+## 8.1.1 (04/23/2026)
 
-## 8.1.0.beta1 (10/16/2025)
+* 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
-* Add support for ActiveRecord 8.1.0.beta1
+* 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
 

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

@@ -16,8 +16,8 @@ module Bullet
       require 'active_record'
       ::ActiveRecord::Base.extend(
         Module.new do
-          def find_by_sql(sql, binds = [], preparable: nil, allow_retry: false, &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
@@ -114,9 +114,9 @@ module Bullet
 
       ::ActiveRecord::Associations::JoinDependency.prepend(
         Module.new do
-          def instantiate(result_set, strict_loading_value, &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|
@@ -130,7 +130,8 @@ module Bullet
             records
           end
 
-          def construct(ar_parent, parent, row, seen, model_cache, strict_loading_value)
+          def construct(*args, **kwargs, &block)
+            ar_parent, parent, row = args
             if Bullet.start?
               unless ar_parent.nil?
                 parent.children.each do |node|
@@ -153,12 +154,13 @@ module Bullet
               end
             end
 
-            super
+            super(*args, **kwargs, &block)
           end
 
           # call join associations
-          def construct_model(record, node, row, model_cache, id, strict_loading_value)
-            result = super
+          def construct_model(*args, **kwargs, &block)
+            record, node = args
+            result = super(*args, **kwargs, &block)
 
             if Bullet.start?
               associations = [node.reflection.name]
@@ -232,13 +234,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 +282,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 +308,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/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/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.1.0.beta1'
+  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.1.0.beta1
+  version: 8.1.1
 platform: ruby
 authors:
 - Richard Huang
@@ -113,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: []