RubyGems - bullet - Versions diffs - 8.1.3 → 8.3.0 - Mend

bullet 8.1.3 → 8.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (22) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +13 -0
data/README.md +19 -6
data/lib/bullet/active_record70.rb +14 -0
data/lib/bullet/active_record71.rb +14 -0
data/lib/bullet/active_record72.rb +14 -0
data/lib/bullet/active_record80.rb +14 -0
data/lib/bullet/active_record81.rb +14 -0
data/lib/bullet/{active_record60.rb → active_record82.rb} +74 -49
data/lib/bullet/dependency.rb +10 -58
data/lib/bullet/detector/association.rb +2 -2
data/lib/bullet/detector/n_plus_one_query.rb +1 -1
data/lib/bullet/rack.rb +35 -2
data/lib/bullet/version.rb +1 -1
data/lib/bullet.rb +25 -0
metadata +30 -8
data/lib/bullet/active_record4.rb +0 -197
data/lib/bullet/active_record41.rb +0 -191
data/lib/bullet/active_record42.rb +0 -262
data/lib/bullet/active_record5.rb +0 -294
data/lib/bullet/active_record52.rb +0 -278
data/lib/bullet/active_record61.rb +0 -310

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 8.1.3
+  version: 8.3.0
 platform: ruby
 authors:
 - Richard Huang
@@ -37,6 +37,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: help to kill N+1 queries and unused eager loading.
 email:
 - flyerhzm@gmail.com
@@ -49,18 +77,12 @@ files:
 - README.md
 - lib/bullet.rb
 - lib/bullet/active_job.rb
-- lib/bullet/active_record4.rb
-- lib/bullet/active_record41.rb
-- lib/bullet/active_record42.rb
-- 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/active_record71.rb
 - lib/bullet/active_record72.rb
 - lib/bullet/active_record80.rb
 - lib/bullet/active_record81.rb
+- lib/bullet/active_record82.rb
 - lib/bullet/bullet_xhr.js
 - lib/bullet/dependency.rb
 - lib/bullet/detector.rb

data/lib/bullet/active_record4.rb DELETED Viewed

@@ -1,197 +0,0 @@
-# frozen_string_literal: true
-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 = [])
-            result = origin_find_by_sql(sql, binds)
-            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
-      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
-          records = origin_to_a
-          if Bullet.start?
-            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
-          records
-        end
-      end
-      ::ActiveRecord::Persistence.class_eval do
-        def _create_record_with_bullet(*args)
-          _create_record_without_bullet(*args).tap do
-            Bullet::Detector::NPlusOneQuery.update_inversed_object(self)
-            Bullet::Detector::NPlusOneQuery.add_impossible_object(self)
-          end
-        end
-        alias_method_chain :_create_record, :bullet
-      end
-      ::ActiveRecord::Associations::Preloader.class_eval do
-        # include query for one to many associations.
-        # keep this eager loadings.
-        alias_method :origin_initialize, :initialize
-        def initialize(records, associations, preload_scope = nil)
-          origin_initialize(records, associations, preload_scope)
-          if Bullet.start?
-            records = [records].flatten.compact.uniq
-            return if records.empty?
-            records.each { |record| Bullet::Detector::Association.add_object_associations(record, associations) }
-            Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, associations)
-          end
-        end
-      end
-      ::ActiveRecord::FinderMethods.class_eval do
-        # add includes in scope
-        alias_method :origin_find_with_associations, :find_with_associations
-        def find_with_associations
-          records = origin_find_with_associations
-          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
-          records
-        end
-      end
-      ::ActiveRecord::Associations::JoinDependency.class_eval do
-        alias_method :origin_instantiate, :instantiate
-        alias_method :origin_construct_association, :construct_association
-        def instantiate(rows)
-          @bullet_eager_loadings = {}
-          records = origin_instantiate(rows)
-          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
-        # call join associations
-        def construct_association(record, join, row)
-          result = origin_construct_association(record, join, row)
-          if Bullet.start?
-            associations = [join.reflection.name]
-            if join.reflection.nested?
-              associations << join.reflection.through_reflection.name
-            end
-            associations.each do |association|
-              Bullet::Detector::Association.add_object_associations(record, association)
-              Bullet::Detector::NPlusOneQuery.call_association(record, association)
-              @bullet_eager_loadings[record.class] ||= {}
-              @bullet_eager_loadings[record.class][record] ||= Set.new
-              @bullet_eager_loadings[record.class][record] << association
-            end
-          end
-          result
-        end
-      end
-      ::ActiveRecord::Associations::CollectionAssociation.class_eval do
-        # call one to many associations
-        alias_method :origin_load_target, :load_target
-        def load_target
-          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) if Bullet.start?
-          origin_load_target
-        end
-        alias_method :origin_include?, :include?
-        def include?(object)
-          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) if Bullet.start?
-          origin_include?(object)
-        end
-      end
-      ::ActiveRecord::Associations::HasManyAssociation.class_eval do
-        alias_method :origin_empty?, :empty?
-        def empty?
-          if Bullet.start? && !loaded? && !has_cached_counter?(@reflection)
-            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
-          end
-          origin_empty?
-        end
-      end
-      ::ActiveRecord::Associations::HasAndBelongsToManyAssociation.class_eval do
-        alias_method :origin_empty?, :empty?
-        def empty?
-          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) if Bullet.start? && !loaded?
-          origin_empty?
-        end
-      end
-      ::ActiveRecord::Associations::SingularAssociation.class_eval do
-        # call has_one and belongs_to associations
-        alias_method :origin_reader, :reader
-        def reader(force_reload = false)
-          result = origin_reader(force_reload)
-          if Bullet.start?
-            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name, inversed: @inversed)
-            Bullet::Detector::NPlusOneQuery.add_possible_objects(result) unless @inversed
-          end
-          result
-        end
-      end
-      ::ActiveRecord::Associations::HasManyAssociation.class_eval do
-        alias_method :origin_has_cached_counter?, :has_cached_counter?
-        def has_cached_counter?(reflection = reflection())
-          result = origin_has_cached_counter?(reflection)
-          Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name) if Bullet.start? && !result
-          result
-        end
-      end
-      ::ActiveRecord::Associations::CollectionProxy.class_eval do
-        def count(column_name = nil, options = {})
-          if Bullet.start?
-            Bullet::Detector::CounterCache.add_counter_cache(proxy_association.owner, proxy_association.reflection.name)
-            Bullet::Detector::NPlusOneQuery.call_association(proxy_association.owner, proxy_association.reflection.name)
-          end
-          super(column_name, options)
-        end
-      end
-    end
-  end
-end

data/lib/bullet/active_record41.rb DELETED Viewed

@@ -1,191 +0,0 @@
-# frozen_string_literal: true
-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 = [])
-            result = origin_find_by_sql(sql, binds)
-            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
-      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
-          records = origin_to_a
-          if Bullet.start?
-            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
-      end
-      ::ActiveRecord::Persistence.class_eval do
-        def _create_record_with_bullet(*args)
-          _create_record_without_bullet(*args).tap do
-            Bullet::Detector::NPlusOneQuery.update_inversed_object(self)
-            Bullet::Detector::NPlusOneQuery.add_impossible_object(self)
-          end
-        end
-        alias_method_chain :_create_record, :bullet
-      end
-      ::ActiveRecord::Associations::Preloader.class_eval do
-        alias_method :origin_preloaders_on, :preloaders_on
-        def preloaders_on(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
-          end
-          origin_preloaders_on(association, records, scope)
-        end
-      end
-      ::ActiveRecord::FinderMethods.class_eval 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
-          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
-          records
-        end
-      end
-      ::ActiveRecord::Associations::JoinDependency.class_eval do
-        alias_method :origin_instantiate, :instantiate
-        alias_method :origin_construct_model, :construct_model
-        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
-        # call join associations
-        def construct_model(record, node, row, model_cache, id, aliases)
-          result = origin_construct_model(record, node, row, model_cache, id, aliases)
-          if Bullet.start?
-            associations = [node.reflection.name]
-            if node.reflection.nested?
-              associations << node.reflection.through_reflection.name
-            end
-            associations.each do |association|
-              Bullet::Detector::Association.add_object_associations(record, association)
-              Bullet::Detector::NPlusOneQuery.call_association(record, association)
-              @bullet_eager_loadings[record.class] ||= {}
-              @bullet_eager_loadings[record.class][record] ||= Set.new
-              @bullet_eager_loadings[record.class][record] << association
-            end
-          end
-          result
-        end
-      end
-      ::ActiveRecord::Associations::CollectionAssociation.class_eval do
-        # call one to many associations
-        alias_method :origin_load_target, :load_target
-        def load_target
-          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name, inversed: @inversed) if Bullet.start?
-          origin_load_target
-        end
-        alias_method :origin_empty?, :empty?
-        def empty?
-          if Bullet.start? && !has_cached_counter?(@reflection)
-            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
-          end
-          origin_empty?
-        end
-        alias_method :origin_include?, :include?
-        def include?(object)
-          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) if Bullet.start?
-          origin_include?(object)
-        end
-      end
-      ::ActiveRecord::Associations::SingularAssociation.class_eval do
-        # call has_one and belongs_to associations
-        alias_method :origin_reader, :reader
-        def reader(force_reload = false)
-          result = origin_reader(force_reload)
-          if Bullet.start?
-            if @owner.class.name !~ /^HABTM_/
-              Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name, inversed: @inversed)
-              Bullet::Detector::NPlusOneQuery.add_possible_objects(result) unless @inversed
-            end
-          end
-          result
-        end
-      end
-      ::ActiveRecord::Associations::HasManyAssociation.class_eval do
-        alias_method :origin_count_records, :count_records
-        def count_records
-          result = has_cached_counter?
-          Bullet::Detector::CounterCache.add_counter_cache(@owner, @reflection.name) if Bullet.start? && !result
-          origin_count_records
-        end
-      end
-      ::ActiveRecord::Associations::CollectionProxy.class_eval do
-        def count(column_name = nil, options = {})
-          if Bullet.start?
-            Bullet::Detector::CounterCache.add_counter_cache(proxy_association.owner, proxy_association.reflection.name)
-            Bullet::Detector::NPlusOneQuery.call_association(proxy_association.owner, proxy_association.reflection.name)
-          end
-          super(column_name, options)
-        end
-      end
-    end
-  end
-end