bullet 5.5.0 → 6.1.5

data/spec/integration/counter_cache_spec.rb

@@ -1,84 +1,66 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 if !mongoid? && active_record?
   describe Bullet::Detector::CounterCache do
-    before(:each) do
-      Bullet.start_request
-    end
+    before(:each) { Bullet.start_request }
 
-    after(:each) do
-      Bullet.end_request
-    end
+    after(:each) { Bullet.end_request }
 
-    it "should need counter cache with all cities" do
-      Country.all.each do |country|
-        country.cities.size
-      end
+    it 'should need counter cache with all cities' do
+      Country.all.each { |country| country.cities.size }
       expect(Bullet.collected_counter_cache_notifications).not_to be_empty
     end
 
-    it "should not need counter cache if already define counter_cache" do
-      Person.all.each do |person|
-        person.pets.size
-      end
+    it 'should not need counter cache if already define counter_cache' do
+      Person.all.each { |person| person.pets.size }
       expect(Bullet.collected_counter_cache_notifications).to be_empty
     end
 
-    it "should not need counter cache with only one object" do
+    it 'should not need counter cache with only one object' do
       Country.first.cities.size
       expect(Bullet.collected_counter_cache_notifications).to be_empty
     end
 
-    it "should not need counter cache without size" do
-      Country.includes(:cities).each do |country|
-        country.cities.empty?
-      end
+    it 'should not need counter cache without size' do
+      Country.includes(:cities).each { |country| country.cities.empty? }
       expect(Bullet.collected_counter_cache_notifications).to be_empty
     end
 
-    if active_record5?
-      it "should not need counter cache for has_many through" do
-        Client.all.each do |client|
-          client.firms.size
-        end
+    if active_record5? || active_record6?
+      it 'should not need counter cache for has_many through' do
+        Client.all.each { |client| client.firms.size }
         expect(Bullet.collected_counter_cache_notifications).to be_empty
       end
     else
-      it "should need counter cache for has_many through" do
-        Client.all.each do |client|
-          client.firms.size
-        end
+      it 'should need counter cache for has_many through' do
+        Client.all.each { |client| client.firms.size }
         expect(Bullet.collected_counter_cache_notifications).not_to be_empty
       end
     end
 
-    it "should not need counter cache with part of cities" do
-      Country.all.each do |country|
-        country.cities.where(:name => 'first').size
-      end
+    it 'should not need counter cache with part of cities' do
+      Country.all.each { |country| country.cities.where(name: 'first').size }
       expect(Bullet.collected_counter_cache_notifications).to be_empty
     end
 
-    context "disable" do
+    context 'disable' do
       before { Bullet.counter_cache_enable = false }
       after { Bullet.counter_cache_enable = true }
 
-      it "should not detect counter cache" do
-        Country.all.each do |country|
-          country.cities.size
-        end
+      it 'should not detect counter cache' do
+        Country.all.each { |country| country.cities.size }
         expect(Bullet.collected_counter_cache_notifications).to be_empty
       end
     end
 
-    context "whitelist" do
-      before { Bullet.add_whitelist :type => :counter_cache, :class_name => "Country", :association => :cities }
-      after { Bullet.clear_whitelist }
+    context 'safelist' do
+      before { Bullet.add_safelist type: :counter_cache, class_name: 'Country', association: :cities }
+      after { Bullet.clear_safelist }
 
-      it "should not detect counter cache" do
-        Country.all.each do |country|
-          country.cities.size
-        end
+      it 'should not detect counter cache' do
+        Country.all.each { |country| country.cities.size }
         expect(Bullet.collected_counter_cache_notifications).to be_empty
       end
     end

data/spec/integration/mongoid/association_spec.rb

@@ -1,13 +1,13 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 if mongoid?
   describe Bullet::Detector::Association do
     context 'embeds_many' do
-      context "posts => users" do
-        it "should detect nothing" do
-          Mongoid::Post.all.each do |post|
-            post.users.map(&:name)
-          end
+      context 'posts => users' do
+        it 'should detect nothing' do
+          Mongoid::Post.all.each { |post| post.users.map(&:name) }
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
           expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -17,28 +17,24 @@ if mongoid?
     end
 
     context 'has_many' do
-      context "posts => comments" do
-        it "should detect non preload posts => comments" do
-          Mongoid::Post.all.each do |post|
-            post.comments.map(&:name)
-          end
+      context 'posts => comments' do
+        it 'should detect non preload posts => comments' do
+          Mongoid::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
 
           expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Mongoid::Post, :comments)
         end
 
-        it "should detect preload post => comments" do
-          Mongoid::Post.includes(:comments).each do |post|
-            post.comments.map(&:name)
-          end
+        it 'should detect preload post => comments' do
+          Mongoid::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
 
           expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
-        it "should detect unused preload post => comments" do
+        it 'should detect unused preload post => comments' do
           Mongoid::Post.includes(:comments).map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
           expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Mongoid::Post, :comments)
@@ -46,7 +42,7 @@ if mongoid?
           expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
-        it "should not detect unused preload post => comments" do
+        it 'should not detect unused preload post => comments' do
           Mongoid::Post.all.map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
           expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
@@ -55,8 +51,8 @@ if mongoid?
         end
       end
 
-      context "category => posts, category => entries" do
-        it "should detect non preload with category => [posts, entries]" do
+      context 'category => posts, category => entries' do
+        it 'should detect non preload with category => [posts, entries]' do
           Mongoid::Category.all.each do |category|
             category.posts.map(&:name)
             category.entries.map(&:name)
@@ -68,7 +64,7 @@ if mongoid?
           expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Mongoid::Category, :entries)
         end
 
-        it "should detect preload with category => posts, but not with category => entries" do
+        it 'should detect preload with category => posts, but not with category => entries' do
           Mongoid::Category.includes(:posts).each do |category|
             category.posts.map(&:name)
             category.entries.map(&:name)
@@ -76,11 +72,14 @@ if mongoid?
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
           expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-          expect(Bullet::Detector::Association).not_to be_detecting_unpreloaded_association_for(Mongoid::Category, :posts)
+          expect(Bullet::Detector::Association).not_to be_detecting_unpreloaded_association_for(
+            Mongoid::Category,
+            :posts
+          )
           expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Mongoid::Category, :entries)
         end
 
-        it "should detect preload with category => [posts, entries]" do
+        it 'should detect preload with category => [posts, entries]' do
           Mongoid::Category.includes(:posts, :entries).each do |category|
             category.posts.map(&:name)
             category.entries.map(&:name)
@@ -91,7 +90,7 @@ if mongoid?
           expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
-        it "should detect unused preload with category => [posts, entries]" do
+        it 'should detect unused preload with category => [posts, entries]' do
           Mongoid::Category.includes(:posts, :entries).map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
           expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Mongoid::Category, :posts)
@@ -100,10 +99,8 @@ if mongoid?
           expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
-        it "should detect unused preload with category => entries, but not with category => posts" do
-          Mongoid::Category.includes(:posts, :entries).each do |category|
-            category.posts.map(&:name)
-          end
+        it 'should detect unused preload with category => entries, but not with category => posts' do
+          Mongoid::Category.includes(: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(Mongoid::Category, :posts)
           expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Mongoid::Category, :entries)
@@ -112,18 +109,16 @@ if mongoid?
         end
       end
 
-      context "post => comment" do
-        it "should detect unused preload with post => comments" do
-          Mongoid::Post.includes(:comments).each do |post|
-            post.comments.first.name
-          end
+      context 'post => comment' do
+        it 'should detect unused preload with post => comments' do
+          Mongoid::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(Mongoid::Post, :comments)
 
           expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
-        it "should detect preload with post => commnets" do
+        it 'should detect preload with post => comments' do
           Mongoid::Post.first.comments.map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
           expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
@@ -132,18 +127,16 @@ if mongoid?
         end
       end
 
-      context "scope preload_comments" do
-        it "should detect preload post => comments with scope" do
-          Mongoid::Post.preload_comments.each do |post|
-            post.comments.map(&:name)
-          end
+      context 'scope preload_comments' do
+        it 'should detect preload post => comments with scope' do
+          Mongoid::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
 
           expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
-        it "should detect unused preload with scope" do
+        it 'should detect unused preload with scope' do
           Mongoid::Post.preload_comments.map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
           expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Mongoid::Post, :comments)
@@ -154,18 +147,16 @@ if mongoid?
     end
 
     context 'belongs_to' do
-      context "comment => post" do
-        it "should detect non preload with comment => post" do
-          Mongoid::Comment.all.each do |comment|
-            comment.post.name
-          end
+      context 'comment => post' do
+        it 'should detect non preload with comment => post' do
+          Mongoid::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
 
           expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Mongoid::Comment, :post)
         end
 
-        it "should detect preload with one comment => post" do
+        it 'should detect preload with one comment => post' do
           Mongoid::Comment.first.post.name
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
           expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
@@ -173,17 +164,15 @@ if mongoid?
           expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
-        it "should detect preload with comment => post" do
-          Mongoid::Comment.includes(:post).each do |comment|
-            comment.post.name
-          end
+        it 'should detect preload with comment => post' do
+          Mongoid::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
 
           expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
-        it "should not detect preload with comment => post" do
+        it 'should not detect preload with comment => post' do
           Mongoid::Comment.all.map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
           expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
@@ -191,7 +180,7 @@ if mongoid?
           expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
-        it "should detect unused preload with comments => post" do
+        it 'should detect unused preload with comments => post' do
           Mongoid::Comment.includes(:post).map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
           expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Mongoid::Comment, :post)
@@ -201,31 +190,30 @@ if mongoid?
       end
     end
 
-    context "has_one" do
-      context "company => address" do
+    context 'has_one' do
+      context 'company => address' do
         if Mongoid::VERSION !~ /\A3.0/
-          it "should detect non preload association" do
-            Mongoid::Company.all.each do |company|
-              company.address.name
-            end
+          it 'should detect non preload association' do
+            Mongoid::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
 
-            expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Mongoid::Company, :address)
+            expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(
+              Mongoid::Company,
+              :address
+            )
           end
         end
 
-        it "should detect preload association" do
-          Mongoid::Company.includes(:address).each do |company|
-            company.address.name
-          end
+        it 'should detect preload association' do
+          Mongoid::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
 
           expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
-        it "should not detect preload association" do
+        it 'should not detect preload association' do
           Mongoid::Company.all.map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
           expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
@@ -233,7 +221,7 @@ if mongoid?
           expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
-        it "should detect unused preload association" do
+        it 'should detect unused preload association' do
           criteria = Mongoid::Company.includes(:address)
           criteria.map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
@@ -244,8 +232,8 @@ if mongoid?
       end
     end
 
-    context "call one association that in possible objects" do
-      it "should not detect preload association" do
+    context 'call one association that in possible objects' do
+      it 'should not detect preload association' do
         Mongoid::Post.all
         Mongoid::Post.first.comments.map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations

data/spec/models/address.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Address < ActiveRecord::Base
   belongs_to :company
 end

data/spec/models/attachment.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class Attachment < ActiveRecord::Base
+  belongs_to :submission
+end

data/spec/models/author.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Author < ActiveRecord::Base
   has_many :documents
 end

data/spec/models/base_user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class BaseUser < ActiveRecord::Base
   has_many :comments
   has_many :posts

data/spec/models/category.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Category < ActiveRecord::Base
   has_many :posts, inverse_of: :category
   has_many :entries

data/spec/models/city.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class City < ActiveRecord::Base
   belongs_to :country
 end

data/spec/models/client.rb

@@ -1,4 +1,8 @@
+# frozen_string_literal: true
+
 class Client < ActiveRecord::Base
+  belongs_to :group
+
   has_many :relationships
   has_many :firms, through: :relationships
 end

data/spec/models/comment.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 class Comment < ActiveRecord::Base
   belongs_to :post, inverse_of: :comments
-  belongs_to :author, class_name: "BaseUser"
+  belongs_to :author, class_name: 'BaseUser'
 
   validates :post, presence: true
 end

data/spec/models/company.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Company < ActiveRecord::Base
   has_one :address
 end

data/spec/models/country.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Country < ActiveRecord::Base
   has_many :cities
 end

data/spec/models/deal.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class Deal < ActiveRecord::Base
+  has_and_belongs_to_many :posts
+end

data/spec/models/document.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class Document < ActiveRecord::Base
-  has_many :children, class_name: "Document", foreign_key: 'parent_id'
-  belongs_to :parent, class_name: "Document", foreign_key: 'parent_id'
+  has_many :children, class_name: 'Document', foreign_key: 'parent_id'
+  belongs_to :parent, class_name: 'Document', foreign_key: 'parent_id'
   belongs_to :author
 end

data/spec/models/entry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Entry < ActiveRecord::Base
   belongs_to :category
 end

data/spec/models/firm.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 class Firm < ActiveRecord::Base
   has_many :relationships
   has_many :clients, through: :relationships
+  has_many :groups, through: :clients
 end

data/spec/models/folder.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class Folder < Document
 end

data/spec/models/group.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Group < ActiveRecord::Base
+end

data/spec/models/mongoid/address.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class Mongoid::Address
   include Mongoid::Document
 
   field :name
 
-  belongs_to :company, :class_name => "Mongoid::Company"
+  belongs_to :company, class_name: 'Mongoid::Company'
 end

data/spec/models/mongoid/category.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 class Mongoid::Category
   include Mongoid::Document
 
   field :name
 
-  has_many :posts, :class_name => "Mongoid::Post"
-  has_many :entries, :class_name => "Mongoid::Entry"
+  has_many :posts, class_name: 'Mongoid::Post'
+  has_many :entries, class_name: 'Mongoid::Entry'
 end

data/spec/models/mongoid/comment.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class Mongoid::Comment
   include Mongoid::Document
 
   field :name
 
-  belongs_to :post, :class_name => "Mongoid::Post"
+  belongs_to :post, class_name: 'Mongoid::Post'
 end

data/spec/models/mongoid/company.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class Mongoid::Company
   include Mongoid::Document
 
   field :name
 
-  has_one :address, :class_name => "Mongoid::Address"
+  has_one :address, class_name: 'Mongoid::Address'
 end

data/spec/models/mongoid/entry.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class Mongoid::Entry
   include Mongoid::Document
 
   field :name
 
-  belongs_to :category, :class_name => "Mongoid::Category"
+  belongs_to :category, class_name: 'Mongoid::Category'
 end

data/spec/models/mongoid/post.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 class Mongoid::Post
   include Mongoid::Document
 
   field :name
 
-  has_many :comments, :class_name => "Mongoid::Comment"
-  belongs_to :category, :class_name => "Mongoid::Category"
+  has_many :comments, class_name: 'Mongoid::Comment'
+  belongs_to :category, class_name: 'Mongoid::Category'
 
-  embeds_many :users, :class_name => "Mongoid::User"
+  embeds_many :users, class_name: 'Mongoid::User'
 
-  scope :preload_comments, lambda { includes(:comments) }
+  scope :preload_comments, -> { includes(:comments) }
 end

data/spec/models/mongoid/user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Mongoid::User
   include Mongoid::Document
 

data/spec/models/newspaper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Newspaper < ActiveRecord::Base
-  has_many :writers, class_name: "BaseUser"
+  has_many :writers, class_name: 'BaseUser'
 end

data/spec/models/page.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class Page < Document
 end

data/spec/models/person.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Person < ActiveRecord::Base
   has_many :pets
 end

data/spec/models/pet.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Pet < ActiveRecord::Base
   belongs_to :person, counter_cache: true
 end