bullet 5.0.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5439116cdedcd96dfad6dfd315eaf47ee815153
-  data.tar.gz: 9542679b93fa670fbf8b014fb0cbd3adb13a30d8
+  metadata.gz: 0158f6af4990b365de2859cea97877e5b290ea83
+  data.tar.gz: cd8914938d74645ae75d01ee8feaf23e38f8d028
 SHA512:
-  metadata.gz: 4704ead627526344ab065d5d0a9bd2f3516165f664d9ab97aca3dd576c55ecc75450636daceebe21d100562be45c5e9352296ea0cd5856b0a4205be2120751cb
-  data.tar.gz: 6b3d52be604e5188920592e6b3952d2a683364631739c097b619b151f9131b911454452eae824e13493a4866ff767eb9ba61da3a98097aa3042e498faf74bdd6
+  metadata.gz: 9e92c13202832afaaf604072c06e695cfe552d5626318d6c625cebacdfdc13ecc14aeed8c64d6df483b4c05caa090ecee01e613228dae6466edbe66803e7333a
+  data.tar.gz: 7d365b32c075a00733e4c70daedcfbca042cb2334a77c6e132fc31b33e9dd23aaca8a65eaa1578ffba2f106303cf572e84e41b7fd6c7c61a239b2dbea9fcaabe

data/.travis.yml

@@ -1,6 +1,7 @@
 sudo: false
 language: ruby
 rvm:
+  - 1.9.3
   - 2.0
   - 2.1
   - 2.2
@@ -28,8 +29,38 @@ services:
   - mongodb
 matrix:
   exclude:
+    - rvm: 1.9.3
+      gemfile: Gemfile.rails-4.0
+    - rvm: 1.9.3
+      gemfile: Gemfile.rails-4.1
+    - rvm: 1.9.3
+      gemfile: Gemfile.rails-4.2
+    - rvm: 1.9.3
+      gemfile: Gemfile.rails-5.0
+    - rvm: 1.9.3
+      gemfile: Gemfile.mongoid-2.4
+    - rvm: 1.9.3
+      gemfile: Gemfile.mongoid-2.5
+    - rvm: 1.9.3
+      gemfile: Gemfile.mongoid-2.6
+    - rvm: 1.9.3
+      gemfile: Gemfile.mongoid-2.7
+    - rvm: 1.9.3
+      gemfile: Gemfile.mongoid-2.8
+    - rvm: 1.9.3
+      gemfile: Gemfile.mongoid-3.0
+    - rvm: 1.9.3
+      gemfile: Gemfile.mongoid-3.1
+    - rvm: 1.9.3
+      gemfile: Gemfile.mongoid-4.0
+    - rvm: 1.9.3
+      gemfile: Gemfile.mongoid-5.0
+    - rvm: 2.0
+      gemfile: Gemfile.rails-3.0
     - rvm: 2.0
       gemfile: Gemfile.rails-5.0
+    - rvm: 2.1
+      gemfile: Gemfile.rails-3.0
     - rvm: 2.1
       gemfile: Gemfile.rails-5.0
     - rvm: 2.2

data/CHANGELOG.md

@@ -1,55 +1,36 @@
 # Next Release
 
-## 5.0.0 (01/06/2015)
+## 5.1.1
 
-* Support Rails 5.0.0.beta1
+* Fix `has_cached_counter?` is not defined in HABTM #297
+* Fix false alert if preloaded association has no records #260
 
-## 4.14.10
+## 5.1.0 (05/21/2016)
 
-* Fix `has_many :through` infinite loop issue
+* Fix false alert when `empty?` used with `counter_cache`
+* Fix `alias_method_chain` deprecation for rails 5
+* Add response handling for non-Rails Rack responses
+* Fix false alert when querying immediately after creation
+* Fix UnusedEagerLoading bug when multiple eager loading query include same objects
 
-## 4.14.9
+## 5.0.0 (01/06/2016)
 
+* Support Rails 5.0.0.beta1
+* Fix `has_many :through` infinite loop issue
 * 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
-
-## 4.14.7
-
+* Compatible with `composite_primary_keys` gem
 * Fix AR 4.2 SingularAssociation#reader result can be nil
 * `perform_out_of_channel_notifications` should always be triggered
-
-## 4.14.6
-
 * Fix false positive with `belongs_to` -> `belongs_to` for active\_record 4.2
 * Activate active\_record hacks only when Bullet already start
-
-## 4.14.5
-
 * Don't execute query when running `to_sql`
 * Send backtrace to `uniform_notifier`
 * Fix sse response check
 * Dynamically delegate available notifiers to UniformNotifier
-
-## 4.14.4
-
-* Fix false N + 1 warnings on Rails 4.2
-
-## 4.14.3
-
-* Fix false positive on create
-
-## 4.14.2
-
 * Hotfix nil object when `add_impossible_object`
-
-## 4.14.1
-
 * Fix `has_one` then `has_many` associations in rails 4.2
 * Append js and dom to html body in proper position
 

data/Gemfile.mongoid-5.0

@@ -5,7 +5,7 @@ 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 'mongoid', '~> 5.0.0'
 
 gem "rspec"
 

data/Gemfile.rails-3.0

@@ -6,6 +6,7 @@ gem 'rails', '~> 3.0.0'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'
+gem 'tins', '~> 1.6.0', platforms: [:ruby_19]
 
 gem "rspec"
 

data/Gemfile.rails-3.1

@@ -6,6 +6,7 @@ gem 'rails', '~> 3.1.0'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'
+gem 'tins', '~> 1.6.0', platforms: [:ruby_19]
 
 gem "rspec"
 

data/Gemfile.rails-3.2

@@ -6,6 +6,7 @@ gem 'rails', '~> 3.2.0'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'
+gem 'tins', '~> 1.6.0', platforms: [:ruby_19]
 
 gem "rspec"
 

data/Gemfile.rails-4.0

@@ -6,6 +6,7 @@ gem 'rails', '~> 4.0.0'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'
+gem 'tins', '~> 1.6.0', platforms: [:ruby_19]
 
 gem "rspec"
 

data/Gemfile.rails-4.1

@@ -6,6 +6,7 @@ gem 'rails', '~> 4.1.0'
 gem 'sqlite3'
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'
+gem 'tins', '~> 1.6.0', platforms: [:ruby_19]
 
 gem "rspec"
 

data/Gemfile.rails-4.2

@@ -6,6 +6,7 @@ gem 'rails', '~> 4.2.0'
 gem 'sqlite3'
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'
+gem 'tins', '~> 1.6.0', platforms: [:ruby_19]
 
 gem "rspec"
 

data/Hacking.md

@@ -23,6 +23,7 @@ Notification instances contain the message that will be displayed, and will
 use a Presenter class to display their message to the user.
 
 So the flow of a request goes like this:
+
 1. Bullet.start_request is called, which resets all the detectors and empties
    the notification collector
 2. The request is handled by Rails, and the installed ActiveRecord extensions

data/README.md

@@ -238,7 +238,9 @@ Bullet outputs some details info, to enable debug mode, set
 
 ## Demo
 
-Bullet is designed to function as you browse through your application in development. To see it in action, follow these steps to create, detect, and fix example query problems.
+Bullet is designed to function as you browse through your application in development. To see it in action,
+you can visit [https://github.com/flyerhzm/bullet_test](https://github.com/flyerhzm/bullet_test) or
+follow these steps to create, detect, and fix example query problems.
 
 1\. Create an example application
 
@@ -458,4 +460,4 @@ Meanwhile, there's a line appended to `log/bullet.log`
   Post => [:comments]
 ```
 
-Copyright (c) 2009 - 2015 Richard Huang (flyerhzm@gmail.com), released under the MIT license
+Copyright (c) 2009 - 2016 Richard Huang (flyerhzm@gmail.com), released under the MIT license

data/bullet.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
 
   s.add_runtime_dependency "activesupport", ">= 3.0.0"
-  s.add_runtime_dependency "uniform_notifier", "~> 1.9.0"
+  s.add_runtime_dependency "uniform_notifier", "~> 1.10.0"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/bullet/active_record3.rb

@@ -23,6 +23,24 @@ module Bullet
         end
       end
 
+      ::ActiveRecord::Persistence.class_eval do
+        alias_method :origin_save, :save
+        def save(*args, &proc)
+          was_new_record = new_record?
+          origin_save(*args, &proc).tap do |result|
+            Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
+          end
+        end
+
+        alias_method :origin_save!, :save!
+        def save!(*args, &proc)
+          was_new_record = new_record?
+          origin_save!(*args, &proc).tap do |result|
+            Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
+          end
+        end
+      end
+
       ::ActiveRecord::AssociationPreload::ClassMethods.class_eval do
         alias_method :origin_preload_associations, :preload_associations
         # include query for one to many associations.
@@ -116,20 +134,32 @@ module Bullet
           origin_last(*args)
         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::HasManyAssociation.class_eval do
         alias_method :origin_empty?, :empty?
         def empty?
-          if Bullet.start?
+          if Bullet.start? && !has_cached_counter?
             Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
           end
           origin_empty?
         end
+      end
 
-        alias_method :origin_include?, :include?
-        def include?(object)
+      ::ActiveRecord::Associations::HasAndBelongsToManyAssociation.class_eval do
+        alias_method :origin_empty?, :empty?
+        def empty?
           if Bullet.start?
             Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
           end
-          origin_include?(object)
+          origin_empty?
         end
       end
 

data/lib/bullet/active_record3x.rb

@@ -21,6 +21,24 @@ module Bullet
         end
       end
 
+      ::ActiveRecord::Persistence.class_eval do
+        alias_method :origin_save, :save
+        def save(*args, &proc)
+          was_new_record = new_record?
+          origin_save(*args, &proc).tap do |result|
+            Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
+          end
+        end
+
+        alias_method :origin_save!, :save!
+        def save!(*args, &proc)
+          was_new_record = new_record?
+          origin_save!(*args, &proc).tap do |result|
+            Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
+          end
+        end
+      end
+
       ::ActiveRecord::Associations::Preloader.class_eval do
         # include query for one to many associations.
         # keep this eager loadings.
@@ -98,20 +116,32 @@ module Bullet
           origin_load_target
         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::HasManyAssociation.class_eval do
         alias_method :origin_empty?, :empty?
         def empty?
-          if Bullet.start?
+          if Bullet.start? && !has_cached_counter?(@reflection)
             Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
           end
           origin_empty?
         end
+      end
 
-        alias_method :origin_include?, :include?
-        def include?(object)
+      ::ActiveRecord::Associations::HasAndBelongsToManyAssociation.class_eval do
+        alias_method :origin_empty?, :empty?
+        def empty?
           if Bullet.start?
             Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
           end
-          origin_include?(object)
+          origin_empty?
         end
       end
 

data/lib/bullet/active_record4.rb

@@ -29,6 +29,14 @@ module Bullet
           end
         end
         alias_method_chain :save, :bullet
+
+        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
@@ -108,20 +116,32 @@ module Bullet
           origin_load_target
         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::HasManyAssociation.class_eval do
         alias_method :origin_empty?, :empty?
         def empty?
-          if Bullet.start?
+          if Bullet.start? && !has_cached_counter?(@reflection)
             Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
           end
           origin_empty?
         end
+      end
 
-        alias_method :origin_include?, :include?
-        def include?(object)
+      ::ActiveRecord::Associations::HasAndBelongsToManyAssociation.class_eval do
+        alias_method :origin_empty?, :empty?
+        def empty?
           if Bullet.start?
             Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
           end
-          origin_include?(object)
+          origin_empty?
         end
       end
 

data/lib/bullet/active_record41.rb

@@ -31,6 +31,14 @@ module Bullet
           end
         end
         alias_method_chain :save, :bullet
+
+        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
@@ -113,7 +121,7 @@ module Bullet
 
         alias_method :origin_empty?, :empty?
         def empty?
-          if Bullet.start?
+          if Bullet.start? && !has_cached_counter?(@reflection)
             Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
           end
           origin_empty?

data/lib/bullet/active_record42.rb

@@ -29,6 +29,14 @@ module Bullet
           end
         end
         alias_method_chain :save, :bullet
+
+        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
@@ -127,7 +135,9 @@ module Bullet
           records = origin_load_target
 
           if Bullet.start?
-            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless @inversed
+            if records.size > 1
+              Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless @inversed
+            end
             if records.first.class.name !~ /^HABTM_/
               if records.size > 1
                 Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
@@ -143,7 +153,7 @@ module Bullet
 
         alias_method :origin_empty?, :empty?
         def empty?
-          if Bullet.start?
+          if Bullet.start? && !has_cached_counter?(@reflection)
             Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
           end
           origin_empty?
@@ -183,7 +193,7 @@ module Bullet
           Thread.current[:bullet_collection_empty] = true
           result = origin_many_empty?
           Thread.current[:bullet_collection_empty] = nil
-          if Bullet.start?
+          if Bullet.start? && !has_cached_counter?(@reflection)
             Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
           end
           result

data/lib/bullet/active_record5.rb

@@ -1,4 +1,20 @@
 module Bullet
+  module SaveWithBulletSupport
+    def save(*args)
+      was_new_record = new_record?
+      super(*args).tap do |result|
+        Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
+      end
+    end
+
+    def save!(*args)
+      was_new_record = new_record?
+      super(*args).tap do |result|
+        Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
+      end
+    end
+  end
+
   module ActiveRecord
     def self.enable
       require 'active_record'
@@ -21,15 +37,7 @@ 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::Base.prepend(SaveWithBulletSupport)
 
       ::ActiveRecord::Relation.class_eval do
         alias_method :origin_to_a, :to_a
@@ -135,7 +143,9 @@ module Bullet
           records = origin_load_target
 
           if Bullet.start?
-            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless @inversed
+            if records.size > 1
+              Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless @inversed
+            end
             if records.first.class.name !~ /^HABTM_/
               if records.size > 1
                 Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
@@ -151,7 +161,7 @@ module Bullet
 
         alias_method :origin_empty?, :empty?
         def empty?
-          if Bullet.start?
+          if Bullet.start? && !@reflection.has_cached_counter?
             Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
           end
           origin_empty?
@@ -191,7 +201,7 @@ module Bullet
           Thread.current[:bullet_collection_empty] = true
           result = origin_many_empty?
           Thread.current[:bullet_collection_empty] = nil
-          if Bullet.start?
+          if Bullet.start? && !@reflection.has_cached_counter?
             Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
           end
           result

data/lib/bullet/detector/unused_eager_loading.rb

@@ -27,27 +27,25 @@ module Bullet
           Bullet.debug("Detector::UnusedEagerLoading#add_eager_loadings", "objects: #{objects.map(&:bullet_key).join(', ')}, associations: #{associations}")
           bullet_keys = objects.map(&:bullet_key)
 
-          to_add = nil
-          to_merge, to_delete = [], []
+          to_add, to_merge, to_delete = [], [], []
           eager_loadings.each do |k, v|
             key_objects_overlap = k & bullet_keys
 
             next if key_objects_overlap.empty?
 
+            bullet_keys = bullet_keys - k
             if key_objects_overlap == k
-              to_add = [k, associations]
-              break
+              to_add << [k, associations]
             else
               to_merge << [key_objects_overlap, ( eager_loadings[k].dup  << associations )]
 
-              keys_without_objects = k - bullet_keys
+              keys_without_objects = k - key_objects_overlap
               to_merge << [keys_without_objects, eager_loadings[k]]
               to_delete << k
-              bullet_keys = bullet_keys - k
             end
           end
 
-          eager_loadings.add(*to_add) if to_add
+          to_add.each { |k, val| eager_loadings.add k, val }
           to_merge.each { |k, val| eager_loadings.merge k, val }
           to_delete.each { |k| eager_loadings.delete k }
 

data/lib/bullet/notification/base.rb

@@ -57,11 +57,11 @@ module Bullet
       end
 
       def eql?(other)
-        klazz_associations_str == other.klazz_associations_str
+        self.class == other.class && klazz_associations_str == other.klazz_associations_str
       end
 
       def hash
-        klazz_associations_str.hash
+        [self.class, klazz_associations_str].hash
       end
 
       protected

data/lib/bullet/rack.rb

@@ -67,7 +67,7 @@ module Bullet
     end
 
     def response_body(response)
-      if rails?
+      if response.respond_to?(:body)
         Array === response.body ? response.body.first : response.body
       else
         response.first

data/lib/bullet/version.rb

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

data/lib/bullet.rb

@@ -82,8 +82,8 @@ module Bullet
 
     def add_whitelist(options)
       reset_whitelist
-      @whitelist[options[:type]][options[:class_name].classify] ||= []
-      @whitelist[options[:type]][options[:class_name].classify] << options[:association].to_sym
+      @whitelist[options[:type]][options[:class_name]] ||= []
+      @whitelist[options[:type]][options[:class_name]] << options[:association].to_sym
     end
 
     def get_whitelist_associations(type, class_name)
@@ -190,17 +190,22 @@ module Bullet
     end
 
     def profile
+      return_value = nil
       if Bullet.enable?
         begin
           Bullet.start_request
 
-          yield
+          return_value = yield
 
           Bullet.perform_out_of_channel_notifications if Bullet.notification?
         ensure
           Bullet.end_request
         end
+      else
+        return_value = yield
       end
+
+      return_value
     end
 
     private

data/spec/bullet/detector/unused_eager_loading_spec.rb

@@ -5,7 +5,8 @@ module Bullet
     describe UnusedEagerLoading do
       before(:all) do
         @post = Post.first
-        @post2 = Post.last
+        @post2 = Post.all[1]
+        @post3 = Post.last
       end
 
       context ".call_associations" do
@@ -72,7 +73,18 @@ module Bullet
           UnusedEagerLoading.add_eager_loadings([@post, @post2], :association2)
           expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post.bullet_key], :association1)
           expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post.bullet_key], :association2)
-          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post.bullet_key, @post2.bullet_key], :association2)
+          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post2.bullet_key], :association2)
+        end
+
+        it "should vmerge objects recursively, associations pair for existing eager_loadings" do
+          UnusedEagerLoading.add_eager_loadings([@post, @post2], :association1)
+          UnusedEagerLoading.add_eager_loadings([@post, @post3], :association1)
+          UnusedEagerLoading.add_eager_loadings([@post, @post3], :association2)
+          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post.bullet_key], :association1)
+          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post.bullet_key], :association2)
+          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post2.bullet_key], :association1)
+          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post3.bullet_key], :association1)
+          expect(UnusedEagerLoading.send(:eager_loadings)).to be_include([@post3.bullet_key], :association2)
         end
 
         it "should delete objects, associations pair for existing eager_loadings" do

data/spec/bullet/rack_spec.rb

@@ -93,5 +93,36 @@ module Bullet
         end
       end
     end
+
+    describe "#response_body" do
+      let(:response) { double }
+      let(:body_string) { "<html><body>My Body</body></html>" }
+
+      context "when `response` responds to `body`" do
+        before { allow(response).to receive(:body).and_return(body) }
+
+        context "when `body` returns an Array" do
+          let(:body) { [body_string, 'random string'] }
+          it "should return the plain body string" do
+            expect(middleware.response_body(response)).to eq body_string
+          end
+        end
+
+        context "when `body` does not return an Array" do
+          let(:body) { body_string }
+          it "should return the plain body string" do
+            expect(middleware.response_body(response)).to eq body_string
+          end
+        end
+      end
+
+      context "when `response` does not respond to `body`" do
+        before { allow(response).to receive(:first).and_return(body_string) }
+
+        it "should return the plain body string" do
+          expect(middleware.response_body(response)).to eq body_string
+        end
+      end
+    end
   end
 end

data/spec/bullet_spec.rb

@@ -85,4 +85,13 @@ describe Bullet, focused: true do
       end
     end
   end
+
+  describe '#add_whitelist' do
+    context "for 'special' class names" do
+      it 'is added to the whitelist successfully' do
+        Bullet.add_whitelist(:type => :n_plus_one_query, :class_name => 'Klass', :association => :department)
+        expect(Bullet.get_whitelist_associations(:n_plus_one_query, 'Klass')).to include :department
+      end
+    end
+  end
 end

data/spec/integration/active_record3/association_spec.rb

@@ -72,6 +72,16 @@ if !mongoid? && active_record3?
 
         expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
       end
+
+      it "should not detect unused preload person => pets with empty?" do
+        Person.all.each do |person|
+          person.pets.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_completely_preloading_associations
+      end
     end
 
     context "category => posts => comments" do
@@ -204,7 +214,7 @@ if !mongoid? && active_record3?
     context "post => comment" do
       it "should detect unused preload with post => comments" do
         Post.includes(:comments).each do |post|
-          post.comments.first.name
+          post.comments.first.name if post.comments.first
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_unused_preload_associations_for(Post, :comments)
@@ -443,6 +453,16 @@ if !mongoid? && active_record3?
 
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
+
+      it "should detect non preload student => teachers with empty?" do
+        Student.all.each do |student|
+          student.teachers.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(Student, :teachers)
+      end
     end
   end
 
@@ -537,6 +557,50 @@ if !mongoid? && active_record3?
     end
   end
 
+  describe Bullet::Detector::Association, "query immediately after creation" do
+    context "with save" 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
+
+    context "with save!" 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
+  end
+
   describe Bullet::Detector::Association, "STI" do
     context "page => author" do
       it "should detect non preload associations" do

data/spec/integration/active_record4/association_spec.rb

@@ -72,6 +72,16 @@ if !mongoid? && active_record4?
 
         expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
       end
+
+      it "should not detect unused preload person => pets with empty?" do
+        Person.all.each do |person|
+          person.pets.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_completely_preloading_associations
+      end
     end
 
     context "category => posts => comments" do
@@ -204,7 +214,7 @@ if !mongoid? && active_record4?
     context "post => comment" do
       it "should detect unused preload with post => comments" do
         Post.includes(:comments).each do |post|
-          post.comments.first.name
+          post.comments.first.name if post.comments.first
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_unused_preload_associations_for(Post, :comments)
@@ -455,6 +465,16 @@ if !mongoid? && active_record4?
 
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
+
+      it "should detect non preload student => teachers with empty?" do
+        Student.all.each do |student|
+          student.teachers.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(Student, :teachers)
+      end
     end
   end
 
@@ -561,22 +581,45 @@ if !mongoid? && active_record4?
   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
+    context "with save" 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
+          document2 = Document.new(parent: document1)
+          document2.save
+          document2.parent
 
-        document1.children.each.first
+          document1.children.each.first
 
-        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+          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
+          expect(Bullet::Detector::Association).to be_completely_preloading_associations
+        end
+      end
+    end
+
+    context "with save!" 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
   end

data/spec/integration/active_record5/association_spec.rb

@@ -72,6 +72,16 @@ if !mongoid? && active_record5?
 
         expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
       end
+
+      it "should not detect unused preload person => pets with empty?" do
+        Person.all.each do |person|
+          person.pets.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_completely_preloading_associations
+      end
     end
 
     context "category => posts => comments" do
@@ -204,7 +214,7 @@ if !mongoid? && active_record5?
     context "post => comment" do
       it "should detect unused preload with post => comments" do
         Post.includes(:comments).each do |post|
-          post.comments.first.name
+          post.comments.first.name if post.comments.first
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_unused_preload_associations_for(Post, :comments)
@@ -455,6 +465,16 @@ if !mongoid? && active_record5?
 
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
+
+      it "should detect non preload student => teachers with empty?" do
+        Student.all.each do |student|
+          student.teachers.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(Student, :teachers)
+      end
     end
   end
 
@@ -561,22 +581,45 @@ if !mongoid? && active_record5?
   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
+    context "with save" 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
+          document2 = Document.new(parent: document1)
+          document2.save
+          document2.parent
 
-        document1.children.each.first
+          document1.children.each.first
 
-        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+          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
+          expect(Bullet::Detector::Association).to be_completely_preloading_associations
+        end
+      end
+    end
+
+    context "with save!" 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
   end

data/spec/support/sqlite_seed.rb

@@ -16,6 +16,7 @@ module Support
       post1 = category1.posts.create(:name => 'first', :writer => writer1)
       post1a = category1.posts.create(:name => 'like first', :writer => writer2, active: false)
       post2 = category2.posts.create(:name => 'second', :writer => writer2)
+      post3 = category2.posts.create(:name => 'third', :writer => writer2)
 
       comment1 = post1.comments.create(:name => 'first', :author => writer1)
       comment2 = post1.comments.create(:name => 'first2', :author => writer1)

data/test.sh

@@ -1,5 +1,6 @@
 #bundle update rails && bundle exec rspec spec
 #BUNDLE_GEMFILE=Gemfile.mongoid bundle update mongoid && BUNDLE_GEMFILE=Gemfile.mongoid bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-5.0 bundle && BUNDLE_GEMFILE=Gemfile.rails-5.0 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-4.2 bundle && BUNDLE_GEMFILE=Gemfile.rails-4.2 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-4.1 bundle && BUNDLE_GEMFILE=Gemfile.rails-4.1 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-4.0 bundle && BUNDLE_GEMFILE=Gemfile.rails-4.0 bundle exec rspec spec

data/update.sh

@@ -1,3 +1,4 @@
+BUNDLE_GEMFILE=Gemfile.rails-5.0 bundle update
 BUNDLE_GEMFILE=Gemfile.rails-4.2 bundle update
 BUNDLE_GEMFILE=Gemfile.rails-4.1 bundle update
 BUNDLE_GEMFILE=Gemfile.rails-4.0 bundle update

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
 description: help to kill N+1 queries and unused eager loading.
 email:
 - flyerhzm@gmail.com