bullet 5.7.0 → 6.0.0

data/spec/integration/active_record/association_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 if active_record?
@@ -122,7 +124,7 @@ if active_record?
       end
 
       it 'should detect preload with category => posts => comments' do
-        Category.includes({ :posts => :comments }).each do |category|
+        Category.includes(posts: :comments).each do |category|
           category.posts.each do |post|
             post.comments.map(&:name)
           end
@@ -134,7 +136,7 @@ if active_record?
       end
 
       it 'should detect preload with category => posts => comments with posts.id > 0' do
-        Category.includes({ :posts => :comments }).where('posts.id > 0').references(:posts).each do |category|
+        Category.includes(posts: :comments).where('posts.id > 0').references(:posts).each do |category|
           category.posts.each do |post|
             post.comments.map(&:name)
           end
@@ -146,7 +148,7 @@ if active_record?
       end
 
       it 'should detect unused preload with category => posts => comments' do
-        Category.includes({ :posts => :comments }).map(&:name)
+        Category.includes(posts: :comments).map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Post, :comments)
 
@@ -154,7 +156,7 @@ if active_record?
       end
 
       it 'should detect unused preload with post => commnets, no category => posts' do
-        Category.includes({ :posts => :comments }).each do |category|
+        Category.includes(posts: :comments).each do |category|
           category.posts.map(&:name)
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
@@ -190,7 +192,7 @@ if active_record?
       end
 
       it 'should detect preload with category => [posts, entries]' do
-        Category.includes([:posts, :entries]).each do |category|
+        Category.includes(%i[posts entries]).each do |category|
           category.posts.map(&:name)
           category.entries.map(&:name)
         end
@@ -201,7 +203,7 @@ if active_record?
       end
 
       it 'should detect unused preload with category => [posts, entries]' do
-        Category.includes([:posts, :entries]).map(&:name)
+        Category.includes(%i[posts entries]).map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Category, :posts)
         expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Category, :entries)
@@ -210,7 +212,7 @@ if active_record?
       end
 
       it 'should detect unused preload with category => entries, but not with category => posts' do
-        Category.includes([:posts, :entries]).each do |category|
+        Category.includes(%i[posts entries]).each do |category|
           category.posts.map(&:name)
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
@@ -224,7 +226,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 if post.comments.first
+          post.comments.first&.name
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_unused_preload_associations_for(Post, :comments)
@@ -244,7 +246,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
 
@@ -257,7 +259,7 @@ if active_record?
 
     context 'category => posts => writer' do
       it 'should not detect unused preload associations' do
-        category = Category.includes({ :posts => :writer }).order('id DESC').find_by_name('first')
+        category = Category.includes(posts: :writer).order('id DESC').find_by_name('first')
         category.posts.map do |post|
           post.name
           post.writer.name
@@ -329,7 +331,7 @@ if active_record?
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
-      it 'should dtect preload with comment => post' do
+      it 'should detect preload with comment => post' do
         Comment.includes(:post).each do |comment|
           comment.post.name
         end
@@ -354,6 +356,17 @@ if active_record?
 
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
+
+      it 'should not detect newly assigned object in an after_save' do
+        new_post = Post.new(category: Category.first)
+
+        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
     end
 
     context 'comment => post => category' do
@@ -387,7 +400,7 @@ if active_record?
       end
 
       it 'should not detect unpreload association' do
-        Comment.includes(:post => :category).each do |comment|
+        Comment.includes(post: :category).each do |comment|
           comment.post.category.name
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
@@ -399,7 +412,7 @@ if active_record?
 
     context 'comment => author, post => writer' do
       it 'should detect non preloaded writer' do
-        Comment.includes([:author, :post]).where(['base_users.id = ?', BaseUser.first]).references(:base_users).each do |comment|
+        Comment.includes(%i[author post]).where(['base_users.id = ?', BaseUser.first]).references(:base_users).each do |comment|
           comment.post.writer.name
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
@@ -409,7 +422,7 @@ if active_record?
       end
 
       it 'should detect unused preload with comment => author' do
-        Comment.includes([:author, { :post => :writer }]).where(['base_users.id = ?', BaseUser.first]).references(:base_users).each do |comment|
+        Comment.includes([:author, { post: :writer }]).where(['base_users.id = ?', BaseUser.first]).references(:base_users).each do |comment|
           comment.post.writer.name
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
@@ -419,7 +432,7 @@ if active_record?
       end
 
       it 'should detect non preloading with writer => newspaper' do
-        Comment.includes(:post => :writer).where("posts.name like '%first%'").references(:posts).each do |comment|
+        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
@@ -430,10 +443,10 @@ if active_record?
 
       it 'should not raise a stack error from posts to category' do
         expect {
-          Comment.includes({ :post => :category }).each do |com|
+          Comment.includes(post: :category).each do |com|
             com.post.category
           end
-        }.not_to raise_error()
+        }.not_to raise_error
       end
     end
   end
@@ -526,6 +539,44 @@ if active_record?
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
     end
+
+    context 'firm => clients => groups' do
+      it 'should detect non preload associations' do
+        Firm.all.each do |firm|
+          firm.groups.map(&:name)
+        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_detecting_unpreloaded_association_for(Firm, :groups)
+      end
+
+      it 'should detect preload associations' do
+        Firm.includes(:groups).each do |firm|
+          firm.groups.map(&:name)
+        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 not detect preload associations' do
+        Firm.all.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 associations' do
+        Firm.includes(:groups).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Firm, :groups)
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+    end
   end
 
   describe Bullet::Detector::Association, 'has_one' do
@@ -720,7 +771,7 @@ if active_record?
     end
 
     context 'whitelist n plus one query' do
-      before { Bullet.add_whitelist :type => :n_plus_one_query, :class_name => 'Post', :association => :comments }
+      before { Bullet.add_whitelist type: :n_plus_one_query, class_name: 'Post', association: :comments }
       after { Bullet.clear_whitelist }
 
       it 'should not detect n plus one query' do
@@ -743,7 +794,7 @@ if active_record?
     end
 
     context 'whitelist unused eager loading' do
-      before { Bullet.add_whitelist :type => :unused_eager_loading, :class_name => 'Post', :association => :comments }
+      before { Bullet.add_whitelist type: :unused_eager_loading, class_name: 'Post', association: :comments }
       after { Bullet.clear_whitelist }
 
       it 'should not detect unused eager loading' do

data/spec/integration/counter_cache_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 if !mongoid? && active_record?
@@ -36,7 +38,7 @@ if !mongoid? && active_record?
       expect(Bullet.collected_counter_cache_notifications).to be_empty
     end
 
-    if active_record5?
+    if active_record5? || active_record6?
       it 'should not need counter cache for has_many through' do
         Client.all.each do |client|
           client.firms.size
@@ -54,7 +56,7 @@ if !mongoid? && active_record?
 
     it 'should not need counter cache with part of cities' do
       Country.all.each do |country|
-        country.cities.where(:name => 'first').size
+        country.cities.where(name: 'first').size
       end
       expect(Bullet.collected_counter_cache_notifications).to be_empty
     end
@@ -72,7 +74,7 @@ if !mongoid? && active_record?
     end
 
     context 'whitelist' do
-      before { Bullet.add_whitelist :type => :counter_cache, :class_name => 'Country', :association => :cities }
+      before { Bullet.add_whitelist type: :counter_cache, class_name: 'Country', association: :cities }
       after { Bullet.clear_whitelist }
 
       it 'should not detect counter cache' do

data/spec/integration/mongoid/association_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 if mongoid?

data/spec/models/address.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Address < ActiveRecord::Base
   belongs_to :company
 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,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comment < ActiveRecord::Base
   belongs_to :post, inverse_of: :comments
   belongs_to :author, class_name: 'BaseUser'

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/document.rb

@@ -1,3 +1,5 @@
+# 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'

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'
 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

data/spec/models/post.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Post < ActiveRecord::Base
   belongs_to :category, inverse_of: :posts
   belongs_to :writer
@@ -12,4 +14,19 @@ class Post < ActiveRecord::Base
   def link=(*)
     comments.new
   end
+
+  # see association_spec.rb 'should not detect newly assigned object in an after_save'
+  attr_accessor :trigger_after_save
+  after_save do
+    next unless trigger_after_save
+
+    temp_comment = Comment.new(post: self)
+    # this triggers self to be "possible", even though it's
+    # not saved yet
+    temp_comment.post
+
+    # category should NOT whine about not being pre-loaded, because
+    # it's obviously attached to a new object
+    category
+  end
 end

data/spec/models/relationship.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Relationship < ActiveRecord::Base
   belongs_to :firm
   belongs_to :client

data/spec/models/reply.rb

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

data/spec/models/student.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Student < ActiveRecord::Base
   has_and_belongs_to_many :teachers
 end

data/spec/models/submission.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Submission < ActiveRecord::Base
   belongs_to :user
   has_many :replies

data/spec/models/teacher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Teacher < ActiveRecord::Base
   has_and_belongs_to_many :students
 end

data/spec/models/user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class User < ActiveRecord::Base
   has_one :submission
   belongs_to :category

data/spec/models/writer.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class Writer < BaseUser
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rspec'
 begin
   require 'active_record'
@@ -33,7 +35,7 @@ Dir[File.join(SUPPORT, '*.rb')].reject { |filename| filename =~ /_seed.rb$/ }.so
 RSpec.configure do |config|
   config.extend Bullet::Dependency
 
-  config.filter_run :focus => true
+  config.filter_run focus: true
   config.run_all_when_everything_filtered = true
 end
 

data/spec/support/bullet_ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   def self.collected_notifications_of_class(notification_class)
     Bullet.notification_collector.collection.select do |notification|