bullet 4.4.0 → 4.5.0

data/lib/bullet/detector/{unused_eager_association.rb → unused_eager_loading.rb}

@@ -1,12 +1,14 @@
 module Bullet
   module Detector
-    class UnusedEagerAssociation < Association
+    class UnusedEagerLoading < Association
       class <<self
         # check if there are unused preload associations.
         #   get related_objects from eager_loadings associated with object and associations
         #   get call_object_association from associations of call_object_associations whose object is in related_objects
         #   if association not in call_object_association, then the object => association - call_object_association is ununsed preload assocations
         def check_unused_preload_associations
+          return unless Bullet.unused_eager_loading_enable?
+
           @@checked = true
           object_associations.each do |bullet_ar_key, associations|
             object_association_diff = diff_object_associations bullet_ar_key, associations
@@ -16,10 +18,45 @@ module Bullet
           end
         end
 
+        def add_eager_loadings(objects, associations)
+          return unless Bullet.unused_eager_loading_enable?
+          bullet_ar_keys = objects.map(&:bullet_ar_key)
+
+          to_add = nil
+          to_merge, to_delete = [], []
+          eager_loadings.each do |k, v|
+            key_objects_overlap = k & bullet_ar_keys
+
+            next if key_objects_overlap.empty?
+
+            if key_objects_overlap == k
+              to_add = [k, associations]
+              break
+            else
+              to_merge << [key_objects_overlap, ( eager_loadings[k].dup  << associations )]
+
+              keys_without_objects = k - bullet_ar_keys
+              to_merge << [keys_without_objects, eager_loadings[k]]
+              to_delete << k
+              bullet_ar_keys = bullet_ar_keys - k
+            end
+          end
+
+          eager_loadings.add *to_add if to_add
+          to_merge.each { |k,val| eager_loadings.merge k, val }
+          to_delete.each { |k| eager_loadings.delete k }
+
+          eager_loadings.add bullet_ar_keys, associations unless bullet_ar_keys.empty?
+        end
+
         private
           def create_notification(klazz, associations)
-            notice = Bullet::Notification::UnusedEagerLoading.new(klazz, associations)
-            Bullet.notification_collector.add(notice)
+            notify_associations = Array(associations) - Bullet.get_whitelist_associations(:unused_eager_loading, klazz)
+
+            if notify_associations.present?
+              notice = Bullet::Notification::UnusedEagerLoading.new(klazz, notify_associations)
+              Bullet.notification_collector.add(notice)
+            end
           end
 
           def call_associations(bullet_ar_key, associations)

data/lib/bullet/mongoid2x.rb

@@ -11,22 +11,22 @@ module Bullet
 
         def first
           result = origin_first
-          Bullet::Detector::Association.add_impossible_object(result) if result
+          Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
           result
         end
 
         def last
           result = origin_last
-          Bullet::Detector::Association.add_impossible_object(result) if result
+          Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
           result
         end
 
         def iterate(&block)
           records = execute.to_a
           if records.size > 1
-            Bullet::Detector::Association.add_possible_objects(records)
+            Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
           elsif records.size == 1
-            Bullet::Detector::Association.add_impossible_object(records.first)
+            Bullet::Detector::NPlusOneQuery.add_impossible_object(records.first)
           end
           origin_iterate(&block)
         end
@@ -36,7 +36,7 @@ module Bullet
           docs.each do |doc|
             Bullet::Detector::Association.add_object_associations(doc, associations)
           end
-          Bullet::Detector::Association.add_eager_loadings(docs, associations)
+          Bullet::Detector::UnusedEagerLoading.add_eager_loadings(docs, associations)
           origin_eager_load(docs)
         end
       end

data/lib/bullet/mongoid3x.rb

@@ -10,22 +10,22 @@ module Bullet
 
         def first
           result = origin_first
-          Bullet::Detector::Association.add_impossible_object(result) if result
+          Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
           result
         end
 
         def last
           result = origin_last
-          Bullet::Detector::Association.add_impossible_object(result) if result
+          Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
           result
         end
 
         def each(&block)
           records = query.map{ |doc| ::Mongoid::Factory.from_db(klass, doc) }
           if records.length > 1
-            Bullet::Detector::Association.add_possible_objects(records)
+            Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
           elsif records.size == 1
-            Bullet::Detector::Association.add_impossible_object(records.first)
+            Bullet::Detector::NPlusOneQuery.add_impossible_object(records.first)
           end
           origin_each(&block)
         end
@@ -33,9 +33,9 @@ module Bullet
         def eager_load(docs)
           associations = criteria.inclusions.map(&:name)
           docs.each do |doc|
-            Bullet::Detector::Association.add_object_associations(doc, associations)
+            Bullet::Detector::NPlusOneQuery.add_object_associations(doc, associations)
           end
-          Bullet::Detector::Association.add_eager_loadings(docs, associations)
+          Bullet::Detector::UnusedEagerLoading.add_eager_loadings(docs, associations)
           origin_eager_load(docs)
         end
       end

data/lib/bullet/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Bullet
-  VERSION = "4.4.0"
+  VERSION = "4.5.0"
 end

data/spec/bullet/detector/association_spec.rb

@@ -40,55 +40,6 @@ module Bullet
           Association.send(:call_object_associations).should be_include(@post1.bullet_ar_key, :associations)
         end
       end
-
-      context ".add_possible_objects" do
-        it "should add possible objects" do
-          Association.add_possible_objects([@post1, @post2])
-          Association.send(:possible_objects).should be_include(@post1.bullet_ar_key)
-          Association.send(:possible_objects).should be_include(@post2.bullet_ar_key)
-        end
-
-        it "should not raise error if object is nil" do
-          lambda { Association.add_possible_objects(nil) }.should_not raise_error
-        end
-      end
-
-      context ".add_impossible_object" do
-        it "should add impossible object" do
-          Association.add_impossible_object(@post1)
-          Association.send(:impossible_objects).should be_include(@post1.bullet_ar_key)
-        end
-      end
-
-      context ".add_eager_loadings" do
-        it "should add objects, associations pair when eager_loadings are empty" do
-          Association.add_eager_loadings([@post1, @post2], :associations)
-          Association.send(:eager_loadings).should be_include([@post1.bullet_ar_key, @post2.bullet_ar_key], :associations)
-        end
-
-        it "should add objects, associations pair for existing eager_loadings" do
-          Association.add_eager_loadings([@post1, @post2], :association1)
-          Association.add_eager_loadings([@post1, @post2], :association2)
-          Association.send(:eager_loadings).should be_include([@post1.bullet_ar_key, @post2.bullet_ar_key], :association1)
-          Association.send(:eager_loadings).should be_include([@post1.bullet_ar_key, @post2.bullet_ar_key], :association2)
-        end
-
-        it "should merge objects, associations pair for existing eager_loadings" do
-          Association.add_eager_loadings([@post1], :association1)
-          Association.add_eager_loadings([@post1, @post2], :association2)
-          Association.send(:eager_loadings).should be_include([@post1.bullet_ar_key], :association1)
-          Association.send(:eager_loadings).should be_include([@post1.bullet_ar_key], :association2)
-          Association.send(:eager_loadings).should be_include([@post1.bullet_ar_key, @post2.bullet_ar_key], :association2)
-        end
-
-        it "should delete objects, associations pair for existing eager_loadings" do
-          Association.add_eager_loadings([@post1, @post2], :association1)
-          Association.add_eager_loadings([@post1], :association2)
-          Association.send(:eager_loadings).should be_include([@post1.bullet_ar_key], :association1)
-          Association.send(:eager_loadings).should be_include([@post1.bullet_ar_key], :association2)
-          Association.send(:eager_loadings).should be_include([@post2.bullet_ar_key], :association1)
-        end
-      end
     end
   end
 end

data/spec/bullet/detector/counter_cache_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+
+module Bullet
+  module Detector
+    describe CounterCache do
+      before :all do
+        @post1 = Post.first
+        @post2 = Post.last
+      end
+      before(:each) { CounterCache.clear }
+
+      context ".clear" do
+        it "should clear all class variables" do
+          CounterCache.class_variable_get(:@@possible_objects).should be_nil
+          CounterCache.class_variable_get(:@@impossible_objects).should be_nil
+        end
+      end
+
+      context ".add_counter_cache" do
+        it "should create notification if conditions met" do
+          CounterCache.should_receive(:conditions_met?).with(@post1.bullet_ar_key, [:comments]).and_return(true)
+          CounterCache.should_receive(:create_notification).with("Post", [:comments])
+          CounterCache.add_counter_cache(@post1, [:comments])
+        end
+
+        it "should not create notification if conditions not met" do
+          CounterCache.should_receive(:conditions_met?).with(@post1.bullet_ar_key, [:comments]).and_return(false)
+          CounterCache.should_receive(:create_notification).never
+          CounterCache.add_counter_cache(@post1, [:comments])
+        end
+      end
+
+      context ".add_possible_objects" do
+        it "should add possible objects" do
+          CounterCache.add_possible_objects([@post1, @post2])
+          CounterCache.send(:possible_objects).should be_include(@post1.bullet_ar_key)
+          CounterCache.send(:possible_objects).should be_include(@post2.bullet_ar_key)
+        end
+
+        it "should add impossible object" do
+          CounterCache.add_impossible_object(@post1)
+          CounterCache.send(:impossible_objects).should be_include(@post1.bullet_ar_key)
+        end
+      end
+
+      context ".conditions_met?" do
+        it "should be true when object is possible, not impossible" do
+          CounterCache.add_possible_objects(@post1)
+          CounterCache.send(:conditions_met?, @post1.bullet_ar_key, :associations).should be_true
+        end
+
+        it "should be false when object is not possible" do
+          CounterCache.send(:conditions_met?, @post1.bullet_ar_key, :associations).should be_false
+        end
+
+        it "should be true when object is possible, and impossible" do
+          CounterCache.add_possible_objects(@post1)
+          CounterCache.add_impossible_object(@post1)
+          CounterCache.send(:conditions_met?, @post1.bullet_ar_key, :associations).should be_false
+        end
+      end
+    end
+  end
+end

data/spec/bullet/detector/n_plus_one_query_spec.rb

@@ -3,7 +3,10 @@ require 'spec_helper'
 module Bullet
   module Detector
     describe NPlusOneQuery do
-      before(:all) { @post = Post.first }
+      before(:all) do
+        @post = Post.first
+        @post2 = Post.last
+      end
       before(:each) { NPlusOneQuery.clear }
 
       context ".call_association" do
@@ -89,6 +92,25 @@ module Bullet
           NPlusOneQuery.call_association(@post, :association)
         end
       end
+
+      context ".add_possible_objects" do
+        it "should add possible objects" do
+          NPlusOneQuery.add_possible_objects([@post, @post2])
+          NPlusOneQuery.send(:possible_objects).should be_include(@post.bullet_ar_key)
+          NPlusOneQuery.send(:possible_objects).should be_include(@post2.bullet_ar_key)
+        end
+
+        it "should not raise error if object is nil" do
+          lambda { NPlusOneQuery.add_possible_objects(nil) }.should_not raise_error
+        end
+      end
+
+      context ".add_impossible_object" do
+        it "should add impossible object" do
+          NPlusOneQuery.add_impossible_object(@post)
+          NPlusOneQuery.send(:impossible_objects).should be_include(@post.bullet_ar_key)
+        end
+      end
     end
   end
 end

data/spec/bullet/detector/unused_eager_loading_spec.rb

@@ -0,0 +1,95 @@
+require 'spec_helper'
+
+module Bullet
+  module Detector
+    describe UnusedEagerLoading do
+      before(:all) do
+        @post = Post.first
+        @post2 = Post.last
+      end
+      before(:each) { UnusedEagerLoading.clear }
+
+      context ".call_associations" do
+        it "should get empty array if eager_loadgins" do
+          UnusedEagerLoading.send(:call_associations, @post.bullet_ar_key, Set.new([:association])).should be_empty
+        end
+
+        it "should get call associations if object and association are both in eager_loadings and call_object_associations" do
+          UnusedEagerLoading.add_eager_loadings([@post], :association)
+          UnusedEagerLoading.add_call_object_associations(@post, :association)
+          UnusedEagerLoading.send(:call_associations, @post.bullet_ar_key, Set.new([:association])).should == [:association]
+        end
+
+        it "should not get call associations if not exist in call_object_associations" do
+          UnusedEagerLoading.add_eager_loadings([@post], :association)
+          UnusedEagerLoading.send(:call_associations, @post.bullet_ar_key, Set.new([:association])).should be_empty
+        end
+      end
+
+      context ".diff_object_associations" do
+        it "should return associations not exist in call_association" do
+          UnusedEagerLoading.send(:diff_object_associations, @post.bullet_ar_key, Set.new([:association])).should == [:association]
+        end
+
+        it "should return empty if associations exist in call_association" do
+          UnusedEagerLoading.add_eager_loadings([@post], :association)
+          UnusedEagerLoading.add_call_object_associations(@post, :association)
+          UnusedEagerLoading.send(:diff_object_associations, @post.bullet_ar_key, Set.new([:association])).should be_empty
+        end
+      end
+
+      context ".check_unused_preload_associations" do
+        it "should set @@checked to true" do
+          UnusedEagerLoading.check_unused_preload_associations
+          UnusedEagerLoading.class_variable_get(:@@checked).should be_true
+        end
+
+        it "should create notification if object_association_diff is not empty" do
+          UnusedEagerLoading.add_object_associations(@post, :association)
+          UnusedEagerLoading.should_receive(:create_notification).with("Post", [:association])
+          UnusedEagerLoading.check_unused_preload_associations
+        end
+
+        it "should not create notification if object_association_diff is empty" do
+          UnusedEagerLoading.clear
+          UnusedEagerLoading.add_object_associations(@post, :association)
+          UnusedEagerLoading.add_eager_loadings([@post], :association)
+          UnusedEagerLoading.add_call_object_associations(@post, :association)
+          UnusedEagerLoading.send(:diff_object_associations, @post.bullet_ar_key, Set.new([:association])).should be_empty
+          UnusedEagerLoading.should_not_receive(:create_notification).with("Post", [:association])
+          UnusedEagerLoading.check_unused_preload_associations
+        end
+      end
+
+      context ".add_eager_loadings" do
+        it "should add objects, associations pair when eager_loadings are empty" do
+          UnusedEagerLoading.add_eager_loadings([@post, @post2], :associations)
+          UnusedEagerLoading.send(:eager_loadings).should be_include([@post.bullet_ar_key, @post2.bullet_ar_key], :associations)
+        end
+
+        it "should add objects, associations pair for existing eager_loadings" do
+          UnusedEagerLoading.add_eager_loadings([@post, @post2], :association1)
+          UnusedEagerLoading.add_eager_loadings([@post, @post2], :association2)
+          UnusedEagerLoading.send(:eager_loadings).should be_include([@post.bullet_ar_key, @post2.bullet_ar_key], :association1)
+          UnusedEagerLoading.send(:eager_loadings).should be_include([@post.bullet_ar_key, @post2.bullet_ar_key], :association2)
+        end
+
+        it "should merge objects, associations pair for existing eager_loadings" do
+          UnusedEagerLoading.add_eager_loadings([@post], :association1)
+          UnusedEagerLoading.add_eager_loadings([@post, @post2], :association2)
+          UnusedEagerLoading.send(:eager_loadings).should be_include([@post.bullet_ar_key], :association1)
+          UnusedEagerLoading.send(:eager_loadings).should be_include([@post.bullet_ar_key], :association2)
+          UnusedEagerLoading.send(:eager_loadings).should be_include([@post.bullet_ar_key, @post2.bullet_ar_key], :association2)
+        end
+
+        it "should delete objects, associations pair for existing eager_loadings" do
+          UnusedEagerLoading.add_eager_loadings([@post, @post2], :association1)
+          UnusedEagerLoading.add_eager_loadings([@post], :association2)
+          UnusedEagerLoading.send(:eager_loadings).should be_include([@post.bullet_ar_key], :association1)
+          UnusedEagerLoading.send(:eager_loadings).should be_include([@post.bullet_ar_key], :association2)
+          UnusedEagerLoading.send(:eager_loadings).should be_include([@post2.bullet_ar_key], :association1)
+        end
+      end
+    end
+  end
+end

data/spec/integration/association_spec.rb

@@ -16,7 +16,7 @@ if active_record3? || active_record4?
         Post.all.each do |post|
           post.comments.map(&:name)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Post, :comments)
@@ -26,7 +26,7 @@ if active_record3? || active_record4?
         Post.includes(:comments).each do |post|
           post.comments.map(&:name)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -34,7 +34,7 @@ if active_record3? || active_record4?
 
       it "should detect unused preload post => comments" do
         Post.includes(:comments).map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should be_unused_preload_associations_for(Post, :comments)
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -42,7 +42,7 @@ if active_record3? || active_record4?
 
       it "should not detect unused preload post => comments" do
         Post.all.map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -56,7 +56,7 @@ if active_record3? || active_record4?
             post.comments.map(&:name)
           end
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Category, :posts)
@@ -69,7 +69,7 @@ if active_record3? || active_record4?
             post.comments.map(&:name)
           end
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should_not be_detecting_unpreloaded_association_for(Category, :posts)
@@ -82,7 +82,7 @@ if active_record3? || active_record4?
             post.comments.map(&:name)
           end
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -90,7 +90,7 @@ if active_record3? || active_record4?
 
       it "should detect unused preload with category => posts => comments" do
         Category.includes({:posts => :comments}).map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should be_unused_preload_associations_for(Post, :comments)
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -100,7 +100,7 @@ if active_record3? || active_record4?
         Category.includes({:posts => :comments}).each do |category|
           category.posts.map(&:name)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should be_unused_preload_associations_for(Post, :comments)
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -113,7 +113,7 @@ if active_record3? || active_record4?
           category.posts.map(&:name)
           category.entries.map(&:name)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Category, :posts)
@@ -125,7 +125,7 @@ if active_record3? || active_record4?
           category.posts.map(&:name)
           category.entries.map(&:name)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should_not be_detecting_unpreloaded_association_for(Category, :posts)
@@ -137,7 +137,7 @@ if active_record3? || active_record4?
           category.posts.map(&:name)
           category.entries.map(&:name)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -145,7 +145,7 @@ if active_record3? || active_record4?
 
       it "should detect unused preload with category => [posts, entries]" do
         Category.includes([:posts, :entries]).map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should be_unused_preload_associations_for(Category, :posts)
         Bullet::Detector::Association.should be_unused_preload_associations_for(Category, :entries)
 
@@ -156,7 +156,7 @@ if active_record3? || active_record4?
         Category.includes([:posts, :entries]).each do |category|
           category.posts.map(&:name)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_unused_preload_associations_for(Category, :posts)
         Bullet::Detector::Association.should be_unused_preload_associations_for(Category, :entries)
 
@@ -169,7 +169,7 @@ if active_record3? || active_record4?
         Post.includes(:comments).each do |post|
           post.comments.first.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_unused_preload_associations_for(Post, :comments)
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -177,7 +177,7 @@ if active_record3? || active_record4?
 
       it "should detect preload with post => commnets" do
         Post.first.comments.map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -191,7 +191,7 @@ if active_record3? || active_record4?
           post.name
           post.writer.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_unused_preload_associations_for(Category, :posts)
         Bullet::Detector::Association.should_not be_unused_preload_associations_for(Post, :writer)
       end
@@ -202,7 +202,7 @@ if active_record3? || active_record4?
         Post.in_category_name('first').each do |post|
           post.category.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -210,7 +210,7 @@ if active_record3? || active_record4?
 
       it "should not be unused preload post => category" do
         Post.in_category_name('first').all.map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -222,7 +222,7 @@ if active_record3? || active_record4?
         Post.preload_comments.each do |post|
           post.comments.map(&:name)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -230,7 +230,7 @@ if active_record3? || active_record4?
 
       it "should detect unused preload with scope" do
         Post.preload_comments.map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should be_unused_preload_associations_for(Post, :comments)
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -253,7 +253,7 @@ if active_record3? || active_record4?
         Comment.all.each do |comment|
           comment.post.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Comment, :post)
@@ -261,7 +261,7 @@ if active_record3? || active_record4?
 
       it "should detect preload with one comment => post" do
         Comment.first.post.name
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -271,7 +271,7 @@ if active_record3? || active_record4?
         Comment.includes(:post).each do |comment|
           comment.post.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -279,7 +279,7 @@ if active_record3? || active_record4?
 
       it "should not detect preload with comment => post" do
         Comment.all.map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -287,7 +287,7 @@ if active_record3? || active_record4?
 
       it "should detect unused preload with comments => post" do
         Comment.includes(:post).map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should be_unused_preload_associations_for(Comment, :post)
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -299,7 +299,7 @@ if active_record3? || active_record4?
         Comment.all.each do |comment|
           comment.post.category.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Comment, :post)
@@ -309,7 +309,7 @@ if active_record3? || active_record4?
         Comment.includes(:post).each do |comment|
           comment.post.category.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Post, :category)
@@ -319,7 +319,7 @@ if active_record3? || active_record4?
         Comment.includes(:post => :category).each do |comment|
           comment.post.category.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -333,7 +333,7 @@ if active_record3? || active_record4?
         Comment.includes([:author, :post]).where(["base_users.id = ?", BaseUser.first]).each do |comment|
           comment.post.writer.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Post, :writer)
@@ -345,7 +345,7 @@ if active_record3? || active_record4?
         Comment.includes([:author, {:post => :writer}]).where(["base_users.id = ?", BaseUser.first]).each do |comment|
           comment.post.writer.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should be_unused_preload_associations_for(Comment, :author)
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -357,7 +357,7 @@ if active_record3? || active_record4?
         Comment.all(:include => {:post => :writer}, :conditions => "posts.name like '%first%'").each do |comment|
           comment.post.writer.newspaper.name
         end
-        #Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        #Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         #Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Writer, :newspaper)
@@ -390,7 +390,7 @@ if active_record3? || active_record4?
         Student.all.each do |student|
           student.teachers.map(&:name)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Student, :teachers)
@@ -400,7 +400,7 @@ if active_record3? || active_record4?
         Student.includes(:teachers).each do |student|
           student.teachers.map(&:name)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -408,7 +408,7 @@ if active_record3? || active_record4?
 
       it "should detect unused preload associations" do
         Student.includes(:teachers).map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should be_unused_preload_associations_for(Student, :teachers)
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -416,7 +416,7 @@ if active_record3? || active_record4?
 
       it "should detect no unused preload associations" do
         Student.all.map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -439,7 +439,7 @@ if active_record3? || active_record4?
         Firm.all.each do |firm|
           firm.clients.map(&:name)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Firm, :clients)
@@ -449,7 +449,7 @@ if active_record3? || active_record4?
         Firm.includes(:clients).each do |firm|
           firm.clients.map(&:name)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -457,7 +457,7 @@ if active_record3? || active_record4?
 
       it "should not detect preload associations" do
         Firm.all.map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -465,7 +465,7 @@ if active_record3? || active_record4?
 
       it "should detect unused preload associations" do
         Firm.includes(:clients).map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should be_unused_preload_associations_for(Firm, :clients)
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -488,7 +488,7 @@ if active_record3? || active_record4?
         Company.all.each do |company|
           company.address.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Company, :address)
@@ -498,7 +498,7 @@ if active_record3? || active_record4?
         Company.includes(:address).each do |company|
           company.address.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -506,7 +506,7 @@ if active_record3? || active_record4?
 
       it "should not detect preload association" do
         Company.all.map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -514,7 +514,7 @@ if active_record3? || active_record4?
 
       it "should detect unused preload association" do
         Company.includes(:address).map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should be_unused_preload_associations_for(Company, :address)
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -535,7 +535,7 @@ if active_record3? || active_record4?
     it "should not detect preload association" do
       Post.all
       Post.first.comments.map(&:name)
-      Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+      Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
       Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
       Bullet::Detector::Association.should be_completely_preloading_associations
@@ -557,7 +557,7 @@ if active_record3? || active_record4?
         Page.all.each do |page|
           page.author.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Page, :author)
@@ -567,7 +567,7 @@ if active_record3? || active_record4?
         Page.includes(:author).each do |page|
           page.author.name
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -575,7 +575,7 @@ if active_record3? || active_record4?
 
       it "should detect unused preload associations" do
         Page.includes(:author).map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should be_unused_preload_associations_for(Page, :author)
 
         Bullet::Detector::Association.should be_completely_preloading_associations
@@ -583,11 +583,103 @@ if active_record3? || active_record4?
 
       it "should not detect preload associations" do
         Page.all.map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
       end
     end
+
+    context "disable n plus one query" do
+      before { Bullet.n_plus_one_query_enable = false }
+      after { Bullet.n_plus_one_query_enable = true }
+
+      it "should not detect n plus one query" do
+        Post.all.each do |post|
+          post.comments.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+
+        expect(Bullet::Detector::Association).not_to be_detecting_unpreloaded_association_for(Post, :comments)
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+      end
+
+      it "should still detect unused eager loading" do
+        Post.includes(:comments).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Post, :comments)
+      end
+    end
+
+    context "disable unused eager loading" do
+      before { Bullet.unused_eager_loading_enable = false }
+      after { Bullet.unused_eager_loading_enable = true }
+
+      it "should not detect unused eager loading" do
+        Post.includes(:comments).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+      end
+
+      it "should still detect n plus one query" do
+        Post.all.each do |post|
+          post.comments.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+      end
+    end
+
+    context "whitelist n plus one query" do
+      before { Bullet.add_whitelist :type => :n_plus_one_query, :class_name => "Post", :association => :comments }
+      after { Bullet.reset_whitelist }
+
+      it "should not detect n plus one query" do
+        Post.all.each do |post|
+          post.comments.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+
+        expect(Bullet::Detector::Association).not_to be_detecting_unpreloaded_association_for(Post, :comments)
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+      end
+
+      it "should still detect unused eager loading" do
+        Post.includes(:comments).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Post, :comments)
+      end
+    end
+
+    context "whitelist unused eager loading" do
+      before { Bullet.add_whitelist :type => :unused_eager_loading, :class_name => "Post", :association => :comments }
+      after { Bullet.reset_whitelist }
+
+      it "should not detect unused eager loading" do
+        Post.includes(:comments).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+      end
+
+      it "should still detect n plus one query" do
+        Post.all.each do |post|
+          post.comments.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+      end
+    end
   end
 end