bullet 5.0.0 → 5.2.0

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

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.2.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-07-26 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