bullet 8.3.0 → 8.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce3dc25a18b75ec4068eae5386c39a96ac90775b2b410efd64f9993790205b83
-  data.tar.gz: a777865c06b2b8102a834db3d8a943bd41b2aadf92a91ecbc23f466dcc2bdea6
+  metadata.gz: d5c5aff8226198c501ed0c0a3e9d71138bd896f9956cf072b0f92fef79b125c7
+  data.tar.gz: 90209fe95da7ad96e110cfdabb96a91a9c403ef9e5824df2877aeab20239f020
 SHA512:
-  metadata.gz: 643e6e91d5cb5a3d1de379b738451e82a3e9e7691f2a78a0d7721bac47deaff49181ac93f54cc8fd3390c34732d2bfdea0f4f0701bfb509e0fa9af789f41c519
-  data.tar.gz: 70982dc3a2e6cfe721ee126dd138f0c3ff9b0401d5376db35bc88f7245fcb6364f00ebae0e11401658a36e28964d7806d90f6eff15dc498b7e4aecdb32969884
+  metadata.gz: 98dbc38b0e5f77f61617e75bab2b92838bbead761421681791711c917f61282e6ae29fe70fabe645ef8685344a879535fb4634451ff1bb35d560b0fd8a9c3a12
+  data.tar.gz: 49f2ebf88e0d99386ebd35a82403ece35167e9ac253013244f9ded4fe76de6b14ea070741847b6048b90ca1e15b6765430a56a180d8f6e6961383be035d08b38

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Unreleased
 
+## 8.3.1 (10/24/2026)
+
+* Avoid redefining the `footer_position` getter
+* Avoid the CGI loading warning on Ruby 4
+* Keep request state separate for sibling fibers on one thread
+
 ## 8.3.0 (10/10/2026)
 
 * Add support for ActiveRecord 8.2
@@ -15,7 +21,7 @@
 
 ## 8.1.3 (06/02/2026)
 
-* Handle inversed polymorphic belongs_to false positives
+* Handle inversed polymorphic `belongs_to` false positives
 
 ## 8.1.2 (05/25/2026)
 

data/lib/bullet/detector/association.rb

@@ -36,7 +36,7 @@ module Bullet
         # that the objects may cause N+1 query.
         # e.g. { Post => ["Post:1", "Post:2"] }
         def possible_objects
-          Thread.current.thread_variable_get(:bullet_possible_objects)
+          Bullet.state[:bullet_possible_objects]
         end
 
         # impossible_objects keep the class to objects relationships
@@ -45,7 +45,7 @@ module Bullet
         # if find collection returns only one object, then the object is impossible object,
         # impossible_objects are used to avoid treating 1+1 query to N+1 query.
         def impossible_objects
-          Thread.current.thread_variable_get(:bullet_impossible_objects)
+          Bullet.state[:bullet_impossible_objects]
         end
 
         private
@@ -56,7 +56,7 @@ module Bullet
         # the object_associations keep all associations that may be or may no be
         # unpreload associations or unused preload associations.
         def object_associations
-          Thread.current.thread_variable_get(:bullet_object_associations)
+          Bullet.state[:bullet_object_associations]
         end
 
         # call_object_associations keep the object relationships
@@ -64,27 +64,27 @@ module Bullet
         # e.g. { "Post:1" => [:comments] }
         # they are used to detect unused preload associations.
         def call_object_associations
-          Thread.current.thread_variable_get(:bullet_call_object_associations)
+          Bullet.state[:bullet_call_object_associations]
         end
 
         # inversed_objects keeps object relationships
         # that association is inversed.
         # e.g. { "Comment:1" => ["post"] }
         def inversed_objects
-          Thread.current.thread_variable_get(:bullet_inversed_objects)
+          Bullet.state[:bullet_inversed_objects]
         end
 
         # eager_loadings keep the object relationships
         # that the associations are preloaded by find :include.
         # e.g. { ["Post:1", "Post:2"] => [:comments, :user] }
         def eager_loadings
-          Thread.current.thread_variable_get(:bullet_eager_loadings)
+          Bullet.state[:bullet_eager_loadings]
         end
 
         # call_stacks keeps stacktraces where querie-objects were called from.
         # e.g. { 'Object:111' => [SomeProject/app/controllers/...] }
         def call_stacks
-          Thread.current.thread_variable_get(:bullet_call_stacks)
+          Bullet.state[:bullet_call_stacks]
         end
       end
     end

data/lib/bullet/detector/counter_cache.rb

@@ -46,11 +46,11 @@ module Bullet
         end
 
         def possible_objects
-          Thread.current.thread_variable_get(:bullet_counter_possible_objects)
+          Bullet.state[:bullet_counter_possible_objects]
         end
 
         def impossible_objects
-          Thread.current.thread_variable_get(:bullet_counter_impossible_objects)
+          Bullet.state[:bullet_counter_impossible_objects]
         end
 
         private

data/lib/bullet/rack.rb

@@ -2,7 +2,12 @@
 
 require 'rack/request'
 require 'json'
-require 'cgi'
+
+if RUBY_VERSION.to_i >= 4
+  require 'cgi/escape'
+else
+  require 'cgi'
+end
 
 module Bullet
   class Rack

data/lib/bullet/version.rb

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

data/lib/bullet.rb

@@ -39,10 +39,10 @@ module Bullet
                 :counter_cache_enable,
                 :stacktrace_includes,
                 :stacktrace_excludes,
-                :skip_html_injection
+                :skip_html_injection,
+                :footer_position
     attr_reader :safelist
     attr_accessor :add_footer,
-                  :footer_position,
                   :orm_patches_applied,
                   :skip_http_headers,
                   :always_append_html_body,
@@ -149,56 +149,71 @@ module Bullet
       puts "[Bullet][#{title}] #{message}" if ENV['BULLET_DEBUG'] == 'true'
     end
 
+    # Fiber storage reaches child fibers; start_request gives each request its own, and the owner check keeps it off new threads.
+    def state
+      unless Fiber.respond_to?(:[])
+        return Thread.current.thread_variable_get(:bullet_state) || Thread.current.thread_variable_set(:bullet_state, {})
+      end
+
+      current = Fiber[:bullet_state]
+      return current if current && current[:owner].equal?(Thread.current)
+
+      Fiber[:bullet_state] = { owner: Thread.current }
+    end
+
     def start_request
-      Thread.current.thread_variable_set(:bullet_start, true)
-      Thread.current.thread_variable_set(:bullet_notification_collector, Bullet::NotificationCollector.new)
-
-      Thread.current.thread_variable_set(:bullet_object_associations, Bullet::Registry::Base.new)
-      Thread.current.thread_variable_set(:bullet_call_object_associations, Bullet::Registry::Base.new)
-      Thread.current.thread_variable_set(:bullet_possible_objects, Bullet::Registry::Object.new)
-      Thread.current.thread_variable_set(:bullet_impossible_objects, Bullet::Registry::Object.new)
-      Thread.current.thread_variable_set(:bullet_inversed_objects, Bullet::Registry::Base.new)
-      Thread.current.thread_variable_set(:bullet_eager_loadings, Bullet::Registry::Association.new)
-      Thread.current.thread_variable_set(:bullet_call_stacks, Bullet::Registry::CallStack.new)
-
-      unless Thread.current.thread_variable_get(:bullet_counter_possible_objects)
-        Thread.current.thread_variable_set(:bullet_counter_possible_objects, Bullet::Registry::Object.new)
+      if Fiber.respond_to?(:[])
+        Fiber[:bullet_state] = state.slice(:owner)
+      end
+      Bullet.state[:bullet_start] = true
+      Bullet.state[:bullet_notification_collector] = Bullet::NotificationCollector.new
+
+      Bullet.state[:bullet_object_associations] = Bullet::Registry::Base.new
+      Bullet.state[:bullet_call_object_associations] = Bullet::Registry::Base.new
+      Bullet.state[:bullet_possible_objects] = Bullet::Registry::Object.new
+      Bullet.state[:bullet_impossible_objects] = Bullet::Registry::Object.new
+      Bullet.state[:bullet_inversed_objects] = Bullet::Registry::Base.new
+      Bullet.state[:bullet_eager_loadings] = Bullet::Registry::Association.new
+      Bullet.state[:bullet_call_stacks] = Bullet::Registry::CallStack.new
+
+      unless Bullet.state[:bullet_counter_possible_objects]
+        Bullet.state[:bullet_counter_possible_objects] = Bullet::Registry::Object.new
       end
 
-      unless Thread.current.thread_variable_get(:bullet_counter_impossible_objects)
-        Thread.current.thread_variable_set(:bullet_counter_impossible_objects, Bullet::Registry::Object.new)
+      unless Bullet.state[:bullet_counter_impossible_objects]
+        Bullet.state[:bullet_counter_impossible_objects] = Bullet::Registry::Object.new
       end
     end
 
     def end_request
-      Thread.current.thread_variable_set(:bullet_start, nil)
-      Thread.current.thread_variable_set(:bullet_notification_collector, nil)
+      Bullet.state[:bullet_start] = nil
+      Bullet.state[:bullet_notification_collector] = nil
 
-      Thread.current.thread_variable_set(:bullet_object_associations, nil)
-      Thread.current.thread_variable_set(:bullet_call_object_associations, nil)
-      Thread.current.thread_variable_set(:bullet_possible_objects, nil)
-      Thread.current.thread_variable_set(:bullet_impossible_objects, nil)
-      Thread.current.thread_variable_set(:bullet_inversed_objects, nil)
-      Thread.current.thread_variable_set(:bullet_eager_loadings, nil)
+      Bullet.state[:bullet_object_associations] = nil
+      Bullet.state[:bullet_call_object_associations] = nil
+      Bullet.state[:bullet_possible_objects] = nil
+      Bullet.state[:bullet_impossible_objects] = nil
+      Bullet.state[:bullet_inversed_objects] = nil
+      Bullet.state[:bullet_eager_loadings] = nil
 
-      Thread.current.thread_variable_set(:bullet_counter_possible_objects, nil)
-      Thread.current.thread_variable_set(:bullet_counter_impossible_objects, nil)
+      Bullet.state[:bullet_counter_possible_objects] = nil
+      Bullet.state[:bullet_counter_impossible_objects] = nil
     end
 
     def start?
-      enable? && Thread.current.thread_variable_get(:bullet_start)
+      enable? && Bullet.state[:bullet_start]
     end
 
     def pause
-      Thread.current.thread_variable_set(:bullet_start, false)
+      Bullet.state[:bullet_start] = false
     end
 
     def resume
-      Thread.current.thread_variable_set(:bullet_start, true)
+      Bullet.state[:bullet_start] = true
     end
 
     def paused?
-      enable? && !Thread.current.thread_variable_get(:bullet_start)
+      enable? && !Bullet.state[:bullet_start]
     end
 
     def skip
@@ -210,7 +225,7 @@ module Bullet
     end
 
     def notification_collector
-      Thread.current.thread_variable_get(:bullet_notification_collector)
+      Bullet.state[:bullet_notification_collector]
     end
 
     def notification?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 8.3.0
+  version: 8.3.1
 platform: ruby
 authors:
 - Richard Huang
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.20
 specification_version: 4
 summary: help to kill N+1 queries and unused eager loading.
 test_files: []