bullet 5.9.0 → 6.1.1

data/spec/bullet/registry/association_spec.rb

@@ -16,11 +16,11 @@ module Bullet
 
       context '#similarly_associated' do
         it 'should return similarly associated keys' do
-          expect(subject.similarly_associated('key1', Set.new(['value']))).to eq(%w[key1 key2])
+          expect(subject.similarly_associated('key1', Set.new(%w[value]))).to eq(%w[key1 key2])
         end
 
         it 'should return empty if key does not exist' do
-          expect(subject.similarly_associated('key3', Set.new(['value']))).to be_empty
+          expect(subject.similarly_associated('key3', Set.new(%w[value]))).to be_empty
         end
       end
     end

data/spec/bullet/registry/base_spec.rb

@@ -9,7 +9,7 @@ module Bullet
 
       context '#[]' do
         it 'should get value by key' do
-          expect(subject['key']).to eq(Set.new(['value']))
+          expect(subject['key']).to eq(Set.new(%w[value]))
         end
       end
 

data/spec/bullet_spec.rb

@@ -17,9 +17,7 @@ describe Bullet, focused: true do
       end
 
       context 'disable Bullet' do
-        before do
-          Bullet.enable = false
-        end
+        before { Bullet.enable = false }
 
         it 'should be disabled' do
           expect(subject).to_not be_enable
@@ -27,8 +25,8 @@ describe Bullet, focused: true do
 
         context 'enable Bullet again without patching again the orms' do
           before do
-            expect(Bullet::Mongoid).not_to receive(:enable) if defined? Bullet::Mongoid
-            expect(Bullet::ActiveRecord).not_to receive(:enable) if defined? Bullet::ActiveRecord
+            expect(Bullet::Mongoid).not_to receive(:enable) if defined?(Bullet::Mongoid)
+            expect(Bullet::ActiveRecord).not_to receive(:enable) if defined?(Bullet::ActiveRecord)
             Bullet.enable = true
           end
 
@@ -42,9 +40,7 @@ describe Bullet, focused: true do
 
   describe '#start?' do
     context 'when bullet is disabled' do
-      before(:each) do
-        Bullet.enable = false
-      end
+      before(:each) { Bullet.enable = false }
 
       it 'should not be started' do
         expect(Bullet).not_to be_start
@@ -53,28 +49,19 @@ describe Bullet, focused: true do
   end
 
   describe '#debug' do
-    before(:each) do
-      $stdout = StringIO.new
-    end
+    before(:each) { $stdout = StringIO.new }
 
-    after(:each) do
-      $stdout = STDOUT
-    end
+    after(:each) { $stdout = STDOUT }
 
     context 'when debug is enabled' do
-      before(:each) do
-        ENV['BULLET_DEBUG'] = 'true'
-      end
+      before(:each) { ENV['BULLET_DEBUG'] = 'true' }
 
-      after(:each) do
-        ENV['BULLET_DEBUG'] = 'false'
-      end
+      after(:each) { ENV['BULLET_DEBUG'] = 'false' }
 
       it 'should output debug information' do
         Bullet.debug('debug_message', 'this is helpful information')
 
-        expect($stdout.string)
-          .to eq("[Bullet][debug_message] this is helpful information\n")
+        expect($stdout.string).to eq("[Bullet][debug_message] this is helpful information\n")
       end
     end
 
@@ -101,7 +88,7 @@ describe Bullet, focused: true do
       it 'is deleted from the whitelist successfully' do
         Bullet.add_whitelist(type: :n_plus_one_query, class_name: 'Klass', association: :department)
         Bullet.delete_whitelist(type: :n_plus_one_query, class_name: 'Klass', association: :department)
-        expect(Bullet.whitelist[:n_plus_one_query]).to eq({})
+        expect(Thread.current[:whitelist][:n_plus_one_query]).to eq({})
       end
     end
 
@@ -125,13 +112,7 @@ describe Bullet, focused: true do
     end
 
     context 'when called with Rack environment hash' do
-      let(:env) {
-        {
-          'REQUEST_METHOD' => 'GET',
-          'PATH_INFO' => '/path',
-          'QUERY_STRING' => 'foo=bar'
-        }
-      }
+      let(:env) { { 'REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/path', 'QUERY_STRING' => 'foo=bar' } }
 
       context "when env['REQUEST_URI'] is nil" do
         before { env['REQUEST_URI'] = nil }

data/spec/integration/active_record/association_spec.rb

@@ -6,9 +6,7 @@ if active_record?
   describe Bullet::Detector::Association, 'has_many' do
     context 'post => comments' do
       it 'should detect non preload post => comments' do
-        Post.all.each do |post|
-          post.comments.map(&:name)
-        end
+        Post.all.each { |post| post.comments.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -16,9 +14,7 @@ if active_record?
       end
 
       it 'should detect non preload post => comments for find_by_sql' do
-        Post.find_by_sql('SELECT * FROM posts').each do |post|
-          post.comments.map(&:name)
-        end
+        Post.find_by_sql('SELECT * FROM posts').each { |post| post.comments.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -26,9 +22,7 @@ if active_record?
       end
 
       it 'should detect preload with post => comments' do
-        Post.includes(:comments).each do |post|
-          post.comments.map(&:name)
-        end
+        Post.includes(:comments).each { |post| post.comments.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -65,9 +59,7 @@ if active_record?
       end
 
       it 'should detect non preload post => comments with empty?' do
-        Post.all.each do |post|
-          post.comments.empty?
-        end
+        Post.all.each { |post| post.comments.empty? }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -76,9 +68,7 @@ if active_record?
 
       it 'should detect non preload post => comments with include?' do
         comment = Comment.last
-        Post.all.each do |post|
-          post.comments.include?(comment)
-        end
+        Post.all.each { |post| post.comments.include?(comment) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -86,9 +76,7 @@ if active_record?
       end
 
       it 'should not detect unused preload person => pets with empty?' do
-        Person.all.each do |person|
-          person.pets.empty?
-        end
+        Person.all.each { |person| person.pets.empty? }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -98,11 +86,7 @@ if active_record?
 
     context 'category => posts => comments' do
       it 'should detect non preload category => posts => comments' do
-        Category.all.each do |category|
-          category.posts.each do |post|
-            post.comments.map(&:name)
-          end
-        end
+        Category.all.each { |category| category.posts.each { |post| post.comments.map(&:name) } }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -111,11 +95,7 @@ if active_record?
       end
 
       it 'should detect preload category => posts, but no post => comments' do
-        Category.includes(:posts).each do |category|
-          category.posts.each do |post|
-            post.comments.map(&:name)
-          end
-        end
+        Category.includes(:posts).each { |category| category.posts.each { |post| post.comments.map(&:name) } }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -124,11 +104,7 @@ if active_record?
       end
 
       it 'should detect preload with category => posts => comments' do
-        Category.includes(posts: :comments).each do |category|
-          category.posts.each do |post|
-            post.comments.map(&:name)
-          end
-        end
+        Category.includes(posts: :comments).each { |category| category.posts.each { |post| post.comments.map(&:name) } }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -137,9 +113,7 @@ if active_record?
 
       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
+          category.posts.each { |post| post.comments.map(&:name) }
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
@@ -156,9 +130,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.posts.map(&:name)
-        end
+        Category.includes(posts: :comments).each { |category| category.posts.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Post, :comments)
 
@@ -212,9 +184,7 @@ if active_record?
       end
 
       it 'should detect unused preload with category => entries, but not with category => posts' do
-        Category.includes(%i[posts entries]).each do |category|
-          category.posts.map(&:name)
-        end
+        Category.includes(%i[posts entries]).each { |category| category.posts.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_unused_preload_associations_for(Category, :posts)
         expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Category, :entries)
@@ -225,9 +195,7 @@ if active_record?
 
     context 'post => comment' do
       it 'should detect unused preload with post => comments' do
-        Post.includes(:comments).each do |post|
-          post.comments.first&.name
-        end
+        Post.includes(:comments).each { |post| post.comments.first&.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_unused_preload_associations_for(Post, :comments)
 
@@ -246,7 +214,7 @@ if active_record?
         category = Category.first
         category.draft_post.destroy!
         post = category.draft_post
-        post.update_attributes!(link: true)
+        post.update!(link: true)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -272,9 +240,7 @@ if active_record?
 
     context 'scope for_category_name' do
       it 'should detect preload with post => category' do
-        Post.in_category_name('first').references(:categories).each do |post|
-          post.category.name
-        end
+        Post.in_category_name('first').references(:categories).each { |post| post.category.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -292,9 +258,7 @@ if active_record?
 
     context 'scope preload_comments' do
       it 'should detect preload post => comments with scope' do
-        Post.preload_comments.each do |post|
-          post.comments.map(&:name)
-        end
+        Post.preload_comments.each { |post| post.comments.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -314,9 +278,7 @@ if active_record?
   describe Bullet::Detector::Association, 'belongs_to' do
     context 'comment => post' do
       it 'should detect non preload with comment => post' do
-        Comment.all.each do |comment|
-          comment.post.name
-        end
+        Comment.all.each { |comment| comment.post.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -331,10 +293,8 @@ if active_record?
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
-      it 'should dtect preload with comment => post' do
-        Comment.includes(:post).each do |comment|
-          comment.post.name
-        end
+      it 'should detect preload with comment => post' do
+        Comment.includes(:post).each { |comment| comment.post.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -362,29 +322,16 @@ if active_record?
 
         new_post.trigger_after_save = true
         new_post.save!
+        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 not detect "manual" preload' do
-        comment = Comment.all.to_a.first
-        post = Post.find(comment.post_id)
-        # "manually" preload with out-of-band data
-        comment.post = post
-        # loading it should not trigger anything
-        comment.post
-
-        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
-        expect(Bullet::Detector::Association).to be_completely_preloading_associations
-      end
     end
 
     context 'comment => post => category' do
       it 'should detect non preload association with comment => post' do
-        Comment.all.each do |comment|
-          comment.post.category.name
-        end
+        Comment.all.each { |comment| comment.post.category.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -401,9 +348,7 @@ if active_record?
       end
 
       it 'should detect non preload association with post => category' do
-        Comment.includes(:post).each do |comment|
-          comment.post.category.name
-        end
+        Comment.includes(:post).each { |comment| comment.post.category.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -411,9 +356,7 @@ if active_record?
       end
 
       it 'should not detect unpreload association' do
-        Comment.includes(post: :category).each do |comment|
-          comment.post.category.name
-        end
+        Comment.includes(post: :category).each { |comment| comment.post.category.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -423,9 +366,8 @@ if active_record?
 
     context 'comment => author, post => writer' do
       it 'should detect non preloaded writer' do
-        Comment.includes(%i[author post]).where(['base_users.id = ?', BaseUser.first]).references(:base_users).each do |comment|
-          comment.post.writer.name
-        end
+        Comment.includes(%i[author post]).where(['base_users.id = ?', BaseUser.first]).references(:base_users)
+          .each { |comment| comment.post.writer.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -433,9 +375,9 @@ 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.post.writer.name
-        end
+        Comment.includes([:author, { post: :writer }]).where(['base_users.id = ?', BaseUser.first]).references(
+          :base_users
+        ).each { |comment| comment.post.writer.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -453,11 +395,7 @@ if active_record?
       end
 
       it 'should not raise a stack error from posts to category' do
-        expect {
-          Comment.includes(post: :category).each do |com|
-            com.post.category
-          end
-        }.not_to raise_error
+        expect { Comment.includes(post: :category).each { |com| com.post.category } }.not_to raise_error
       end
     end
   end
@@ -465,9 +403,7 @@ if active_record?
   describe Bullet::Detector::Association, 'has_and_belongs_to_many' do
     context 'students <=> teachers' do
       it 'should detect non preload associations' do
-        Student.all.each do |student|
-          student.teachers.map(&:name)
-        end
+        Student.all.each { |student| student.teachers.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -475,9 +411,7 @@ if active_record?
       end
 
       it 'should detect preload associations' do
-        Student.includes(:teachers).each do |student|
-          student.teachers.map(&:name)
-        end
+        Student.includes(:teachers).each { |student| student.teachers.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -501,9 +435,7 @@ if active_record?
       end
 
       it 'should detect non preload student => teachers with empty?' do
-        Student.all.each do |student|
-          student.teachers.empty?
-        end
+        Student.all.each { |student| student.teachers.empty? }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -515,9 +447,7 @@ if active_record?
   describe Bullet::Detector::Association, 'has_many :through' do
     context 'firm => clients' do
       it 'should detect non preload associations' do
-        Firm.all.each do |firm|
-          firm.clients.map(&:name)
-        end
+        Firm.all.each { |firm| firm.clients.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -525,9 +455,7 @@ if active_record?
       end
 
       it 'should detect preload associations' do
-        Firm.includes(:clients).each do |firm|
-          firm.clients.map(&:name)
-        end
+        Firm.includes(:clients).each { |firm| firm.clients.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -553,9 +481,7 @@ if active_record?
 
     context 'firm => clients => groups' do
       it 'should detect non preload associations' do
-        Firm.all.each do |firm|
-          firm.groups.map(&:name)
-        end
+        Firm.all.each { |firm| firm.groups.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -563,9 +489,7 @@ if active_record?
       end
 
       it 'should detect preload associations' do
-        Firm.includes(:groups).each do |firm|
-          firm.groups.map(&:name)
-        end
+        Firm.includes(:groups).each { |firm| firm.groups.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -593,9 +517,7 @@ if active_record?
   describe Bullet::Detector::Association, 'has_one' do
     context 'company => address' do
       it 'should detect non preload association' do
-        Company.all.each do |company|
-          company.address.name
-        end
+        Company.all.each { |company| company.address.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -603,9 +525,7 @@ if active_record?
       end
 
       it 'should detect preload association' do
-        Company.includes(:address).each do |company|
-          company.address.name
-        end
+        Company.includes(:address).each { |company| company.address.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -699,9 +619,7 @@ if active_record?
   describe Bullet::Detector::Association, 'STI' do
     context 'page => author' do
       it 'should detect non preload associations' do
-        Page.all.each do |page|
-          page.author.name
-        end
+        Page.all.each { |page| page.author.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -709,9 +627,7 @@ if active_record?
       end
 
       it 'should detect preload associations' do
-        Page.includes(:author).each do |page|
-          page.author.name
-        end
+        Page.includes(:author).each { |page| page.author.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -740,9 +656,7 @@ if active_record?
       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
+        Post.all.each { |post| post.comments.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
 
         expect(Bullet::Detector::Association).not_to be_detecting_unpreloaded_association_for(Post, :comments)
@@ -771,9 +685,7 @@ if active_record?
       end
 
       it 'should still detect n plus one query' do
-        Post.all.each do |post|
-          post.comments.map(&:name)
-        end
+        Post.all.each { |post| post.comments.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
 
         expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
@@ -786,9 +698,7 @@ if active_record?
       after { Bullet.clear_whitelist }
 
       it 'should not detect n plus one query' do
-        Post.all.each do |post|
-          post.comments.map(&:name)
-        end
+        Post.all.each { |post| post.comments.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
 
         expect(Bullet::Detector::Association).not_to be_detecting_unpreloaded_association_for(Post, :comments)
@@ -817,9 +727,7 @@ if active_record?
       end
 
       it 'should still detect n plus one query' do
-        Post.all.each do |post|
-          post.comments.map(&:name)
-        end
+        Post.all.each { |post| post.comments.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
 
         expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)