bullet 6.1.1 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d02240600f13580ed16200edd5c39563bec1cb49a46ccbc82c57cff73a46e2f
-  data.tar.gz: 0f40a4a1fe6157dabec88cb0ecc817168eda794aa1177c41ede1df351695d76a
+  metadata.gz: 0363cc75d4facd4a8b4a318312a421040d5b21d7ca81c0b3af21daaf7c2b60cd
+  data.tar.gz: ac0b0e4ed9c1641b5359b3d885ef854934b85b8ee21bc0486a4c3d2661e20853
 SHA512:
-  metadata.gz: 1d3d3ce81767ce81091ddd7412dd8f341190ffac085477cde3ea04fa1ed696661f84be64d9c1fb6e6a0de276788e56f18aaada213df712cb51e6efb0a577ec37
-  data.tar.gz: a3633af514a31e0ad6ff317a98616ed2c6c3ce070109288b8514c80277d4098359ed25a60bd5bcc4cd0ebf469f156751fa707f8d410f010bfcb8828e206e08a3
+  metadata.gz: 199558c8186455fb2ddac94461d611d1c40eb0fb83ac68e36647efe0a34927020967a803cb24645b7ae3d5d045aa0060c604b455476f8c6aad6b5329103a7ebe
+  data.tar.gz: 86c4bcf9fcca52275229b7fa5e02919c39318d91a60c7fe956d4cab07442cbacfc3d9df134af1ee38bc7f153eeb2cd256faff45815ad83acd296c1831d1fc9ee

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Next Release
 
+## 6.1.2 (12/12/2020)
+
+* Revert "Make whitelist thread safe"
+
 ## 6.1.1 (12/12/2020)
 
 * Add support Rails 6.1

data/lib/bullet.rb

@@ -38,6 +38,7 @@ module Bullet
                 :stacktrace_includes,
                 :stacktrace_excludes,
                 :skip_html_injection
+    attr_reader :whitelist
     attr_accessor :add_footer, :orm_patches_applied
 
     available_notifiers = UniformNotifier::AVAILABLE_NOTIFIERS.map { |notifier| "#{notifier}=" }
@@ -97,27 +98,27 @@ module Bullet
 
     def add_whitelist(options)
       reset_whitelist
-      Thread.current[:whitelist][options[:type]][options[:class_name]] ||= []
-      Thread.current[:whitelist][options[:type]][options[:class_name]] << options[:association].to_sym
+      @whitelist[options[:type]][options[:class_name]] ||= []
+      @whitelist[options[:type]][options[:class_name]] << options[:association].to_sym
     end
 
     def delete_whitelist(options)
       reset_whitelist
-      Thread.current[:whitelist][options[:type]][options[:class_name]] ||= []
-      Thread.current[:whitelist][options[:type]][options[:class_name]].delete(options[:association].to_sym)
-      Thread.current[:whitelist][options[:type]].delete_if { |_key, val| val.empty? }
+      @whitelist[options[:type]][options[:class_name]] ||= []
+      @whitelist[options[:type]][options[:class_name]].delete(options[:association].to_sym)
+      @whitelist[options[:type]].delete_if { |_key, val| val.empty? }
     end
 
     def get_whitelist_associations(type, class_name)
-      Array(Thread.current[:whitelist][type][class_name])
+      Array(@whitelist[type][class_name])
     end
 
     def reset_whitelist
-      Thread.current[:whitelist] ||= { n_plus_one_query: {}, unused_eager_loading: {}, counter_cache: {} }
+      @whitelist ||= { n_plus_one_query: {}, unused_eager_loading: {}, counter_cache: {} }
     end
 
     def clear_whitelist
-      Thread.current[:whitelist] = nil
+      @whitelist = nil
     end
 
     def bullet_logger=(active)

data/lib/bullet/version.rb

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

data/spec/bullet_spec.rb

@@ -88,7 +88,7 @@ describe Bullet, focused: true do
       it 'is deleted from the whitelist successfully' do
         Bullet.add_whitelist(type: :n_plus_one_query, class_name: 'Klass', association: :department)
         Bullet.delete_whitelist(type: :n_plus_one_query, class_name: 'Klass', association: :department)
-        expect(Thread.current[:whitelist][:n_plus_one_query]).to eq({})
+        expect(Bullet.whitelist[:n_plus_one_query]).to eq({})
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.1.2
 platform: ruby
 authors:
 - Richard Huang