Merge pull request #738 from koya1616/change-enable-sett

change Bullet's feature enable logic
flyerhzm · Feb 26, 2025 · d59f350 · d59f350
2 parents 86654e7 + daf4e89
commit d59f350
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -121,8 +121,6 @@ Bullet.unused_eager_loading_enable = false
 Bullet.counter_cache_enable        = false
 ```
 
-Note: When calling `Bullet.enable`, all other detectors are reset to their defaults (`true`) and need reconfiguring.
-
 ## Safe list
 
 Sometimes Bullet may notify you of query problems you don't care to fix, or

diff --git a/lib/bullet.rb b/lib/bullet.rb
@@ -64,7 +64,7 @@ def raise=(should_raise)
     ].freeze
 
     def enable=(enable)
-      @enable = @n_plus_one_query_enable = @unused_eager_loading_enable = @counter_cache_enable = enable
+      @enable = enable
 
       if enable?
         reset_safelist
@@ -90,15 +90,15 @@ def app_root
     end
 
     def n_plus_one_query_enable?
-      enable? && !!@n_plus_one_query_enable
+      enable? && (@n_plus_one_query_enable.nil? ? true : @n_plus_one_query_enable)
     end
 
     def unused_eager_loading_enable?
-      enable? && !!@unused_eager_loading_enable
+      enable? && (@unused_eager_loading_enable.nil? ? true : @unused_eager_loading_enable)
     end
 
     def counter_cache_enable?
-      enable? && !!@counter_cache_enable
+      enable? && (@counter_cache_enable.nil? ? true : @counter_cache_enable)
     end
 
     def stacktrace_includes