bullet 5.4.3 → 5.5.0

data/lib/bullet/version.rb

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

data/spec/bullet/notification/n_plus_one_query_spec.rb

@@ -5,10 +5,10 @@ module Bullet
     describe NPlusOneQuery do
       subject { NPlusOneQuery.new([["caller1", "caller2"]], Post, [:comments, :votes], "path") }
 
-      it { expect(subject.body_with_caller).to eq("  Post => [:comments, :votes]\n  Add to your finder: :includes => [:comments, :votes]\nN+1 Query method call stack\n  caller1\n  caller2\n") }
-      it { expect([subject.body_with_caller, subject.body_with_caller]).to eq([ "  Post => [:comments, :votes]\n  Add to your finder: :includes => [:comments, :votes]\nN+1 Query method call stack\n  caller1\n  caller2\n", "  Post => [:comments, :votes]\n  Add to your finder: :includes => [:comments, :votes]\nN+1 Query method call stack\n  caller1\n  caller2\n" ]) }
+      it { expect(subject.body_with_caller).to eq("  Post => [:comments, :votes]\n  Add to your finder: :includes => [:comments, :votes]\nCall stack\n  caller1\n  caller2\n") }
+      it { expect([subject.body_with_caller, subject.body_with_caller]).to eq([ "  Post => [:comments, :votes]\n  Add to your finder: :includes => [:comments, :votes]\nCall stack\n  caller1\n  caller2\n", "  Post => [:comments, :votes]\n  Add to your finder: :includes => [:comments, :votes]\nCall stack\n  caller1\n  caller2\n" ]) }
       it { expect(subject.body).to eq("  Post => [:comments, :votes]\n  Add to your finder: :includes => [:comments, :votes]") }
-      it { expect(subject.title).to eq("N+1 Query in path") }
+      it { expect(subject.title).to eq("USE eager loading in path") }
     end
   end
 end

data/spec/bullet/notification/unused_eager_loading_spec.rb

@@ -6,7 +6,7 @@ module Bullet
       subject { UnusedEagerLoading.new([""], Post, [:comments, :votes], "path") }
 
       it { expect(subject.body).to eq("  Post => [:comments, :votes]\n  Remove from your finder: :includes => [:comments, :votes]") }
-      it { expect(subject.title).to eq("Unused Eager Loading in path") }
+      it { expect(subject.title).to eq("AVOID eager loading in path") }
     end
   end
 end

data/spec/integration/counter_cache_spec.rb

@@ -29,6 +29,13 @@ if !mongoid? && active_record?
       expect(Bullet.collected_counter_cache_notifications).to be_empty
     end
 
+    it "should not need counter cache without size" do
+      Country.includes(:cities).each do |country|
+        country.cities.empty?
+      end
+      expect(Bullet.collected_counter_cache_notifications).to be_empty
+    end
+
     if active_record5?
       it "should not need counter cache for has_many through" do
         Client.all.each do |client|

data/test.sh

@@ -4,15 +4,6 @@ BUNDLE_GEMFILE=Gemfile.rails-5.0 bundle && BUNDLE_GEMFILE=Gemfile.rails-5.0 bund
 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
-BUNDLE_GEMFILE=Gemfile.rails-3.2 bundle && BUNDLE_GEMFILE=Gemfile.rails-3.2 bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.rails-3.1 bundle && BUNDLE_GEMFILE=Gemfile.rails-3.1 bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.rails-3.0 bundle && BUNDLE_GEMFILE=Gemfile.rails-3.0 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.mongoid-6.0 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-6.0 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.mongoid-5.0 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-5.0 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.mongoid-4.0 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-4.0 bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.mongoid-3.1 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-3.1 bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.mongoid-3.0 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-3.0 bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.mongoid-2.8 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-2.8 bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.mongoid-2.7 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-2.7 bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.mongoid-2.6 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-2.6 bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.mongoid-2.5 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-2.5 bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.mongoid-2.4 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-2.4 bundle exec rspec spec

data/update.sh

@@ -2,15 +2,6 @@ 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
-BUNDLE_GEMFILE=Gemfile.rails-3.2 bundle update
-BUNDLE_GEMFILE=Gemfile.rails-3.1 bundle update
-BUNDLE_GEMFILE=Gemfile.rails-3.0 bundle update
+BUNDLE_GEMFILE=Gemfile.mongoid-6.0 bundle update
 BUNDLE_GEMFILE=Gemfile.mongoid-5.0 bundle update
 BUNDLE_GEMFILE=Gemfile.mongoid-4.0 bundle update
-BUNDLE_GEMFILE=Gemfile.mongoid-3.1 bundle update
-BUNDLE_GEMFILE=Gemfile.mongoid-3.0 bundle update
-BUNDLE_GEMFILE=Gemfile.mongoid-2.8 bundle update
-BUNDLE_GEMFILE=Gemfile.mongoid-2.7 bundle update
-BUNDLE_GEMFILE=Gemfile.mongoid-2.6 bundle update
-BUNDLE_GEMFILE=Gemfile.mongoid-2.5 bundle update
-BUNDLE_GEMFILE=Gemfile.mongoid-2.4 bundle update

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 5.4.3
+  version: 5.5.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2016-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -51,18 +51,9 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.mongoid
-- Gemfile.mongoid-2.4
-- Gemfile.mongoid-2.5
-- Gemfile.mongoid-2.6
-- Gemfile.mongoid-2.7
-- Gemfile.mongoid-2.8
-- Gemfile.mongoid-3.0
-- Gemfile.mongoid-3.1
 - Gemfile.mongoid-4.0
 - Gemfile.mongoid-5.0
-- Gemfile.rails-3.0
-- Gemfile.rails-3.1
-- Gemfile.rails-3.2
+- Gemfile.mongoid-6.0
 - Gemfile.rails-4.0
 - Gemfile.rails-4.1
 - Gemfile.rails-4.2
@@ -74,8 +65,6 @@ files:
 - Rakefile
 - bullet.gemspec
 - lib/bullet.rb
-- lib/bullet/active_record3.rb
-- lib/bullet/active_record3x.rb
 - lib/bullet/active_record4.rb
 - lib/bullet/active_record41.rb
 - lib/bullet/active_record42.rb
@@ -89,10 +78,9 @@ files:
 - lib/bullet/detector/unused_eager_loading.rb
 - lib/bullet/ext/object.rb
 - lib/bullet/ext/string.rb
-- lib/bullet/mongoid2x.rb
-- lib/bullet/mongoid3x.rb
 - lib/bullet/mongoid4x.rb
 - lib/bullet/mongoid5x.rb
+- lib/bullet/mongoid6x.rb
 - lib/bullet/notification.rb
 - lib/bullet/notification/base.rb
 - lib/bullet/notification/counter_cache.rb
@@ -125,7 +113,6 @@ files:
 - spec/bullet/registry/base_spec.rb
 - spec/bullet/registry/object_spec.rb
 - 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
@@ -212,7 +199,6 @@ test_files:
 - spec/bullet/registry/base_spec.rb
 - spec/bullet/registry/object_spec.rb
 - 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

data/Gemfile.mongoid-2.5

@@ -1,15 +0,0 @@
-source "https://rubygems.org"
-
-gemspec
-
-gem 'rails', '~> 3.2.0'
-gem 'sqlite3', platforms: [:ruby]
-gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mongoid', '~> 2.5.0'
-
-gem "rspec"
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'rubinius-developer_tools'
-end

data/Gemfile.mongoid-2.6

@@ -1,15 +0,0 @@
-source "https://rubygems.org"
-
-gemspec
-
-gem 'rails', '~> 3.2.0'
-gem 'sqlite3', platforms: [:ruby]
-gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mongoid', '~> 2.6.0'
-
-gem "rspec"
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'rubinius-developer_tools'
-end

data/Gemfile.mongoid-2.7

@@ -1,15 +0,0 @@
-source "https://rubygems.org"
-
-gemspec
-
-gem 'rails', '~> 3.2.0'
-gem 'sqlite3', platforms: [:ruby]
-gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mongoid', '~> 2.7.0'
-
-gem "rspec"
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'rubinius-developer_tools'
-end

data/Gemfile.mongoid-2.8

@@ -1,15 +0,0 @@
-source "https://rubygems.org"
-
-gemspec
-
-gem 'rails', '~> 3.2.0'
-gem 'sqlite3', platforms: [:ruby]
-gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mongoid', '~> 2.8.0'
-
-gem "rspec"
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'rubinius-developer_tools'
-end

data/Gemfile.mongoid-3.0

@@ -1,15 +0,0 @@
-source "https://rubygems.org"
-
-gemspec
-
-gem 'rails', '~> 3.2.0'
-gem 'sqlite3', platforms: [:ruby]
-gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mongoid', '~> 3.0.0'
-
-gem "rspec"
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'rubinius-developer_tools'
-end

data/Gemfile.mongoid-3.1

@@ -1,15 +0,0 @@
-source "https://rubygems.org"
-
-gemspec
-
-gem 'rails', '~> 3.2.0'
-gem 'sqlite3', platforms: [:ruby]
-gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mongoid', '~> 3.1.0'
-
-gem "rspec"
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'rubinius-developer_tools'
-end

data/Gemfile.rails-3.0

@@ -1,16 +0,0 @@
-source "https://rubygems.org"
-
-gemspec
-
-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"
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'rubinius-developer_tools'
-end

data/Gemfile.rails-3.1

@@ -1,16 +0,0 @@
-source "https://rubygems.org"
-
-gemspec
-
-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"
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'rubinius-developer_tools'
-end

data/Gemfile.rails-3.2

@@ -1,16 +0,0 @@
-source "https://rubygems.org"
-
-gemspec
-
-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"
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'rubinius-developer_tools'
-end

data/lib/bullet/active_record3.rb

@@ -1,238 +0,0 @@
-module Bullet
-  module ActiveRecord
-    LOAD_TARGET = 'load_target'.freeze
-
-    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
-                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
-              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.
-        # 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.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
-          records
-        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.
-        # keep this eager loadings.
-        def preload_associations(records, associations, preload_options={})
-          if Bullet.start?
-            records = [records].flatten.compact.uniq
-            return if records.empty?
-            records.each do |record|
-              Bullet::Detector::Association.add_object_associations(record, associations)
-            end
-            Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, associations)
-          end
-          origin_preload_associations(records, associations, preload_options={})
-        end
-      end
-
-      ::ActiveRecord::FinderMethods.class_eval do
-        # add includes in scope
-        alias_method :origin_find_with_associations, :find_with_associations
-        def find_with_associations
-          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::ClassMethods::JoinDependency.class_eval do
-        alias_method :origin_instantiate, :instantiate
-        alias_method :origin_construct_association, :construct_association
-
-        def instantiate(rows)
-          @bullet_eager_loadings = {}
-          records = origin_instantiate(rows)
-
-          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_association(record, join, row)
-          result = origin_construct_association(record, join, row)
-
-          if Bullet.start?
-            associations = join.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::AssociationCollection.class_eval do
-        # call one to many associations
-        alias_method :origin_load_target, :load_target
-        def load_target
-          if Bullet.start?
-            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
-          end
-          origin_load_target
-        end
-
-        alias_method :origin_first, :first
-        def first(*args)
-          if Bullet.start?
-            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
-          end
-          origin_first(*args)
-        end
-
-        alias_method :origin_last, :last
-        def last(*args)
-          if Bullet.start?
-            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
-          end
-          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?
-            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
-          end
-          origin_empty?
-        end
-      end
-
-      ::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_empty?
-        end
-      end
-
-      ::ActiveRecord::Associations::AssociationProxy.class_eval do
-        # call has_one and belong_to association
-        alias_method :origin_load_target, :load_target
-        def load_target
-          # avoid stack level too deep
-          result = origin_load_target
-          if Bullet.start?
-            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless caller.any? { |c| c.include?(LOAD_TARGET) }
-            Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
-          end
-          result
-        end
-
-        alias_method :origin_set_inverse_instance, :set_inverse_instance
-        def set_inverse_instance(record, instance)
-          if Bullet.start?
-            if record && we_can_set_the_inverse_on_this?(record)
-              Bullet::Detector::NPlusOneQuery.add_inversed_object(record, @reflection.inverse_of.name)
-            end
-          end
-          origin_set_inverse_instance(record, instance)
-        end
-      end
-
-      ::ActiveRecord::Associations::HasManyAssociation.class_eval do
-        alias_method :origin_has_cached_counter?, :has_cached_counter?
-
-        def has_cached_counter?
-          result = origin_has_cached_counter?
-          if Bullet.start? && !result
-            Bullet::Detector::CounterCache.add_counter_cache(@owner, @reflection.name)
-          end
-          result
-        end
-      end
-
-      ::ActiveRecord::Associations::HasManyThroughAssociation.class_eval do
-        alias_method :origin_has_cached_counter?, :has_cached_counter?
-        def has_cached_counter?
-          result = origin_has_cached_counter?
-          if Bullet.start? && !result
-            Bullet::Detector::CounterCache.add_counter_cache(@owner, @reflection.name)
-          end
-          result
-        end
-      end
-    end
-  end
-end