bullet 4.14.8 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e402a50f9b2a4c75edafcf12bc2bdb32e3298860
-  data.tar.gz: 73102589e922894098fe54684ac483c8ef6b44b7
+  metadata.gz: d5439116cdedcd96dfad6dfd315eaf47ee815153
+  data.tar.gz: 9542679b93fa670fbf8b014fb0cbd3adb13a30d8
 SHA512:
-  metadata.gz: 03191a02a885f763bbe24986fdad49f5f9e6d19f6f9a4501ff0c5915b1bb3eaf4cebde6b611be5c0a99982eef12ea32e1e3c51ad6a7a8d3029a1d38ea285d7c8
-  data.tar.gz: dffc316bd5cbacaee45d5ef161bfb63f159a24006d09baf7a5572cfed72a21f970a668c55799fceb2e48705625074fa257bdd0d608a5391c54a5e13e1b354577
+  metadata.gz: 4704ead627526344ab065d5d0a9bd2f3516165f664d9ab97aca3dd576c55ecc75450636daceebe21d100562be45c5e9352296ea0cd5856b0a4205be2120751cb
+  data.tar.gz: 6b3d52be604e5188920592e6b3952d2a683364631739c097b619b151f9131b911454452eae824e13493a4866ff767eb9ba61da3a98097aa3042e498faf74bdd6

data/.travis.yml

@@ -1,15 +1,19 @@
+sudo: false
 language: ruby
 rvm:
   - 2.0
   - 2.1
   - 2.2
+  - 2.2.3
 gemfile:
+  - Gemfile.rails-5.0
   - Gemfile.rails-4.2
   - Gemfile.rails-4.1
   - Gemfile.rails-4.0
   - Gemfile.rails-3.2
   - Gemfile.rails-3.1
   - Gemfile.rails-3.0
+  - Gemfile.mongoid-5.0
   - Gemfile.mongoid-4.0
   - Gemfile.mongoid-3.1
   - Gemfile.mongoid-3.0
@@ -24,6 +28,12 @@ services:
   - mongodb
 matrix:
   exclude:
+    - rvm: 2.0
+      gemfile: Gemfile.rails-5.0
+    - rvm: 2.1
+      gemfile: Gemfile.rails-5.0
+    - rvm: 2.2
+      gemfile: Gemfile.rails-5.0
     - rvm: 2.2
       gemfile: Gemfile.rails-3.0
     - rvm: 2.2
@@ -44,3 +54,23 @@ matrix:
       gemfile: Gemfile.mongoid-2.5
     - rvm: 2.2
       gemfile: Gemfile.mongoid-2.4
+    - rvm: 2.2.3
+      gemfile: Gemfile.rails-3.0
+    - rvm: 2.2.3
+      gemfile: Gemfile.rails-3.1
+    - rvm: 2.2.3
+      gemfile: Gemfile.rails-3.2
+    - rvm: 2.2.3
+      gemfile: Gemfile.mongoid-3.1
+    - rvm: 2.2.3
+      gemfile: Gemfile.mongoid-3.0
+    - rvm: 2.2.3
+      gemfile: Gemfile.mongoid-2.8
+    - rvm: 2.2.3
+      gemfile: Gemfile.mongoid-2.7
+    - rvm: 2.2.3
+      gemfile: Gemfile.mongoid-2.6
+    - rvm: 2.2.3
+      gemfile: Gemfile.mongoid-2.5
+    - rvm: 2.2.3
+      gemfile: Gemfile.mongoid-2.4

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Next Release
 
+## 5.0.0 (01/06/2015)
+
+* Support Rails 5.0.0.beta1
+
+## 4.14.10
+
+* Fix `has_many :through` infinite loop issue
+
+## 4.14.9
+
+* Support mongoid 5.0.0
+* Do not report association queries immediately after object creation to
+  require a preload
+* Detect `counter_cache` for `has_many :through` association
+
 ## 4.14.8
 
 * compatible with `composite_primary_keys` gem

data/Gemfile.mongoid-5.0

@@ -0,0 +1,17 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem 'rails', '~> 4.0.0'
+gem 'sqlite3', platforms: [:ruby]
+gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
+gem 'mongoid', '~> 5.0.0.beta', github: 'mongoid'
+
+gem "rspec"
+
+gem 'coveralls', require: false
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'rubinius-developer_tools'
+end

data/Gemfile.rails-5.0

@@ -0,0 +1,17 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem 'rails', '5.0.0.beta1'
+gem 'sqlite3'
+gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
+gem 'activerecord-import'
+
+gem "rspec"
+
+gem 'coveralls', require: false
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'rubinius-developer_tools'
+end

data/README.md

@@ -36,6 +36,9 @@ or add it into a Gemfile (Bundler):
 gem "bullet", :group => "development"
 ```
 
+**Note**: make sure `bullet` gem is added after activerecord (rails) and
+mongoid.
+
 ## Configuration
 
 Bullet won't do ANYTHING unless you tell it to explicitly. Append to
@@ -59,6 +62,7 @@ config.after_initialize do
   Bullet.rollbar = true
   Bullet.add_footer = true
   Bullet.stacktrace_includes = [ 'your_gem', 'your_middleware' ]
+  Bullet.stacktrace_excludes = [ 'their_gem', 'their_middleware' ]
   Bullet.slack = { webhook_url: 'http://some.slack.url', foo: 'bar' }
 end
 ```
@@ -80,6 +84,7 @@ The code above will enable all seven of the Bullet notification systems:
 * `Bullet.raise`: raise errors, useful for making your specs fail unless they have optimized queries
 * `Bullet.add_footer`: adds the details in the bottom left corner of the page
 * `Bullet.stacktrace_includes`: include paths with any of these substrings in the stack trace, even if they are not in your main app
+* `Bullet.stacktrace_excludes`: ignore paths with any of these substrings in the stack trace, even if they are not in your main app.
 * `Bullet.slack`: add notifications to slack
 
 Bullet also allows you to disable any of its detectors.

data/lib/bullet/active_record3.rb

@@ -1,5 +1,7 @@
 module Bullet
   module ActiveRecord
+    LOAD_TARGET = 'load_target'.freeze
+
     def self.enable
       require 'active_record'
       ::ActiveRecord::Relation.class_eval do
@@ -138,7 +140,7 @@ module Bullet
           # avoid stack level too deep
           result = origin_load_target
           if Bullet.start?
-            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless caller.any? { |c| c.include?("load_target") }
+            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless caller.any? { |c| c.include?(LOAD_TARGET) }
             Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
           end
           result
@@ -160,8 +162,8 @@ module Bullet
 
         def has_cached_counter?
           result = origin_has_cached_counter?
-          if Bullet.start?
-            Bullet::Detector::CounterCache.add_counter_cache(@owner, @reflection.name) unless result
+          if Bullet.start? && !result
+            Bullet::Detector::CounterCache.add_counter_cache(@owner, @reflection.name)
           end
           result
         end
@@ -171,8 +173,8 @@ module Bullet
         alias_method :origin_has_cached_counter?, :has_cached_counter?
         def has_cached_counter?
           result = origin_has_cached_counter?
-          if Bullet.start?
-            Bullet::Detector::CounterCache.add_counter_cache(@owner, @reflection.name) unless result
+          if Bullet.start? && !result
+            Bullet::Detector::CounterCache.add_counter_cache(@owner, @reflection.name)
           end
           result
         end

data/lib/bullet/active_record3x.rb

@@ -143,10 +143,10 @@ module Bullet
       ::ActiveRecord::Associations::HasManyAssociation.class_eval do
         alias_method :origin_has_cached_counter?, :has_cached_counter?
 
-        def has_cached_counter?(reflection = reflection)
+        def has_cached_counter?(reflection = reflection())
           result = origin_has_cached_counter?(reflection)
-          if Bullet.start?
-            Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name) unless result
+          if Bullet.start? && !result
+            Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name)
           end
           result
         end

data/lib/bullet/active_record4.rb

@@ -21,6 +21,16 @@ module Bullet
         end
       end
 
+      ::ActiveRecord::Persistence.class_eval do
+        def save_with_bullet(*args, &proc)
+          was_new_record = new_record?
+          save_without_bullet(*args, &proc).tap do |result|
+            Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
+          end
+        end
+        alias_method_chain :save, :bullet
+      end
+
       ::ActiveRecord::Associations::Preloader.class_eval do
         # include query for one to many associations.
         # keep this eager loadings.
@@ -135,8 +145,8 @@ module Bullet
 
         def has_cached_counter?(reflection = reflection())
           result = origin_has_cached_counter?(reflection)
-          if Bullet.start?
-            Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name) unless result
+          if Bullet.start? && !result
+            Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name)
           end
           result
         end

data/lib/bullet/active_record41.rb

@@ -23,6 +23,16 @@ module Bullet
         end
       end
 
+      ::ActiveRecord::Persistence.class_eval do
+        def save_with_bullet(*args, &proc)
+          was_new_record = new_record?
+          save_without_bullet(*args, &proc).tap do |result|
+            Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
+          end
+        end
+        alias_method_chain :save, :bullet
+      end
+
       ::ActiveRecord::Associations::Preloader.class_eval do
         alias_method :origin_preloaders_on, :preloaders_on
 
@@ -138,8 +148,8 @@ module Bullet
 
         def has_cached_counter?(reflection = reflection())
           result = origin_has_cached_counter?(reflection)
-          if Bullet.start?
-            Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name) unless result
+          if Bullet.start? && !result
+            Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name)
           end
           result
         end

data/lib/bullet/active_record42.rb

@@ -21,6 +21,16 @@ module Bullet
         end
       end
 
+      ::ActiveRecord::Persistence.class_eval do
+        def save_with_bullet(*args, &proc)
+          was_new_record = new_record?
+          save_without_bullet(*args, &proc).tap do |result|
+            Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
+          end
+        end
+        alias_method_chain :save, :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.
@@ -182,10 +192,19 @@ module Bullet
         alias_method :origin_has_cached_counter?, :has_cached_counter?
         def has_cached_counter?(reflection = reflection())
           result = origin_has_cached_counter?(reflection)
-          if Bullet.start?
-            if !result && !Thread.current[:bullet_collection_empty]
-              Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name)
-            end
+          if Bullet.start? && !result && !Thread.current[:bullet_collection_empty]
+            Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name)
+          end
+          result
+        end
+      end
+
+      ::ActiveRecord::Associations::HasManyThroughAssociation.class_eval do
+        alias_method :origin_hmt_has_cached_counter?, :has_cached_counter?
+        def has_cached_counter?(reflection = reflection())
+          result = origin_hmt_has_cached_counter?(reflection)
+          if Bullet.start? && !result && !Thread.current[:bullet_collection_empty]
+            Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name)
           end
           result
         end

data/lib/bullet/active_record5.rb

@@ -0,0 +1,217 @@
+module Bullet
+  module ActiveRecord
+    def self.enable
+      require 'active_record'
+      ::ActiveRecord::Base.class_eval do
+        class <<self
+          alias_method :origin_find, :find
+          def find(*args)
+            result = origin_find(*args)
+            if Bullet.start?
+              if result.is_a? Array
+                Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
+                Bullet::Detector::CounterCache.add_possible_objects(result)
+              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::Persistence.class_eval do
+        def save_with_bullet(*args, &proc)
+          was_new_record = new_record?
+          save_without_bullet(*args, &proc).tap do |result|
+            Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
+          end
+        end
+        alias_method_chain :save, :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
+          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::Associations::Association.class_eval do
+        alias_method :origin_initialize, :initialize
+        def initialize(owner, reflection)
+          origin_initialize(owner, reflection)
+          reflection.set_owner owner
+        end
+      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 do |record|
+                Bullet::Detector::Association.add_object_associations(record, association)
+              end
+              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 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.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
+            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.class_eval do
+        # call one to many associations
+        alias_method :origin_load_target, :load_target
+        def load_target
+          records = origin_load_target
+
+          if Bullet.start?
+            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
+
+        alias_method :origin_empty?, :empty?
+        def empty?
+          if Bullet.start?
+            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          end
+          origin_empty?
+        end
+
+        alias_method :origin_include?, :include?
+        def include?(object)
+          if Bullet.start?
+            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          end
+          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_/ && !@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.class_eval do
+        alias_method :origin_many_empty?, :empty?
+        def empty?
+          Thread.current[:bullet_collection_empty] = true
+          result = origin_many_empty?
+          Thread.current[:bullet_collection_empty] = nil
+          if Bullet.start?
+            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          end
+          result
+        end
+      end
+
+      ::ActiveRecord::Reflection::AbstractReflection.class_eval do
+        def set_owner(owner)
+          @owner = owner
+        end
+
+        alias_method :origin_has_cached_counter?, :has_cached_counter?
+        def has_cached_counter?
+          result = origin_has_cached_counter?
+          if Bullet.start? && !result && !Thread.current[:bullet_collection_empty]
+            Bullet::Detector::CounterCache.add_counter_cache(@owner, @name)
+          end
+          result
+        end
+      end
+    end
+  end
+end

data/lib/bullet/dependency.rb

@@ -24,6 +24,8 @@ module Bullet
                                      'active_record41'
                                    elsif active_record42?
                                      'active_record42'
+                                   elsif active_record50?
+                                     'active_record5'
                                    end
                                  end
     end
@@ -36,6 +38,8 @@ module Bullet
                                'mongoid3x'
                              elsif mongoid4x?
                                'mongoid4x'
+                             elsif mongoid5x?
+                               'mongoid5x'
                              end
                            end
     end
@@ -48,6 +52,10 @@ module Bullet
       active_record? && ::ActiveRecord::VERSION::MAJOR == 4
     end
 
+    def active_record5?
+      active_record? && ::ActiveRecord::VERSION::MAJOR == 5
+    end
+
     def active_record30?
       active_record3? && ::ActiveRecord::VERSION::MINOR == 0
     end
@@ -72,6 +80,10 @@ module Bullet
       active_record4? && ::ActiveRecord::VERSION::MINOR == 2
     end
 
+    def active_record50?
+      active_record5? && ::ActiveRecord::VERSION::MINOR == 0
+    end
+
     def mongoid2x?
       mongoid? && ::Mongoid::VERSION =~ /\A2\.[4-8]/
     end
@@ -83,5 +95,9 @@ module Bullet
     def mongoid4x?
       mongoid? && ::Mongoid::VERSION =~ /\A4/
     end
+
+    def mongoid5x?
+      mongoid? && ::Mongoid::VERSION =~ /\A5/
+    end
   end
 end

data/lib/bullet/detector/n_plus_one_query.rb

@@ -15,7 +15,7 @@ module Bullet
           add_call_object_associations(object, associations)
 
           Bullet.debug("Detector::NPlusOneQuery#call_association", "object: #{object.bullet_key}, associations: #{associations}")
-          if conditions_met?(object, associations)
+          if !excluded_stacktrace_path? && conditions_met?(object, associations)
             Bullet.debug("detect n + 1 query", "object: #{object.bullet_key}, associations: #{associations}")
             create_notification caller_in_project, object.class.to_s, associations
           end
@@ -70,7 +70,7 @@ module Bullet
               # associations == v comparision order is important here because
               # v variable might be a squeel node where :== method is redefined,
               # so it does not compare values at all and return unexpected results
-              result = v.is_a?(Hash) ? v.has_key?(associations) : associations == v
+              result = v.is_a?(Hash) ? v.key?(associations) : associations == v
               return true if result
             end
           end
@@ -96,6 +96,12 @@ module Bullet
               Bullet.stacktrace_includes.any? { |include| c.include?(include) }
             end
           end
+
+          def excluded_stacktrace_path?
+            Bullet.stacktrace_excludes.any? do |excluded_path|
+              caller_in_project.any? { |c| c.include?(excluded_path) }
+            end
+          end
       end
     end
   end

data/lib/bullet/detector/unused_eager_loading.rb

@@ -48,7 +48,7 @@ module Bullet
           end
 
           eager_loadings.add(*to_add) if to_add
-          to_merge.each { |k,val| eager_loadings.merge k, val }
+          to_merge.each { |k, val| eager_loadings.merge k, val }
           to_delete.each { |k| eager_loadings.delete k }
 
           eager_loadings.add bullet_keys, associations unless bullet_keys.empty?

data/lib/bullet/mongoid5x.rb

@@ -0,0 +1,56 @@
+module Bullet
+  module Mongoid
+    def self.enable
+      require 'mongoid'
+      ::Mongoid::Contextual::Mongo.class_eval do
+        alias_method :origin_first, :first
+        alias_method :origin_last, :last
+        alias_method :origin_each, :each
+        alias_method :origin_eager_load, :eager_load
+
+        def first
+          result = origin_first
+          Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
+          result
+        end
+
+        def last
+          result = origin_last
+          Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
+          result
+        end
+
+        def each(&block)
+          records = view.map{ |doc| ::Mongoid::Factory.from_db(klass, doc) }
+          if records.length > 1
+            Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
+          elsif records.size == 1
+            Bullet::Detector::NPlusOneQuery.add_impossible_object(records.first)
+          end
+          origin_each(&block)
+        end
+
+        def eager_load(docs)
+          associations = criteria.inclusions.map(&:name)
+          docs.each do |doc|
+            Bullet::Detector::NPlusOneQuery.add_object_associations(doc, associations)
+          end
+          Bullet::Detector::UnusedEagerLoading.add_eager_loadings(docs, associations)
+          origin_eager_load(docs)
+        end
+      end
+
+      ::Mongoid::Relations::Accessors.class_eval do
+        alias_method :origin_get_relation, :get_relation
+
+        def get_relation(name, metadata, object, reload = false)
+          result = origin_get_relation(name, metadata, object, reload)
+          if metadata.macro !~ /embed/
+            Bullet::Detector::NPlusOneQuery.call_association(self, name)
+          end
+          result
+        end
+      end
+    end
+  end
+end

data/lib/bullet/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Bullet
-  VERSION = "4.14.8"
+  VERSION = "5.0.0"
 end