bullet 5.1.0 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f726582290756f07599b35204f8e903fd20350b3
-  data.tar.gz: 2e4a9e95087d246cb69e887eef07868c2d9e0a63
+  metadata.gz: 58f4f616944a1bfde9a34e4670788802f0ccd418
+  data.tar.gz: 61aabed03705063018b28e1505f0f0b693e1109b
 SHA512:
-  metadata.gz: 66c4b18f8c522a2cfa310bd8b818b177a12507c99255860881d225bac39722f35bfea65d7ea14287496f7fcf4d52d618e77ba712ebb28b2dad7a7a08909f56a8
-  data.tar.gz: f68a5397786c67ae3aefe57ce3030133f4c0f54a253add872dc54ba83ab00c33439325b6f0ee3500a0534bddca951e95b5929a8dfc0c74d8bf5c818b204992ad
+  metadata.gz: 4be86c6d80b67bec48ee84d491b3b92cd19f9b9ea6d6d9d7d973848f93801edf0165f9a7f8f9309d7feee84ed2da1d6f39170161da2d0b01fe8debf7724d6dc9
+  data.tar.gz: b82c8e8207775a8e987e52fbbddb6d35350c591df288e1152ee2d55e8de9f257ca55f82bcac02c59807b3cffa76038c0373fc09ba42c36a45be059fc05fed7e8

data/.travis.yml

@@ -5,7 +5,7 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
-  - 2.2.3
+  - 2.3.0
 gemfile:
   - Gemfile.rails-5.0
   - Gemfile.rails-4.2
@@ -63,14 +63,14 @@ matrix:
       gemfile: Gemfile.rails-3.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
       gemfile: Gemfile.rails-3.1
     - rvm: 2.2
       gemfile: Gemfile.rails-3.2
+    - rvm: 2.2
+      gemfile: Gemfile.rails-5.0
     - rvm: 2.2
       gemfile: Gemfile.mongoid-3.1
     - rvm: 2.2
@@ -85,23 +85,23 @@ matrix:
       gemfile: Gemfile.mongoid-2.5
     - rvm: 2.2
       gemfile: Gemfile.mongoid-2.4
-    - rvm: 2.2.3
+    - rvm: 2.3.0
       gemfile: Gemfile.rails-3.0
-    - rvm: 2.2.3
+    - rvm: 2.3.0
       gemfile: Gemfile.rails-3.1
-    - rvm: 2.2.3
+    - rvm: 2.3.0
       gemfile: Gemfile.rails-3.2
-    - rvm: 2.2.3
+    - rvm: 2.3.0
       gemfile: Gemfile.mongoid-3.1
-    - rvm: 2.2.3
+    - rvm: 2.3.0
       gemfile: Gemfile.mongoid-3.0
-    - rvm: 2.2.3
+    - rvm: 2.3.0
       gemfile: Gemfile.mongoid-2.8
-    - rvm: 2.2.3
+    - rvm: 2.3.0
       gemfile: Gemfile.mongoid-2.7
-    - rvm: 2.2.3
+    - rvm: 2.3.0
       gemfile: Gemfile.mongoid-2.6
-    - rvm: 2.2.3
+    - rvm: 2.3.0
       gemfile: Gemfile.mongoid-2.5
-    - rvm: 2.2.3
+    - rvm: 2.3.0
       gemfile: Gemfile.mongoid-2.4

data/CHANGELOG.md

@@ -1,6 +1,24 @@
 # Next Release
 
-## 5.1.0 (05/21/2015)
+## 5.4.0 (10/09/2016)
+
+* Support rails 5.1
+* Extract stack trace filtering into module
+
+## 5.3.0 (15/08/2016)
+
+* Fix false alert on through association with join sql #301
+* Fix association.target in `through_association` can be singular #302
+* Support `find_by_sql` #303
+* Fix env `REQUEST_URI`
+
+## 5.2.0 (07/26/2016)
+
+* Fix `has_cached_counter?` is not defined in HABTM #297
+* Fix false alert if preloaded association has no records #260
+* Support Rails 5.0.0
+
+## 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 +26,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/Gemfile.mongoid-2.4

@@ -9,8 +9,6 @@ gem 'mongoid', '~> 2.4.0'
 
 gem "rspec"
 
-gem 'coveralls', require: false
-
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'rubinius-developer_tools'

data/Gemfile.mongoid-2.5

@@ -9,8 +9,6 @@ gem 'mongoid', '~> 2.5.0'
 
 gem "rspec"
 
-gem 'coveralls', require: false
-
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'rubinius-developer_tools'

data/Gemfile.mongoid-2.6

@@ -9,8 +9,6 @@ gem 'mongoid', '~> 2.6.0'
 
 gem "rspec"
 
-gem 'coveralls', require: false
-
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'rubinius-developer_tools'

data/Gemfile.mongoid-2.7

@@ -9,8 +9,6 @@ gem 'mongoid', '~> 2.7.0'
 
 gem "rspec"
 
-gem 'coveralls', require: false
-
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'rubinius-developer_tools'

data/Gemfile.mongoid-2.8

@@ -9,8 +9,6 @@ gem 'mongoid', '~> 2.8.0'
 
 gem "rspec"
 
-gem 'coveralls', require: false
-
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'rubinius-developer_tools'

data/Gemfile.mongoid-3.0

@@ -9,8 +9,6 @@ gem 'mongoid', '~> 3.0.0'
 
 gem "rspec"
 
-gem 'coveralls', require: false
-
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'rubinius-developer_tools'

data/Gemfile.mongoid-3.1

@@ -9,8 +9,6 @@ gem 'mongoid', '~> 3.1.0'
 
 gem "rspec"
 
-gem 'coveralls', require: false
-
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'rubinius-developer_tools'

data/Gemfile.mongoid-4.0

@@ -9,8 +9,6 @@ gem 'mongoid', '~> 4.0.0'
 
 gem "rspec"
 
-gem 'coveralls', require: false
-
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'rubinius-developer_tools'

data/Gemfile.mongoid-5.0

@@ -9,8 +9,6 @@ gem 'mongoid', '~> 5.0.0'
 
 gem "rspec"
 
-gem 'coveralls', require: false
-
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'rubinius-developer_tools'

data/Gemfile.rails-3.0

@@ -10,8 +10,6 @@ gem 'tins', '~> 1.6.0', platforms: [:ruby_19]
 
 gem "rspec"
 
-gem 'coveralls', require: false
-
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'rubinius-developer_tools'

data/Gemfile.rails-3.1

@@ -10,8 +10,6 @@ gem 'tins', '~> 1.6.0', platforms: [:ruby_19]
 
 gem "rspec"
 
-gem 'coveralls', require: false
-
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'rubinius-developer_tools'

data/Gemfile.rails-3.2

@@ -10,8 +10,6 @@ gem 'tins', '~> 1.6.0', platforms: [:ruby_19]
 
 gem "rspec"
 
-gem 'coveralls', require: false
-
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'rubinius-developer_tools'

data/Gemfile.rails-4.0

@@ -10,8 +10,6 @@ gem 'tins', '~> 1.6.0', platforms: [:ruby_19]
 
 gem "rspec"
 
-gem 'coveralls', require: false
-
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'rubinius-developer_tools'

data/Gemfile.rails-4.1

@@ -10,8 +10,6 @@ gem 'tins', '~> 1.6.0', platforms: [:ruby_19]
 
 gem "rspec"
 
-gem 'coveralls', require: false
-
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'rubinius-developer_tools'

data/Gemfile.rails-4.2

@@ -10,8 +10,6 @@ gem 'tins', '~> 1.6.0', platforms: [:ruby_19]
 
 gem "rspec"
 
-gem 'coveralls', require: false
-
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'rubinius-developer_tools'

data/Gemfile.rails-5.0

@@ -2,15 +2,13 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '5.0.0.beta1'
+gem 'rails', '5.0.0'
 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'

data/README.md

@@ -2,7 +2,6 @@
 
 [![Gem Version](https://badge.fury.io/rb/bullet.png)](http://badge.fury.io/rb/bullet)
 [![Build Status](https://secure.travis-ci.org/flyerhzm/bullet.png)](http://travis-ci.org/flyerhzm/bullet)
-[![Coverage Status](https://coveralls.io/repos/flyerhzm/bullet/badge.png?branch=master)](https://coveralls.io/r/flyerhzm/bullet)
 <a href="https://codeclimate.com/github/flyerhzm/bullet"><img src="https://codeclimate.com/github/flyerhzm/bullet.png" /></a>
 [![Coderwall Endorse](http://api.coderwall.com/flyerhzm/endorsecount.png)](http://coderwall.com/flyerhzm)
 
@@ -63,7 +62,7 @@ config.after_initialize do
   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' }
+  Bullet.slack = { webhook_url: 'http://some.slack.url', channel: '#default', username: 'notifier' }
 end
 ```
 
@@ -238,7 +237,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 +459,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/active_record3.rb

@@ -4,6 +4,25 @@ module Bullet
 
     def self.enable
       require 'active_record'
+      ::ActiveRecord::Base.class_eval do
+        class <<self
+          alias_method :origin_find_by_sql, :find_by_sql
+          def find_by_sql(sql)
+            result = origin_find_by_sql(sql)
+            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::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.
@@ -134,6 +153,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 +170,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

@@ -2,6 +2,25 @@ module Bullet
   module ActiveRecord
     def self.enable
       require 'active_record'
+      ::ActiveRecord::Base.class_eval do
+        class <<self
+          alias_method :origin_find_by_sql, :find_by_sql
+          def find_by_sql(sql, binds = [])
+            result = origin_find_by_sql(sql, binds)
+            if Bullet.start?
+              if result.is_a? Array
+                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::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.
@@ -116,6 +135,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 +152,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

@@ -2,6 +2,25 @@ module Bullet
   module ActiveRecord
     def self.enable
       require 'active_record'
+      ::ActiveRecord::Base.class_eval do
+        class <<self
+          alias_method :origin_find_by_sql, :find_by_sql
+          def find_by_sql(sql, binds = [])
+            result = origin_find_by_sql(sql, binds)
+            if Bullet.start?
+              if result.is_a? Array
+                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::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.
@@ -116,6 +135,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 +152,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_record41.rb

@@ -2,6 +2,25 @@ module Bullet
   module ActiveRecord
     def self.enable
       require 'active_record'
+      ::ActiveRecord::Base.class_eval do
+        class <<self
+          alias_method :origin_find_by_sql, :find_by_sql
+          def find_by_sql(sql, binds = [])
+            result = origin_find_by_sql(sql, binds)
+            if Bullet.start?
+              if result.is_a? Array
+                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::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.

data/lib/bullet/active_record42.rb

@@ -18,6 +18,21 @@ module Bullet
             end
             result
           end
+
+          alias_method :origin_find_by_sql, :find_by_sql
+          def find_by_sql(sql, binds = [])
+            result = origin_find_by_sql(sql, binds)
+            if Bullet.start?
+              if result.is_a? Array
+                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
 
@@ -96,6 +111,7 @@ module Bullet
 
       ::ActiveRecord::Associations::JoinDependency.class_eval do
         alias_method :origin_instantiate, :instantiate
+        alias_method :origin_construct, :construct
         alias_method :origin_construct_model, :construct_model
 
         def instantiate(result_set, aliases)
@@ -111,6 +127,27 @@ module Bullet
           records
         end
 
+        def construct(ar_parent, parent, row, rs, seen, model_cache, aliases)
+          if Bullet.start?
+            unless ar_parent.nil?
+              parent.children.each do |node|
+                key = aliases.column_alias(node, node.primary_key)
+                id = row[key]
+                if id.nil?
+                  associations = node.reflection.name
+                  Bullet::Detector::Association.add_object_associations(ar_parent, associations)
+                  Bullet::Detector::NPlusOneQuery.call_association(ar_parent, associations)
+                  @bullet_eager_loadings[ar_parent.class] ||= {}
+                  @bullet_eager_loadings[ar_parent.class][ar_parent] ||= Set.new
+                  @bullet_eager_loadings[ar_parent.class][ar_parent] << associations
+                end
+              end
+            end
+          end
+
+          origin_construct(ar_parent, parent, row, rs, seen, model_cache, aliases)
+        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)