bullet 5.1.1 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0158f6af4990b365de2859cea97877e5b290ea83
-  data.tar.gz: cd8914938d74645ae75d01ee8feaf23e38f8d028
+  metadata.gz: dbcef4cb1e9b0db722674cc600a456767eb5d2dd
+  data.tar.gz: 27107041da317defb0433329dc55375b305cc7b8
 SHA512:
-  metadata.gz: 9e92c13202832afaaf604072c06e695cfe552d5626318d6c625cebacdfdc13ecc14aeed8c64d6df483b4c05caa090ecee01e613228dae6466edbe66803e7333a
-  data.tar.gz: 7d365b32c075a00733e4c70daedcfbca042cb2334a77c6e132fc31b33e9dd23aaca8a65eaa1578ffba2f106303cf572e84e41b7fd6c7c61a239b2dbea9fcaabe
+  metadata.gz: ea8208a3a4f1a1ef3f4f247667f9485b951a00ba5036cc87b8049005813e8f7452a5d340c1fdb09ea525fd5996b0050587a758afc8ff2a421f93acb21424f605
+  data.tar.gz: 456466364914301c30c4622bba947888bd16d92dad0603759c8b1108c4bc11ed417a8fca5a8ee2c983f119fa16e587cc140498393d2ec31f1a79c410082f1874

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,9 +1,10 @@
 # Next Release
 
-## 5.1.1
+## 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)
 

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
 ```
 

data/lib/bullet/active_record5.rb

@@ -40,38 +40,30 @@ module Bullet
       ::ActiveRecord::Base.prepend(SaveWithBulletSupport)
 
       ::ActiveRecord::Relation.class_eval do
-        alias_method :origin_to_a, :to_a
+        alias_method :origin_records, :records
         # 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
+        def records
+          result = origin_records
           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)
+            if result.first.class.name !~ /^HABTM_/
+              if result.size > 1
+                Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
+                Bullet::Detector::CounterCache.add_possible_objects(result)
+              elsif result.size == 1
+                Bullet::Detector::NPlusOneQuery.add_impossible_object(result.first)
+                Bullet::Detector::CounterCache.add_impossible_object(result.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
+          result
         end
       end
 
       ::ActiveRecord::Associations::Preloader.class_eval do
-        alias_method :origin_preloaders_on, :preloaders_on
+        alias_method :origin_preloaders_for_one, :preloaders_for_one
 
-        def preloaders_on(association, records, scope)
+        def preloaders_for_one(association, records, scope)
           if Bullet.start?
             records.compact!
             if records.first.class.name !~ /^HABTM_/
@@ -81,7 +73,7 @@ module Bullet
               Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, association)
             end
           end
-          origin_preloaders_on(association, records, scope)
+          origin_preloaders_for_one(association, records, scope)
         end
       end
 
@@ -144,7 +136,14 @@ module Bullet
 
           if Bullet.start?
             if records.size > 1
-              Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless @inversed
+              if self.is_a? ::ActiveRecord::Associations::ThroughAssociation
+                Bullet::Detector::NPlusOneQuery.call_association(owner, through_reflection.name)
+                association = self.owner.association self.through_reflection.name
+                association.target.each do |through_record|
+                  Bullet::Detector::NPlusOneQuery.call_association(through_record, source_reflection.name)
+                end
+              end
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name) unless @inversed
             end
             if records.first.class.name !~ /^HABTM_/
               if records.size > 1
@@ -161,8 +160,8 @@ module Bullet
 
         alias_method :origin_empty?, :empty?
         def empty?
-          if Bullet.start? && !@reflection.has_cached_counter?
-            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          if Bullet.start? && !reflection.has_cached_counter?
+            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
           end
           origin_empty?
         end
@@ -170,7 +169,7 @@ module Bullet
         alias_method :origin_include?, :include?
         def include?(object)
           if Bullet.start?
-            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
           end
           origin_include?(object)
         end
@@ -182,9 +181,9 @@ module Bullet
         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)
+            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
@@ -198,28 +197,20 @@ module Bullet
       ::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? && !@reflection.has_cached_counter?
-            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          if Bullet.start? && !reflection.has_cached_counter?
+            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)
+        alias_method :origin_count_records, :count_records
+        def count_records
+          result = reflection.has_cached_counter?
+          if Bullet.start? && !result && !self.is_a?(::ActiveRecord::Associations::ThroughAssociation)
+            Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name)
           end
-          result
+          origin_count_records
         end
       end
     end

data/lib/bullet/version.rb

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

data/spec/spec_helper.rb

@@ -30,9 +30,6 @@ $LOAD_PATH.unshift(MODELS)
 SUPPORT = File.join(File.dirname(__FILE__), "support")
 Dir[ File.join(SUPPORT, "*.rb") ].reject { |filename| filename =~ /_seed.rb$/ }.sort.each { |file| require file }
 
-require 'coveralls'
-Coveralls.wear!
-
 RSpec.configure do |config|
   config.extend Bullet::Dependency
 

metadata

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