bullet 4.14.10 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 262911eb5bb5cc6577489084cca4c06042ec466b
-  data.tar.gz: 6aa0f9e1403c8f36cac9375b451880a82c9561cd
+  metadata.gz: d5439116cdedcd96dfad6dfd315eaf47ee815153
+  data.tar.gz: 9542679b93fa670fbf8b014fb0cbd3adb13a30d8
 SHA512:
-  metadata.gz: 99c812cc4085c2e9763ba05564f98b4b3ab9027820932eb70d09060fbfb69071d38d8d844b67d29dc167ad04983e8133fa5727b426122d9a4e0f3b9c55e9bd3b
-  data.tar.gz: d1316bb72c9228fb4b7746795d528506eb472d1bd906424c17bbb5a3adcdd995e75bcdec59b8a93959d80e9ef88e0bfb692092db505c95a50fcd32735f4dda8e
+  metadata.gz: 4704ead627526344ab065d5d0a9bd2f3516165f664d9ab97aca3dd576c55ecc75450636daceebe21d100562be45c5e9352296ea0cd5856b0a4205be2120751cb
+  data.tar.gz: 6b3d52be604e5188920592e6b3952d2a683364631739c097b619b151f9131b911454452eae824e13493a4866ff767eb9ba61da3a98097aa3042e498faf74bdd6

data/.travis.yml

@@ -4,7 +4,9 @@ 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
@@ -26,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
@@ -46,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,9 @@
 # Next Release
 
+## 5.0.0 (01/06/2015)
+
+* Support Rails 5.0.0.beta1
+
 ## 4.14.10
 
 * Fix `has_many :through` infinite loop issue

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

@@ -62,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
 ```
@@ -83,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.rb

@@ -28,7 +28,7 @@ module Bullet
   end
 
   class << self
-    attr_writer :enable, :n_plus_one_query_enable, :unused_eager_loading_enable, :counter_cache_enable, :stacktrace_includes
+    attr_writer :enable, :n_plus_one_query_enable, :unused_eager_loading_enable, :counter_cache_enable, :stacktrace_includes, :stacktrace_excludes
     attr_reader :notification_collector, :whitelist
     attr_accessor :add_footer, :orm_pathches_applied
 
@@ -76,6 +76,10 @@ module Bullet
       @stacktrace_includes || []
     end
 
+    def stacktrace_excludes
+      @stacktrace_excludes || []
+    end
+
     def add_whitelist(options)
       reset_whitelist
       @whitelist[options[:type]][options[:class_name].classify] ||= []

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
@@ -50,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
@@ -74,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

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
@@ -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/version.rb

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

data/spec/bullet/detector/n_plus_one_query_spec.rb

@@ -85,6 +85,21 @@ module Bullet
           expect(NPlusOneQuery).not_to receive(:create_notification).with("Post", :association)
           NPlusOneQuery.call_association(@post, :association)
         end
+
+        context "stacktrace_excludes" do
+          before { Bullet.stacktrace_excludes = [ 'def' ] }
+          after { Bullet.stacktrace_excludes = nil }
+
+          it "should not create notification when stacktrace contains paths that are in the exclude list" do
+            in_project = File.join(Dir.pwd, 'abc', 'abc.rb')
+            included_path = '/ghi/ghi.rb'
+            excluded_path = '/def/def.rb'
+
+            expect(NPlusOneQuery).to receive(:caller).and_return([in_project, included_path, excluded_path])
+            expect(NPlusOneQuery).to_not receive(:create_notification)
+            NPlusOneQuery.call_association(@post, :association)
+          end
+        end
       end
 
       context ".caller_in_project" do

data/spec/integration/active_record5/association_spec.rb

@@ -0,0 +1,715 @@
+require 'spec_helper'
+
+if !mongoid? && active_record5?
+  describe Bullet::Detector::Association, 'has_many' do
+    context "post => comments" do
+      it "should detect non preload post => comments" do
+        Post.all.each do |post|
+          post.comments.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
+      end
+
+      it "should detect preload with post => comments" do
+        Post.includes(:comments).each do |post|
+          post.comments.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should detect unused preload post => comments" do
+        Post.includes(:comments).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Post, :comments)
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should not detect unused preload post => comments" do
+        Post.all.map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should detect non preload comment => post with inverse_of" do
+        Post.includes(:comments).each do |post|
+          post.comments.each do |comment|
+            comment.name
+            comment.post.name
+          end
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should detect non preload post => comments with empty?" do
+        Post.all.each do |post|
+          post.comments.empty?
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
+      end
+
+      it "should detect non preload post => comments with include?" do
+        comment = Comment.last
+        Post.all.each do |post|
+          post.comments.include?(comment)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
+      end
+    end
+
+    context "category => posts => comments" do
+      it "should detect non preload category => posts => comments" do
+        Category.all.each do |category|
+          category.posts.each do |post|
+            post.comments.map(&:name)
+          end
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Category, :posts)
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
+      end
+
+      it "should detect preload category => posts, but no post => comments" do
+        Category.includes(:posts).each do |category|
+          category.posts.each do |post|
+            post.comments.map(&:name)
+          end
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).not_to be_detecting_unpreloaded_association_for(Category, :posts)
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
+      end
+
+      it "should detect preload with category => posts => comments" do
+        Category.includes({:posts => :comments}).each do |category|
+          category.posts.each do |post|
+            post.comments.map(&:name)
+          end
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should detect preload with category => posts => comments with posts.id > 0" do
+        Category.includes({:posts => :comments}).where('posts.id > 0').references(:posts).each do |category|
+          category.posts.each do |post|
+            post.comments.map(&:name)
+          end
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should detect unused preload with category => posts => comments" do
+        Category.includes({:posts => :comments}).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Post, :comments)
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should detect unused preload with post => commnets, no category => posts" do
+        Category.includes({:posts => :comments}).each do |category|
+          category.posts.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Post, :comments)
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+    end
+
+    context "category => posts, category => entries" do
+      it "should detect non preload with category => [posts, entries]" do
+        Category.all.each do |category|
+          category.posts.map(&:name)
+          category.entries.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Category, :posts)
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Category, :entries)
+      end
+
+      it "should detect preload with category => posts, but not with category => entries" do
+        Category.includes(:posts).each do |category|
+          category.posts.map(&:name)
+          category.entries.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).not_to be_detecting_unpreloaded_association_for(Category, :posts)
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Category, :entries)
+      end
+
+      it "should detect preload with category => [posts, entries]" do
+        Category.includes([:posts, :entries]).each do |category|
+          category.posts.map(&:name)
+          category.entries.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should detect unused preload with category => [posts, entries]" do
+        Category.includes([:posts, :entries]).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Category, :posts)
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Category, :entries)
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should detect unused preload with category => entries, but not with category => posts" do
+        Category.includes([:posts, :entries]).each do |category|
+          category.posts.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_unused_preload_associations_for(Category, :posts)
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Category, :entries)
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+    end
+
+    context "post => comment" do
+      it "should detect unused preload with post => comments" do
+        Post.includes(:comments).each do |post|
+          post.comments.first.name
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_unused_preload_associations_for(Post, :comments)
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should detect preload with post => commnets" do
+        Post.first.comments.map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should not detect unused preload with category => posts" do
+        category = Category.first
+        category.draft_post.destroy!
+        post = category.draft_post
+        post.update_attributes!(link: true)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+
+        Support::SqliteSeed.setup_db
+        Support::SqliteSeed.seed_db
+      end
+    end
+
+    context "category => posts => writer" do
+      it "should not detect unused preload associations" do
+        category = Category.includes({:posts => :writer}).order("id DESC").find_by_name('first')
+        category.posts.map do |post|
+          post.name
+          post.writer.name
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_unused_preload_associations_for(Category, :posts)
+        expect(Bullet::Detector::Association).not_to be_unused_preload_associations_for(Post, :writer)
+      end
+    end
+
+    context "scope for_category_name" do
+      it "should detect preload with post => category" do
+        Post.in_category_name('first').references(:categories).each do |post|
+          post.category.name
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should not be unused preload post => category" do
+        Post.in_category_name('first').references(:categories).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+    end
+
+    context "scope preload_comments" do
+      it "should detect preload post => comments with scope" do
+        Post.preload_comments.each do |post|
+          post.comments.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should detect unused preload with scope" do
+        Post.preload_comments.map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Post, :comments)
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+    end
+  end
+
+  describe Bullet::Detector::Association, 'belongs_to' do
+    context "comment => post" do
+      it "should detect non preload with comment => post" do
+        Comment.all.each do |comment|
+          comment.post.name
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Comment, :post)
+      end
+
+      it "should detect preload with one comment => post" do
+        Comment.first.post.name
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should dtect preload with comment => post" do
+        Comment.includes(:post).each do |comment|
+          comment.post.name
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should not detect preload with comment => post" do
+        Comment.all.map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should detect unused preload with comment => post" do
+        Comment.includes(:post).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Comment, :post)
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+    end
+
+    context "comment => post => category" do
+      it "should detect non preload association with comment => post" do
+        Comment.all.each do |comment|
+          comment.post.category.name
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Comment, :post)
+      end
+
+      it "should not detect non preload association with only one comment" do
+        Comment.first.post.category.name
+
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should detect non preload association with post => category" do
+        Comment.includes(:post).each do |comment|
+          comment.post.category.name
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :category)
+      end
+
+      it "should not detect unpreload association" do
+        Comment.includes(:post => :category).each do |comment|
+          comment.post.category.name
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+    end
+
+    context "comment => author, post => writer" do
+      it "should detect non preloaded writer" do
+        Comment.includes([:author, :post]).where(["base_users.id = ?", BaseUser.first]).references(:base_users).each do |comment|
+          comment.post.writer.name
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :writer)
+      end
+
+      it "should detect unused preload with comment => author" do
+        Comment.includes([:author, {:post => :writer}]).where(["base_users.id = ?", BaseUser.first]).references(:base_users).each do |comment|
+          comment.post.writer.name
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should detect non preloading with writer => newspaper" do
+        Comment.includes(:post => :writer).where("posts.name like '%first%'").references(:posts).each do |comment|
+          comment.post.writer.newspaper.name
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Writer, :newspaper)
+      end
+
+      it "should not raise a stack error from posts to category" do
+        expect {
+          Comment.includes({:post => :category}).each do |com|
+            com.post.category
+          end
+        }.not_to raise_error()
+      end
+    end
+  end
+
+  describe Bullet::Detector::Association, 'has_and_belongs_to_many' do
+    context "students <=> teachers" do
+      it "should detect non preload associations" do
+        Student.all.each do |student|
+          student.teachers.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Student, :teachers)
+      end
+
+      it "should detect preload associations" do
+        Student.includes(:teachers).each do |student|
+          student.teachers.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should detect unused preload associations" do
+        Student.includes(:teachers).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Student, :teachers)
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should detect no unused preload associations" do
+        Student.all.map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+    end
+  end
+
+  describe Bullet::Detector::Association, 'has_many :through' do
+    context "firm => clients" do
+      it "should detect non preload associations" do
+        Firm.all.each do |firm|
+          firm.clients.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Firm, :clients)
+      end
+
+      it "should detect preload associations" do
+        Firm.includes(:clients).each do |firm|
+          firm.clients.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should not detect preload associations" do
+        Firm.all.map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should detect unused preload associations" do
+        Firm.includes(:clients).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Firm, :clients)
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+    end
+  end
+
+  describe Bullet::Detector::Association, "has_one" do
+    context "company => address" do
+      it "should detect non preload association" do
+        Company.all.each do |company|
+          company.address.name
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Company, :address)
+      end
+
+      it "should detect preload association" do
+        Company.includes(:address).each do |company|
+          company.address.name
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should not detect preload association" do
+        Company.all.map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should detect unused preload association" do
+        Company.includes(:address).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Company, :address)
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+    end
+  end
+
+  describe Bullet::Detector::Association, "has_one => has_many" do
+    it "should not detect preload association" do
+      user = User.first
+      user.submission.replies.map(&:name)
+      Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+      expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+      expect(Bullet::Detector::Association).to be_completely_preloading_associations
+    end
+  end
+
+  describe Bullet::Detector::Association, "call one association that in possible objects" do
+    it "should not detect preload association" do
+      Post.all
+      Post.first.comments.map(&:name)
+      Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+      expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+      expect(Bullet::Detector::Association).to be_completely_preloading_associations
+    end
+  end
+
+  describe Bullet::Detector::Association, "query immediately after creation" do
+    context "document => children" do
+      it 'should not detect non preload associations' do
+        document1 = Document.new
+        document1.children.build
+        document1.save
+
+        document2 = Document.new(parent: document1)
+        document2.save
+        document2.parent
+
+        document1.children.each.first
+
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+    end
+  end
+
+  describe Bullet::Detector::Association, "STI" do
+    context "page => author" do
+      it "should detect non preload associations" do
+        Page.all.each do |page|
+          page.author.name
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Page, :author)
+      end
+
+      it "should detect preload associations" do
+        Page.includes(:author).each do |page|
+          page.author.name
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should detect unused preload associations" do
+        Page.includes(:author).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Page, :author)
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+
+      it "should not detect preload associations" do
+        Page.all.map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+    end
+
+    context "disable n plus one query" do
+      before { Bullet.n_plus_one_query_enable = false }
+      after { Bullet.n_plus_one_query_enable = true }
+
+      it "should not detect n plus one query" do
+        Post.all.each do |post|
+          post.comments.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+
+        expect(Bullet::Detector::Association).not_to be_detecting_unpreloaded_association_for(Post, :comments)
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+      end
+
+      it "should still detect unused eager loading" do
+        Post.includes(:comments).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Post, :comments)
+      end
+    end
+
+    context "disable unused eager loading" do
+      before { Bullet.unused_eager_loading_enable = false }
+      after { Bullet.unused_eager_loading_enable = true }
+
+      it "should not detect unused eager loading" do
+        Post.includes(:comments).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+      end
+
+      it "should still detect n plus one query" do
+        Post.all.each do |post|
+          post.comments.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+      end
+    end
+
+    context "whitelist n plus one query" do
+      before { Bullet.add_whitelist :type => :n_plus_one_query, :class_name => "Post", :association => :comments }
+      after { Bullet.clear_whitelist }
+
+      it "should not detect n plus one query" do
+        Post.all.each do |post|
+          post.comments.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+
+        expect(Bullet::Detector::Association).not_to be_detecting_unpreloaded_association_for(Post, :comments)
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+      end
+
+      it "should still detect unused eager loading" do
+        Post.includes(:comments).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Post, :comments)
+      end
+    end
+
+    context "whitelist unused eager loading" do
+      before { Bullet.add_whitelist :type => :unused_eager_loading, :class_name => "Post", :association => :comments }
+      after { Bullet.clear_whitelist }
+
+      it "should not detect unused eager loading" do
+        Post.includes(:comments).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+      end
+
+      it "should still detect n plus one query" do
+        Post.all.each do |post|
+          post.comments.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+      end
+    end
+  end
+end

data/spec/integration/counter_cache_spec.rb

@@ -29,11 +29,20 @@ if !mongoid? && active_record?
       expect(Bullet.collected_counter_cache_notifications).to be_empty
     end
 
-    it "should need counter cache for has_many through" do
-      Client.all.each do |client|
-        client.firms.size
+    if active_record5?
+      it "should not need counter cache for has_many through" do
+        Client.all.each do |client|
+          client.firms.size
+        end
+        expect(Bullet.collected_counter_cache_notifications).to be_empty
+      end
+    else
+      it "should need counter cache for has_many through" do
+        Client.all.each do |client|
+          client.firms.size
+        end
+        expect(Bullet.collected_counter_cache_notifications).not_to be_empty
       end
-      expect(Bullet.collected_counter_cache_notifications).not_to be_empty
     end
 
     it "should not need counter cache with part of cities" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 4.14.10
+  version: 5.0.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -66,6 +66,7 @@ files:
 - Gemfile.rails-4.0
 - Gemfile.rails-4.1
 - Gemfile.rails-4.2
+- Gemfile.rails-5.0
 - Guardfile
 - Hacking.md
 - MIT-LICENSE
@@ -78,6 +79,7 @@ files:
 - lib/bullet/active_record4.rb
 - lib/bullet/active_record41.rb
 - lib/bullet/active_record42.rb
+- lib/bullet/active_record5.rb
 - lib/bullet/dependency.rb
 - lib/bullet/detector.rb
 - lib/bullet/detector/association.rb
@@ -124,6 +126,7 @@ files:
 - spec/bullet_spec.rb
 - spec/integration/active_record3/association_spec.rb
 - spec/integration/active_record4/association_spec.rb
+- spec/integration/active_record5/association_spec.rb
 - spec/integration/counter_cache_spec.rb
 - spec/integration/mongoid/association_spec.rb
 - spec/models/address.rb
@@ -186,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: help to kill N+1 queries and unused eager loading.
@@ -210,6 +213,7 @@ test_files:
 - spec/bullet_spec.rb
 - spec/integration/active_record3/association_spec.rb
 - spec/integration/active_record4/association_spec.rb
+- spec/integration/active_record5/association_spec.rb
 - spec/integration/counter_cache_spec.rb
 - spec/integration/mongoid/association_spec.rb
 - spec/models/address.rb