bullet 5.9.0 → 7.0.4

data/lib/bullet/active_record41.rb

@@ -5,7 +5,7 @@ module Bullet
     def self.enable
       require 'active_record'
       ::ActiveRecord::Base.class_eval do
-        class <<self
+        class << self
           alias_method :origin_find_by_sql, :find_by_sql
           def find_by_sql(sql, binds = [])
             result = origin_find_by_sql(sql, binds)
@@ -30,6 +30,7 @@ module Bullet
 
       ::ActiveRecord::Relation.class_eval do
         alias_method :origin_to_a, :to_a
+
         # if select a collection of objects, then these objects have possible to cause N+1 query.
         # if select only one object, then the only one object has impossible to cause N+1 query.
         def to_a
@@ -51,9 +52,7 @@ module Bullet
 
       ::ActiveRecord::Persistence.class_eval do
         def _create_record_with_bullet(*args)
-          _create_record_without_bullet(*args).tap do
-            Bullet::Detector::NPlusOneQuery.add_impossible_object(self)
-          end
+          _create_record_without_bullet(*args).tap { Bullet::Detector::NPlusOneQuery.add_impossible_object(self) }
         end
         alias_method_chain :_create_record, :bullet
       end
@@ -65,9 +64,7 @@ module Bullet
           if Bullet.start?
             records.compact!
             if records.first.class.name !~ /^HABTM_/
-              records.each do |record|
-                Bullet::Detector::Association.add_object_associations(record, association)
-              end
+              records.each { |record| Bullet::Detector::Association.add_object_associations(record, association) }
               Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, association)
             end
           end
@@ -84,9 +81,7 @@ module Bullet
           records = origin_find_with_associations
           if Bullet.start?
             associations = (eager_load_values + includes_values).uniq
-            records.each do |record|
-              Bullet::Detector::Association.add_object_associations(record, associations)
-            end
+            records.each { |record| Bullet::Detector::Association.add_object_associations(record, associations) }
             Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, associations)
           end
           records
@@ -131,9 +126,7 @@ module Bullet
         # call one to many associations
         alias_method :origin_load_target, :load_target
         def load_target
-          if Bullet.start?
-            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless @inversed
-          end
+          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) if Bullet.start? && !@inversed
           origin_load_target
         end
 
@@ -147,9 +140,7 @@ module Bullet
 
         alias_method :origin_include?, :include?
         def include?(object)
-          if Bullet.start?
-            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
-          end
+          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) if Bullet.start?
           origin_include?(object)
         end
       end
@@ -173,20 +164,10 @@ module Bullet
         alias_method :origin_count_records, :count_records
         def count_records
           result = has_cached_counter?
-          if Bullet.start? && !result
-            Bullet::Detector::CounterCache.add_counter_cache(@owner, @reflection.name)
-          end
+          Bullet::Detector::CounterCache.add_counter_cache(@owner, @reflection.name) if Bullet.start? && !result
           origin_count_records
         end
       end
-
-      ::ActiveRecord::Associations::BelongsToAssociation.class_eval do
-        def writer_with_bullet(record)
-          Bullet::Detector::Association.add_object_associations(owner, reflection.name) if Bullet.start?
-          writer_without_bullet(record)
-        end
-        alias_method_chain :writer, :bullet
-      end
     end
   end
 end

data/lib/bullet/active_record42.rb

@@ -5,7 +5,7 @@ module Bullet
     def self.enable
       require 'active_record'
       ::ActiveRecord::Base.class_eval do
-        class <<self
+        class << self
           alias_method :origin_find, :find
           def find(*args)
             result = origin_find(*args)
@@ -45,15 +45,14 @@ module Bullet
 
       ::ActiveRecord::Persistence.class_eval do
         def _create_record_with_bullet(*args)
-          _create_record_without_bullet(*args).tap do
-            Bullet::Detector::NPlusOneQuery.add_impossible_object(self)
-          end
+          _create_record_without_bullet(*args).tap { Bullet::Detector::NPlusOneQuery.add_impossible_object(self) }
         end
         alias_method_chain :_create_record, :bullet
       end
 
       ::ActiveRecord::Relation.class_eval do
         alias_method :origin_to_a, :to_a
+
         # if select a collection of objects, then these objects have possible to cause N+1 query.
         # if select only one object, then the only one object has impossible to cause N+1 query.
         def to_a
@@ -80,9 +79,7 @@ module Bullet
           if Bullet.start?
             records.compact!
             if records.first.class.name !~ /^HABTM_/
-              records.each do |record|
-                Bullet::Detector::Association.add_object_associations(record, association)
-              end
+              records.each { |record| Bullet::Detector::Association.add_object_associations(record, association) }
               Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, association)
             end
           end
@@ -99,9 +96,7 @@ module Bullet
           records = origin_find_with_associations
           if Bullet.start?
             associations = (eager_load_values + includes_values).uniq
-            records.each do |record|
-              Bullet::Detector::Association.add_object_associations(record, associations)
-            end
+            records.each { |record| Bullet::Detector::Association.add_object_associations(record, associations) }
             Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, associations)
           end
           records
@@ -195,9 +190,7 @@ module Bullet
 
         alias_method :origin_include?, :include?
         def include?(object)
-          if Bullet.start?
-            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
-          end
+          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) if Bullet.start?
           origin_include?(object)
         end
       end
@@ -207,9 +200,11 @@ module Bullet
         alias_method :origin_reader, :reader
         def reader(force_reload = false)
           result = origin_reader(force_reload)
+
           if Bullet.start?
             if @owner.class.name !~ /^HABTM_/ && !@inversed
               Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+
               if Bullet::Detector::NPlusOneQuery.impossible?(@owner)
                 Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
               else
@@ -234,20 +229,10 @@ module Bullet
         alias_method :origin_count_records, :count_records
         def count_records
           result = has_cached_counter?
-          if Bullet.start? && !result
-            Bullet::Detector::CounterCache.add_counter_cache(@owner, @reflection.name)
-          end
+          Bullet::Detector::CounterCache.add_counter_cache(@owner, @reflection.name) if Bullet.start? && !result
           origin_count_records
         end
       end
-
-      ::ActiveRecord::Associations::BelongsToAssociation.class_eval do
-        def writer_with_bullet(record)
-          Bullet::Detector::Association.add_object_associations(owner, reflection.name) if Bullet.start?
-          writer_without_bullet(record)
-        end
-        alias_method_chain :writer, :bullet
-      end
     end
   end
 end

data/lib/bullet/active_record5.rb

@@ -13,242 +13,253 @@ module Bullet
   module ActiveRecord
     def self.enable
       require 'active_record'
-      ::ActiveRecord::Base.extend(Module.new do
-        def find_by_sql(sql, binds = [], preparable: nil, &block)
-          result = super
-          if Bullet.start?
-            if result.is_a? Array
-              if result.size > 1
-                Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
-                Bullet::Detector::CounterCache.add_possible_objects(result)
-              elsif result.size == 1
-                Bullet::Detector::NPlusOneQuery.add_impossible_object(result.first)
-                Bullet::Detector::CounterCache.add_impossible_object(result.first)
+      ::ActiveRecord::Base.extend(
+        Module.new do
+          def find_by_sql(sql, binds = [], preparable: nil, &block)
+            result = super
+            if Bullet.start?
+              if result.is_a? Array
+                if result.size > 1
+                  Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
+                  Bullet::Detector::CounterCache.add_possible_objects(result)
+                elsif result.size == 1
+                  Bullet::Detector::NPlusOneQuery.add_impossible_object(result.first)
+                  Bullet::Detector::CounterCache.add_impossible_object(result.first)
+                end
+              elsif result.is_a? ::ActiveRecord::Base
+                Bullet::Detector::NPlusOneQuery.add_impossible_object(result)
+                Bullet::Detector::CounterCache.add_impossible_object(result)
               end
-            elsif result.is_a? ::ActiveRecord::Base
-              Bullet::Detector::NPlusOneQuery.add_impossible_object(result)
-              Bullet::Detector::CounterCache.add_impossible_object(result)
             end
+            result
           end
-          result
         end
-      end)
+      )
 
       ::ActiveRecord::Base.prepend(SaveWithBulletSupport)
 
-      ::ActiveRecord::Relation.prepend(Module.new do
-        # if select a collection of objects, then these objects have possible to cause N+1 query.
-        # if select only one object, then the only one object has impossible to cause N+1 query.
-        def records
-          result = super
-          if Bullet.start?
-            if result.first.class.name !~ /^HABTM_/
-              if result.size > 1
-                Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
-                Bullet::Detector::CounterCache.add_possible_objects(result)
-              elsif result.size == 1
-                Bullet::Detector::NPlusOneQuery.add_impossible_object(result.first)
-                Bullet::Detector::CounterCache.add_impossible_object(result.first)
+      ::ActiveRecord::Relation.prepend(
+        Module.new do
+          # if select a collection of objects, then these objects have possible to cause N+1 query.
+          # if select only one object, then the only one object has impossible to cause N+1 query.
+          def records
+            result = super
+            if Bullet.start?
+              if result.first.class.name !~ /^HABTM_/
+                if result.size > 1
+                  Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
+                  Bullet::Detector::CounterCache.add_possible_objects(result)
+                elsif result.size == 1
+                  Bullet::Detector::NPlusOneQuery.add_impossible_object(result.first)
+                  Bullet::Detector::CounterCache.add_impossible_object(result.first)
+                end
               end
             end
+            result
           end
-          result
         end
-      end)
-
-      ::ActiveRecord::Associations::Preloader.prepend(Module.new do
-        def preloaders_for_one(association, records, scope)
-          if Bullet.start?
-            records.compact!
-            if records.first.class.name !~ /^HABTM_/
-              records.each do |record|
-                Bullet::Detector::Association.add_object_associations(record, association)
+      )
+
+      ::ActiveRecord::Associations::Preloader.prepend(
+        Module.new do
+          def preloaders_for_one(association, records, scope)
+            if Bullet.start?
+              records.compact!
+              if records.first.class.name !~ /^HABTM_/
+                records.each { |record| Bullet::Detector::Association.add_object_associations(record, association) }
+                Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, association)
               end
-              Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, association)
             end
+            super
           end
-          super
         end
-      end)
+      )
 
-      ::ActiveRecord::FinderMethods.prepend(Module.new do
-        # add includes in scope
-        def find_with_associations
-          return super { |r| yield r } if block_given?
+      ::ActiveRecord::FinderMethods.prepend(
+        Module.new do
+          # add includes in scope
+          def find_with_associations
+            return super { |r| yield r } if block_given?
 
-          records = super
-          if Bullet.start?
-            associations = (eager_load_values + includes_values).uniq
-            records.each do |record|
-              Bullet::Detector::Association.add_object_associations(record, associations)
+            records = super
+            if Bullet.start?
+              associations = (eager_load_values + includes_values).uniq
+              records.each { |record| Bullet::Detector::Association.add_object_associations(record, associations) }
+              Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, associations)
             end
-            Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, associations)
+            records
           end
-          records
         end
-      end)
+      )
 
-      ::ActiveRecord::Associations::JoinDependency.prepend(Module.new do
-        if ::ActiveRecord::Associations::JoinDependency.instance_method(:instantiate).parameters.last[0] == :block
-          # ActiveRecord >= 5.1.5
-          def instantiate(result_set, &block)
-            @bullet_eager_loadings = {}
-            records = super
+      ::ActiveRecord::Associations::JoinDependency.prepend(
+        Module.new do
+          if ::ActiveRecord::Associations::JoinDependency.instance_method(:instantiate).parameters.last[0] == :block
+            # ActiveRecord >= 5.1.5
+            def instantiate(result_set, &block)
+              @bullet_eager_loadings = {}
+              records = super
 
-            if Bullet.start?
-              @bullet_eager_loadings.each do |_klazz, eager_loadings_hash|
-                objects = eager_loadings_hash.keys
-                Bullet::Detector::UnusedEagerLoading.add_eager_loadings(objects, eager_loadings_hash[objects.first].to_a)
+              if Bullet.start?
+                @bullet_eager_loadings.each do |_klazz, eager_loadings_hash|
+                  objects = eager_loadings_hash.keys
+                  Bullet::Detector::UnusedEagerLoading.add_eager_loadings(
+                    objects,
+                    eager_loadings_hash[objects.first].to_a
+                  )
+                end
               end
+              records
             end
-            records
-          end
-        else
-          # ActiveRecord <= 5.1.4
-          def instantiate(result_set, aliases)
-            @bullet_eager_loadings = {}
-            records = super
+          else
+            # ActiveRecord <= 5.1.4
+            def instantiate(result_set, aliases)
+              @bullet_eager_loadings = {}
+              records = super
 
-            if Bullet.start?
-              @bullet_eager_loadings.each do |_klazz, eager_loadings_hash|
-                objects = eager_loadings_hash.keys
-                Bullet::Detector::UnusedEagerLoading.add_eager_loadings(objects, eager_loadings_hash[objects.first].to_a)
+              if Bullet.start?
+                @bullet_eager_loadings.each do |_klazz, eager_loadings_hash|
+                  objects = eager_loadings_hash.keys
+                  Bullet::Detector::UnusedEagerLoading.add_eager_loadings(
+                    objects,
+                    eager_loadings_hash[objects.first].to_a
+                  )
+                end
               end
+              records
             end
-            records
           end
-        end
 
-        def construct(ar_parent, parent, row, rs, seen, model_cache, aliases)
-          if Bullet.start?
-            unless ar_parent.nil?
-              parent.children.each do |node|
-                key = aliases.column_alias(node, node.primary_key)
-                id = row[key]
-                next unless id.nil?
-
-                associations = node.reflection.name
-                Bullet::Detector::Association.add_object_associations(ar_parent, associations)
-                Bullet::Detector::NPlusOneQuery.call_association(ar_parent, associations)
-                @bullet_eager_loadings[ar_parent.class] ||= {}
-                @bullet_eager_loadings[ar_parent.class][ar_parent] ||= Set.new
-                @bullet_eager_loadings[ar_parent.class][ar_parent] << associations
+          def construct(ar_parent, parent, row, rs, seen, model_cache, aliases)
+            if Bullet.start?
+              unless ar_parent.nil?
+                parent.children.each do |node|
+                  key = aliases.column_alias(node, node.primary_key)
+                  id = row[key]
+                  next unless id.nil?
+
+                  associations = node.reflection.name
+                  Bullet::Detector::Association.add_object_associations(ar_parent, associations)
+                  Bullet::Detector::NPlusOneQuery.call_association(ar_parent, associations)
+                  @bullet_eager_loadings[ar_parent.class] ||= {}
+                  @bullet_eager_loadings[ar_parent.class][ar_parent] ||= Set.new
+                  @bullet_eager_loadings[ar_parent.class][ar_parent] << associations
+                end
               end
             end
+
+            super
           end
 
-          super
-        end
+          # call join associations
+          def construct_model(record, node, row, model_cache, id, aliases)
+            result = super
 
-        # call join associations
-        def construct_model(record, node, row, model_cache, id, aliases)
-          result = super
-
-          if Bullet.start?
-            associations = node.reflection.name
-            Bullet::Detector::Association.add_object_associations(record, associations)
-            Bullet::Detector::NPlusOneQuery.call_association(record, associations)
-            @bullet_eager_loadings[record.class] ||= {}
-            @bullet_eager_loadings[record.class][record] ||= Set.new
-            @bullet_eager_loadings[record.class][record] << associations
-          end
+            if Bullet.start?
+              associations = node.reflection.name
+              Bullet::Detector::Association.add_object_associations(record, associations)
+              Bullet::Detector::NPlusOneQuery.call_association(record, associations)
+              @bullet_eager_loadings[record.class] ||= {}
+              @bullet_eager_loadings[record.class][record] ||= Set.new
+              @bullet_eager_loadings[record.class][record] << associations
+            end
 
-          result
+            result
+          end
         end
-      end)
-
-      ::ActiveRecord::Associations::CollectionAssociation.prepend(Module.new do
-        def load_target
-          records = super
-
-          if Bullet.start?
-            if is_a? ::ActiveRecord::Associations::ThroughAssociation
-              refl = reflection.through_reflection
-              Bullet::Detector::NPlusOneQuery.call_association(owner, refl.name)
-              association = owner.association refl.name
-              Array(association.target).each do |through_record|
-                Bullet::Detector::NPlusOneQuery.call_association(through_record, source_reflection.name)
-              end
+      )
 
-              if refl.through_reflection?
-                while refl.through_reflection?
-                  refl = refl.through_reflection
+      ::ActiveRecord::Associations::CollectionAssociation.prepend(
+        Module.new do
+          def load_target
+            records = super
+
+            if Bullet.start?
+              if is_a? ::ActiveRecord::Associations::ThroughAssociation
+                refl = reflection.through_reflection
+                association = owner.association(refl.name)
+                if association.loaded?
+                  Bullet::Detector::NPlusOneQuery.call_association(owner, refl.name)
+                  Array.wrap(association.target).each do |through_record|
+                    Bullet::Detector::NPlusOneQuery.call_association(through_record, source_reflection.name)
+                  end
                 end
 
-                Bullet::Detector::NPlusOneQuery.call_association(owner, refl.name)
+                if refl.through_reflection?
+                  refl = refl.through_reflection while refl.through_reflection?
+
+                  Bullet::Detector::NPlusOneQuery.call_association(owner, refl.name)
+                end
               end
-            end
-            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name) unless @inversed
-            if records.first.class.name !~ /^HABTM_/
-              if records.size > 1
-                Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
-                Bullet::Detector::CounterCache.add_possible_objects(records)
-              elsif records.size == 1
-                Bullet::Detector::NPlusOneQuery.add_impossible_object(records.first)
-                Bullet::Detector::CounterCache.add_impossible_object(records.first)
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name) unless @inversed
+              if records.first.class.name !~ /^HABTM_/
+                if records.size > 1
+                  Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
+                  Bullet::Detector::CounterCache.add_possible_objects(records)
+                elsif records.size == 1
+                  Bullet::Detector::NPlusOneQuery.add_impossible_object(records.first)
+                  Bullet::Detector::CounterCache.add_impossible_object(records.first)
+                end
               end
             end
+            records
           end
-          records
-        end
 
-        def empty?
-          if Bullet.start? && !reflection.has_cached_counter?
-            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+          def empty?
+            if Bullet.start? && !reflection.has_cached_counter?
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+            end
+            super
           end
-          super
-        end
 
-        def include?(object)
-          if Bullet.start?
-            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+          def include?(object)
+            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name) if Bullet.start?
+            super
           end
-          super
         end
-      end)
-
-      ::ActiveRecord::Associations::SingularAssociation.prepend(Module.new do
-        # call has_one and belongs_to associations
-        def target
-          result = super()
-          if Bullet.start?
-            if owner.class.name !~ /^HABTM_/ && !@inversed
-              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
-              if Bullet::Detector::NPlusOneQuery.impossible?(owner)
-                Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
-              else
-                Bullet::Detector::NPlusOneQuery.add_possible_objects(result) if result
+      )
+
+      ::ActiveRecord::Associations::SingularAssociation.prepend(
+        Module.new do
+          # call has_one and belongs_to associations
+          def target
+            result = super()
+
+            if Bullet.start?
+              if owner.class.name !~ /^HABTM_/ && !@inversed
+                Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+
+                if Bullet::Detector::NPlusOneQuery.impossible?(owner)
+                  Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
+                else
+                  Bullet::Detector::NPlusOneQuery.add_possible_objects(result) if result
+                end
               end
             end
+            result
           end
-          result
         end
-      end)
+      )
 
-      ::ActiveRecord::Associations::HasManyAssociation.prepend(Module.new do
-        def empty?
-          result = super
-          if Bullet.start? && !reflection.has_cached_counter?
-            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+      ::ActiveRecord::Associations::HasManyAssociation.prepend(
+        Module.new do
+          def empty?
+            result = super
+            if Bullet.start? && !reflection.has_cached_counter?
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+            end
+            result
           end
-          result
-        end
 
-        def count_records
-          result = reflection.has_cached_counter?
-          if Bullet.start? && !result && !is_a?(::ActiveRecord::Associations::ThroughAssociation)
-            Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name)
+          def count_records
+            result = reflection.has_cached_counter?
+            if Bullet.start? && !result && !is_a?(::ActiveRecord::Associations::ThroughAssociation)
+              Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name)
+            end
+            super
           end
-          super
-        end
-      end)
-
-      ::ActiveRecord::Associations::BelongsToAssociation.prepend(Module.new do
-        def writer(record)
-          Bullet::Detector::Association.add_object_associations(owner, reflection.name) if Bullet.start?
-          super
         end
-      end)
+      )
     end
   end
 end