bullet 5.5.0 → 5.8.0

data/lib/bullet/active_record5.rb

@@ -1,16 +1,11 @@
+# frozen_string_literal: true
+
 module Bullet
   module SaveWithBulletSupport
-    def save(*args)
-      was_new_record = new_record?
-      super(*args).tap do |result|
-        Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
-      end
-    end
-
-    def save!(*args)
-      was_new_record = new_record?
-      super(*args).tap do |result|
-        Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
+    def _create_record(*)
+      super do
+        Bullet::Detector::NPlusOneQuery.add_impossible_object(self)
+        yield(self) if block_given?
       end
     end
   end
@@ -18,38 +13,34 @@ module Bullet
   module ActiveRecord
     def self.enable
       require 'active_record'
-      ::ActiveRecord::Base.class_eval do
-        class <<self
-          alias_method :origin_find_by_sql, :find_by_sql
-          def find_by_sql(sql, binds = [], preparable: nil)
-            result = origin_find_by_sql(sql, binds, preparable: nil)
-            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)
+      ::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
-            result
           end
+          result
         end
-      end
+      end)
 
       ::ActiveRecord::Base.prepend(SaveWithBulletSupport)
 
-      ::ActiveRecord::Relation.class_eval do
-        alias_method :origin_records, :records
+      ::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 = origin_records
+          result = super
           if Bullet.start?
             if result.first.class.name !~ /^HABTM_/
               if result.size > 1
@@ -63,11 +54,9 @@ module Bullet
           end
           result
         end
-      end
-
-      ::ActiveRecord::Associations::Preloader.class_eval do
-        alias_method :origin_preloaders_for_one, :preloaders_for_one
+      end)
 
+      ::ActiveRecord::Associations::Preloader.prepend(Module.new do
         def preloaders_for_one(association, records, scope)
           if Bullet.start?
             records.compact!
@@ -78,16 +67,16 @@ module Bullet
               Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, association)
             end
           end
-          origin_preloaders_for_one(association, records, scope)
+          super
         end
-      end
+      end)
 
-      ::ActiveRecord::FinderMethods.class_eval do
+      ::ActiveRecord::FinderMethods.prepend(Module.new do
         # add includes in scope
-        alias_method :origin_find_with_associations, :find_with_associations
         def find_with_associations
-          return origin_find_with_associations { |r| yield r } if block_given?
-          records = origin_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|
@@ -97,24 +86,37 @@ module Bullet
           end
           records
         end
-      end
+      end)
 
-      ::ActiveRecord::Associations::JoinDependency.class_eval do
-        alias_method :origin_instantiate, :instantiate
-        alias_method :origin_construct, :construct
-        alias_method :origin_construct_model, :construct_model
+      ::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
 
-        def instantiate(result_set, aliases)
-          @bullet_eager_loadings = {}
-          records = origin_instantiate(result_set, aliases)
+            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
+        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
 
         def construct(ar_parent, parent, row, rs, seen, model_cache, aliases)
@@ -123,24 +125,24 @@ module Bullet
               parent.children.each do |node|
                 key = aliases.column_alias(node, node.primary_key)
                 id = row[key]
-                if 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
+                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
 
-          origin_construct(ar_parent, parent, row, rs, seen, model_cache, aliases)
+          super
         end
 
         # call join associations
         def construct_model(record, node, row, model_cache, id, aliases)
-          result = origin_construct_model(record, node, row, model_cache, id, aliases)
+          result = super
 
           if Bullet.start?
             associations = node.reflection.name
@@ -153,21 +155,28 @@ module Bullet
 
           result
         end
-      end
+      end)
 
-      ::ActiveRecord::Associations::CollectionAssociation.class_eval do
-        # call one to many associations
-        alias_method :origin_load_target, :load_target
+      ::ActiveRecord::Associations::CollectionAssociation.prepend(Module.new do
         def load_target
-          records = origin_load_target
+          records = super
 
           if Bullet.start?
-            if self.is_a? ::ActiveRecord::Associations::ThroughAssociation
-              Bullet::Detector::NPlusOneQuery.call_association(owner, through_reflection.name)
-              association = self.owner.association self.through_reflection.name
+            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
+                end
+
+                Bullet::Detector::NPlusOneQuery.call_association(owner, refl.name)
+              end
             end
             Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name) unless @inversed
             if records.first.class.name !~ /^HABTM_/
@@ -183,28 +192,25 @@ module Bullet
           records
         end
 
-        alias_method :origin_empty?, :empty?
         def empty?
           if Bullet.start? && !reflection.has_cached_counter?
             Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
           end
-          origin_empty?
+          super
         end
 
-        alias_method :origin_include?, :include?
         def include?(object)
           if Bullet.start?
             Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
           end
-          origin_include?(object)
+          super
         end
-      end
+      end)
 
-      ::ActiveRecord::Associations::SingularAssociation.class_eval do
+      ::ActiveRecord::Associations::SingularAssociation.prepend(Module.new do
         # call has_one and belongs_to associations
-        alias_method :origin_reader, :reader
-        def reader(force_reload = false)
-          result = origin_reader(force_reload)
+        def target
+          result = super()
           if Bullet.start?
             if owner.class.name !~ /^HABTM_/ && !@inversed
               Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
@@ -217,27 +223,32 @@ module Bullet
           end
           result
         end
-      end
+      end)
 
-      ::ActiveRecord::Associations::HasManyAssociation.class_eval do
-        alias_method :origin_many_empty?, :empty?
+      ::ActiveRecord::Associations::HasManyAssociation.prepend(Module.new do
         def empty?
-          result = origin_many_empty?
+          result = super
           if Bullet.start? && !reflection.has_cached_counter?
             Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
           end
           result
         end
 
-        alias_method :origin_count_records, :count_records
         def count_records
           result = reflection.has_cached_counter?
-          if Bullet.start? && !result && !self.is_a?(::ActiveRecord::Associations::ThroughAssociation)
+          if Bullet.start? && !result && !is_a?(::ActiveRecord::Associations::ThroughAssociation)
             Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name)
           end
-          origin_count_records
+          super
         end
-      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

data/lib/bullet/active_record52.rb

@@ -0,0 +1,232 @@
+# frozen_string_literal: true
+
+module Bullet
+  module SaveWithBulletSupport
+    def _create_record(*)
+      super do
+        Bullet::Detector::NPlusOneQuery.add_impossible_object(self)
+        yield(self) if block_given?
+      end
+    end
+  end
+
+  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)
+              end
+            elsif result.is_a? ::ActiveRecord::Base
+              Bullet::Detector::NPlusOneQuery.add_impossible_object(result)
+              Bullet::Detector::CounterCache.add_impossible_object(result)
+            end
+          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)
+              end
+            end
+          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)
+              end
+              Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, association)
+            end
+          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?
+
+          records = super
+          if Bullet.start?
+            associations = (eager_load_values + includes_values).uniq
+            records.each do |record|
+              Bullet::Detector::Association.add_object_associations(record, associations)
+            end
+            Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, associations)
+          end
+          records
+        end
+      end)
+
+      ::ActiveRecord::Associations::JoinDependency.prepend(Module.new do
+        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)
+            end
+          end
+          records
+        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
+              end
+            end
+          end
+
+          super
+        end
+
+        # 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
+
+          result
+        end
+      end)
+
+      ::ActiveRecord::Associations::CollectionAssociation.prepend(Module.new do
+        def load_target
+          records = super
+
+          if Bullet.start?
+            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) 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
+
+        def empty?
+          if Bullet.start? && !reflection.has_cached_counter?
+            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+          end
+          super
+        end
+
+        def include?(object)
+          if Bullet.start?
+            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+          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
+              end
+            end
+          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)
+          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)
+          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

data/lib/bullet/dependency.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module Dependency
     def mongoid?
@@ -24,8 +26,10 @@ module Bullet
                                      'active_record5'
                                    elsif active_record51?
                                      'active_record5'
+                                   elsif active_record52?
+                                     'active_record52'
                                    else
-                                     raise "Bullet does not support active_record #{::ActiveRecord::VERSION} yet"
+                                     raise "Bullet does not support active_record #{::ActiveRecord::VERSION::STRING} yet"
                                    end
                                  end
     end
@@ -72,6 +76,10 @@ module Bullet
       active_record5? && ::ActiveRecord::VERSION::MINOR == 1
     end
 
+    def active_record52?
+      active_record5? && ::ActiveRecord::VERSION::MINOR == 2
+    end
+
     def mongoid4x?
       mongoid? && ::Mongoid::VERSION =~ /\A4/
     end

data/lib/bullet/detector/association.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module Detector
     class Association < Base
@@ -7,7 +9,7 @@ module Bullet
           return if !Bullet.n_plus_one_query_enable? && !Bullet.unused_eager_loading_enable?
           return unless object.primary_key_value
 
-          Bullet.debug("Detector::Association#add_object_associations", "object: #{object.bullet_key}, associations: #{associations}")
+          Bullet.debug('Detector::Association#add_object_associations', "object: #{object.bullet_key}, associations: #{associations}")
           object_associations.add(object.bullet_key, associations)
         end
 
@@ -16,7 +18,7 @@ module Bullet
           return if !Bullet.n_plus_one_query_enable? && !Bullet.unused_eager_loading_enable?
           return unless object.primary_key_value
 
-          Bullet.debug("Detector::Association#add_call_object_associations", "object: #{object.bullet_key}, associations: #{associations}")
+          Bullet.debug('Detector::Association#add_call_object_associations', "object: #{object.bullet_key}, associations: #{associations}")
           call_object_associations.add(object.bullet_key, associations)
         end
 
@@ -37,36 +39,37 @@ module Bullet
         end
 
         private
+
           # object_associations keep the object relationships
           # that the object has many associations.
           # e.g. { "Post:1" => [:comments] }
           # the object_associations keep all associations that may be or may no be
           # unpreload associations or unused preload associations.
-          def object_associations
-            Thread.current[:bullet_object_associations]
-          end
+        def object_associations
+          Thread.current[:bullet_object_associations]
+        end
 
           # call_object_associations keep the object relationships
           # that object.associations is called.
           # e.g. { "Post:1" => [:comments] }
           # they are used to detect unused preload associations.
-          def call_object_associations
-            Thread.current[:bullet_call_object_associations]
-          end
+        def call_object_associations
+          Thread.current[:bullet_call_object_associations]
+        end
 
           # inversed_objects keeps object relationships
           # that association is inversed.
           # e.g. { "Comment:1" => ["post"] }
-          def inversed_objects
-            Thread.current[:bullet_inversed_objects]
-          end
+        def inversed_objects
+          Thread.current[:bullet_inversed_objects]
+        end
 
           # eager_loadings keep the object relationships
           # that the associations are preloaded by find :include.
           # e.g. { ["Post:1", "Post:2"] => [:comments, :user] }
-          def eager_loadings
-            Thread.current[:bullet_eager_loadings]
-          end
+        def eager_loadings
+          Thread.current[:bullet_eager_loadings]
+        end
       end
     end
   end

data/lib/bullet/detector/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module Detector
     class Base