bullet 5.6.1 → 5.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32281988136558818e4c3ae98c4059d88b6baf79
-  data.tar.gz: eb9281de70a51206eddebfe0eb70fa681b7bff51
+  metadata.gz: 7c9650d2dbc870d2ac04be4ca0e19723ef6a85c2
+  data.tar.gz: 35839d605fb1e11687836dbcbe12572b1eb07775
 SHA512:
-  metadata.gz: 49d6dba2f3881bd6c129ff12b2c241627431602804010a2a09cc11e5a1912c636f75b1f286e863117426faa830a7486b17b29b37fe6aa706f241e18eb3df282e
-  data.tar.gz: a24b68afef28189f25406b8233d50e1b14a002d71749d4bfa85a0fff40a9d9a927140e133d2f11aaf5878b126da70544a4e335ddedb6db99ce1f1fa3b10569af
+  metadata.gz: 5064948ab9db44cc9b4082397990a3d91e93dc6986db2767a528a4a05734b1d1ba9231af337624d79d7e312d13e075afb53217191d017a3c511a0889c436d0a0
+  data.tar.gz: 2c12bd045e5e41b4db0761b07562a763d3be089231d5e420fc3d7d8d27a40f184216c9090667883a606e35fcdfd2eda3f276838e60696c642bff0939ab35e85f

data/CHANGELOG.md

@@ -1,7 +1,9 @@
 # Next Release
 
-## 5.6.1 (08/01/2017)
+## 5.7.0 (12/03/2017)
 
+* Support rails 5.2
+* Implement Bullet.delete_whitelist to delete a specific whitelist definition
 * Fix caller_path in the case of nil
 
 ## 5.6.0 (07/16/2017)

data/Gemfile.rails-5.2

@@ -0,0 +1,15 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem 'rails', '~> 5.2.0.beta1'
+gem 'sqlite3'
+gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
+gem 'activerecord-import'
+
+gem "rspec"
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'rubinius-developer_tools'
+end

data/Rakefile

@@ -34,7 +34,6 @@ RSpec::Core::RakeTask.new('spec:progress') do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
 end
 
-
 begin
   require 'rdoc/task'
 

data/lib/bullet.rb

@@ -38,12 +38,12 @@ module Bullet
     delegate *available_notifiers
 
     def raise=(should_raise)
-      UniformNotifier.raise=(should_raise ? Notification::UnoptimizedQueryError : false)
+      UniformNotifier.raise = (should_raise ? Notification::UnoptimizedQueryError : false)
     end
 
-    DETECTORS = [ Bullet::Detector::NPlusOneQuery,
+    DETECTORS = [Bullet::Detector::NPlusOneQuery,
                   Bullet::Detector::UnusedEagerLoading,
-                  Bullet::Detector::CounterCache ].freeze
+                  Bullet::Detector::CounterCache].freeze
 
     def enable=(enable)
       @enable = @n_plus_one_query_enable = @unused_eager_loading_enable = @counter_cache_enable = enable
@@ -87,12 +87,19 @@ module Bullet
       @whitelist[options[:type]][options[:class_name]] << options[:association].to_sym
     end
 
+    def delete_whitelist(options)
+      reset_whitelist
+      @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(@whitelist[type][class_name])
     end
 
     def reset_whitelist
-      @whitelist ||= {:n_plus_one_query => {}, :unused_eager_loading => {}, :counter_cache => {}}
+      @whitelist ||= { :n_plus_one_query => {}, :unused_eager_loading => {}, :counter_cache => {} }
     end
 
     def clear_whitelist
@@ -163,7 +170,7 @@ module Bullet
       for_each_active_notifier_with_notification do |notification|
         responses << notification.notify_inline
       end
-      responses.join( "\n" )
+      responses.join("\n")
     end
 
     def perform_out_of_channel_notifications(env = {})
@@ -211,6 +218,7 @@ module Bullet
     end
 
     private
+
       def for_each_active_notifier_with_notification
         UniformNotifier.active_notifiers.each do |notifier|
           notification_collector.collection.each do |notification|

data/lib/bullet/active_record52.rb

@@ -0,0 +1,225 @@
+module Bullet
+  module SaveWithBulletSupport
+    def save(*args)
+      was_new_record = new_record?
+      super(*args).tap do |result|
+        Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
+      end
+    end
+
+    def save!(*args)
+      was_new_record = new_record?
+      super(*args).tap do |result|
+        Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
+      end
+    end
+  end
+
+  module ActiveRecord
+    def self.enable
+      require 'active_record'
+      ::ActiveRecord::Base.extend(Module.new {
+        def find_by_sql(sql, binds = [], preparable: nil, &block)
+          result = super
+          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
+      })
+
+      ::ActiveRecord::Base.prepend(SaveWithBulletSupport)
+
+      ::ActiveRecord::Relation.prepend(Module.new {
+        # 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
+      })
+
+      ::ActiveRecord::Associations::Preloader.prepend(Module.new {
+        def preloaders_for_one(association, records, scope)
+          if Bullet.start?
+            records.compact!
+            if records.first.class.name !~ /^HABTM_/
+              records.each do |record|
+                Bullet::Detector::Association.add_object_associations(record, association)
+              end
+              Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, association)
+            end
+          end
+          super
+        end
+      })
+
+      ::ActiveRecord::FinderMethods.prepend(Module.new {
+        # add includes in scope
+        def find_with_associations
+          return super { |r| yield r } if block_given?
+          records = super
+          if Bullet.start?
+            associations = (eager_load_values + includes_values).uniq
+            records.each do |record|
+              Bullet::Detector::Association.add_object_associations(record, associations)
+            end
+            Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, associations)
+          end
+          records
+        end
+      })
+
+      ::ActiveRecord::Associations::JoinDependency.prepend(Module.new {
+        def instantiate(result_set, &block)
+          @bullet_eager_loadings = {}
+          records = super
+
+          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(ar_parent, parent, row, rs, seen, model_cache, aliases)
+          if Bullet.start?
+            unless ar_parent.nil?
+              parent.children.each do |node|
+                key = aliases.column_alias(node, node.primary_key)
+                id = row[key]
+                if id.nil?
+                  associations = node.reflection.name
+                  Bullet::Detector::Association.add_object_associations(ar_parent, associations)
+                  Bullet::Detector::NPlusOneQuery.call_association(ar_parent, associations)
+                  @bullet_eager_loadings[ar_parent.class] ||= {}
+                  @bullet_eager_loadings[ar_parent.class][ar_parent] ||= Set.new
+                  @bullet_eager_loadings[ar_parent.class][ar_parent] << associations
+                end
+              end
+            end
+          end
+
+          super
+        end
+
+        # call join associations
+        def construct_model(record, node, row, model_cache, id, aliases)
+          result = super
+
+          if Bullet.start?
+            associations = node.reflection.name
+            Bullet::Detector::Association.add_object_associations(record, associations)
+            Bullet::Detector::NPlusOneQuery.call_association(record, associations)
+            @bullet_eager_loadings[record.class] ||= {}
+            @bullet_eager_loadings[record.class][record] ||= Set.new
+            @bullet_eager_loadings[record.class][record] << associations
+          end
+
+          result
+        end
+      })
+
+      ::ActiveRecord::Associations::CollectionAssociation.prepend(Module.new {
+        def load_target
+          records = super
+
+          if Bullet.start?
+            if self.is_a? ::ActiveRecord::Associations::ThroughAssociation
+              Bullet::Detector::NPlusOneQuery.call_association(owner, through_reflection.name)
+              association = self.owner.association self.through_reflection.name
+              Array(association.target).each do |through_record|
+                Bullet::Detector::NPlusOneQuery.call_association(through_record, source_reflection.name)
+              end
+            end
+            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name) unless @inversed
+            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)
+          end
+          super
+        end
+
+        def include?(object)
+          if Bullet.start?
+            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+          end
+          super
+        end
+      })
+
+      ::ActiveRecord::Associations::SingularAssociation.prepend(Module.new {
+        # call has_one and belongs_to associations
+        def target
+          result = super()
+          if Bullet.start?
+            if owner.class.name !~ /^HABTM_/ && !@inversed
+              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
+      })
+
+      ::ActiveRecord::Associations::HasManyAssociation.prepend(Module.new {
+        def empty?
+          result = super
+          if Bullet.start? && !reflection.has_cached_counter?
+            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+          end
+          result
+        end
+
+        def count_records
+          result = reflection.has_cached_counter?
+          if Bullet.start? && !result && !self.is_a?(::ActiveRecord::Associations::ThroughAssociation)
+            Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name)
+          end
+          super
+        end
+      })
+    end
+  end
+end

data/lib/bullet/dependency.rb

@@ -24,6 +24,8 @@ module Bullet
                                      'active_record5'
                                    elsif active_record51?
                                      'active_record5'
+                                   elsif active_record52?
+                                     'active_record52'
                                    else
                                      raise "Bullet does not support active_record #{::ActiveRecord::VERSION} yet"
                                    end
@@ -72,6 +74,10 @@ module Bullet
       active_record5? && ::ActiveRecord::VERSION::MINOR == 1
     end
 
+    def active_record52?
+      active_record5? && ::ActiveRecord::VERSION::MINOR == 2
+    end
+
     def mongoid4x?
       mongoid? && ::Mongoid::VERSION =~ /\A4/
     end

data/lib/bullet/detector/association.rb

@@ -37,6 +37,7 @@ module Bullet
         end
 
         private
+
           # object_associations keep the object relationships
           # that the object has many associations.
           # e.g. { "Post:1" => [:comments] }

data/lib/bullet/detector/counter_cache.rb

@@ -45,6 +45,7 @@ module Bullet
         end
 
         private
+
           def create_notification(klazz, associations)
             notify_associations = Array(associations) - Bullet.get_whitelist_associations(:counter_cache, klazz)
 

data/lib/bullet/detector/n_plus_one_query.rb

@@ -81,6 +81,7 @@ module Bullet
         end
 
         private
+
           def create_notification(callers, klazz, associations)
             notify_associations = Array(associations) - Bullet.get_whitelist_associations(:n_plus_one_query, klazz)
 

data/lib/bullet/detector/unused_eager_loading.rb

@@ -40,7 +40,7 @@ module Bullet
             if key_objects_overlap == k
               to_add << [k, associations]
             else
-              to_merge << [key_objects_overlap, ( eager_loadings[k].dup  << associations )]
+              to_merge << [key_objects_overlap, (eager_loadings[k].dup << associations)]
 
               keys_without_objects = k - key_objects_overlap
               to_merge << [keys_without_objects, eager_loadings[k]]
@@ -56,6 +56,7 @@ module Bullet
         end
 
         private
+
           def create_notification(callers, klazz, associations)
             notify_associations = Array(associations) - Bullet.get_whitelist_associations(:unused_eager_loading, klazz)
 

data/lib/bullet/mongoid4x.rb

@@ -21,7 +21,7 @@ module Bullet
         end
 
         def each(&block)
-          records = query.map{ |doc| ::Mongoid::Factory.from_db(klass, doc) }
+          records = query.map { |doc| ::Mongoid::Factory.from_db(klass, doc) }
           if records.length > 1
             Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
           elsif records.size == 1

data/lib/bullet/mongoid5x.rb

@@ -21,7 +21,7 @@ module Bullet
         end
 
         def each(&block)
-          records = view.map{ |doc| ::Mongoid::Factory.from_db(klass, doc) }
+          records = view.map { |doc| ::Mongoid::Factory.from_db(klass, doc) }
           if records.length > 1
             Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
           elsif records.size == 1

data/lib/bullet/mongoid6x.rb

@@ -21,7 +21,7 @@ module Bullet
         end
 
         def each(&block)
-          records = view.map{ |doc| ::Mongoid::Factory.from_db(klass, doc) }
+          records = view.map { |doc| ::Mongoid::Factory.from_db(klass, doc) }
           if records.length > 1
             Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
           elsif records.size == 1

data/lib/bullet/notification/base.rb

@@ -6,7 +6,7 @@ module Bullet
 
       def initialize(base_class, association_or_associations, path = nil)
         @base_class = base_class
-        @associations = association_or_associations.is_a?(Array) ?  association_or_associations : [association_or_associations]
+        @associations = association_or_associations.is_a?(Array) ? association_or_associations : [association_or_associations]
         @path = path
       end
 
@@ -65,12 +65,13 @@ module Bullet
       end
 
       protected
+
         def klazz_associations_str
           "  #{@base_class} => [#{@associations.map(&:inspect).join(', '.freeze)}]"
         end
 
         def associations_str
-          ":includes => #{@associations.map{ |a| a.to_s.to_sym unless a.is_a? Hash }.inspect}"
+          ":includes => #{@associations.map { |a| a.to_s.to_sym unless a.is_a? Hash }.inspect}"
         end
     end
   end

data/lib/bullet/notification/n_plus_one_query.rb

@@ -22,8 +22,9 @@ module Bullet
       end
 
       protected
+
         def call_stack_messages
-          (['Call stack'] + @callers).join( "\n  " )
+          (['Call stack'] + @callers).join("\n  ")
         end
     end
   end

data/lib/bullet/notification/unused_eager_loading.rb

@@ -22,8 +22,9 @@ module Bullet
       end
 
       protected
+
         def call_stack_messages
-          (['Call stack'] + @callers).join( "\n  " )
+          (['Call stack'] + @callers).join("\n  ")
         end
     end
   end

data/lib/bullet/rack.rb

@@ -14,7 +14,7 @@ module Bullet
       response_body = nil
       if Bullet.notification?
         if !file?(headers) && !sse?(headers) && !empty?(response) &&
-            status == 200 && !response_body(response).frozen? && html_request?(headers, response)
+           status == 200 && !response_body(response).frozen? && html_request?(headers, response)
           response_body = response_body(response)
           append_to_html_body(response_body, footer_note) if Bullet.add_footer
           append_to_html_body(response_body, Bullet.gather_inline_notifications)

data/lib/bullet/version.rb

@@ -1,4 +1,4 @@
 
 module Bullet
-  VERSION = '5.6.1'.freeze
+  VERSION = '5.7.0'.freeze
 end

data/perf/benchmark.rb

@@ -53,7 +53,7 @@ end
 
 users_size = 100
 posts_size = 1000
-comments_size = 10000
+comments_size = 10_000
 users = []
 users_size.times do |i|
   users << User.new(:name => "user#{i}")
@@ -63,20 +63,19 @@ users = User.all
 
 posts = []
 posts_size.times do |i|
-  posts << Post.new(:title => "Title #{i}", :body => "Body #{i}", :user => users[i%100])
+  posts << Post.new(:title => "Title #{i}", :body => "Body #{i}", :user => users[i % 100])
 end
 Post.import posts
 posts = Post.all
 
 comments = []
 comments_size.times do |i|
-  comments << Comment.new(:body => "Comment #{i}", :post => posts[i%1000], :user => users[i%100])
+  comments << Comment.new(:body => "Comment #{i}", :post => posts[i % 1000], :user => users[i % 100])
 end
 Comment.import comments
 
 puts 'Start benchmarking...'
 
-
 Bullet.enable = true
 
 Benchmark.bm(70) do |bm|
@@ -98,7 +97,6 @@ end
 
 puts 'End benchmarking...'
 
-
 # Run benchmark with bundler
 #
 #     bundle exec ruby perf/benchmark.rb

data/spec/bullet/detector/n_plus_one_query_spec.rb

@@ -87,7 +87,7 @@ module Bullet
         end
 
         context 'stacktrace_excludes' do
-          before { Bullet.stacktrace_excludes = [ /def/ ] }
+          before { Bullet.stacktrace_excludes = [/def/] }
           after { Bullet.stacktrace_excludes = nil }
 
           it 'should not create notification when stacktrace contains paths that are in the exclude list' do
@@ -114,7 +114,7 @@ module Bullet
         end
 
         context 'stacktrace_includes' do
-          before { Bullet.stacktrace_includes = [ 'def', /xyz/ ] }
+          before { Bullet.stacktrace_includes = ['def', /xyz/] }
           after { Bullet.stacktrace_includes = nil }
 
           it 'should include paths that are in the stacktrace_include list' do

data/spec/bullet/notification/base_spec.rb

@@ -50,7 +50,6 @@ module Bullet
         ensure
           ENV[name] = old_value
         end
-
       end
 
       context '#body_with_caller' do

data/spec/bullet/notification/n_plus_one_query_spec.rb

@@ -6,7 +6,7 @@ module Bullet
       subject { NPlusOneQuery.new([['caller1', 'caller2']], Post, [:comments, :votes], 'path') }
 
       it { expect(subject.body_with_caller).to eq("  Post => [:comments, :votes]\n  Add to your finder: :includes => [:comments, :votes]\nCall stack\n  caller1\n  caller2\n") }
-      it { expect([subject.body_with_caller, subject.body_with_caller]).to eq([ "  Post => [:comments, :votes]\n  Add to your finder: :includes => [:comments, :votes]\nCall stack\n  caller1\n  caller2\n", "  Post => [:comments, :votes]\n  Add to your finder: :includes => [:comments, :votes]\nCall stack\n  caller1\n  caller2\n" ]) }
+      it { expect([subject.body_with_caller, subject.body_with_caller]).to eq(["  Post => [:comments, :votes]\n  Add to your finder: :includes => [:comments, :votes]\nCall stack\n  caller1\n  caller2\n", "  Post => [:comments, :votes]\n  Add to your finder: :includes => [:comments, :votes]\nCall stack\n  caller1\n  caller2\n"]) }
       it { expect(subject.body).to eq("  Post => [:comments, :votes]\n  Add to your finder: :includes => [:comments, :votes]") }
       it { expect(subject.title).to eq('USE eager loading in path') }
     end

data/spec/bullet/rack_spec.rb

@@ -8,13 +8,13 @@ module Bullet
 
     context '#html_request?' do
       it 'should be true if Content-Type is text/html and http body contains html tag' do
-        headers = {'Content-Type' => 'text/html'}
+        headers = { 'Content-Type' => 'text/html' }
         response = double(:body => '<html><head></head><body></body></html>')
         expect(middleware).to be_html_request(headers, response)
       end
 
       it 'should be true if Content-Type is text/html and http body contains html tag with attributes' do
-        headers = {'Content-Type' => 'text/html'}
+        headers = { 'Content-Type' => 'text/html' }
         response = double(:body => "<html attr='hello'><head></head><body></body></html>")
         expect(middleware).to be_html_request(headers, response)
       end
@@ -26,13 +26,13 @@ module Bullet
       end
 
       it 'should be false if Content-Type is javascript' do
-        headers = {'Content-Type' => 'text/javascript'}
+        headers = { 'Content-Type' => 'text/javascript' }
         response = double(:body => '<html><head></head><body></body></html>')
         expect(middleware).not_to be_html_request(headers, response)
       end
 
       it "should be false if response body doesn't contain html tag" do
-        headers = {'Content-Type' => 'text/html'}
+        headers = { 'Content-Type' => 'text/html' }
         response = double(:body => '<div>Partial</div>')
         expect(middleware).not_to be_html_request(headers, response)
       end
@@ -68,7 +68,7 @@ module Bullet
           expect(Bullet).to receive(:notification?).and_return(true)
           expect(Bullet).to receive(:gather_inline_notifications).and_return('<bullet></bullet>')
           expect(Bullet).to receive(:perform_out_of_channel_notifications)
-          status, headers, response = middleware.call({'Content-Type' => 'text/html'})
+          status, headers, response = middleware.call({ 'Content-Type' => 'text/html' })
           expect(headers['Content-Length']).to eq('56')
           expect(response).to eq(['<html><head></head><body><bullet></bullet></body></html>'])
         end
@@ -79,7 +79,7 @@ module Bullet
           app.response = response
           expect(Bullet).to receive(:notification?).and_return(true)
           expect(Bullet).to receive(:gather_inline_notifications).and_return('<bullet></bullet>')
-          status, headers, response = middleware.call({'Content-Type' => 'text/html'})
+          status, headers, response = middleware.call({ 'Content-Type' => 'text/html' })
           expect(headers['Content-Length']).to eq('58')
         end
       end

data/spec/bullet_spec.rb

@@ -4,7 +4,6 @@ describe Bullet, focused: true do
   subject { Bullet }
 
   describe '#enable' do
-
     context 'enable Bullet' do
       before do
         # Bullet.enable
@@ -95,6 +94,26 @@ describe Bullet, focused: true do
     end
   end
 
+  describe '#delete_whitelist' do
+    context "for 'special' class names" 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(Bullet.whitelist[:n_plus_one_query]).to eq({})
+      end
+    end
+
+    context 'when exists multiple definitions' do
+      it 'is deleted from the whitelist successfully' do
+        Bullet.add_whitelist(:type => :n_plus_one_query, :class_name => 'Klass', :association => :department)
+        Bullet.add_whitelist(:type => :n_plus_one_query, :class_name => 'Klass', :association => :team)
+        Bullet.delete_whitelist(:type => :n_plus_one_query, :class_name => 'Klass', :association => :team)
+        expect(Bullet.get_whitelist_associations(:n_plus_one_query, 'Klass')).to include :department
+        expect(Bullet.get_whitelist_associations(:n_plus_one_query, 'Klass')).to_not include :team
+      end
+    end
+  end
+
   describe '#perform_out_of_channel_notifications' do
     let(:notification) { double }
 

data/spec/integration/active_record/association_spec.rb

@@ -122,7 +122,7 @@ if active_record?
       end
 
       it 'should detect preload with category => posts => comments' do
-        Category.includes({:posts => :comments}).each do |category|
+        Category.includes({ :posts => :comments }).each do |category|
           category.posts.each do |post|
             post.comments.map(&:name)
           end
@@ -134,7 +134,7 @@ if active_record?
       end
 
       it 'should detect preload with category => posts => comments with posts.id > 0' do
-        Category.includes({:posts => :comments}).where('posts.id > 0').references(:posts).each do |category|
+        Category.includes({ :posts => :comments }).where('posts.id > 0').references(:posts).each do |category|
           category.posts.each do |post|
             post.comments.map(&:name)
           end
@@ -146,7 +146,7 @@ if active_record?
       end
 
       it 'should detect unused preload with category => posts => comments' do
-        Category.includes({:posts => :comments}).map(&:name)
+        Category.includes({ :posts => :comments }).map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Post, :comments)
 
@@ -154,7 +154,7 @@ if active_record?
       end
 
       it 'should detect unused preload with post => commnets, no category => posts' do
-        Category.includes({:posts => :comments}).each do |category|
+        Category.includes({ :posts => :comments }).each do |category|
           category.posts.map(&:name)
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
@@ -257,7 +257,7 @@ if active_record?
 
     context 'category => posts => writer' do
       it 'should not detect unused preload associations' do
-        category = Category.includes({:posts => :writer}).order('id DESC').find_by_name('first')
+        category = Category.includes({ :posts => :writer }).order('id DESC').find_by_name('first')
         category.posts.map do |post|
           post.name
           post.writer.name
@@ -409,7 +409,7 @@ if active_record?
       end
 
       it 'should detect unused preload with comment => author' do
-        Comment.includes([:author, {:post => :writer}]).where(['base_users.id = ?', BaseUser.first]).references(:base_users).each do |comment|
+        Comment.includes([:author, { :post => :writer }]).where(['base_users.id = ?', BaseUser.first]).references(:base_users).each do |comment|
           comment.post.writer.name
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
@@ -430,7 +430,7 @@ if active_record?
 
       it 'should not raise a stack error from posts to category' do
         expect {
-          Comment.includes({:post => :category}).each do |com|
+          Comment.includes({ :post => :category }).each do |com|
             com.post.category
           end
         }.not_to raise_error()

data/spec/spec_helper.rb

@@ -28,7 +28,7 @@ Bullet.enable = true
 MODELS = File.join(File.dirname(__FILE__), 'models')
 $LOAD_PATH.unshift(MODELS)
 SUPPORT = File.join(File.dirname(__FILE__), 'support')
-Dir[ File.join(SUPPORT, '*.rb') ].reject { |filename| filename =~ /_seed.rb$/ }.sort.each { |file| require file }
+Dir[File.join(SUPPORT, '*.rb')].reject { |filename| filename =~ /_seed.rb$/ }.sort.each { |file| require file }
 
 RSpec.configure do |config|
   config.extend Bullet::Dependency
@@ -41,7 +41,7 @@ if active_record?
   ActiveRecord::Migration.verbose = false
 
   # Autoload every active_record model for the test suite that sits in spec/models.
-  Dir[ File.join(MODELS, '*.rb') ].sort.each do |filename|
+  Dir[File.join(MODELS, '*.rb')].sort.each do |filename|
     name = File.basename(filename, '.rb')
     autoload name.camelize.to_sym, name
   end
@@ -71,7 +71,7 @@ end
 
 if mongoid?
   # Autoload every mongoid model for the test suite that sits in spec/models.
-  Dir[ File.join(MODELS, 'mongoid', '*.rb') ].sort.each { |file| require file }
+  Dir[File.join(MODELS, 'mongoid', '*.rb')].sort.each { |file| require file }
   require File.join(SUPPORT, 'mongo_seed.rb')
 
   RSpec.configure do |config|

data/spec/support/mongo_seed.rb

@@ -39,7 +39,7 @@ module Support
             sessions: {
               default: {
                 database: 'bullet',
-                hosts: [ 'localhost:27017' ]
+                hosts: ['localhost:27017']
               }
             }
           )
@@ -50,7 +50,7 @@ module Support
               clients: {
                   default: {
                       database: 'bullet',
-                      hosts: [ 'localhost:27017' ]
+                      hosts: ['localhost:27017']
                   }
               }
           )

data/spec/support/rack_double.rb

@@ -2,7 +2,7 @@ module Support
   class AppDouble
     def call env
       env = @env
-      [ status, headers, response ]
+      [status, headers, response]
     end
 
     def status= status
@@ -14,7 +14,7 @@ module Support
     end
 
     def headers
-      @headers ||= {'Content-Type' => 'text/html'}
+      @headers ||= { 'Content-Type' => 'text/html' }
       @headers
     end
 
@@ -23,6 +23,7 @@ module Support
     end
 
     private
+
     def status
       @status || 200
     end

data/spec/support/sqlite_seed.rb

@@ -9,7 +9,6 @@ module Support
       user1 = BaseUser.create(:name => 'third', :newspaper => newspaper1)
       user2 = BaseUser.create(:name => 'fourth', :newspaper => newspaper2)
 
-
       category1 = Category.create(:name => 'first')
       category2 = Category.create(:name => 'second')
 

data/test.sh

@@ -1,5 +1,7 @@
 #bundle update rails && bundle exec rspec spec
 #BUNDLE_GEMFILE=Gemfile.mongoid bundle update mongoid && BUNDLE_GEMFILE=Gemfile.mongoid bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-5.2 bundle && BUNDLE_GEMFILE=Gemfile.rails-5.2 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-5.1 bundle && BUNDLE_GEMFILE=Gemfile.rails-5.1 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-5.0 bundle && BUNDLE_GEMFILE=Gemfile.rails-5.0 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-4.2 bundle && BUNDLE_GEMFILE=Gemfile.rails-4.2 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-4.1 bundle && BUNDLE_GEMFILE=Gemfile.rails-4.1 bundle exec rspec spec

data/update.sh

@@ -1,3 +1,5 @@
+BUNDLE_GEMFILE=Gemfile.rails-5.2 bundle update
+BUNDLE_GEMFILE=Gemfile.rails-5.1 bundle update
 BUNDLE_GEMFILE=Gemfile.rails-5.0 bundle update
 BUNDLE_GEMFILE=Gemfile.rails-4.2 bundle update
 BUNDLE_GEMFILE=Gemfile.rails-4.1 bundle update

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 5.6.1
+  version: 5.7.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2017-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -59,6 +59,7 @@ files:
 - Gemfile.rails-4.2
 - Gemfile.rails-5.0
 - Gemfile.rails-5.1
+- Gemfile.rails-5.2
 - Guardfile
 - Hacking.md
 - MIT-LICENSE
@@ -70,6 +71,7 @@ files:
 - lib/bullet/active_record41.rb
 - lib/bullet/active_record42.rb
 - lib/bullet/active_record5.rb
+- lib/bullet/active_record52.rb
 - lib/bullet/dependency.rb
 - lib/bullet/detector.rb
 - lib/bullet/detector/association.rb
@@ -178,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: help to kill N+1 queries and unused eager loading.