bullet 6.1.2 → 6.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0363cc75d4facd4a8b4a318312a421040d5b21d7ca81c0b3af21daaf7c2b60cd
-  data.tar.gz: ac0b0e4ed9c1641b5359b3d885ef854934b85b8ee21bc0486a4c3d2661e20853
+  metadata.gz: b574ae38dafed75dc9aded2d6c97ab057593fcda5a49ec4875bc327f99625efd
+  data.tar.gz: df882c895e98b91a26371b670ffd439a2a39e80df57ce1b61a87de6e89c10c1a
 SHA512:
-  metadata.gz: 199558c8186455fb2ddac94461d611d1c40eb0fb83ac68e36647efe0a34927020967a803cb24645b7ae3d5d045aa0060c604b455476f8c6aad6b5329103a7ebe
-  data.tar.gz: 86c4bcf9fcca52275229b7fa5e02919c39318d91a60c7fe956d4cab07442cbacfc3d9df134af1ee38bc7f153eeb2cd256faff45815ad83acd296c1831d1fc9ee
+  metadata.gz: 475691616eca228e0938effbc8a9a8930d8ab33f673d4cb2a75ff02b2933ba01ee2a570fff1d9d669700fb05cf09dff9149555f1f2b35c4a31c8904620db70e3
+  data.tar.gz: 86f37317790084aa7ca3860c1757a41354678a1a0bfbf56fe6f21ebe6793eef5ff257fe75bbad77b999484a9e1abb527d9e9ac877dda04cf9f1236e110e6d561

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Next Release
 
+## 6.1.3 (01/21/2021)
+
+* Consider ThroughAssociation at SingularAssociation like CollectionAssociation
+* Add xhr_script only when add_footer is enabled
+
 ## 6.1.2 (12/12/2020)
 
 * Revert "Make whitelist thread safe"

data/lib/bullet.rb

@@ -41,7 +41,7 @@ module Bullet
     attr_reader :whitelist
     attr_accessor :add_footer, :orm_patches_applied
 
-    available_notifiers = UniformNotifier::AVAILABLE_NOTIFIERS.map { |notifier| "#{notifier}=" }
+    available_notifiers = UniformNotifier::AVAILABLE_NOTIFIERS.select { |notifier| notifier != :raise }.map { |notifier| "#{notifier}=" }
     available_notifiers_options = { to: UniformNotifier }
     delegate(*available_notifiers, **available_notifiers_options)
 
@@ -89,11 +89,11 @@ module Bullet
     end
 
     def stacktrace_includes
-      @stacktrace_includes || []
+      @stacktrace_includes ||= []
     end
 
     def stacktrace_excludes
-      @stacktrace_excludes || []
+      @stacktrace_excludes ||= []
     end
 
     def add_whitelist(options)
@@ -241,7 +241,9 @@ module Bullet
     end
 
     def inject_into_page?
-      !@skip_html_injection && (console_enabled? || add_footer)
+      return false if defined?(@skip_html_injection) && @skip_html_injection
+
+      console_enabled? || add_footer
     end
 
     private

data/lib/bullet/active_record52.rb

@@ -202,6 +202,17 @@ module Bullet
 
             if Bullet.start?
               if owner.class.name !~ /^HABTM_/ && !@inversed
+                if is_a? ::ActiveRecord::Associations::ThroughAssociation
+                  Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.through_reflection.name)
+                  association = owner.association reflection.through_reflection.name
+                  Array(association.target).each do |through_record|
+                    Bullet::Detector::NPlusOneQuery.call_association(through_record, source_reflection.name)
+                  end
+
+                  if reflection.through_reflection != through_reflection
+                    Bullet::Detector::NPlusOneQuery.call_association(owner, through_reflection.name)
+                  end
+                end
                 Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
 
                 if Bullet::Detector::NPlusOneQuery.impossible?(owner)

data/lib/bullet/active_record60.rb

@@ -229,6 +229,17 @@ module Bullet
 
             if Bullet.start?
               if owner.class.name !~ /^HABTM_/ && !@inversed
+                if is_a? ::ActiveRecord::Associations::ThroughAssociation
+                  Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.through_reflection.name)
+                  association = owner.association(reflection.through_reflection.name)
+                  Array(association.target).each do |through_record|
+                    Bullet::Detector::NPlusOneQuery.call_association(through_record, source_reflection.name)
+                  end
+
+                  if reflection.through_reflection != through_reflection
+                    Bullet::Detector::NPlusOneQuery.call_association(owner, through_reflection.name)
+                  end
+                end
                 Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
 
                 if Bullet::Detector::NPlusOneQuery.impossible?(owner)

data/lib/bullet/active_record61.rb

@@ -229,6 +229,17 @@ module Bullet
 
             if Bullet.start?
               if owner.class.name !~ /^HABTM_/ && !@inversed
+                if is_a? ::ActiveRecord::Associations::ThroughAssociation
+                  Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.through_reflection.name)
+                  association = owner.association(reflection.through_reflection.name)
+                  Array(association.target).each do |through_record|
+                    Bullet::Detector::NPlusOneQuery.call_association(through_record, source_reflection.name)
+                  end
+
+                  if reflection.through_reflection != through_reflection
+                    Bullet::Detector::NPlusOneQuery.call_association(owner, through_reflection.name)
+                  end
+                end
                 Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
 
                 if Bullet::Detector::NPlusOneQuery.impossible?(owner)

data/lib/bullet/mongoid4x.rb

@@ -23,7 +23,7 @@ module Bullet
         end
 
         def each(&block)
-          return to_enum unless block_given?
+          return to_enum unless block
 
           records = []
           origin_each { |record| records << record }

data/lib/bullet/mongoid5x.rb

@@ -23,7 +23,7 @@ module Bullet
         end
 
         def each(&block)
-          return to_enum unless block_given?
+          return to_enum unless block
 
           records = []
           origin_each { |record| records << record }

data/lib/bullet/mongoid6x.rb

@@ -23,7 +23,7 @@ module Bullet
         end
 
         def each(&block)
-          return to_enum unless block_given?
+          return to_enum unless block
 
           records = []
           origin_each { |record| records << record }

data/lib/bullet/mongoid7x.rb

@@ -23,7 +23,7 @@ module Bullet
         end
 
         def each(&block)
-          return to_enum unless block_given?
+          return to_enum unless block
 
           records = []
           origin_each { |record| records << record }

data/lib/bullet/rack.rb

@@ -22,7 +22,7 @@ module Bullet
             response_body = response_body(response)
             response_body = append_to_html_body(response_body, footer_note) if Bullet.add_footer
             response_body = append_to_html_body(response_body, Bullet.gather_inline_notifications)
-            response_body = append_to_html_body(response_body, xhr_script)
+            response_body = append_to_html_body(response_body, xhr_script) if Bullet.add_footer
             headers['Content-Length'] = response_body.bytesize.to_s
           else
             set_header(headers, 'X-bullet-footer-text', Bullet.footer_info.uniq) if Bullet.add_footer

data/lib/bullet/stack_trace_filter.rb

@@ -59,8 +59,7 @@ module Bullet
     end
 
     def ruby_19?
-      @ruby_19 = Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0') if @ruby_19.nil?
-      @ruby_19
+      @ruby_19 ||= Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0') 
     end
   end
 end

data/lib/bullet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bullet
-  VERSION = '6.1.2'
+  VERSION = '6.1.3'
 end

data/spec/bullet/rack_spec.rb

@@ -69,7 +69,6 @@ module Bullet
           expect(Bullet).to receive(:notification?).and_return(true)
           expect(Bullet).to receive(:console_enabled?).and_return(true)
           expect(Bullet).to receive(:gather_inline_notifications).and_return('<bullet></bullet>')
-          expect(middleware).to receive(:xhr_script).and_return('')
           expect(Bullet).to receive(:perform_out_of_channel_notifications)
           _, headers, response = middleware.call('Content-Type' => 'text/html')
           expect(headers['Content-Length']).to eq('56')
@@ -84,7 +83,7 @@ module Bullet
           allow(Bullet).to receive(:console_enabled?).and_return(true)
           expect(Bullet).to receive(:gather_inline_notifications).and_return('<bullet></bullet>')
           _, headers, response = middleware.call('Content-Type' => 'text/html')
-          expect(headers['Content-Length']).to eq((58 + middleware.send(:xhr_script).length).to_s)
+          expect(headers['Content-Length']).to eq('58')
         end
 
         context 'with injection notifiers' do
@@ -97,7 +96,7 @@ module Bullet
           end
 
           it 'should change response body if add_footer is true' do
-            expect(Bullet).to receive(:add_footer).twice.and_return(true)
+            expect(Bullet).to receive(:add_footer).exactly(3).times.and_return(true)
             _, headers, response = middleware.call('Content-Type' => 'text/html')
 
             expect(headers['Content-Length']).to eq((56 + middleware.send(:footer_note).length).to_s)
@@ -106,7 +105,7 @@ module Bullet
           end
 
           it 'should change response body for html safe string if add_footer is true' do
-            expect(Bullet).to receive(:add_footer).twice.and_return(true)
+            expect(Bullet).to receive(:add_footer).exactly(3).times.and_return(true)
             app.response = Support::ResponseDouble.new.tap do |response|
               response.body = ActiveSupport::SafeBuffer.new('<html><head></head><body></body></html>')
             end

data/spec/integration/active_record/association_spec.rb

@@ -561,6 +561,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

data/spec/models/attachment.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class Attachment < ActiveRecord::Base
+  belongs_to :submission
+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/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.1.2
+  version: 6.1.3
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-12 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -129,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
@@ -216,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