bullet 4.9.0 → 4.10.0

data/spec/bullet/rack_spec.rb

@@ -57,16 +57,10 @@ module Bullet
 
     context "#call" do
       context "when Bullet is enabled" do
-        it "should invoke Bullet.start_request and Bullet.end_request" do
-          expect(Bullet).to receive(:start_request)
-          expect(Bullet).to receive(:end_request)
-          middleware.call([])
-        end
-
         it "should return original response body" do
           expected_response = Support::ResponseDouble.new "Actual body"
           app.response = expected_response
-          status, headers, response = middleware.call([])
+          _, _, response = middleware.call([])
           expect(response).to eq(expected_response)
         end
 

data/spec/bullet/registry/object_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 
-
 module Bullet
   module Registry
     describe Object do

data/spec/bullet_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe Bullet, focused: true do
+  subject { Bullet }
+
+  describe '#enable' do
+
+    context 'enable Bullet' do
+      before do
+        # Bullet.enable
+        # Do nothing. Bullet has already been enabled for the whole test suite.
+      end
+
+      it 'should be enabled' do
+        expect(subject).to be_enable
+      end
+
+      context 'disable Bullet' do
+        before do
+          Bullet.enable = false
+        end
+
+        it 'should be disabled' do
+          expect(subject).to_not be_enable
+        end
+
+        context 'enable Bullet again without patching again the orms' do
+          before do
+            Bullet::Mongoid.should_not_receive(:enable) if defined? Bullet::Mongoid
+            Bullet::ActiveRecord.should_not_receive(:enable) if defined? Bullet::ActiveRecord
+            Bullet.enable = true
+          end
+
+          it 'should be enabled again' do
+            expect(subject).to be_enable
+          end
+        end
+      end
+    end
+  end
+end

data/spec/integration/active_record3/association_spec.rb

@@ -1,16 +1,7 @@
 require 'spec_helper'
 
-if active_record3?
+if !mongoid? && active_record3?
   describe Bullet::Detector::Association, 'has_many' do
-    before(:each) do
-      Bullet.clear
-      Bullet.start_request
-    end
-
-    after(:each) do
-      Bullet.end_request
-    end
-
     context "post => comments" do
       it "should detect non preload post => comments" do
         Post.all.each do |post|
@@ -101,6 +92,18 @@ if active_record3?
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
+      it "should detect preload with category => posts => comments with posts.id > 0" do
+        Category.includes({:posts => :comments}).where('posts.id > 0').each do |category|
+          category.posts.each do |post|
+            post.comments.map(&:name)
+          end
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
       it "should detect unused preload with category => posts => comments" do
         Category.includes({:posts => :comments}).map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
@@ -207,6 +210,8 @@ if active_record3?
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_unused_preload_associations_for(Category, :posts)
         expect(Bullet::Detector::Association).not_to be_unused_preload_associations_for(Post, :writer)
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
     end
 
@@ -252,15 +257,6 @@ if active_record3?
   end
 
   describe Bullet::Detector::Association, 'belongs_to' do
-    before(:each) do
-      Bullet.clear
-      Bullet.start_request
-    end
-
-    after(:each) do
-      Bullet.end_request
-    end
-
     context "comment => post" do
       it "should detect non preload with comment => post" do
         Comment.all.each do |comment|
@@ -340,8 +336,6 @@ if active_record3?
     end
 
     context "comment => author, post => writer" do
-      # this happens because the post isn't a possible object even though the writer is access through the post
-      # which leads to an 1+N queries
       it "should detect non preloaded writer" do
         Comment.includes([:author, :post]).where(["base_users.id = ?", BaseUser.first]).each do |comment|
           comment.post.writer.name
@@ -352,32 +346,26 @@ if active_record3?
         expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :writer)
       end
 
-      # this happens because the comment doesn't break down the hash into keys
-      # properly creating an association from comment to post
       it "should detect unused preload with comment => author" do
         Comment.includes([:author, {:post => :writer}]).where(["base_users.id = ?", BaseUser.first]).each do |comment|
           comment.post.writer.name
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Comment, :author)
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
-      # To flyerhzm: This does not detect that newspaper is unpreloaded. The association is
-      # not within possible objects, and thus cannot be detected as unpreloaded
       it "should detect non preloading with writer => newspaper" do
         Comment.all(:include => {:post => :writer}, :conditions => "posts.name like '%first%'").each do |comment|
           comment.post.writer.newspaper.name
         end
-        #Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        #Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Writer, :newspaper)
       end
 
-      # when we attempt to access category, there is an infinite overflow because load_target is hijacked leading to
-      # a repeating loop of calls in this test
       it "should not raise a stack error from posts to category" do
         expect {
           Comment.includes({:post => :category}).each do |com|
@@ -389,15 +377,6 @@ if active_record3?
   end
 
   describe Bullet::Detector::Association, 'has_and_belongs_to_many' do
-    before(:each) do
-      Bullet.clear
-      Bullet.start_request
-    end
-
-    after(:each) do
-      Bullet.end_request
-    end
-
     context "students <=> teachers" do
       it "should detect non preload associations" do
         Student.all.each do |student|
@@ -438,15 +417,6 @@ if active_record3?
   end
 
   describe Bullet::Detector::Association, 'has_many :through' do
-    before(:each) do
-      Bullet.clear
-      Bullet.start_request
-    end
-
-    after(:each) do
-      Bullet.end_request
-    end
-
     context "firm => clients" do
       it "should detect non preload associations" do
         Firm.all.each do |firm|
@@ -487,15 +457,6 @@ if active_record3?
   end
 
   describe Bullet::Detector::Association, "has_one" do
-    before(:each) do
-      Bullet.clear
-      Bullet.start_request
-    end
-
-    after(:each) do
-      Bullet.end_request
-    end
-
     context "company => address" do
       it "should detect non preload association" do
         Company.all.each do |company|
@@ -536,15 +497,6 @@ if active_record3?
   end
 
   describe Bullet::Detector::Association, "call one association that in possible objects" do
-    before(:each) do
-      Bullet.clear
-      Bullet.start_request
-    end
-
-    after(:each) do
-      Bullet.end_request
-    end
-
     it "should not detect preload association" do
       Post.all
       Post.first.comments.map(&:name)
@@ -556,15 +508,6 @@ if active_record3?
   end
 
   describe Bullet::Detector::Association, "STI" do
-    before(:each) do
-      Bullet.clear
-      Bullet.start_request
-    end
-
-    after(:each) do
-      Bullet.end_request
-    end
-
     context "page => author" do
       it "should detect non preload associations" do
         Page.all.each do |page|

data/spec/integration/active_record4/association_spec.rb

@@ -1,16 +1,7 @@
 require 'spec_helper'
 
-if active_record4?
+if !mongoid? && active_record4?
   describe Bullet::Detector::Association, 'has_many' do
-    before(:each) do
-      Bullet.clear
-      Bullet.start_request
-    end
-
-    after(:each) do
-      Bullet.end_request
-    end
-
     context "post => comments" do
       it "should detect non preload post => comments" do
         Post.all.each do |post|
@@ -101,6 +92,18 @@ if active_record4?
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       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.posts.each do |post|
+            post.comments.map(&:name)
+          end
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
       it "should detect unused preload with category => posts => comments" do
         Category.includes({:posts => :comments}).map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
@@ -252,15 +255,6 @@ if active_record4?
   end
 
   describe Bullet::Detector::Association, 'belongs_to' do
-    before(:each) do
-      Bullet.clear
-      Bullet.start_request
-    end
-
-    after(:each) do
-      Bullet.end_request
-    end
-
     context "comment => post" do
       it "should detect non preload with comment => post" do
         Comment.all.each do |comment|
@@ -340,8 +334,6 @@ if active_record4?
     end
 
     context "comment => author, post => writer" do
-      # this happens because the post isn't a possible object even though the writer is access through the post
-      # which leads to an 1+N queries
       it "should detect non preloaded writer" do
         Comment.includes([:author, :post]).where(["base_users.id = ?", BaseUser.first]).references(:base_users).each do |comment|
           comment.post.writer.name
@@ -352,32 +344,26 @@ if active_record4?
         expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :writer)
       end
 
-      # this happens because the comment doesn't break down the hash into keys
-      # properly creating an association from comment to post
       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.post.writer.name
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Comment, :author)
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
-      # To flyerhzm: This does not detect that newspaper is unpreloaded. The association is
-      # not within possible objects, and thus cannot be detected as unpreloaded
       it "should detect non preloading with writer => newspaper" do
         Comment.includes(:post => :writer).where("posts.name like '%first%'").references(:posts).each do |comment|
           comment.post.writer.newspaper.name
         end
-        #Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        #Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Writer, :newspaper)
       end
 
-      # when we attempt to access category, there is an infinite overflow because load_target is hijacked leading to
-      # a repeating loop of calls in this test
       it "should not raise a stack error from posts to category" do
         expect {
           Comment.includes({:post => :category}).each do |com|
@@ -389,15 +375,6 @@ if active_record4?
   end
 
   describe Bullet::Detector::Association, 'has_and_belongs_to_many' do
-    before(:each) do
-      Bullet.clear
-      Bullet.start_request
-    end
-
-    after(:each) do
-      Bullet.end_request
-    end
-
     context "students <=> teachers" do
       it "should detect non preload associations" do
         Student.all.each do |student|
@@ -438,15 +415,6 @@ if active_record4?
   end
 
   describe Bullet::Detector::Association, 'has_many :through' do
-    before(:each) do
-      Bullet.clear
-      Bullet.start_request
-    end
-
-    after(:each) do
-      Bullet.end_request
-    end
-
     context "firm => clients" do
       it "should detect non preload associations" do
         Firm.all.each do |firm|
@@ -487,15 +455,6 @@ if active_record4?
   end
 
   describe Bullet::Detector::Association, "has_one" do
-    before(:each) do
-      Bullet.clear
-      Bullet.start_request
-    end
-
-    after(:each) do
-      Bullet.end_request
-    end
-
     context "company => address" do
       it "should detect non preload association" do
         Company.all.each do |company|
@@ -536,15 +495,6 @@ if active_record4?
   end
 
   describe Bullet::Detector::Association, "call one association that in possible objects" do
-    before(:each) do
-      Bullet.clear
-      Bullet.start_request
-    end
-
-    after(:each) do
-      Bullet.end_request
-    end
-
     it "should not detect preload association" do
       Post.all
       Post.first.comments.map(&:name)
@@ -556,15 +506,6 @@ if active_record4?
   end
 
   describe Bullet::Detector::Association, "STI" do
-    before(:each) do
-      Bullet.clear
-      Bullet.start_request
-    end
-
-    after(:each) do
-      Bullet.end_request
-    end
-
     context "page => author" do
       it "should detect non preload associations" do
         Page.all.each do |page|

data/spec/integration/counter_cache_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-if active_record3? || active_record4?
+if !mongoid? && active_record?
   describe Bullet::Detector::CounterCache do
     before(:each) do
       Bullet.start_request

data/spec/integration/mongoid/association_spec.rb

@@ -2,15 +2,6 @@ require 'spec_helper'
 
 if mongoid?
   describe Bullet::Detector::Association do
-    before(:each) do
-      Bullet.clear
-      Bullet.start_request
-    end
-    after(:each) do
-      Bullet.end_request
-      Mongoid::IdentityMap.clear
-    end
-
     context 'embeds_many' do
       context "posts => users" do
         it "should detect nothing" do
@@ -213,7 +204,6 @@ if mongoid?
     context "has_one" do
       context "company => address" do
         if Mongoid::VERSION !~ /\A3.0/
-          # mongodid 3.0.x doesn't set relation properly, it will query company for each address which causes n+1 query.
           it "should detect non preload association" do
             Mongoid::Company.all.each do |company|
               company.address.name