bullet 6.0.2 → 6.1.4

data/spec/integration/counter_cache_spec.rb

@@ -4,25 +4,17 @@ 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
+      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
+      Person.all.each { |person| person.pets.size }
       expect(Bullet.collected_counter_cache_notifications).to be_empty
     end
 
@@ -32,32 +24,24 @@ if !mongoid? && active_record?
     end
 
     it 'should not need counter cache without size' do
-      Country.includes(:cities).each do |country|
-        country.cities.empty?
-      end
+      Country.includes(:cities).each { |country| country.cities.empty? }
       expect(Bullet.collected_counter_cache_notifications).to be_empty
     end
 
     if active_record5? || active_record6?
       it 'should not need counter cache for has_many through' do
-        Client.all.each do |client|
-          client.firms.size
-        end
+        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
+        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
+      Country.all.each { |country| country.cities.where(name: 'first').size }
       expect(Bullet.collected_counter_cache_notifications).to be_empty
     end
 
@@ -66,9 +50,7 @@ if !mongoid? && active_record?
       after { Bullet.counter_cache_enable = true }
 
       it 'should not detect counter cache' do
-        Country.all.each do |country|
-          country.cities.size
-        end
+        Country.all.each { |country| country.cities.size }
         expect(Bullet.collected_counter_cache_notifications).to be_empty
       end
     end
@@ -78,9 +60,7 @@ if !mongoid? && active_record?
       after { Bullet.clear_whitelist }
 
       it 'should not detect counter cache' do
-        Country.all.each do |country|
-          country.cities.size
-        end
+        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

@@ -7,9 +7,7 @@ if mongoid?
     context 'embeds_many' do
       context 'posts => users' do
         it 'should detect nothing' do
-          Mongoid::Post.all.each do |post|
-            post.users.map(&:name)
-          end
+          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
 
@@ -21,9 +19,7 @@ if mongoid?
     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
+          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
 
@@ -31,9 +27,7 @@ if mongoid?
         end
 
         it 'should detect preload post => comments' do
-          Mongoid::Post.includes(:comments).each do |post|
-            post.comments.map(&:name)
-          end
+          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
 
@@ -78,7 +72,10 @@ 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
 
@@ -103,9 +100,7 @@ if mongoid?
         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
+          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)
@@ -116,9 +111,7 @@ if mongoid?
 
       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
+          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)
 
@@ -136,9 +129,7 @@ if mongoid?
 
       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
+          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
 
@@ -158,9 +149,7 @@ if mongoid?
     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
+          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
 
@@ -176,9 +165,7 @@ if mongoid?
         end
 
         it 'should detect preload with comment => post' do
-          Mongoid::Comment.includes(:post).each do |comment|
-            comment.post.name
-          end
+          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
 
@@ -207,20 +194,19 @@ if mongoid?
       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
+            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
+          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
 

data/spec/models/attachment.rb

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

data/spec/models/folder.rb

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

data/spec/models/group.rb

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

data/spec/models/page.rb

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

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,4 +1,3 @@
 # frozen_string_literal: true
 
-class Writer < BaseUser
-end
+class Writer < BaseUser; end

data/spec/spec_helper.rb

@@ -4,14 +4,16 @@ require 'rspec'
 begin
   require 'active_record'
 rescue LoadError
+
 end
 begin
   require 'mongoid'
 rescue LoadError
+
 end
 
 module Rails
-  class <<self
+  class << self
     def root
       File.expand_path(__FILE__).split('/')[0..-3].join('/')
     end
@@ -60,9 +62,7 @@ if active_record?
       Bullet.enable = true
     end
 
-    config.after(:example) do
-      Bullet.end_request
-    end
+    config.after(:example) { Bullet.end_request }
   end
 
   if ENV['BULLET_LOG']
@@ -87,13 +87,9 @@ if mongoid?
       Support::MongoSeed.teardown_db
     end
 
-    config.before(:each) do
-      Bullet.start_request
-    end
+    config.before(:each) { Bullet.start_request }
 
-    config.after(:each) do
-      Bullet.end_request
-    end
+    config.after(:each) { Bullet.end_request }
   end
 
   if ENV['BULLET_LOG']

data/spec/support/bullet_ext.rb

@@ -2,9 +2,7 @@
 
 module Bullet
   def self.collected_notifications_of_class(notification_class)
-    Bullet.notification_collector.collection.select do |notification|
-      notification.is_a? notification_class
-    end
+    Bullet.notification_collector.collection.select { |notification| notification.is_a? notification_class }
   end
 
   def self.collected_counter_cache_notifications
@@ -23,7 +21,7 @@ end
 module Bullet
   module Detector
     class Association
-      class <<self
+      class << self
         # returns true if all associations are preloaded
         def completely_preloading_associations?
           Bullet.collected_n_plus_one_query_notifications.empty?
@@ -35,21 +33,22 @@ module Bullet
 
         # returns true if a given object has a specific association
         def creating_object_association_for?(object, association)
-          object_associations[object.bullet_key].present? && object_associations[object.bullet_key].include?(association)
+          object_associations[object.bullet_key].present? &&
+            object_associations[object.bullet_key].include?(association)
         end
 
         # returns true if a given class includes the specific unpreloaded association
         def detecting_unpreloaded_association_for?(klass, association)
-          Bullet.collected_n_plus_one_query_notifications.select { |notification|
+          Bullet.collected_n_plus_one_query_notifications.select do |notification|
             notification.base_class == klass.to_s && notification.associations.include?(association)
-          }.present?
+          end.present?
         end
 
         # returns true if the given class includes the specific unused preloaded association
         def unused_preload_associations_for?(klass, association)
-          Bullet.collected_unused_eager_association_notifications.select { |notification|
+          Bullet.collected_unused_eager_association_notifications.select do |notification|
             notification.base_class == klass.to_s && notification.associations.include?(association)
-          }.present?
+          end.present?
         end
       end
     end

data/spec/support/mongo_seed.rb

@@ -39,25 +39,11 @@ module Support
     def setup_db
       if Mongoid::VERSION =~ /\A4/
         Mongoid.configure do |config|
-          config.load_configuration(
-            sessions: {
-              default: {
-                database: 'bullet',
-                hosts: ['localhost:27017']
-              }
-            }
-          )
+          config.load_configuration(sessions: { default: { database: 'bullet', hosts: %w[localhost:27017] } })
         end
       else
         Mongoid.configure do |config|
-          config.load_configuration(
-            clients: {
-              default: {
-                database: 'bullet',
-                hosts: ['localhost:27017']
-              }
-            }
-          )
+          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

data/spec/support/sqlite_seed.rb

@@ -95,6 +95,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
@@ -240,6 +243,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 6.0.2
+  version: 6.1.4
 platform: ruby
 authors:
 - Richard Huang
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-20 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -62,6 +62,7 @@ files:
 - Gemfile.rails-5.1
 - Gemfile.rails-5.2
 - Gemfile.rails-6.0
+- Gemfile.rails-6.1
 - Guardfile
 - Hacking.md
 - MIT-LICENSE
@@ -76,6 +77,7 @@ files:
 - lib/bullet/active_record5.rb
 - lib/bullet/active_record52.rb
 - lib/bullet/active_record60.rb
+- lib/bullet/active_record61.rb
 - lib/bullet/bullet_xhr.js
 - lib/bullet/dependency.rb
 - lib/bullet/detector.rb
@@ -127,6 +129,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
@@ -173,7 +176,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 +191,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.1.4
+signing_key:
 specification_version: 4
 summary: help to kill N+1 queries and unused eager loading.
 test_files:
@@ -214,6 +217,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