bullet 6.1.0 → 7.0.0

data/spec/integration/active_record/association_spec.rb

@@ -129,7 +129,7 @@ if active_record?
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
-      it 'should detect unused preload with post => commnets, no category => posts' do
+      it 'should detect unused preload with post => comments, no category => posts' do
         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)
@@ -202,7 +202,7 @@ if active_record?
         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
         Post.first.comments.map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
@@ -377,8 +377,7 @@ if active_record?
       it 'should detect unused preload with comment => author' do
         Comment.includes([:author, { post: :writer }]).where(['base_users.id = ?', BaseUser.first]).references(
           :base_users
-        )
-          .each { |comment| comment.post.writer.name }
+        ).each { |comment| comment.post.writer.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
@@ -402,6 +401,15 @@ if active_record?
   end
 
   describe Bullet::Detector::Association, 'has_and_belongs_to_many' do
+    context 'posts <=> deals' do
+      it 'should detect preload associations with join tables that have identifier' do
+        Post.includes(:deals).each { |post| post.deals.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
+    end
     context 'students <=> teachers' do
       it 'should detect non preload associations' do
         Student.all.each { |student| student.teachers.map(&:name) }
@@ -562,6 +570,42 @@ if active_record?
     end
   end
 
+  describe Bullet::Detector::Association, 'has_one :through' do
+    context 'user => attachment' do
+      it 'should detect non preload associations' do
+        User.all.each { |user| user.submission_attachment.file_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(User, :submission_attachment)
+      end
+
+      it 'should detect preload associations' do
+        User.includes(:submission_attachment).each { |user| user.submission_attachment.file_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 associations' do
+        User.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
+        User.includes(:submission_attachment).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(User, :submission_attachment)
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+    end
+  end
+
   describe Bullet::Detector::Association, 'call one association that in possible objects' do
     it 'should not detect preload association' do
       Post.all
@@ -694,9 +738,9 @@ if active_record?
       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.clear_whitelist }
+    context 'add n plus one query to safelist' do
+      before { Bullet.add_safelist type: :n_plus_one_query, class_name: 'Post', association: :comments }
+      after { Bullet.clear_safelist }
 
       it 'should not detect n plus one query' do
         Post.all.each { |post| post.comments.map(&:name) }
@@ -715,9 +759,9 @@ if active_record?
       end
     end
 
-    context 'whitelist unused eager loading' do
-      before { Bullet.add_whitelist type: :unused_eager_loading, class_name: 'Post', association: :comments }
-      after { Bullet.clear_whitelist }
+    context 'add unused eager loading to safelist' do
+      before { Bullet.add_safelist type: :unused_eager_loading, class_name: 'Post', association: :comments }
+      after { Bullet.clear_safelist }
 
       it 'should not detect unused eager loading' do
         Post.includes(:comments).map(&:name)

data/spec/integration/counter_cache_spec.rb

@@ -28,7 +28,7 @@ if !mongoid? && active_record?
       expect(Bullet.collected_counter_cache_notifications).to be_empty
     end
 
-    if active_record5? || active_record6?
+    if ActiveRecord::VERSION::MAJOR > 4
       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
@@ -55,9 +55,9 @@ if !mongoid? && active_record?
       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 { |country| country.cities.size }

data/spec/integration/mongoid/association_spec.rb

@@ -73,9 +73,9 @@ if mongoid?
           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
-                                                       )
+            Mongoid::Category,
+            :posts
+          )
           expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Mongoid::Category, :entries)
         end
 
@@ -118,7 +118,7 @@ if mongoid?
           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

data/spec/models/attachment.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class Attachment < ActiveRecord::Base
+  belongs_to :submission
+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/folder.rb

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

data/spec/models/group.rb

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

data/spec/models/page.rb

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

data/spec/models/post.rb

@@ -4,6 +4,7 @@ class Post < ActiveRecord::Base
   belongs_to :category, inverse_of: :posts
   belongs_to :writer
   has_many :comments, inverse_of: :post
+  has_and_belongs_to_many :deals
 
   validates :category, presence: true
 
@@ -21,6 +22,7 @@ class Post < ActiveRecord::Base
     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

data/spec/models/submission.rb

@@ -3,4 +3,5 @@
 class Submission < ActiveRecord::Base
   belongs_to :user
   has_many :replies
+  has_one :attachment
 end

data/spec/models/user.rb

@@ -2,5 +2,6 @@
 
 class User < ActiveRecord::Base
   has_one :submission
+  has_one :submission_attachment, through: :submission, source: :attachment, class_name: 'Attachment'
   belongs_to :category
 end

data/spec/models/writer.rb

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

data/spec/spec_helper.rb

@@ -4,12 +4,10 @@ require 'rspec'
 begin
   require 'active_record'
 rescue LoadError
-
 end
 begin
   require 'mongoid'
 rescue LoadError
-
 end
 
 module Rails

data/spec/support/mongo_seed.rb

@@ -45,6 +45,7 @@ module Support
         Mongoid.configure do |config|
           config.load_configuration(clients: { default: { database: 'bullet', hosts: %w[localhost:27017] } })
         end
+
         # Increase the level from DEBUG in order to avoid excessive logging to the screen
         Mongo::Logger.logger.level = Logger::WARN
       end

data/spec/support/sqlite_seed.rb

@@ -21,6 +21,13 @@ module Support
       post2 = category2.posts.create(name: 'second', writer: writer2)
       post3 = category2.posts.create(name: 'third', writer: writer2)
 
+      deal1 = Deal.new(name: 'Deal 1')
+      deal1.posts << post1
+      deal1.posts << post2
+      deal2 = Deal.new(name: 'Deal 2')
+      post1.deals << deal1
+      post1.deals << deal2
+
       comment1 = post1.comments.create(name: 'first', author: writer1)
       comment2 = post1.comments.create(name: 'first2', author: writer1)
       comment3 = post1.comments.create(name: 'first3', author: writer1)
@@ -95,6 +102,9 @@ module Support
       submission1.replies.create(name: 'reply2')
       submission2.replies.create(name: 'reply3')
       submission2.replies.create(name: 'reply4')
+
+      submission1.create_attachment(file_name: 'submission1 file')
+      submission2.create_attachment(file_name: 'submission2 file')
     end
 
     def setup_db
@@ -153,6 +163,11 @@ module Support
           t.column :hotel_id, :integer
         end
 
+        create_table :deals_posts do |t|
+          t.column :deal_id, :integer
+          t.column :post_id, :integer
+        end
+
         create_table :documents do |t|
           t.string :name
           t.string :type
@@ -240,6 +255,11 @@ module Support
           t.column :name, :string
           t.column :category_id, :integer
         end
+
+        create_table :attachments do |t|
+          t.column :file_name, :string
+          t.column :submission_id, :integer
+        end
       end
     end
   end

data/test.sh

@@ -1,5 +1,7 @@
 #bundle update rails && bundle exec rspec spec
 #BUNDLE_GEMFILE=Gemfile.mongoid bundle update mongoid && BUNDLE_GEMFILE=Gemfile.mongoid bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-7.0 bundle && BUNDLE_GEMFILE=Gemfile.rails-7.0 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-6.1 bundle && BUNDLE_GEMFILE=Gemfile.rails-6.1 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-6.0 bundle && BUNDLE_GEMFILE=Gemfile.rails-6.0 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-5.2 bundle && BUNDLE_GEMFILE=Gemfile.rails-5.2 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-5.1 bundle && BUNDLE_GEMFILE=Gemfile.rails-5.1 bundle exec rspec spec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Richard Huang
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-28 00:00:00.000000000 Z
+date: 2021-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -45,9 +45,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.mongoid
@@ -62,6 +62,8 @@ files:
 - Gemfile.rails-5.1
 - Gemfile.rails-5.2
 - Gemfile.rails-6.0
+- Gemfile.rails-6.1
+- Gemfile.rails-7.0
 - Guardfile
 - Hacking.md
 - MIT-LICENSE
@@ -76,6 +78,8 @@ files:
 - lib/bullet/active_record5.rb
 - lib/bullet/active_record52.rb
 - lib/bullet/active_record60.rb
+- lib/bullet/active_record61.rb
+- lib/bullet/active_record70.rb
 - lib/bullet/bullet_xhr.js
 - lib/bullet/dependency.rb
 - lib/bullet/detector.rb
@@ -127,6 +131,7 @@ files:
 - spec/integration/counter_cache_spec.rb
 - spec/integration/mongoid/association_spec.rb
 - spec/models/address.rb
+- spec/models/attachment.rb
 - spec/models/author.rb
 - spec/models/base_user.rb
 - spec/models/category.rb
@@ -135,6 +140,7 @@ files:
 - spec/models/comment.rb
 - spec/models/company.rb
 - spec/models/country.rb
+- spec/models/deal.rb
 - spec/models/document.rb
 - spec/models/entry.rb
 - spec/models/firm.rb
@@ -173,7 +179,7 @@ licenses:
 metadata:
   changelog_uri: https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/flyerhzm/bullet
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -188,8 +194,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: help to kill N+1 queries and unused eager loading.
 test_files:
@@ -214,6 +220,7 @@ test_files:
 - spec/integration/counter_cache_spec.rb
 - spec/integration/mongoid/association_spec.rb
 - spec/models/address.rb
+- spec/models/attachment.rb
 - spec/models/author.rb
 - spec/models/base_user.rb
 - spec/models/category.rb
@@ -222,6 +229,7 @@ test_files:
 - spec/models/comment.rb
 - spec/models/company.rb
 - spec/models/country.rb
+- spec/models/deal.rb
 - spec/models/document.rb
 - spec/models/entry.rb
 - spec/models/firm.rb

data/.travis.yml

@@ -1,33 +0,0 @@
-language: ruby
-rvm:
-  - 2.3.0
-  - 2.6.0
-gemfile:
-  - Gemfile.rails-6.0
-  - Gemfile.rails-5.2
-  - Gemfile.rails-5.1
-  - Gemfile.rails-5.0
-  - Gemfile.rails-4.2
-  - Gemfile.rails-4.1
-  - Gemfile.rails-4.0
-matrix:
-  exclude:
-    - rvm: 2.3.0
-      gemfile: Gemfile.rails-6.0
-    - rvm: 2.6.0
-      gemfile: Gemfile.rails-5.2
-    - rvm: 2.6.0
-      gemfile: Gemfile.rails-5.1
-    - rvm: 2.6.0
-      gemfile: Gemfile.rails-5.0
-    - rvm: 2.6.0
-      gemfile: Gemfile.rails-4.2
-    - rvm: 2.6.0
-      gemfile: Gemfile.rails-4.1
-    - rvm: 2.6.0
-      gemfile: Gemfile.rails-4.0
-env:
-  - DB=sqlite
-before_install:
-  - "find /home/travis/.rvm/rubies -wholename '*default/bundler-*.gemspec' -delete"
-  - gem install bundler -v '< 2'