bullet 5.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f726582290756f07599b35204f8e903fd20350b3
-  data.tar.gz: 2e4a9e95087d246cb69e887eef07868c2d9e0a63
+  metadata.gz: 0158f6af4990b365de2859cea97877e5b290ea83
+  data.tar.gz: cd8914938d74645ae75d01ee8feaf23e38f8d028
 SHA512:
-  metadata.gz: 66c4b18f8c522a2cfa310bd8b818b177a12507c99255860881d225bac39722f35bfea65d7ea14287496f7fcf4d52d618e77ba712ebb28b2dad7a7a08909f56a8
-  data.tar.gz: f68a5397786c67ae3aefe57ce3030133f4c0f54a253add872dc54ba83ab00c33439325b6f0ee3500a0534bddca951e95b5929a8dfc0c74d8bf5c818b204992ad
+  metadata.gz: 9e92c13202832afaaf604072c06e695cfe552d5626318d6c625cebacdfdc13ecc14aeed8c64d6df483b4c05caa090ecee01e613228dae6466edbe66803e7333a
+  data.tar.gz: 7d365b32c075a00733e4c70daedcfbca042cb2334a77c6e132fc31b33e9dd23aaca8a65eaa1578ffba2f106303cf572e84e41b7fd6c7c61a239b2dbea9fcaabe

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Next Release
 
-## 5.1.0 (05/21/2015)
+## 5.1.1
+
+* Fix `has_cached_counter?` is not defined in HABTM #297
+* Fix false alert if preloaded association has no records #260
+
+## 5.1.0 (05/21/2016)
 
 * Fix false alert when `empty?` used with `counter_cache`
 * Fix `alias_method_chain` deprecation for rails 5
@@ -8,7 +13,7 @@
 * Fix false alert when querying immediately after creation
 * Fix UnusedEagerLoading bug when multiple eager loading query include same objects
 
-## 5.0.0 (01/06/2015)
+## 5.0.0 (01/06/2016)
 
 * Support Rails 5.0.0.beta1
 * Fix `has_many :through` infinite loop issue

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/lib/bullet.rb

@@ -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/lib/bullet/active_record3.rb

@@ -134,6 +134,16 @@ 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? && !has_cached_counter?
@@ -141,13 +151,15 @@ module Bullet
           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

@@ -116,6 +116,16 @@ 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? && !has_cached_counter?(@reflection)
@@ -123,13 +133,15 @@ module Bullet
           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

@@ -116,6 +116,16 @@ 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? && !has_cached_counter?(@reflection)
@@ -123,13 +133,15 @@ module Bullet
           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_record42.rb

@@ -135,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)

data/lib/bullet/active_record5.rb

@@ -143,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)

data/lib/bullet/version.rb

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

data/spec/integration/active_record3/association_spec.rb

@@ -214,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)
@@ -453,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
 

data/spec/integration/active_record4/association_spec.rb

@@ -214,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)
@@ -465,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
 

data/spec/integration/active_record5/association_spec.rb

@@ -214,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)
@@ -465,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
 

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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.1.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-22 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport